diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java index 6d514b609..d16b08bb5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java @@ -129,8 +129,6 @@ public class LmsToMesServiceImpl implements LmsToMesService { if (RTYPE.equals("E")) { throw new BadRequestException(result.getString("RTMSG")); } - - } catch (Exception e) { throw new BadRequestException("MES提示错误：" + e.getMessage()); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java index a692e0500..2bd4bb9c9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java @@ -106,7 +106,7 @@ public class FeedingServiceImpl implements FeedingService { String task_id = ""; JSONObject jo = new JSONObject(); - if (StrUtil.isEmpty(cut_jo.getString("empty_vehicle_code"))) { + if (StrUtil.equals("01", cut_jo.getString("empty_point_status"))) { jo.put("point_code1", cool_ivt.getString("full_point_code")); jo.put("point_code2", cut_jo.getString("full_point_code")); jo.put("vehicle_code", parent_container_name); @@ -271,7 +271,7 @@ public class FeedingServiceImpl implements FeedingService { } JSONObject jo = new JSONObject(); - if (StrUtil.equals("01", cut_jo.getString("empty_point_code"))) { + if (StrUtil.equals("01", cut_jo.getString("empty_point_status"))) { jo.put("point_code1", point_code); jo.put("point_code2", next_point_code); jo.put("vehicle_code", cool_jo.getString("container_name")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql index 9492cb448..91fe4df50 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql @@ -51,7 +51,6 @@ WHERE is_delete = '0' AND is_used = '1' - AND point_status = '1' OPTION 输入.reging_id <> "" region_id = 输入.reging_id @@ -82,6 +81,7 @@ is_used = '1' AND full_point_status = '01' AND empty_point_status = '01' + AND is_used = '1' AND NOT EXISTS ( SELECT diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolOutServiceImpl.java index f81327ebd..c69e71fd9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/CoolOutServiceImpl.java @@ -51,8 +51,8 @@ public class CoolOutServiceImpl String point_code = whereJson.getString("point_code"); // 出库点位 // 查询终点在冷却区是否存在 - JSONObject jsonCoolIvt = coolIvtTab.query("point_code = '" + point_code + "' and full_point_status = '02' and is_used = '1'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonCoolIvt)) throw new BadRequestException("此点位不存在或是空位"+point_code); + JSONObject jsonCoolIvt = coolIvtTab.query("full_point_code = '" + point_code + "' and full_point_status = '02' and is_used = '1'").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonCoolIvt)) throw new BadRequestException("点位："+point_code+"不符，请扫描冷却区满轴点位！"); // 更新点位状态 jsonCoolIvt.put("full_point_status", "01"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLOUT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLOUT.wql index 7cf8a079e..d7601a4ba 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLOUT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_COOLOUT.wql @@ -59,13 +59,8 @@ FROM ST_IVT_CoolPointIvt coolIvt LEFT JOIN PDM_BI_RawFoilWorkOrder der ON coolIvt.container_name = der.container_name - LEFT JOIN ST_IVT_HotRegionIOMst hotMst ON hotMst.container_name = coolIvt.container_name - LEFT JOIN ( - SELECT * FROM ST_IVT_HotRegionIOMst WHERE 1=1 ORDER BY confirm_time ASC LIMIT 1 - ) AS hotDtl1 ON hotMst.iostorinv_id = hotDtl1.iostorinv_id - LEFT JOIN ( - SELECT * FROM ST_IVT_HotRegionIOMst WHERE 1=1 ORDER BY confirm_time DESC LIMIT 1 - ) AS hotDtl2 ON hotMst.iostorinv_id = hotDtl1.iostorinv_id + LEFT JOIN ( SELECT * FROM ST_IVT_HotRegionIOMst WHERE 1 = 1 ORDER BY confirm_time ASC LIMIT 1 ) AS hotDtl1 ON hotDtl1.container_name = coolIvt.container_name + LEFT JOIN ( SELECT * FROM ST_IVT_HotRegionIOMst WHERE 1 = 1 ORDER BY confirm_time DESC LIMIT 1 ) AS hotDtl2 ON hotDtl2.container_name = coolIvt.container_name WHERE coolIvt.full_point_status = '02' diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java index 882b85456..284074ed4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java @@ -45,10 +45,10 @@ public class CoolCutTask extends AbstractAcsTask { String product_area = json.getString("product_area"); String agv_system_type = ""; - if (product_area.equals("A1")||product_area.equals("A2")){ + if (product_area.equals("A1") || product_area.equals("A2")) { agv_system_type = "2"; } - if (product_area.equals("A3")||product_area.equals("A4")){ + if (product_area.equals("A3") || product_area.equals("A4")) { agv_system_type = "3"; } AcsTaskDto dto = AcsTaskDto.builder() @@ -83,7 +83,7 @@ public class CoolCutTask extends AbstractAcsTask { if (StrUtil.equals(status, "0")) { // 更新删除字段 - jsonTask.put("is_delete","1"); + jsonTask.put("is_delete", "1"); jsonTask.put("update_time", DateUtil.now()); taskTab.update(jsonTask); @@ -162,17 +162,17 @@ public class CoolCutTask extends AbstractAcsTask { WQLObject.getWQLObject("st_ivt_coolpointivt").update(jsonCoolIvt2); //更新该母卷对应分切计划的状态 - HashMap map = new HashMap<>(); - map.put("is_parent_ok","1"); - WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(map,"parent_container_name = '"+container_name+"'"); + HashMap map = new HashMap<>(); + map.put("is_parent_ok", "1"); + WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(map, "parent_container_name = '" + container_name + "'"); //回传MES JSONObject mom_jo = new JSONObject(); - mom_jo.put("contain_name",container_name); - mom_jo.put("warehouse","1"); + mom_jo.put("contain_name", container_name); + mom_jo.put("warehouse", "1"); //判断该接口是否需要回传 JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'cutPlanMomRollDeliveryComplete'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")){ + if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")) { new LmsToMesServiceImpl().cutPlanMomRollDeliveryComplete(mom_jo); } } @@ -208,17 +208,17 @@ public class CoolCutTask extends AbstractAcsTask { WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_jo); //更新该母卷对应分切计划的状态 - HashMap map = new HashMap<>(); - map.put("is_parent_ok","1"); - WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(map,"parent_container_name = '"+container_name+"'"); + HashMap map = new HashMap<>(); + map.put("is_parent_ok", "1"); + WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(map, "parent_container_name = '" + container_name + "'"); //回传MES JSONObject mom_jo = new JSONObject(); - mom_jo.put("contain_name",container_name); - mom_jo.put("warehouse","1"); + mom_jo.put("contain_name", container_name); + mom_jo.put("warehouse", "1"); //判断该接口是否需要回传 JSONObject back_jo = WQLObject.getWQLObject("MD_PB_InterfaceBack").query("interface_name = 'cutPlanMomRollDeliveryComplete'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")){ + if (ObjectUtil.isNotEmpty(back_jo) && back_jo.getString("is_back").equals("1")) { new LmsToMesServiceImpl().cutPlanMomRollDeliveryComplete(mom_jo); } } @@ -283,7 +283,7 @@ public class CoolCutTask extends AbstractAcsTask { } JSONObject json = new JSONObject(); json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); - json.put("task_code", IdUtil.getSnowflake(1,1).nextId()); + json.put("task_code", IdUtil.getSnowflake(1, 1).nextId()); json.put("task_type", form.getString("task_type")); json.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); json.put("point_code1", point_code1); @@ -298,20 +298,22 @@ public class CoolCutTask extends AbstractAcsTask { json.put("create_name", currentUsername); json.put("create_time", DateUtil.now()); //根据类型获取对应的任务优先级 - JSONObject priority_jo = WQL.getWO("PDA_COOLIN").addParam("flag","3").addParam("task_type",json.getString("task_type")).process().uniqueResult(0); - if (ObjectUtil.isEmpty(priority_jo)){ + JSONObject priority_jo = WQL.getWO("PDA_COOLIN").addParam("flag", "3").addParam("task_type", json.getString("task_type")).process().uniqueResult(0); + if (ObjectUtil.isEmpty(priority_jo)) { json.put("priority", "1"); - }else { + } else { json.put("priority", priority_jo.getString("value")); } - if (form.getString("task_type").equals("010301")){ + if (form.getString("task_type").equals("010301")) { json.put("acs_task_type", "2"); - }else { + } else { json.put("acs_task_type", "3"); } tab.insert(json); + this.immediateNotifyAcs(null); + return json.getString("task_id"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java index b9febbcf9..cc6ab6d04 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InHotTask.java @@ -236,9 +236,6 @@ public class InHotTask extends AbstractAcsTask { if (cutConveyorTask.isSingleTask(point_code1)) { throw new BadRequestException("点位：" + point_code1 + "存在未完成的任务！"); } - if (cutConveyorTask.isSingleTask(point_code2)) { - throw new BadRequestException("点位：" + point_code2 + "存在未完成的任务！"); - } if (cutConveyorTask.isSingleTask(point_code3)) { throw new BadRequestException("点位：" + point_code3 + "存在未完成的任务！"); }