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

fix: 过滤失败2

Browse Source
This commit is contained in:
liyongde
2025-04-30 16:18:23 +08:00
parent 2b0cd990bb
commit 1c2d6f76ab
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java
View File

@@ -381,21 +381,22 @@ public class ShippingServiceImpl implements ShippingService {
throw new BadRequestException("载具码不能为空！");
}
JSONObject vehicle_task = WQLObject.getWQLObject("sch_base_task").query("vehicle_code2 = '" + vehicle_code + "' AND is_delete = '0' AND task_status < '07'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(vehicle_task) && vehicle_task.getString("point_code2").contains("OUT")) {
// 请求ACS删除任务
log.info("载具码：" + vehicle_code + "存在未完成的输送线任务！正在请求ACS删除任务！");
JSONObject taskParams = new JSONObject();
taskParams.put("product_area", vehicle_task.getString("product_area"));
taskParams.put("task_code", vehicle_task.getString("task_code"));
JSONObject acsRes = wmsToAcsService.toNoticeACSCancelTask(taskParams);
// 删除任务
log.info("请求ACS删除完毕！ACS返回值：{}", acsRes);
vehicle_task.put("task_status", TaskStatusEnum.FINISHED.getCode());
vehicle_task.put("remark", "异常自动完成任务!");
WQLObject.getWQLObject("sch_base_task").update(vehicle_task);
// throw new BadRequestException("载具码：" + vehicle_code + "存在未完成的输送线任务！");
} else if (ObjectUtil.isNotEmpty(vehicle_task)) {
throw new BadRequestException("载具码：" + vehicle_code + "存在未完成的输送线任务！");
if (ObjectUtil.isNotEmpty(vehicle_task)) {
if (vehicle_task.getString("point_code2").contains("OUT")) {
// 请求ACS删除任务
log.info("载具码：" + vehicle_code + "存在未完成的输送线任务！正在请求ACS删除任务！");
JSONObject taskParams = new JSONObject();
taskParams.put("product_area", vehicle_task.getString("product_area"));
taskParams.put("task_code", vehicle_task.getString("task_code"));
JSONObject acsRes = wmsToAcsService.toNoticeACSCancelTask(taskParams);
// 删除任务
log.info("请求ACS删除完毕！ACS返回值：{}", acsRes);
vehicle_task.put("task_status", TaskStatusEnum.FINISHED.getCode());
vehicle_task.put("remark", "异常自动完成任务!");
WQLObject.getWQLObject("sch_base_task").update(vehicle_task);
} else {
throw new BadRequestException("载具码：" + vehicle_code + "存在未完成的输送线任务！");
}
}
JSONObject del_jo = WQLObject.getWQLObject("st_ivt_deliverypointivt").query("vehicle_code = '" + vehicle_code + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(del_jo)) {