From 9d2dfab2e00a61da23b47d7afb77515746d0249c Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 20 Dec 2022 16:01:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/ext/mes/rest/LmsToMesController.java | 13 ++++-- .../wms/ext/mes/service/LmsToMesService.java | 14 +++++- .../mes/service/impl/LmsToMesServiceImpl.java | 46 ++++++++++++++++++- .../org/nl/wms/st/outbill/wql/ST_OUTIVT03.wql | 2 + .../impl/InAndOutRetrunServiceImpl.java | 40 ++++++++++++++++ 5 files changed, 110 insertions(+), 5 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/LmsToMesController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/LmsToMesController.java index 0c0b488ec..54c086539 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/LmsToMesController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/LmsToMesController.java @@ -86,9 +86,16 @@ public class LmsToMesController { } @PostMapping("/LMSUnPackakge") - @Log("拆箱入库回传mes箱号、子卷号") - @ApiOperation("拆箱入库回传mes箱号、子卷号") - public ResponseEntity LmsSunPackage(@RequestBody JSONObject jo) { + @Log("拆箱出库回传mes箱号、子卷号") + @ApiOperation("拆箱出库回传mes箱号、子卷号") + public ResponseEntity lmsSunPackage(@RequestBody JSONObject jo) { return new ResponseEntity<>(lmsToMesService.LmsSunPackage(jo), HttpStatus.OK); } + + @PostMapping("/LMSPackakge") + @Log("拆箱入库回传mes箱号、子卷号") + @ApiOperation("拆箱入库回传mes箱号、子卷号") + public ResponseEntity lmsPackage(@RequestBody JSONObject jo) { + return new ResponseEntity<>(lmsToMesService.lmsPackage(jo), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/LmsToMesService.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/LmsToMesService.java index 87620c376..78e9334c0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/LmsToMesService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/LmsToMesService.java @@ -88,7 +88,7 @@ public interface LmsToMesService { JSONObject childRollFGOutboundComplete(JSONObject param); /** - * 拆箱入库：回传mes箱号、子卷号 + * 拆箱出库：回传mes箱号、子卷号 * 参数: * { * PackageBoxSN： 箱号 @@ -98,4 +98,16 @@ public interface LmsToMesService { * } */ JSONObject LmsSunPackage(JSONObject jo); + + /** + * 拆箱入库：回传mes箱号、子卷号 + * 参数: + * { + * PackageBoxSN： 箱号 + * Details： [ + * {ContainerName: 子卷号} + * ] + * } + */ + JSONObject lmsPackage(JSONObject jo); } 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 93a172923..30c6c740e 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 @@ -473,7 +473,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { } /** - * 拆箱入库：回传mes箱号、子卷号 + * 拆箱出库：回传mes箱号、子卷号 * * @return */ @@ -510,6 +510,50 @@ public class LmsToMesServiceImpl implements LmsToMesService { } + } catch (Exception e) { + throw new BadRequestException("MES提示错误："+e.getMessage()); + } + return result; + } + + /** + * 拆箱入库：回传mes箱号、子卷号 + * + * @return + */ + @LokiLog(type = LokiLogType.LMS_TO_MES) + @Override + public JSONObject lmsPackage(JSONObject param) { + log.info("LMSPackakge接口输入参数为：-------------------" + param.toString()); + + JSONObject result = new JSONObject(); + if (StrUtil.equals("0", is_connect_mes)) { + result.put("status", HttpStatus.OK.value()); + result.put("message", "下发成功，但未连接MES!"); + result.put("data", new JSONObject()); + return result; + } + + JSONArray list = new JSONArray(); + + // String url = acsUrl + api; + String url = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("MES_URL").getValue(); + String api = "CamstarApi/LMSPackakge"; + url = url + api; + try { + String resultMsg = HttpRequest.post(url) + .body(String.valueOf(param)) + .execute().body(); + result = JSONObject.parseObject(resultMsg); + log.info("LMSPackakge接口输出参数为：-------------------" + result.toString()); + + + String RTYPE = result.getString("RTYPE"); + 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/st/outbill/wql/ST_OUTIVT03.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT03.wql index b966ef7e0..16d0762d7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT03.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT03.wql @@ -84,6 +84,7 @@ st_ivt_structattr sa3 WHERE IFNULL( sa3.storagevehicle_code, '' ) <> '' + AND AND sa3.lock_type = '1' ) c WHERE c.block_num = a.block_num @@ -136,6 +137,7 @@ st_ivt_structattr sa2 WHERE IFNULL( sa2.storagevehicle_code, '' ) <> '' + AND AND sa2.lock_type = '1' ) b WHERE b.block_num = a.block_num diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java index 78947b600..6c058bac8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java @@ -131,6 +131,26 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { JSONObject param = new JSONObject(); JSONArray details = new JSONArray(); + for (int j = 0; j < disArr.size(); j++) { + JSONObject json = disArr.getJSONObject(j); + param.put("PackageBoxSN", json.getString("box_no")); + + JSONObject jsonParamDtl = new JSONObject(); + jsonParamDtl.put("ContainerName", json.getString("pcsn")); + + details.add(jsonParamDtl); + } + param.put("Details", details); + new LmsToMesServiceImpl().lmsPackage(param); + } + + // 拆分出库：回传mes + if (StrUtil.equals(bill_type, "1005")) { + JSONArray disArr = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "'").getResultJSONArray(0); + + JSONObject param = new JSONObject(); + JSONArray details = new JSONArray(); + for (int j = 0; j < disArr.size(); j++) { JSONObject json = disArr.getJSONObject(j); param.put("PackageBoxSN", json.getString("box_no")); @@ -608,6 +628,26 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { JSONObject param = new JSONObject(); JSONArray details = new JSONArray(); + for (int j = 0; j < disArr.size(); j++) { + JSONObject json = disArr.getJSONObject(j); + param.put("PackageBoxSN", json.getString("box_no")); + + JSONObject jsonParamDtl = new JSONObject(); + jsonParamDtl.put("ContainerName", json.getString("pcsn")); + + details.add(jsonParamDtl); + } + param.put("Details", details); + new LmsToMesServiceImpl().lmsPackage(param); + } + + // 拆分出库：回传mes + if (StrUtil.equals(bill_type, "1005")) { + JSONArray disArr = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "'").getResultJSONArray(0); + + JSONObject param = new JSONObject(); + JSONArray details = new JSONArray(); + for (int j = 0; j < disArr.size(); j++) { JSONObject json = disArr.getJSONObject(j); param.put("PackageBoxSN", json.getString("box_no"));