From 085ce786b72ee335deee0c7c6aecd4ed9fe4b9e4 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 19 Dec 2022 17:14:31 +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 | 7 +++ .../wms/ext/mes/service/LmsToMesService.java | 11 +++++ .../mes/service/impl/LmsToMesServiceImpl.java | 44 +++++++++++++++++++ .../pda/st/service/impl/PrintServiceImpl.java | 2 +- .../java/org/nl/wms/pda/st/wql/PDA_ST_01.wql | 2 +- .../st/outbill/wql/QST_IVT_CHECKOUTBILL.wql | 2 + .../impl/InAndOutRetrunServiceImpl.java | 43 +++++++++++++++++- 7 files changed, 108 insertions(+), 3 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 fac709719..0c0b488ec 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 @@ -84,4 +84,11 @@ public class LmsToMesController { public ResponseEntity childRollFGOutboundComplete(@RequestBody JSONObject jo) { return new ResponseEntity<>(lmsToMesService.childRollFGOutboundComplete(jo), HttpStatus.OK); } + + @PostMapping("/LMSUnPackakge") + @Log("拆箱入库回传mes箱号、子卷号") + @ApiOperation("拆箱入库回传mes箱号、子卷号") + public ResponseEntity LmsSunPackage(@RequestBody JSONObject jo) { + return new ResponseEntity<>(lmsToMesService.LmsSunPackage(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 6dd002cb2..87620c376 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 @@ -87,4 +87,15 @@ public interface LmsToMesService { */ JSONObject childRollFGOutboundComplete(JSONObject param); + /** + * 拆箱入库：回传mes箱号、子卷号 + * 参数: + * { + * PackageBoxSN： 箱号 + * Details： [ + * {ContainerName: 子卷号} + * ] + * } + */ + JSONObject LmsSunPackage(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 2e672fe3e..93a172923 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 @@ -466,6 +466,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 LmsSunPackage(JSONObject param) { + log.info("LMSUnPackakge接口输入参数为：-------------------" + 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/LMSUnPackakge"; + url = url + api; + try { + String resultMsg = HttpRequest.post(url) + .body(String.valueOf(param)) + .execute().body(); + result = JSONObject.parseObject(resultMsg); + log.info("LMSUnPackakge接口输出参数为：-------------------" + 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/pda/st/service/impl/PrintServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java index 9e682078e..108617d35 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java @@ -96,7 +96,7 @@ public class PrintServiceImpl implements PrintService { //保质期 String quality_guaran_period = box_jo.getString("quality_guaran_period"); //检验员 - String nspector = ""; + String nspector = "1"; //储存条件 String storage_conditions = ""; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql index 23859b627..4242e9316 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql @@ -160,7 +160,7 @@ FROM st_ivt_iostorinvdis dis LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id - LEFT JOIN pdm_bi_subpackagerelation sub ON sub.package_box_SN = dis.box_no AND sub.container_name = dis.pcsn + LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn LEFT JOIN sch_base_task task ON task.vehicle_code = dis.storagevehicle_code WHERE mst.bill_type = '1005' diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql index d038bfa7a..eaa958ccb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql @@ -374,6 +374,8 @@ OPTION 输入.bill_status <> "" dis.work_status <= 输入.bill_status ENDOPTION + + order by dis.struct_code ASC ENDSELECT ENDQUERY ENDIF 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 7811cfbcb..78947b600 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 @@ -124,6 +124,26 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { } } + // 拆分入库：回传mes + if (StrUtil.equals(bill_type, "0005")) { + 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")); + + JSONObject jsonParamDtl = new JSONObject(); + jsonParamDtl.put("ContainerName", json.getString("pcsn")); + + details.add(jsonParamDtl); + } + param.put("Details", details); + new LmsToMesServiceImpl().LmsSunPackage(param); + } + // 销售出库 if (StrUtil.equals(bill_type, "1001") && is_productstore.equals("1")) { // 2.回传mes @@ -580,7 +600,28 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { jo_mst.put("upload_time", DateUtil.now()); WQLObject.getWQLObject("ST_IVT_IOStorInv").update(jo_mst); } - // 销售出库 + + // 拆分入库：回传mes + if (StrUtil.equals(bill_type, "0005")) { + 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")); + + JSONObject jsonParamDtl = new JSONObject(); + jsonParamDtl.put("ContainerName", json.getString("pcsn")); + + details.add(jsonParamDtl); + } + param.put("Details", details); + new LmsToMesServiceImpl().LmsSunPackage(param); + } + + // 销售出库 if (StrUtil.equals(bill_type, "1001")) { // 1.回传sap JSONArray paramSapMstArr = new JSONArray();