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-09 17:45:30 +08:00
parent a3776cdaf2
commit bd82a98c7e
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
View File

@ -364,7 +364,10 @@ public class EmisWaybillController extends EmisBaseController
"sendProvince","sendProvinceName", "sendProvince","sendProvinceName",
"sendCity","sendCityName", "sendCity","sendCityName",
"transLineType","transLineName", "transLineType","transLineName",
"productType","productName" "productType","productName",
"sendSiteName","destinationName",
"dispatchUnderlingSiteName"
},value= EmisWaybill.class,type= JacksonFilter.JscksonFilterType.RESPONSE) },value= EmisWaybill.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@RequestMapping("/listSimple") @RequestMapping("/listSimple")

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

@ -623,11 +623,14 @@ public class EmisBaseService {
// 派送方式 // 派送方式
order.put("dispatchType", dispatchType); order.put("dispatchType", dispatchType);
String agingFlag="";
EmisTransProduct emisTransProduct=getTransProductByCode(waybill.getProductType()); EmisTransProduct emisTransProduct=getTransProductByCode(waybill.getProductType());
if(emisTransProduct!=null) { if(emisTransProduct!=null) {
order.put("agingFlag", emisTransProduct.getAgingFlag()); agingFlag=emisTransProduct.getAgingFlag();
} }
order.put("agingFlag", agingFlag);
order.put("kdgs", "TANEX"); order.put("kdgs", "TANEX");
order.put("pdfInfo", waybill.getThirdCode()); order.put("pdfInfo", waybill.getThirdCode());
@ -789,11 +792,12 @@ public class EmisBaseService {
order.put("billWeight", billWeight); order.put("billWeight", billWeight);
order.put("totalVolume", totalVolume); order.put("totalVolume", totalVolume);
Integer subSeqNum=1;
if(isSubBill) { if(isSubBill) {
// 子单的序号 // 子单的序号
Integer subSeqNum=Integer.valueOf(subBillSuffix); subSeqNum=Integer.valueOf(subBillSuffix);
order.put("subSeqNum", subSeqNum);
} }
order.put("subSeqNum", subSeqNum);
String packType=""; String packType="";
if(!StringUtils.isEmpty(waybill.getPackType())){ if(!StringUtils.isEmpty(waybill.getPackType())){