This commit is contained in:
linfso 2024-05-30 11:58:51 +08:00
parent af4db543fe
commit 4dc11445dd

View File

@ -397,23 +397,23 @@ public class EmisBaseService {
boolean isSubBill=false;
// 判断是否是子单
String queryBillCode = "";
String mainBillCode = "";
String subBillSuffix = "";
if(billCode.startsWith("T7080") && billCode.length()>14 ){
isSubBill = true;
queryBillCode=billCode.substring(0,14);
mainBillCode=billCode.substring(0,14);
subBillSuffix=billCode.substring(14);
}else{
queryBillCode=billCode;
mainBillCode=billCode;
}
if(StringUtils.isEmpty(queryBillCode)){
if(StringUtils.isEmpty(mainBillCode)){
return null;
}
EmisWaybill waybill = emisWaybillMapper.selectEmisWaybillByBillCode(queryBillCode);
EmisWaybill waybill = emisWaybillMapper.selectEmisWaybillByBillCode(mainBillCode);
if (waybill == null) {
return null;
}
@ -437,6 +437,10 @@ public class EmisBaseService {
order.put("ydSn", billCode);
order.put("logisticNo", billCode);
// 子单后缀
order.put("mainBillCode", mainBillCode);
order.put("subBillSuffix", subBillSuffix);
String mainBillCode=waybill.getBillCode();
String shortLogisticNo=mainBillCode.substring(mainBillCode.length() - 6);
String shortLogisticNo4Number=mainBillCode.substring(mainBillCode.length() - 4);