From 82939e5ac549ab083b96cfad58eb891435220f6f Mon Sep 17 00:00:00 2001
From: lym <1994302445@qq.com>
Date: Tue, 18 Jun 2024 10:08:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=A0=E5=8F=82=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../executor/controller/admin/order/OrderController.java      | 3 ++-
 .../imes/module/executor/service/order/OrderServiceImpl.java  | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java
index 7660b92f8..1dce77e80 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java
@@ -109,7 +109,8 @@ public class OrderController {
     @Operation(summary = "还原")
     @Parameter(name = "orderId", description = "生产单id", required = true, example = "1")
     @PreAuthorize("@ss.hasPermission('executor:order:update')")
-    public CommonResult<Boolean> restoreOrder(@RequestParam("orderId") Long orderId) {
+    public CommonResult<Boolean> restoreOrder(@RequestBody JSONObject jsonObject) {
+        Long orderId = jsonObject.getLong("orderId");
         orderService.restoreOrder(orderId);
         return success(true);
     }
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
index bf92232a0..5881d3e35 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
@@ -378,6 +378,10 @@ public class OrderServiceImpl implements OrderService {
                 if (plateGoodDO != null) {//存在
                     goodsDO.setGoodsId(plateGoodDO.getId());
                 }
+
+            }else { // 没有goodsId 其他信息匹配
+
+
             }
 
             Long plateGoods = (Long) identifierGenerator.nextId(null);