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-08-22 18:31:16 +08:00
parent ab11ab950c
commit 1934ee19ce
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1958,10 +1958,28 @@ public class EmisBaseService {
extData.put("pickupMethod",pickupMethod); extData.put("pickupMethod",pickupMethod);
extData.put("freight",waybill.getFreight());
extData.put("feeRemark",WaybillHelper.removeUnSeeChar(waybill.getFeeRemark())); extData.put("feeRemark",WaybillHelper.removeUnSeeChar(waybill.getFeeRemark()));
extData.put("volumeWeight",waybill.getVolumeWeight());
extData.put("settlementWeight",waybill.getSettlementWeight()); String freight="0.0";
String volumeWeight="0.0";
String settlementWeight="0.0";
if(waybill.getFreight()!=null){
freight=waybill.getFreight().stripTrailingZeros().toPlainString();
}
if(waybill.getVolumeWeight()!=null){
volumeWeight=waybill.getVolumeWeight().stripTrailingZeros().toPlainString();
}
if(waybill.getSettlementWeight()!=null){
settlementWeight=waybill.getSettlementWeight().stripTrailingZeros().toPlainString();
}
extData.put("freight",freight);
extData.put("volumeWeight",volumeWeight);
extData.put("settlementWeight",settlementWeight);
extData.put("takePieceEmployeeName",WaybillHelper.removeUnSeeChar(waybill.getTakePieceEmployeeName())); extData.put("takePieceEmployeeName",WaybillHelper.removeUnSeeChar(waybill.getTakePieceEmployeeName()));
extData.put("operateEmployeeName",WaybillHelper.removeUnSeeChar(waybill.getOperateEmployeeName())); extData.put("operateEmployeeName",WaybillHelper.removeUnSeeChar(waybill.getOperateEmployeeName()));

4
emis-biz/src/main/java/com/xdadan/erp/emis/service/print/cpcl/CvtTplToCpcl.java
View File

File diff suppressed because one or more lines are too long