From d2a8682f4a8141daafec241912977192c5c060fe Mon Sep 17 00:00:00 2001 From: zhangzq Date: Fri, 25 Apr 2025 13:59:33 +0800 Subject: [PATCH] =?UTF-8?q?add:=E4=B8=80=E6=A5=BC=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE=EF=BC=9Bfix:=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E4=BB=BB=E5=8A=A1=E5=AE=8C=E6=88=90=E6=8A=A5=E9=94=99?= =?UTF-8?q?=EF=BC=9Bopt:=E4=BB=BB=E5=8A=A1=E6=9F=A5=E8=AF=A2=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch/point/dto/BstIvtPackageinfoivtVO.java | 6 ++ .../impl/BstIvtPackageinfoivtServiceImpl.java | 2 + .../org/nl/b_lms/sch/tasks/TwoOutTask.java | 6 +- .../java/org/nl/common/enums/SpecEnum.java | 1 + .../wms/sch/service/impl/TaskServiceImpl.java | 2 +- .../nl/wms/sch/service/wql/QSCH_TASK_01.wql | 101 ++++++++---------- .../src/main/resources/logback-spring.xml | 1 + 7 files changed, 63 insertions(+), 56 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/BstIvtPackageinfoivtVO.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/BstIvtPackageinfoivtVO.java index e8247e619..2c81ebfba 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/BstIvtPackageinfoivtVO.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/BstIvtPackageinfoivtVO.java @@ -25,4 +25,10 @@ public class BstIvtPackageinfoivtVO extends BstIvtPackageinfoivt { * 管芯重量 */ private String paper_weight; + + /** 子卷幅宽 */ + private Integer split_breadth; + + /** 子卷理论长度 */ + private Integer split_height; } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java index 903222654..1d8af7108 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java @@ -137,6 +137,8 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl '" + TaskStatusEnum.FINISHED.getCode() + "' and handle_class = '"+THIS_CLASS+"'") .getResultJSONArray(0); if (ObjectUtil.isEmpty(resultJSONArray)) { - this.immediateNotifyAcs(null); + try { + this.immediateNotifyAcs(null); + }catch (Exception ex){ + log.warn("载具出库批量下发异常",ex.getMessage()); + } } }, "cratergv", 30, this); } diff --git a/lms/nladmin-system/src/main/java/org/nl/common/enums/SpecEnum.java b/lms/nladmin-system/src/main/java/org/nl/common/enums/SpecEnum.java index 3701983ea..8871b6601 100644 --- a/lms/nladmin-system/src/main/java/org/nl/common/enums/SpecEnum.java +++ b/lms/nladmin-system/src/main/java/org/nl/common/enums/SpecEnum.java @@ -23,6 +23,7 @@ public enum SpecEnum { YX_MES(9, "验箱","CamstarApi/BoxDataCollectionSubmit2"), RK(10, "入库",""), RK_YC(11, "异常口入库",""), + RK_MES(12, "入库回传","CamstarApi/ChildRollFGInboundComplete"), ; private final Integer value; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java index bb8566144..50d3d58ff 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/TaskServiceImpl.java @@ -73,7 +73,7 @@ public class TaskServiceImpl implements TaskService { map.put("task_status", task_status.replace("-1", "")); } if (StrUtil.isNotEmpty(whereJson.getString("task_code"))) { - map.put("task_code", "%" + whereJson.getString("task_code") + "%"); + map.put("task_code", whereJson.getString("task_code")); } if (StrUtil.isNotEmpty(whereJson.getString("point_code1"))) { map.put("point_code1", "%" + whereJson.getString("point_code1") + "%"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql index ac19f6afb..b16ee78a2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_TASK_01.wql @@ -18,6 +18,7 @@ 输入.finished_type TYPEAS s_string 输入.task_type TYPEAS f_string 输入.in_area_id TYPEAS f_string + 输入.lk TYPEAS s_string 输入.point_code1 TYPEAS s_string 输入.point_code2 TYPEAS s_string 输入.task_code TYPEAS s_string @@ -50,61 +51,53 @@ ########################################## IF 输入.flag = "1" - PAGEQUERY - SELECT * FROM ( - SELECT - task.*, - md.class_name task_type_name, - user.person_name AS create_name1, - dict.label task_status_name, - case when task.task_type like '0105%' then 'LK' when task.task_type like '0107%' then 'LK' ELSE task.product_area end AS final_product_area - FROM - (select - tas.* - from - sch_base_task tas - where 1=1 - OPTION 输入.is_delete <> "" - tas.is_delete = 输入.is_delete - ENDOPTION - OPTION 输入.finished_type <> "" - tas.finished_type = 输入.finished_type - ENDOPTION - OPTION 输入.unFinish <> "" - tas.task_status <> '07' - ENDOPTION - OPTION 输入.task_status <> "" - find_in_set( tas.task_status, 输入.task_status) - ENDOPTION - OPTION 输入.vehicle_code <> "" - (tas.vehicle_code like 输入.vehicle_code OR tas.material_code like 输入.vehicle_code OR tas.vehicle_code2 like 输入.vehicle_code) - ENDOPTION - OPTION 输入.task_code <> "" - (tas.task_code like 输入.task_code) - ENDOPTION - OPTION 输入.point_code1 <> "" - (tas.point_code1 like 输入.point_code1) - ENDOPTION - OPTION 输入.begin_time <> "" - tas.create_time >= 输入.begin_time - ENDOPTION - OPTION 输入.end_time <> "" - tas.create_time <= 输入.end_time - ENDOPTION - ) task - LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code - LEFT JOIN sys_user user ON user.username = task.create_name - LEFT JOIN sys_dict dict ON dict.`value` = task.task_status AND dict.`code` = 'task_status' - WHERE - 1=1 - OPTION 输入.task_type <> "" - md.class_id in 输入.task_type - ENDOPTION - ) a - WHERE 1=1 - OPTION 输入.in_area_id <> "" - a.final_product_area IN 输入.in_area_id + PAGEQUERY + SELECT + task.*, + md.class_name task_type_name, + user.person_name AS create_name1, + dict.label task_status_name + FROM + sch_base_task task + LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code + LEFT JOIN sys_user user ON user.username = task.create_name + LEFT JOIN sys_dict dict ON dict.`value` = task.task_status AND dict.`code` = 'task_status' + WHERE + 1=1 + OPTION 输入.is_delete <> "" + task.is_delete = 输入.is_delete ENDOPTION + OPTION 输入.task_type <> "" + md.class_id in 输入.task_type + ENDOPTION + OPTION 输入.finished_type <> "" + task.finished_type = 输入.finished_type + ENDOPTION + OPTION 输入.unFinish <> "" + task.task_status <> '07' + ENDOPTION + OPTION 输入.task_status <> "" + find_in_set( task.task_status, 输入.task_status) + ENDOPTION + OPTION 输入.vehicle_code <> "" + (task.vehicle_code like 输入.vehicle_code OR task.material_code like 输入.vehicle_code OR task.vehicle_code2 like 输入.vehicle_code) + ENDOPTION + OPTION 输入.task_code <> "" + (task.task_code = 输入.task_code) + ENDOPTION + OPTION 输入.point_code1 <> "" + (task.point_code1 like 输入.point_code1) + ENDOPTION + OPTION 输入.begin_time <> "" + task.create_time >= 输入.begin_time + ENDOPTION + OPTION 输入.end_time <> "" + task.create_time <= 输入.end_time + ENDOPTION + OPTION 输入.in_area_id <> "" + IF(task_type like '0105%','LK',IF(task_type like '0107%','LK',ifnull(product_area,'LK'))) + IN 输入.in_area_id + ENDOPTION ENDSELECT ENDPAGEQUERY ENDIF diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml index 040e763ef..9a7897e83 100644 --- a/lms/nladmin-system/src/main/resources/logback-spring.xml +++ b/lms/nladmin-system/src/main/resources/logback-spring.xml @@ -134,6 +134,7 @@ https://juejin.cn/post/6844903775631572999 +