From 80da88967326cdda69c7b59199193f57c14aa9f1 Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 25 Nov 2022 13:55:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/service/impl/MesToLmsServiceImpl.java | 6 ++++++ .../src/main/java/org/nl/wms/pdm/wql/pdm.xls | Bin 248320 -> 249344 bytes .../service/impl/CheckOutBillServiceImpl.java | 10 +++++++-- .../org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql | 19 ++++++++++++++++++ 4 files changed, 33 insertions(+), 2 deletions(-) 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 0581627f1..4db597d1e 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 @@ -695,6 +695,9 @@ public class MesToLmsServiceImpl implements MesToLmsService { String Description = param.getString("Description"); // 来源卷位置 String DateOfFGInbound = param.getString("DateOfFGInbound"); // 来源卷位置 String box_type = param.getString("Attribute1"); // 木箱料号 + String box_length = param.getString("Attribute2"); // 木箱料号 + String box_width = param.getString("Attribute3"); // 木箱料号 + String box_high = param.getString("Attribute4"); // 木箱料号 JSONArray details = param.getJSONArray("details"); @@ -723,6 +726,9 @@ public class MesToLmsServiceImpl implements MesToLmsService { jo.put("package_box_sn", PackageBoxSN); jo.put("sap_pcsn", sap_pcsn); jo.put("box_type", box_type); + jo.put("box_length", box_length); + jo.put("box_width", box_width); + jo.put("box_high", box_high); jo.put("quanlity_in_box", QuanlityInBox); jo.put("box_weight", BoxWeight); jo.put("quality_guaran_period", QualityGuaranPeriod); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index 6f3c831130828f275ede05affc53e20a8ac87e61..3334b86fd79da21a1a73df18a17e66d1467d736d 100644 GIT binary patch delta 13766 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 oneMap = new HashMap<>(); - oneMap.put("vbeln", ""); oneMap.put("consignee", jsonMst.getString("consignee")); oneMap.put("receiver", jsonMst.getString("receiver")); oneMap.put("receiptaddress", jsonMst.getString("receiptaddress")); @@ -2159,7 +2158,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { oneMap.put("carno", jsonMst.getString("carno")); oneMap.put("driverphone", jsonMst.getString("driverphone")); oneMap.put("contractno", jsonMst.getString("contractno")); - oneMap.put("all_box", ""); + // 总箱数 + JSONArray jsonAllBox = WQL.getWO("ST_OUTIVT02").addParam("flag", "4").addParam("iostorinv_id", MapUtil.getStr(whereJson, "iostorinv_id")).process().getResultJSONArray(0); + oneMap.put("all_box", jsonAllBox.size()); oneMap.put("all_qty", ""); oneMap.put("deliveryaddress", jsonMst.getString("deliveryaddress")); oneMap.put("deliveryname", jsonMst.getString("deliveryname")); @@ -2176,6 +2177,8 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { JSONObject json = dtlArr.getJSONObject(i); HashMap mapFL = new HashMap<>(); + oneMap.put("vbeln", json.getString("vbeln")); // 送货单号 + // 明细 mapFL.put("index", i + 1); mapFL.put("source_bill_code", json.getString("source_bill_code")); mapFL.put("material_name", json.getString("material_name")); @@ -2199,6 +2202,9 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { } JSONObject json = dtlArr.getJSONObject(i); HashMap mapFL = new HashMap<>(); + + oneMap.put("vbeln", json.getString("vbeln")); // 送货单号 + // 明细 mapFL.put("index", i + 1); mapFL.put("source_bill_code", json.getString("source_bill_code")); mapFL.put("material_name", json.getString("material_name")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql index 61ae56fae..fe82afebc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql @@ -98,6 +98,25 @@ dtl.iostorinv_id = 输入.iostorinv_id ENDOPTION + ENDSELECT + ENDQUERY + ENDIF + + IF 输入.flag = "3" + QUERY + SELECT + count(*) AS num + FROM + ST_IVT_IOStorInvDis dis + WHERE + 1 = 1 + + OPTION 输入.iostorinv_id <> "" + dis.iostorinv_id = 输入.iostorinv_id + ENDOPTION + + group by dis.struct_id + ENDSELECT ENDQUERY ENDIF \ No newline at end of file