diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java index 7cce537c9..df2542f6a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java @@ -189,7 +189,7 @@ public class ShippingServiceImpl implements ShippingService { JSONObject right_point = WQLObject.getWQLObject("st_ivt_deliverypointivt").query("point_location = '" + empty_point.getString("point_location") + "' AND product_area = '" + empty_point.getString("product_area") + "' AND sort_seq = '" + empty_point.getString("sort_seq") + "' order by point_code desc").uniqueResult(0); //判断是否存在任务 JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("(point_code1 = '" + right_point.getString("point_code") + "' OR point_code2 = '" + right_point.getString("point_code") + "') AND task_status < '07' AND is_delete = '0'").uniqueResult(0); - if (ObjectUtil.isEmpty(task_jo) && !right_point.getString("point_status").equals("01")) { + if (ObjectUtil.isNotEmpty(task_jo) && !right_point.getString("point_status").equals("01")) { throw new BadRequestException(empty_point.getString("point_code") + "所在一截输送线缓存位存在货物，请使用【载具横移】功能将货物横移！"); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql index c09bb9cbb..e51b93c4c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql @@ -229,6 +229,38 @@ ENDQUERY ENDIF + IF 输入.flag = "601" + QUERY + SELECT + plan.*, + ivt.point_code, + ivt.sort_seq, + ivt.product_area, + ivt.point_location + FROM + PDM_BI_SlittingProductionPlan plan + LEFT JOIN st_ivt_cutpointivt ivt ON ivt.ext_code = plan.resource_name + WHERE + plan.STATUS = '02' + AND + is_child_tz_ok = 1 + AND + is_child_ps_ok = 0 + AND + plan.is_delete = '0' + OPTION 输入.product_area <> "" + ivt.product_area = 输入.product_area + ENDOPTION + OPTION 输入.device_code <> "" + ivt.point_code = 输入.device_code + ENDOPTION + OPTION 输入.qzzno <> "" + plan.qzzno = 输入.qzzno + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF + IF 输入.flag = "7" QUERY SELECT @@ -408,6 +440,7 @@ AND IFNULL( plan.qzzno, '' ) <> '' AND task.is_delete = '0' AND plan.is_delete = '0' + AND plan.`status` < '09' AND task.task_status < '07' OPTION 输入.product_area <> "" cut.product_area = 输入.product_area @@ -428,6 +461,8 @@ ivt.point_status = '03' AND plan.is_delete = '0' + AND + plan.`status` < '09' OPTION 输入.product_area <> "" cut.product_area = 输入.product_area ENDOPTION @@ -448,6 +483,8 @@ plan.is_delete = '0' AND plan.is_child_ps_ok = '0' + AND + plan.`status` < '09' OPTION 输入.product_area <> "" cut.product_area = 输入.product_area ENDOPTION diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java index 1327c5462..c64c467e6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java @@ -79,6 +79,23 @@ public class CutConveyorTask extends AbstractAcsTask { jsonTask.put("is_delete", "1"); jsonTask.put("update_time", DateUtil.now()); taskTab.update(jsonTask); + + //初始化任务开始前分切计划的状态 + if (jsonTask.getString("task_type").equals("010402") && StrUtil.isNotEmpty(jsonTask.getString("vehicle_code"))){ + //更新该气涨轴对应的分切计划状态 + HashMap map = new HashMap(); + map.put("flag", "601"); + + if (StrUtil.isNotEmpty(jsonTask.getString("vehicle_code"))) { + map.put("qzzno", jsonTask.getString("vehicle_code")); + } + JSONArray plan_rows = WQL.getWO("PDA_02").addParamMap(map).process().getResultJSONArray(0); + for (int i = 0; i < plan_rows.size(); i++) { + JSONObject row = plan_rows.getJSONObject(i); + row.put("status", "01"); + WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(row); + } + } } if (TaskStatusEnum.EXECUTING.getCode().equals(status)) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java index c005aabe7..a8f3bd3eb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java @@ -82,6 +82,62 @@ public class CutTrussTask extends AbstractAcsTask { jsonTask.put("is_delete", "1"); jsonTask.put("update_time", DateUtil.now()); taskTab.update(jsonTask); + + //桁架标准任务 + if (jsonTask.getString("task_type").equals("010403")) { + //更新入站气涨轴的分切计划状态 + JSONArray plan_jo = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + jsonTask.getString("vehicle_code") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '04'").getResultJSONArray(0); + if (ObjectUtil.isEmpty(plan_jo)) { + throw new BadRequestException("未查询到气涨轴：" + jsonTask.getString("vehicle_code") + "对应的分切计划！"); + } + for (int i = 0; i < plan_jo.size(); i++) { + JSONObject plan_row = plan_jo.getJSONObject(i); + plan_row.put("status", "03"); + plan_row.put("end_time", DateUtil.now()); + WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(plan_row); + } + + //更新出站气涨轴的分切计划状态 + JSONArray plan_jo2 = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + jsonTask.getString("vehicle_code2") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '06'").getResultJSONArray(0); + if (ObjectUtil.isEmpty(plan_jo2)) { + throw new BadRequestException("未查询到气涨轴：" + jsonTask.getString("vehicle_code2") + "对应的分切计划！"); + } + for (int i = 0; i < plan_jo2.size(); i++) { + JSONObject plan_row = plan_jo2.getJSONObject(i); + plan_row.put("status", "05"); + plan_row.put("end_time", DateUtil.now()); + WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(plan_row); + } + } + + //分切>输送线 子卷出站 + if (jsonTask.getString("task_type").equals("010404")) { + //更新出站气涨轴的分切计划状态 + JSONArray plan_jo2 = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + jsonTask.getString("vehicle_code") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '06'").getResultJSONArray(0); + if (ObjectUtil.isEmpty(plan_jo2)) { + throw new BadRequestException("未查询到气涨轴：" + jsonTask.getString("vehicle_code") + "对应的分切计划！"); + } + for (int i = 0; i < plan_jo2.size(); i++) { + JSONObject plan_row = plan_jo2.getJSONObject(i); + plan_row.put("status", "05"); + plan_row.put("end_time", DateUtil.now()); + WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(plan_row); + } + } + //分切>输送线 子卷入站 + if (jsonTask.getString("task_type").equals("010405")) { + //更新入站气涨轴的分切计划状态 + JSONArray plan_jo = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + jsonTask.getString("vehicle_code") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '04'").getResultJSONArray(0); + if (ObjectUtil.isEmpty(plan_jo)) { + throw new BadRequestException("未查询到气涨轴：" + jsonTask.getString("vehicle_code") + "对应的分切计划！"); + } + for (int i = 0; i < plan_jo.size(); i++) { + JSONObject plan_row = plan_jo.getJSONObject(i); + plan_row.put("status", "03"); + plan_row.put("end_time", DateUtil.now()); + WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(plan_row); + } + } } if (TaskStatusEnum.EXECUTING.getCode().equals(status)) {