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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
lishuai
2024-07-16 09:47:04 +08:00
parent 467a9c94d1 6f316d1960
commit 2f104185bb
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java
View File

@@ -340,7 +340,17 @@ public class OutBillQueryServiceImpl implements OutBillQueryService {
mp.put("销售订单", json.getString("sale_order_name")); mp.put("销售订单", json.getString("sale_order_name"));
mp.put("行号", ""); mp.put("行号", "");
} }
// 原销售订单 // 原销售订单
if (ObjectUtil.isEmpty(jsonSub)) {
try {
mp.put("原销售订单", json.getString("sale_order_name").substring(0, json.getString("sale_order_name").indexOf("-")));
mp.put("原行号", json.getString("sale_order_name").substring(json.getString("sale_order_name").indexOf("-") + 1, json.getString("sale_order_name").length()));
} catch (Exception e) {
mp.put("原销售订单", json.getString("sale_order_name"));
mp.put("原行号", "");
}
} else {
try { try {
mp.put("原销售订单", jsonSub.getString("sale_order_name").substring(0, jsonSub.getString("sale_order_name").indexOf("-"))); mp.put("原销售订单", jsonSub.getString("sale_order_name").substring(0, jsonSub.getString("sale_order_name").indexOf("-")));
mp.put("原行号", jsonSub.getString("sale_order_name").substring(jsonSub.getString("sale_order_name").indexOf("-") + 1, jsonSub.getString("sale_order_name").length())); mp.put("原行号", jsonSub.getString("sale_order_name").substring(jsonSub.getString("sale_order_name").indexOf("-") + 1, jsonSub.getString("sale_order_name").length()));
@@ -348,6 +358,7 @@ public class OutBillQueryServiceImpl implements OutBillQueryService {
mp.put("原销售订单", jsonSub.getString("sale_order_name")); mp.put("原销售订单", jsonSub.getString("sale_order_name"));
mp.put("原行号", ""); mp.put("原行号", "");
} }
}
mp.put("业务员", json.getString("sales_owner")); mp.put("业务员", json.getString("sales_owner"));
mp.put("出库日期", json.getString("input_time")); mp.put("出库日期", json.getString("input_time"));