aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-06-25 16:49:47 +08:00
parent c0577c6c30
commit 6319826313
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -1132,18 +1132,20 @@ public class EmisBaseService {
order.put("bagNo",emisTmsPack.getPackNo()); order.put("bagNo",emisTmsPack.getPackNo());
order.put("ydSn",emisTmsPack.getPackNo()); order.put("ydSn",emisTmsPack.getPackNo());
order.put("logisticNo",emisTmsPack.getPackNo()); order.put("logisticNo",emisTmsPack.getPackNo());
order.put("printStatus", emisTmsPack.getPrintStatus());
return order; return order;
} }
boolean isSubBill=false; boolean isSubBill=false;
// 判断是否是子单 // 判断是否是子单
String mainBillCode = "";
String subBillSuffix = ""; String subBillSuffix = "";
String mainBillCode=getMainBillCode(billCode);
if(billCode.startsWith("T7080") && billCode.length()>14 ){ if(!billCode.equals(mainBillCode) ){
isSubBill = true; isSubBill = true;
mainBillCode=billCode.substring(0,14); int len=billCode.length();
subBillSuffix=billCode.substring(14); subBillSuffix=billCode.substring(len-4);
}else{ }else{
mainBillCode=billCode; mainBillCode=billCode;
} }
@ -1152,7 +1154,6 @@ public class EmisBaseService {
return null; return null;
} }
EmisWaybill waybill = emisWaybillMapper.selectEmisWaybillByBillCode(mainBillCode); EmisWaybill waybill = emisWaybillMapper.selectEmisWaybillByBillCode(mainBillCode);
if (waybill == null) { if (waybill == null) {
return null; return null;
@ -1164,14 +1165,14 @@ public class EmisBaseService {
} }
if(isSubBill) { if(isSubBill) {
if (Integer.valueOf(subBillSuffix) > waybill.getParcelQty()) { if ( Integer.valueOf(subBillSuffix) > waybill.getParcelQty()
|| Integer.valueOf(subBillSuffix)<= 0;
) {
// 子单尾数超过总件数,查不到信息 // 子单尾数超过总件数,查不到信息
return null; return null;
} }
} }
order.put("orderSn", waybill.getOrderSn()); order.put("orderSn", waybill.getOrderSn());
order.put("ydSn", billCode); order.put("ydSn", billCode);
order.put("logisticNo", billCode); order.put("logisticNo", billCode);