fix: 过滤失败

This commit is contained in:
2025-04-25 14:09:26 +08:00
parent 14ea6df2c0
commit c57096181e

View File

@@ -381,7 +381,7 @@ 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)) {
if (ObjectUtil.isNotEmpty(vehicle_task) && vehicle_task.getString("point_code2").contains("OUT")) {
// 请求ACS删除任务
log.info("载具码:" + vehicle_code + "存在未完成的输送线任务正在请求ACS删除任务");
JSONObject taskParams = new JSONObject();
@@ -394,6 +394,8 @@ public class ShippingServiceImpl implements ShippingService {
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 + "存在未完成的输送线任务!");
}
JSONObject del_jo = WQLObject.getWQLObject("st_ivt_deliverypointivt").query("vehicle_code = '" + vehicle_code + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(del_jo)) {