This commit is contained in:
linfso 2024-05-22 11:20:35 +08:00
parent 79c6f372ad
commit 6761b5ddb4

View File

@ -306,9 +306,26 @@ public class EmisBaseService {
order.put("goodsInfo", waybill.getGoodsInfo());
order.put("remark", waybill.getRemark());
order.put("parcelQty", waybill.getParcelQty().toString());
order.put("billWeight", waybill.getBillWeight().stripTrailingZeros().toPlainString());
order.put("totalVolume", waybill.getTotalVolume().stripTrailingZeros().toPlainString());
String billWeight="0.0";
String totalVolume="0.0";
String parcelQty="0";
if(waybill.getParcelQty()!=null){
parcelQty=waybill.getParcelQty().toString()
}
if(waybill.getBillWeight()!=null){
billWeight=waybill.getBillWeight().stripTrailingZeros().toPlainString()
}
if(waybill.getTotalVolume()!=null){
totalVolume=waybill.getTotalVolume().stripTrailingZeros().toPlainString()
}
order.put("parcelQty", parcelQty);
order.put("billWeight", billWeight);
order.put("totalVolume", totalVolume);
order.put("packType", DictUtils.getDictLabel("emis_tab_packing_type",waybill.getPackType()) );
order.put("paymentType", DictUtils.getDictLabel("emis_payment_type",waybill.getPaymentType()));
order.put("printDay", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,new Date()));