From 636e34717709b6a0d50a2c810864fe9a3a47da9c Mon Sep 17 00:00:00 2001 From: zhangzq Date: Fri, 11 Apr 2025 14:38:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E5=9B=9E=E4=BC=A0MES=E6=94=B9=E6=88=90=E5=90=8C?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BstIvtPackageinfoivtController.java | 1 - .../util/impl/InBussManageServiceImpl.java | 23 +++++++------------ .../mes/service/impl/LmsToMesServiceImpl.java | 4 ++-- .../src/main/resources/config/application.yml | 2 +- .../src/main/resources/logback-spring.xml | 6 +++-- 5 files changed, 15 insertions(+), 21 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/controller/BstIvtPackageinfoivtController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/controller/BstIvtPackageinfoivtController.java index 3b1c4a8eb..8bf5e2c13 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/controller/BstIvtPackageinfoivtController.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/controller/BstIvtPackageinfoivtController.java @@ -47,7 +47,6 @@ public class BstIvtPackageinfoivtController { */ @GetMapping @SaIgnore - @Log("查询点位库存") public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(bstIvtPackageinfoivtService.queryAll(whereJson, page)), HttpStatus.OK); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java index 4c8f77df5..4fd48444f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java @@ -298,21 +298,14 @@ public class InBussManageServiceImpl implements InBussManageService { tableData.add(jsonDtl); } String package_box_sn = (String) tableData.get(0).get("package_box_sn"); - - CompletableFuture.runAsync(() -> { - try { - String isConnect2 = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("IS_CONNECT_MES2").getValue(); - if ("1".equals(isConnect2)) { - JSONObject param_jo = new JSONObject(); - param_jo.put("box_no", package_box_sn); - param_jo.put("box_weight", subList.get(0).getString("box_weight")); - lmsToMesServiceImpl.BoxDataCollectionSubmit2(param_jo); - } - } catch (Exception e) { - log.error("验箱回传MES异常，BoxDataCollectionSubmit2给MES传输子卷包装关系异常,木箱号为：" + package_box_sn + ",异常信息：" + e); - } - }, pool); - + try { + JSONObject param_jo = new JSONObject(); + param_jo.put("box_no", package_box_sn); + param_jo.put("box_weight", subList.get(0).getString("box_weight")); + lmsToMesServiceImpl.BoxDataCollectionSubmit2(param_jo); + } catch (Exception e) { + log.error("验箱回传MES异常，BoxDataCollectionSubmit2给MES传输子卷包装关系异常,木箱号为：" + package_box_sn + ",异常信息：" + e); + } mst.put("tableData", tableData); // 判断是否已经生成过入库单 JSONObject param = new JSONObject(); 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 207aebe6a..59dc47ae2 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 @@ -1044,10 +1044,10 @@ public class LmsToMesServiceImpl implements LmsToMesService { String RTYPE = result.getString("RTYPE"); if ("E".equals(RTYPE)) { - throw new BadRequestException(result.getString("RTMSG")); + throw new BadRequestException("MES提示错误：" +result.getString("RTMSG")); } } catch (Exception e) { - throw new BadRequestException("MES提示错误：" + e.getMessage()); + throw new BadRequestException("MES错误：" + e.getMessage()); } return result; } diff --git a/lms/nladmin-system/src/main/resources/config/application.yml b/lms/nladmin-system/src/main/resources/config/application.yml index a435e1108..a9fc87884 100644 --- a/lms/nladmin-system/src/main/resources/config/application.yml +++ b/lms/nladmin-system/src/main/resources/config/application.yml @@ -6,7 +6,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev + active: prod jackson: time-zone: GMT+8 data: diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml index d840c16f1..0417acbf8 100644 --- a/lms/nladmin-system/src/main/resources/logback-spring.xml +++ b/lms/nladmin-system/src/main/resources/logback-spring.xml @@ -58,7 +58,7 @@ https://juejin.cn/post/6844903775631572999 0 - 500 + 2000 @@ -92,7 +92,8 @@ https://juejin.cn/post/6844903775631572999 - 512 + 0 + 3000 @@ -134,6 +135,7 @@ https://juejin.cn/post/6844903775631572999 +