From 91180430486fae2fe40a10bc08dfb130e342fb35 Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 31 Jul 2024 18:14:48 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E4=B8=80=E6=9C=9F=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8E=A5=E5=8F=A3=EF=BC=9A=E9=A3=9E=E9=80=81=E9=80=9A?= =?UTF-8?q?=E7=9F=A5LMS=E6=9C=A8=E7=AE=B1=E6=98=AF=E5=90=A6=E9=80=9A?= =?UTF-8?q?=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/iostorInv/util/wql/BST_INBOX.wql | 1 + .../wms/ext/mes/rest/MesToLmsController.java | 7 ++++ .../wms/ext/mes/service/MesToLmsService.java | 3 +- .../mes/service/impl/MesToLmsServiceImpl.java | 32 +++++++++++++++++++ 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql index a3c17f1f2..ab206c744 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql @@ -238,6 +238,7 @@ WHERE attr.is_used = '1' AND attr.is_delete = '0' + AND attr.lock_type = '1' AND attr.sect_id = 输入.sect_id OPTION 输入.row_in <> "" diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/MesToLmsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/MesToLmsController.java index 6e26acbc2..c30b5bca2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/MesToLmsController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/MesToLmsController.java @@ -183,4 +183,11 @@ public class MesToLmsController { public ResponseEntity WasteFoilSuccess(@RequestBody JSONObject jo) { return new ResponseEntity<>(mesToLmsService.WasteFoilSuccess(jo), HttpStatus.OK); } + + @PostMapping("/boxIsPass") + @Log("飞书通知LMS木箱是否通过") + @SaIgnore + public ResponseEntity boxIsPass(@RequestBody JSONObject jo) { + return new ResponseEntity<>(mesToLmsService.boxIsPass(jo), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/MesToLmsService.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/MesToLmsService.java index 79219ba21..4998f11b9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/MesToLmsService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/MesToLmsService.java @@ -84,6 +84,5 @@ public interface MesToLmsService { JSONObject WasteFoilSuccess(JSONObject param); - - + JSONObject boxIsPass(JSONObject jo); } 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 dc81c0edb..15ebe50d2 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 @@ -2334,4 +2334,36 @@ public class MesToLmsServiceImpl implements MesToLmsService { return resultParam; } + + @Override + public JSONObject boxIsPass(JSONObject param) { + log.info("boxIsPass输入参数为：-------------------" + param.toString()); + WQLObject subTab = WQLObject.getWQLObject("pdm_bi_subpackagerelation"); + + JSONObject resultParam = new JSONObject(); + try { + if (ObjectUtil.isEmpty(param.getString("PackageBoxSn"))) { + throw new BadRequestException("木箱号不能为空!"); + } + + if (ObjectUtil.isEmpty(param.getString("IsPss"))) { + throw new BadRequestException("是否通过不能为空!"); + } + // 更新子卷包装关系 + JSONObject json = new JSONObject(); + json.put("is_pass", param.getString("IsPss")); + subTab.update(json,"package_box_sn = '"+param.getString("PackageBoxSn")+"'"); + + resultParam.put("RTYPE", "S"); + resultParam.put("RTMSG", "操作成功!"); + resultParam.put("RTOAL", 1); + resultParam.put("RTDAT", null); + } catch (Exception e) { + resultParam.put("RTYPE", "E"); + resultParam.put("RTMSG", "操作失败!" + e.getMessage()); + resultParam.put("RTOAL", 0); + resultParam.put("RTDAT", null); + } + return resultParam; + } }