diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/BaseStoreReportRequest.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/BaseStoreReportRequest.java index ad29613b5..ed5e9574f 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/BaseStoreReportRequest.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/liKuData/BaseStoreReportRequest.java @@ -38,4 +38,7 @@ public class BaseStoreReportRequest { * 移库任务上报 1 已接收 2开始执行3 执行完成 4 起点库位有货被阻挡 5目的点库位无货被阻挡 */ public String state; + + public String robotId; + } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java index edb72c1a8..f4c507e2b 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java @@ -61,6 +61,7 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService { log.info("入库任务状态反馈-----输入参数{}", JSON.toJSONString(requestParam)); String inst_code = requestParam.getOrderId(); String status = requestParam.getState(); + String carNo = requestParam.getRobotId(); Instruction inst = instructionService.findByCodeFromCache(inst_code); TaskDto task = taskService.findByCodeFromCache(inst.getTask_code()); // 1 已接收 2 开始执行 3执行完成 4 5 取消 @@ -68,6 +69,8 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService { task.setTask_status("1"); taskService.update(task); inst.setInstruction_status("1"); + inst.setExecute_device_code(carNo); + inst.setCarno(carNo); instructionService.update(inst); } else if(StrUtil.equals(status,"3")){ inst.setInstruction_status("2"); @@ -102,6 +105,7 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService { log.info("出库任务状态反馈-----输入参数{}", JSON.toJSONString(requestParam)); String inst_code = requestParam.getOrderId(); String status = requestParam.getState(); + String carNo = requestParam.getRobotId(); Instruction inst = instructionService.findByCodeFromCache(inst_code); TaskDto task = taskService.findByCodeFromCache(inst.getTask_code()); @@ -110,6 +114,8 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService { task.setTask_status("1"); taskService.update(task); inst.setInstruction_status("1"); + inst.setExecute_device_code(carNo); + inst.setCarno(carNo); instructionService.update(inst); } else if(StrUtil.equals(status,"3")){ inst.setInstruction_status("2"); @@ -148,6 +154,7 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService { log.info("移库任务上报-----输入参数{}", JSON.toJSONString(requestParam)); String inst_code = requestParam.getOrderId(); String status = requestParam.getState(); + String carNo = requestParam.getRobotId(); Instruction inst = instructionService.findByCodeFromCache(inst_code); TaskDto task = taskService.findByCodeFromCache(inst.getTask_code()); // 1 已接收 2 开始执行 3执行完成 4 阻挡 5 空洞 @@ -155,6 +162,8 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService { task.setTask_status("1"); taskService.update(task); inst.setInstruction_status("1"); + inst.setExecute_device_code(carNo); + inst.setCarno(carNo); instructionService.update(inst); } else if(StrUtil.equals(status,"3")){