From 5f3acc4ddc1f4c7cbcff9286047c4f20a00b0eaa Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Wed, 19 Apr 2023 10:37:53 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=8C=87=E4=BB=A4=E5=8F=B7=E7=94=9F?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/service/impl/WmsToAcsServiceImpl.java    |  8 ++++++--
 .../org/nl/modules/system/util/CodeUtil.java     | 16 +++++++++-------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
index 2904daced..f05daf04e 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
@@ -59,7 +59,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
 
     private final ApplicationContext applicationContext;
 
-    private final InstructionService InstructionService;
+    private final InstructionService instructionService;
     private final TaskService taskService;
     private final DeviceService deviceService;
     private final DeviceAppService deviceAppService;
@@ -784,7 +784,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
             OutConfirmRequest outConfirmRequest = new OutConfirmRequest();
             outConfirmRequest.setOutPortNo(device_code);
             outConfirmRequest.setPalletCode(vehicle_code);
-
+            Instruction instruction = instructionService.findByCode(String.valueOf(task_code));
+            if(ObjectUtil.isNotEmpty(instruction)){
+                task_code = instruction.getInstruction_code();
+                outConfirmRequest.setOrderId(task_code);
+            }
             Resp<OutConfirmReportResponse> resp  = acsToLiKuService.outConfirm(outConfirmRequest);
 
 
diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java b/acs/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java
index 982cd1b0d..ccfbf9825 100644
--- a/acs/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java
+++ b/acs/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java
@@ -7,13 +7,15 @@ import java.util.HashMap;
 
 public class CodeUtil {
 
-    public  static synchronized String getNewCode(String ruleCode){
-        GenCodeService service=new GenCodeServiceImpl();
-        String flag = "1";
-        HashMap<String,String> map = new HashMap<>();
-        map.put("flag",flag);
-        map.put("code",ruleCode);
-        return service.codeDemo(map);
+    public static String getNewCode(String ruleCode){
+        synchronized (ruleCode) {
+            GenCodeService service=new GenCodeServiceImpl();
+            String flag = "1";
+            HashMap<String,String> map = new HashMap<>();
+            map.put("flag",flag);
+            map.put("code",ruleCode);
+            return service.codeDemo(map);
+        }
     }
 
 }