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

异常情况手动完成指令时上送wms任务完成

Browse Source
This commit is contained in:
psh
2023-10-28 20:58:24 +08:00
parent 4e2164b1c1
commit 948fca3348
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -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();
}