From 74e662d547591284c620bfa1a5ce1b0c68125b6d Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Sun, 19 Feb 2023 00:06:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B2=B9=E6=BC=86=E7=BA=BF=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BC=98=E5=85=88=E7=BA=A7=E5=92=8C=E9=80=81=E6=96=99=E9=80=81?= =?UTF-8?q?=E6=89=98=E7=9B=98=E7=9A=84=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../callEmpty/YqxCallEmpVehicleTask.java | 1 + .../callMaterial/YqxCallMaterialTask.java | 1 + .../sendEmpty/YqxSendEmpVehicleTask.java | 20 +++++++++++++++++-- .../sendMaterial/YqxSendMaterialTask.java | 16 ++++++++++----- 4 files changed, 31 insertions(+), 7 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java index 79b2e60..db6c378 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java @@ -362,6 +362,7 @@ public class YqxCallEmpVehicleTask extends AbstractAcsTask { .task_status(TaskStatusEnum.SURE_END.getCode()) .point_code2(point_code2) .acs_task_type("2") + .priority("8") .vehicle_code(form.getString("vehicle_code")) .vehicle_type(workOrderObj.getString("vehicle_type")) .vehicle_qty(1) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterialTask.java index 56ae02b..c73c43c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterialTask.java @@ -209,6 +209,7 @@ public class YqxCallMaterialTask extends AbstractAcsTask { .task_type("task_type") .task_name("油漆线叫料") .material_qty(qty) + .priority("8") .task_status(TaskStatusEnum.SURE_END.getCode()) .point_code2(point_code2) .vehicle_code(vehicle_code) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java index 20dd5c7..82560a8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java @@ -120,15 +120,31 @@ public class YqxSendEmpVehicleTask extends AbstractAcsTask { * 3.下发给ACS */ WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表 - + //生产工单表【PDM_BD_WorkOrder】 + WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); + //点位基础表【SCH_BASE_Point】 + WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); String point_code1 = form.getString("point_code1"); + String device_code = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0).getString("device_code"); + + JSONObject workOrderObj = workOrderTab.query("device_code = '" + device_code + "' and order_status = '3' and is_delete ='0'").uniqueResult(0); + if (ObjectUtil.isEmpty(workOrderObj)) throw new BadRequestException("该设备当前未生产或者已删除"); + + String vehicleType = workOrderObj.getString("vehicle_type"); + if (ObjectUtil.isEmpty(vehicleType)) throw new BadRequestException("载具类型不能为空"); + JSONObject jsonObject = pointTab.query("region_code = 'YQQY01' and point_type = '2' and can_vehicle_type = '" + vehicleType + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonObject)) throw new BadRequestException("找不到油漆线托盘下料起点"); + String startPointCode = jsonObject.getString("point_code"); + + SchTaskDto dto = SchTaskDto.builder().task_id(org.nl.wms.util.IdUtil.getLongId()) .task_code(CodeUtil.getNewCode("TASK_CODE")) .task_type("") .task_name("油漆线空盘入库") .task_status(TaskStatusEnum.SURE_START.getCode()) - .point_code1(point_code1) + .point_code1(startPointCode) + .priority("8") .vehicle_code(form.getString("vehicle_code")) .vehicle_type(form.getString("vehicle_type")) .vehicle_qty(form.getIntValue("qty")) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java index a3d3b32..724bfe6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java @@ -150,23 +150,29 @@ public class YqxSendMaterialTask extends AbstractAcsTask { //任务表【SCH_BASE_Task】 WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - //判断当前点是否有未完成的任务 - JSONObject taskObj = taskTab.query("is_delete='0' and point_code1 = '" + point_code1 + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(taskObj)) throw new BadRequestException("当前点位" + point_code1 + "存在未完成的任务"); - String device_code = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0).getString("device_code"); JSONObject workOrderObj = workOrderTab.query("device_code = '" + device_code + "' and order_status = '3' and is_delete ='0'").uniqueResult(0); if (ObjectUtil.isEmpty(workOrderObj)) throw new BadRequestException("该设备当前未生产或者已删除"); + String vehicleType = workOrderObj.getString("vehicle_type"); + if (ObjectUtil.isEmpty(vehicleType)) throw new BadRequestException("载具类型不能为空"); + JSONObject jsonObject = pointTab.query("region_code = 'YQQY01' and point_type = '4' and can_vehicle_type = '" + vehicleType + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonObject)) throw new BadRequestException("找不到油漆线物料下料起点"); + String startPointCode = jsonObject.getString("point_code"); + //判断当前点是否有未完成的任务 + JSONObject taskObj = taskTab.query("is_delete='0' and point_code1 = '" + startPointCode + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(taskObj)) throw new BadRequestException("当前点位" + startPointCode + "存在未完成的任务"); + SchTaskDto dto = SchTaskDto.builder() .task_id(IdUtil.getLongId()) .task_code(CodeUtil.getNewCode("TASK_CODE")) .task_type("task_type") .task_name("油漆线满料") + .priority("8") .task_status(TaskStatusEnum.SURE_START.getCode()) - .point_code1(point_code1) + .point_code1(startPointCode) .material_info_id(workOrderObj.getLong("workorder_id")) .material_id(workOrderObj.getLong("material_id")) .vehicle_type(workOrderObj.getString("vehicle_type"))