From 2c9b074efd5978672ce69a5a88f30e4f635b5ef1 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Sat, 13 Jul 2024 11:40:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:MES=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/service/impl/MesToLmsServiceImpl.java | 21 ++++++++++++------- .../mps/service/impl/BakingServiceImpl.java | 3 +++ .../mps/service/impl/FeedingServiceImpl.java | 3 +++ .../wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql | 6 +++++- 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java index ae56a8999..f6f281a35 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java @@ -616,10 +616,12 @@ public class MesToLmsServiceImpl implements MesToLmsService { } if (param.getString("PaperTubeDescription").contains("3.12")) { qzz_generation = "4"; - } - if (param.getString("PaperTubeDescription").contains("3.15")) { + } else if (param.getString("PaperTubeDescription").contains("3.15")) { qzz_generation = "5"; + } else { + qzz_generation = "4"; } + // 解析描述数组 String[] tubeArray = param.getString("PaperTubeDescription").split("\\|"); // 定义尺寸与长度 @@ -636,10 +638,12 @@ public class MesToLmsServiceImpl implements MesToLmsService { } if (param.getString("FRPDescription").contains("3.12")) { qzz_generation = "4"; - } - if (param.getString("FRPDescription").contains("3.15")) { + } else if (param.getString("FRPDescription").contains("3.15")) { qzz_generation = "5"; + } else { + qzz_generation = "4"; } + // 解析描述数组 String[] tubeArray = param.getString("FRPDescription").split("\\|"); // 定义尺寸与长度 @@ -671,14 +675,14 @@ public class MesToLmsServiceImpl implements MesToLmsService { json.put("split_breadth", SplitBreadth); json.put("split_height", SplitHeight); json.put("split_weight", SplitWeight); - if (Attribute3.equals("U")){ + if (Attribute3.equals("U")) { json.put("up_or_down", "1"); - }else { + } else { json.put("up_or_down", "2"); } - if (Attribute4.equals("U")){ + if (Attribute4.equals("L")) { json.put("left_or_right", "1"); - }else { + } else { json.put("left_or_right", "2"); } json.put("qzz_size", qzz_size); @@ -1017,6 +1021,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { if (plan_jo.getString("up_or_down").equals("2")) { cut_jo.put("down_qzzno", qzzNO); } + plan_jo.put("qzzno", qzzNO); WQLObject.getWQLObject("ST_IVT_CutPointIvt").update(cut_jo); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java index dee4bf2ed..cdffdf2d8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java @@ -728,6 +728,9 @@ public class BakingServiceImpl implements BakingService { String in_area_id = userAreaService.getInArea(); JSONObject jsonCool = coolIvtTab.query("full_point_code = '" + point_code + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(jsonCool)) { + jsonCool = coolIvtTab.query("point_code = '" + point_code + "'").uniqueResult(0); + } if (ObjectUtil.isNotEmpty(jsonCool) && ObjectUtil.isNotEmpty(jsonCool.getString("container_name"))) { json.put("container_name", jsonCool.getString("container_name")); String product_area = jsonCool.getString("product_area"); 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 e1dc6c316..9e6b760bc 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 @@ -232,6 +232,9 @@ public class FeedingServiceImpl implements FeedingService { } JSONObject cool_jo = WQLObject.getWQLObject("st_ivt_coolpointivt").query("full_point_code = '" + point_code + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(cool_jo)) { + cool_jo = WQLObject.getWQLObject("st_ivt_coolpointivt").query("point_code = '" + point_code + "'").uniqueResult(0); + } if (ObjectUtil.isEmpty(cool_jo)) { throw new BadRequestException("请输入或者扫描冷却区满轴位的点位！"); 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 81019bfc8..c28b660d3 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 @@ -19,6 +19,7 @@ 输入.product_area TYPEAS s_string 输入.point_type TYPEAS s_string 输入.cant_location TYPEAS f_string + 输入.mater_flag TYPEAS s_string [临时表] @@ -106,6 +107,9 @@ ENDOPTION OPTION 输入.point_type = "5" IFNULL(po.material_code,'') = '' + ENDOPTION + OPTION 输入.mater_flag = "1" + IFNULL(po.material_code,'') = '' ENDOPTION UNION SELECT @@ -161,7 +165,7 @@ FROM sch_base_task WHERE - ( point_code1 = empty_point_code OR point_code2 = empty_point_code ) + ( point_code1 = empty_point_code OR point_code2 = empty_point_code OR point_code4 = empty_point_code ) AND task_status < '07' AND is_delete = '0' )