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 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 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 map = new HashMap<>(); + map.put("flag",flag); + map.put("code",ruleCode); + return service.codeDemo(map); + } } }