From 1094e00242a8c8044d7b43063d126b4fb584ba42 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Fri, 8 Sep 2023 09:15:56 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=9B=9E=E4=BC=A0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=81=E5=BA=93=E5=AD=98=E6=8A=A5=E8=A1=A8=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../st/service/impl/StructivtServiceImpl.java | 4 + .../wms/basedata/st/wql/QST_STRUCTIVT001.wql | 45 +++++++ .../mps/service/impl/BakingServiceImpl.java | 3 + .../impl/InAndOutRetrunServiceImpl.java | 116 +++++++++--------- .../src/views/wms/basedata/st/ivt/index.vue | 17 +++ .../wms/pdm/ivt/deliverypointivt/index.vue | 6 +- .../src/views/wms/st/outbill/index.vue | 2 +- 7 files changed, 133 insertions(+), 60 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java index 5e56d3626..7f4b2d58f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java @@ -55,6 +55,7 @@ public class StructivtServiceImpl implements StructivtService { String sale_order_name = MapUtil.getStr(whereJson, "sale_order_name"); String ivt_status = MapUtil.getStr(whereJson, "ivt_status"); String is_virtual = MapUtil.getStr(whereJson, "is_virtual"); + String rein_flag = MapUtil.getStr(whereJson, "rein_flag"); JSONObject map = new JSONObject(); map.put("flag", "1"); map.put("stor_id", stor_id); @@ -95,6 +96,7 @@ public class StructivtServiceImpl implements StructivtService { String in_stor_id = userStorService.getInStor(); if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id", in_stor_id); + if (ObjectUtil.isNotEmpty(rein_flag)) map.put("rein_flag", rein_flag); JSONObject jsonObject = WQL.getWO("QST_STRUCTIVT001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "ivt.instorage_time desc"); return jsonObject; @@ -199,6 +201,7 @@ public class StructivtServiceImpl implements StructivtService { String package_box_sn = MapUtil.getStr(whereJson, "package_box_sn"); String sale_order_name = MapUtil.getStr(whereJson, "sale_order_name"); String is_virtual = MapUtil.getStr(whereJson, "is_virtual"); + String rein_flag = MapUtil.getStr(whereJson, "rein_flag"); JSONObject map = new JSONObject(); map.put("flag", "2"); map.put("stor_id", stor_id); @@ -238,6 +241,7 @@ public class StructivtServiceImpl implements StructivtService { String in_stor_id = userStorService.getInStor(); if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id", in_stor_id); + if (ObjectUtil.isNotEmpty(rein_flag)) map.put("rein_flag", rein_flag); JSONArray resultJSONArray = WQL.getWO("QST_STRUCTIVT001").addParamMap(map).process().getResultJSONArray(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql index bd46cdf03..98352d823 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql @@ -25,6 +25,7 @@ 输入.sale_order_name TYPEAS s_string 输入.package_box_sn TYPEAS s_string 输入.is_virtual TYPEAS s_string + 输入.rein_flag TYPEAS s_string 输入.in_stor_id TYPEAS f_string [临时表] @@ -51,6 +52,10 @@ IF 输入.flag = "1" PAGEQUERY + SELECT + a.* + FROM + ( SELECT ivt.*, attr.sect_id, @@ -134,6 +139,24 @@ OPTION 输入.ivt_status = "frozen_qty" ivt.frozen_qty > 0 ENDOPTION + ) a + INNER JOIN ( + SELECT + dis.pcsn, + mst.bill_type + FROM + st_ivt_iostorinvdis dis + INNER JOIN ( SELECT MAX( iostorinvdis_id ) AS iostorinvdis_id, pcsn FROM st_ivt_iostorinvdis GROUP BY pcsn ) a ON a.iostorinvdis_id = dis.iostorinvdis_id + INNER JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id + ) b ON a.pcsn = b.pcsn + WHERE + 1=1 + OPTION 输入.rein_flag = "1" + b.bill_type = '0002' + ENDOPTION + OPTION 输入.rein_flag = "0" + b.bill_type <> '0002' + ENDOPTION ENDSELECT ENDPAGEQUERY @@ -141,6 +164,10 @@ IF 输入.flag = "2" QUERY + SELECT + a.* + FROM + ( SELECT ivt.*, attr.sect_id, @@ -223,6 +250,24 @@ ENDOPTION OPTION 输入.areas <> "" LEFT(sub.container_name,2) IN 输入.areas + ENDOPTION + ) a + INNER JOIN ( + SELECT + dis.pcsn, + mst.bill_type + FROM + st_ivt_iostorinvdis dis + INNER JOIN ( SELECT MAX( iostorinvdis_id ) AS iostorinvdis_id, pcsn FROM st_ivt_iostorinvdis GROUP BY pcsn ) a ON a.iostorinvdis_id = dis.iostorinvdis_id + INNER JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id + ) b ON a.pcsn = b.pcsn + WHERE + 1=1 + OPTION 输入.rein_flag = "1" + b.bill_type = '0002' + ENDOPTION + OPTION 输入.rein_flag = "0" + b.bill_type <> '0002' ENDOPTION ENDSELECT ENDQUERY diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java index 6e41b54a1..a23f94055 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java @@ -401,6 +401,9 @@ public class BakingServiceImpl implements BakingService { JSONObject last_hot_mst = WQLObject.getWQLObject("ST_IVT_HotRegionIOMst").query("container_name = '" + jsonHotIvt.getString("container_name") + "' AND io_type = '0' order by confirm_time desc").uniqueResult(0); JSONObject jsonRaw = rawTab.query("container_name = '" + jsonHotIvt.getString("container_name") + "' and is_delete = '0'").uniqueResult(0); + if(ObjectUtil.isEmpty(jsonRaw)){ + throw new BadRequestException("未查询到母卷号："+jsonHotIvt.getString("container_name")+"对应的生箔工单！"); + } JSONObject jsonMater = materTab.query("material_code = '" + jsonRaw.getString("product_name") + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonMater)) { throw new BadRequestException("物料基础信息中无此物料！"); 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 b9c947050..00ba106ef 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 @@ -71,7 +71,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { if (ObjectUtil.isNotEmpty(in_stor_id)) map.put("in_stor_id", in_stor_id); - JSONObject jo = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time desc"); + JSONObject jo = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time desc"); return jo; } @@ -129,14 +129,14 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { // 拆分入库：回传mes if (StrUtil.equals(bill_type, "0005")) { - JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag","2").addParam("iostorinv_id",jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0); + JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag", "2").addParam("iostorinv_id", jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0); for (int j = 0; j < disArr.size(); j++) { JSONObject param = new JSONObject(); JSONArray details = new JSONArray(); JSONObject json = disArr.getJSONObject(j); param.put("PackageBoxSN", json.getString("box_no")); - JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '"+json.getString("box_no")+"'").getResultJSONArray(0); + JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '" + json.getString("box_no") + "'").getResultJSONArray(0); for (int k = 0; k < container_jo.size(); k++) { JSONObject dis_jo = container_jo.getJSONObject(k); JSONObject jsonParamDtl = new JSONObject(); @@ -155,14 +155,14 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { // 拆分出库：回传mes if (StrUtil.equals(bill_type, "1005")) { - JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag","2").addParam("iostorinv_id",jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0); + JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag", "2").addParam("iostorinv_id", jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0); for (int j = 0; j < disArr.size(); j++) { JSONObject param = new JSONObject(); JSONArray details = new JSONArray(); JSONObject json = disArr.getJSONObject(j); param.put("PackageBoxSN", json.getString("box_no")); - JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '"+json.getString("box_no")+"'").getResultJSONArray(0); + JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '" + json.getString("box_no") + "'").getResultJSONArray(0); for (int k = 0; k < container_jo.size(); k++) { JSONObject dis_jo = container_jo.getJSONObject(k); JSONObject jsonParamDtl = new JSONObject(); @@ -181,7 +181,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { // 返检出库：回传mes if (StrUtil.equals(bill_type, "1006")) { - JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag","2").addParam("iostorinv_id",jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0); + JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag", "2").addParam("iostorinv_id", jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0); for (int j = 0; j < disArr.size(); j++) { JSONObject param = new JSONObject(); JSONArray details = new JSONArray(); @@ -189,7 +189,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { param.put("PackageBoxSN", json.getString("box_no")); param.put("Attribute1", "ReCheck"); - JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '"+json.getString("box_no")+"'").getResultJSONArray(0); + JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '" + json.getString("box_no") + "'").getResultJSONArray(0); for (int k = 0; k < container_jo.size(); k++) { JSONObject dis_jo = container_jo.getJSONObject(k); JSONObject jsonParamDtl = new JSONObject(); @@ -207,7 +207,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { } // 销售出库 - if (StrUtil.equals(bill_type, "1001") && is_productstore.equals("1")) { +// if (StrUtil.equals(bill_type, "1001") && is_productstore.equals("1")) { + if (StrUtil.equals(bill_type, "1001")) { // 2.回传mes JSONObject paramMesMst = new JSONObject(); String userName = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_USERNAME").getValue(); @@ -217,7 +218,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { paramMesMst.put("Password", passWord); paramMesMst.put("iOutboundOrderNum", jo_mst.getString("bill_code")); paramMesMst.put("iOutboundUser", jo_mst.getString("confirm_optname")); - paramMesMst.put("iOutboundTime", jo_mst.getString("confirm_time")); + paramMesMst.put("iOutboundTime", DateUtil.now()); JSONArray boxArr = WQL.getWO("ST_OUTIVT02").addParam("flag", "2") .addParam("iostorinv_id", jo_mst.getString("iostorinv_id")) @@ -246,7 +247,8 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { } // 调拨出库 - if (StrUtil.equals(bill_type, "1004") && is_productstore.equals("1")) { +// if (StrUtil.equals(bill_type, "1004") && is_productstore.equals("1")) { + if (StrUtil.equals(bill_type, "1004")) { // 2.回传mes JSONObject paramMesMst = new JSONObject(); String userName = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_USERNAME").getValue(); @@ -256,7 +258,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { paramMesMst.put("Password", passWord); paramMesMst.put("iOutboundOrderNum", jo_mst.getString("bill_code")); paramMesMst.put("iOutboundUser", jo_mst.getString("confirm_optname")); - paramMesMst.put("iOutboundTime", jo_mst.getString("confirm_time")); + paramMesMst.put("iOutboundTime", DateUtil.now()); JSONArray boxArr = WQL.getWO("ST_OUTIVT02").addParam("flag", "2") .addParam("iostorinv_id", jo_mst.getString("iostorinv_id")) @@ -369,7 +371,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { jsonDtl.put("LGORT", lgort); // 明細储存地点 } - JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "' AND package_box_sn = '"+json2.getString("box_no")+"'").uniqueResult(0); + JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "' AND package_box_sn = '" + json2.getString("box_no") + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonSect)) { jsonDis.put("CHARG", jsonSub.getString("sap_pcsn")); // sap批次 } @@ -442,7 +444,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点 } - JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "' AND package_box_sn = '"+json2.getString("box_no")+"'").uniqueResult(0); + JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "' AND package_box_sn = '" + json2.getString("box_no") + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonSub)) { jsonDis.put("CHARG", jsonSub.getString("sap_pcsn")); // sap批次 } @@ -516,7 +518,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { jsonDtl.put("LGORT", lgort); // 明細储存地点 } - JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "' AND package_box_sn = '"+json2.getString("box_no")+"'").uniqueResult(0); + JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "' AND package_box_sn = '" + json2.getString("box_no") + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonSect)) { jsonDis.put("CHARG", jsonSub.getString("sap_pcsn")); // sap批次 } @@ -559,7 +561,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { JSONArray disArr = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "'").getResultJSONArray(0); JSONObject jsonDtl = wo_dtl.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "'").uniqueResult(0); - param.put("ZDBSQD",jsonDtl.getString("vbeln")); + param.put("ZDBSQD", jsonDtl.getString("vbeln")); param.put("LGORT2", jo_mst.getString("stor_code")); JSONObject jsonStorOut = WQLObject.getWQLObject("st_ivt_bsrealstorattr").query("stor_id = '" + jo_mst.getString("out_stor_id") + "'").uniqueResult(0); param.put("LGORT1", jsonStorOut.getString("stor_code")); @@ -576,7 +578,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { paramDis.put("ZHL02", jsonSub.getString("width")); paramDis.put("ZZWLHD", jsonSub.getString("thickness")); paramDis.put("CHARG", jsonSub.getString("sap_pcsn")); - paramDis.put("KALAB", NumberUtil.round(jsonDis.getDoubleValue("plan_qty"),3)); + paramDis.put("KALAB", NumberUtil.round(jsonDis.getDoubleValue("plan_qty"), 3)); paramDis.put("WERKS", "2460"); paramSapMstArr.add(paramDis); } @@ -696,7 +698,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点 } - JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "' AND package_box_sn = '"+json2.getString("box_no")+"'").uniqueResult(0); + JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "' AND package_box_sn = '" + json2.getString("box_no") + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonSub)) { jsonDis.put("CHARG", jsonSub.getString("sap_pcsn")); // sap批次 } @@ -866,7 +868,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { jsonDtl.put("LGORT", jo_mst.getString("remark")); // 明細储存地点 } - JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "' AND package_box_sn = '"+json2.getString("box_no")+"'").uniqueResult(0); + JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "' AND package_box_sn = '" + json2.getString("box_no") + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonSect)) { jsonDis.put("CHARG", jsonSub.getString("sap_pcsn")); // sap批次 } @@ -907,7 +909,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { JSONArray disArr = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "'").getResultJSONArray(0); JSONObject jsonDtl = wo_dtl.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "'").uniqueResult(0); - param.put("ZDBSQD",jsonDtl.getString("vbeln")); + param.put("ZDBSQD", jsonDtl.getString("vbeln")); param.put("LGORT2", jo_mst.getString("stor_code")); JSONObject jsonStorOut = WQLObject.getWQLObject("st_ivt_bsrealstorattr").query("stor_id = '" + jo_mst.getString("out_stor_id") + "'").uniqueResult(0); param.put("LGORT1", jsonStorOut.getString("stor_code")); @@ -924,7 +926,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { paramDis.put("ZHL02", jsonSub.getString("width")); paramDis.put("ZZWLHD", jsonSub.getString("thickness")); paramDis.put("CHARG", jsonSub.getString("sap_pcsn")); - paramDis.put("KALAB", NumberUtil.round(jsonDis.getDoubleValue("plan_qty"),3)); + paramDis.put("KALAB", NumberUtil.round(jsonDis.getDoubleValue("plan_qty"), 3)); paramDis.put("WERKS", "2460"); paramSapMstArr.add(paramDis); } @@ -943,14 +945,14 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { // 拆分入库：回传mes if (StrUtil.equals(bill_type, "0005")) { - JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag","2").addParam("iostorinv_id",jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0); + JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag", "2").addParam("iostorinv_id", jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0); for (int j = 0; j < disArr.size(); j++) { JSONObject param = new JSONObject(); JSONArray details = new JSONArray(); JSONObject json = disArr.getJSONObject(j); param.put("PackageBoxSN", json.getString("box_no")); - JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '"+json.getString("box_no")+"'").getResultJSONArray(0); + JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '" + json.getString("box_no") + "'").getResultJSONArray(0); for (int k = 0; k < container_jo.size(); k++) { JSONObject dis_jo = container_jo.getJSONObject(k); JSONObject jsonParamDtl = new JSONObject(); @@ -1007,7 +1009,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点 } - JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "' AND package_box_sn = '"+json2.getString("box_no")+"'").uniqueResult(0); + JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "' AND package_box_sn = '" + json2.getString("box_no") + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonSub)) { jsonDis.put("CHARG", jsonSub.getString("sap_pcsn")); // sap批次 } @@ -1041,14 +1043,14 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { // 拆分出库：回传mes if (StrUtil.equals(bill_type, "1005")) { - JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag","2").addParam("iostorinv_id",jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0); + JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag", "2").addParam("iostorinv_id", jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0); for (int j = 0; j < disArr.size(); j++) { JSONObject param = new JSONObject(); JSONArray details = new JSONArray(); JSONObject json = disArr.getJSONObject(j); param.put("PackageBoxSN", json.getString("box_no")); - JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '"+json.getString("box_no")+"'").getResultJSONArray(0); + JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '" + json.getString("box_no") + "'").getResultJSONArray(0); for (int k = 0; k < container_jo.size(); k++) { JSONObject dis_jo = container_jo.getJSONObject(k); JSONObject jsonParamDtl = new JSONObject(); @@ -1107,7 +1109,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { jsonDtl.put("LGORT", lgort); // 明細储存地点 } - JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "' AND package_box_sn = '"+json2.getString("box_no")+"'").uniqueResult(0); + JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "' AND package_box_sn = '" + json2.getString("box_no") + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonSect)) { jsonDis.put("CHARG", jsonSub.getString("sap_pcsn")); // sap批次 } @@ -1137,36 +1139,36 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { // 2.回传mes - if (is_productstore.equals("1")) { - JSONObject paramMesMst = new JSONObject(); - String userName = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_USERNAME").getValue(); - String passWord = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_PASSWORD").getValue(); + //if (is_productstore.equals("1")) { + JSONObject paramMesMst = new JSONObject(); + String userName = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_USERNAME").getValue(); + String passWord = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MES_PASSWORD").getValue(); - paramMesMst.put("UserName", userName); - paramMesMst.put("Password", passWord); - paramMesMst.put("iOutboundOrderNum", jo_mst.getString("bill_code")); - paramMesMst.put("iOutboundUser", jo_mst.getString("confirm_optname")); - paramMesMst.put("iOutboundTime", jo_mst.getString("confirm_time")); + paramMesMst.put("UserName", userName); + paramMesMst.put("Password", passWord); + paramMesMst.put("iOutboundOrderNum", jo_mst.getString("bill_code")); + paramMesMst.put("iOutboundUser", jo_mst.getString("confirm_optname")); + paramMesMst.put("iOutboundTime", DateUtil.now()); - JSONArray boxArr = WQL.getWO("ST_OUTIVT02").addParam("flag", "2") - .addParam("iostorinv_id", jo_mst.getString("iostorinv_id")) - .process().getResultJSONArray(0); + JSONArray boxArr = WQL.getWO("ST_OUTIVT02").addParam("flag", "2") + .addParam("iostorinv_id", jo_mst.getString("iostorinv_id")) + .process().getResultJSONArray(0); - JSONArray paramArr = new JSONArray(); - for (int j = 0; j < boxArr.size(); j++) { - JSONObject json = boxArr.getJSONObject(j); - JSONObject jsonBox = new JSONObject(); + JSONArray paramArr = new JSONArray(); + for (int j = 0; j < boxArr.size(); j++) { + JSONObject json = boxArr.getJSONObject(j); + JSONObject jsonBox = new JSONObject(); - jsonBox.put("PackageBoxSN", json.getString("box_no")); - paramArr.add(jsonBox); - } - paramMesMst.put("item", paramArr); - - // 调用接口回传 - new LmsToMesServiceImpl().childRollFGOutboundComplete(paramMesMst); - - jo_mst.put("upload_mes", "1"); + jsonBox.put("PackageBoxSN", json.getString("box_no")); + paramArr.add(jsonBox); } + paramMesMst.put("item", paramArr); + + // 调用接口回传 + new LmsToMesServiceImpl().childRollFGOutboundComplete(paramMesMst); + + jo_mst.put("upload_mes", "1"); + // } jo_mst.put("is_upload", "1"); jo_mst.put("upload_optid", SecurityUtils.getCurrentUserId()); jo_mst.put("upload_time", DateUtil.now()); @@ -1238,7 +1240,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { paramMesMst.put("Password", passWord); paramMesMst.put("iOutboundOrderNum", jo_mst.getString("bill_code")); paramMesMst.put("iOutboundUser", jo_mst.getString("confirm_optname")); - paramMesMst.put("iOutboundTime", jo_mst.getString("confirm_time")); + paramMesMst.put("iOutboundTime", DateUtil.now()); JSONArray boxArr = WQL.getWO("ST_OUTIVT02").addParam("flag", "2") .addParam("iostorinv_id", jo_mst.getString("iostorinv_id")) @@ -1266,7 +1268,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { // 改切出库：回传mes if (StrUtil.equals(bill_type, "1003")) { - JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag","2").addParam("iostorinv_id",jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0); + JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag", "2").addParam("iostorinv_id", jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0); for (int j = 0; j < disArr.size(); j++) { JSONObject param = new JSONObject(); JSONArray details = new JSONArray(); @@ -1274,7 +1276,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { param.put("PackageBoxSN", json.getString("box_no")); param.put("Attribute1", "ReCut"); - JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '"+json.getString("box_no")+"'").getResultJSONArray(0); + JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '" + json.getString("box_no") + "'").getResultJSONArray(0); for (int k = 0; k < container_jo.size(); k++) { JSONObject dis_jo = container_jo.getJSONObject(k); JSONObject jsonParamDtl = new JSONObject(); @@ -1293,7 +1295,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { // 返检出库：回传mes if (StrUtil.equals(bill_type, "1006")) { - JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag","2").addParam("iostorinv_id",jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0); + JSONArray disArr = WQL.getWO("QST_IVT_INANDOUTRETRUN").addParam("flag", "2").addParam("iostorinv_id", jo_mst.getString("iostorinv_id")).process().getResultJSONArray(0); for (int j = 0; j < disArr.size(); j++) { JSONObject param = new JSONObject(); JSONArray details = new JSONArray(); @@ -1301,7 +1303,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { param.put("PackageBoxSN", json.getString("box_no")); param.put("Attribute1", "ReCheck"); - JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '"+json.getString("box_no")+"'").getResultJSONArray(0); + JSONArray container_jo = wo_dis.query("iostorinv_id = '" + jo_mst.getString("iostorinv_id") + "' AND box_no = '" + json.getString("box_no") + "'").getResultJSONArray(0); for (int k = 0; k < container_jo.size(); k++) { JSONObject dis_jo = container_jo.getJSONObject(k); JSONObject jsonParamDtl = new JSONObject(); @@ -1358,7 +1360,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { jsonDtl.put("LGORT", jsonSect.getString("ext_id")); // 明細储存地点 } - JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "' AND package_box_sn = '"+json2.getString("box_no")+"'").uniqueResult(0); + JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "' AND package_box_sn = '" + json2.getString("box_no") + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(jsonSub)) { jsonDis.put("CHARG", jsonSub.getString("sap_pcsn")); // sap批次 } diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue index 6174b2533..beed26f42 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue @@ -134,6 +134,23 @@ /> + + + + + diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue index d76f43831..ba7fc5b8e 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue @@ -80,7 +80,7 @@ > - + - + diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue index d85b33d7e..748a7d293 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue @@ -481,7 +481,7 @@ export default { }, outReturn() { alert('点击确认按钮后，单据进行回传！') - checkoutbill.outReturn({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => { + checkoutbill.outReturn(this.currentRow).then(res => { this.crud.notify('回传成功！', CRUD.NOTIFICATION_TYPE.SUCCESS) this.querytable() })