diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index 97bd083..456805d 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.http.HttpResponse; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; @@ -24,6 +25,8 @@ import org.nl.acs.device_driver.basedriver.standard_conveyor_control_with_scanne import org.nl.acs.device_driver.basedriver.standard_inspect_site.StandardInspectSiteDeviceDriver; import org.nl.acs.ext.wms.liKuData.*; import org.nl.acs.ext.wms.service.AcsToLiKuService; +import org.nl.acs.ext.wms.service.AcsToWmsService; +import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; import org.nl.acs.opc.Device; @@ -81,6 +84,8 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu TaskService taskService; @Autowired AcsToLiKuService acsToLiKuService; + @Autowired + AcsToWmsService acsToWmsService; @Override public void autoInitial() { @@ -712,6 +717,17 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu } } + //异常情况手动完成指令时上送wms任务完成 + JSONObject map = new JSONObject(); + map.put("uuid", IdUtil.simpleUUID()); + map.put("taskNo", entity.getTask_code()); + map.put("businessType", "ARRIVE_TO_POINT"); + map.put("containerNo",entity.getVehicle_code()); + map.put("deviceNo",entity.getCarno()); + try (HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(map)) { + log.info("指令号:{},agv异常情况手动完成指令,上送wms任务完成", entity.getInstruction_code()); + } + removeByCodeFromCache(entity.getInstruction_code()); // this.reload(); }