root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 指令号生成

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2023-04-19 10:37:53 +08:00
parent 49a0c61938
commit 5f3acc4ddc
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -59,7 +59,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
private final ApplicationContext applicationContext; private final ApplicationContext applicationContext;
private final InstructionService InstructionService; private final InstructionService instructionService;
private final TaskService taskService; private final TaskService taskService;
private final DeviceService deviceService; private final DeviceService deviceService;
private final DeviceAppService deviceAppService; private final DeviceAppService deviceAppService;
@@ -784,7 +784,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
OutConfirmRequest outConfirmRequest = new OutConfirmRequest(); OutConfirmRequest outConfirmRequest = new OutConfirmRequest();
outConfirmRequest.setOutPortNo(device_code); outConfirmRequest.setOutPortNo(device_code);
outConfirmRequest.setPalletCode(vehicle_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); Resp<OutConfirmReportResponse> resp = acsToLiKuService.outConfirm(outConfirmRequest);

4
acs/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java
View File

@@ -7,7 +7,8 @@ import java.util.HashMap;
public class CodeUtil { public class CodeUtil {
public static synchronized String getNewCode(String ruleCode){ public static String getNewCode(String ruleCode){
synchronized (ruleCode) {
GenCodeService service=new GenCodeServiceImpl(); GenCodeService service=new GenCodeServiceImpl();
String flag = "1"; String flag = "1";
HashMap<String,String> map = new HashMap<>(); HashMap<String,String> map = new HashMap<>();
@@ -15,5 +16,6 @@ public class CodeUtil {
map.put("code",ruleCode); map.put("code",ruleCode);
return service.codeDemo(map); return service.codeDemo(map);
} }
}
} }