root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
liuxy
2022-11-25 13:55:04 +08:00
parent 673758226e
commit 80da889673
4 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
View File

@@ -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);

BIN
lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls
View File

Binary file not shown.

10
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -2149,7 +2149,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
// WriteSheet sheet = EasyExcel.writerSheet().build();
// 5.单组填充
HashMap<String, Object> 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<String, Object> 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<String, Object> 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"));

19
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT02.wql
View File

@@ -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