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

Merge branch 'master' into master_merge

Browse Source
This commit is contained in:
liuxy
2024-07-15 09:52:19 +08:00
parent 4f63db49e0 6f316d1960
commit 258428b276
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -350,8 +350,7 @@ public class OutBillQueryServiceImpl implements OutBillQueryService {
mp.put("原销售订单", json.getString("sale_order_name")); mp.put("原销售订单", json.getString("sale_order_name"));
mp.put("原行号", ""); 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()));
@@ -359,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"));