Merge branch 'master' into master_merge

This commit is contained in:
2024-07-15 09:52:19 +08:00

View File

@@ -350,14 +350,14 @@ public class OutBillQueryServiceImpl implements OutBillQueryService {
mp.put("原销售订单", json.getString("sale_order_name"));
mp.put("原行号", "");
}
}
try {
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()));
} catch (Exception e) {
mp.put("销售订单", jsonSub.getString("sale_order_name"));
mp.put("原行号", "");
} else {
try {
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()));
} catch (Exception e) {
mp.put("原销售订单", jsonSub.getString("sale_order_name"));
mp.put("行号", "");
}
}
mp.put("业务员", json.getString("sales_owner"));