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 2025-01-07 19:34:36 +08:00
parent 32b43ed016
commit 3bec00e04b
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -4058,27 +4058,29 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
/*1.根据模板生成文档*/ /*1.根据模板生成文档*/
String fileName = URLEncoder.encode(emisWaybillOld.getIntoWarehouseBillCode(), "UTF-8"); String fileName = URLEncoder.encode(emisWaybillOld.getIntoWarehouseBillCode(), "UTF-8");
List<EmisWaybillCargo> cargoList = null; List<EmisWaybillDeclareGoods> declareGoodsList = null;
// 快递需要明细 // 快递需要明细
if("1".equals(emisTransLine.getTransType()) ){ if("1".equals(emisTransLine.getTransType()) ){
// 货物清单 使用货物总览 // 货物清单 使用货物总览
EmisWaybillCargo queryCargo = new EmisWaybillCargo(); EmisWaybillDeclareGoods queryDeclareGoods = new EmisWaybillDeclareGoods();
queryCargo.setWaybillId(emisWaybillOld.getId()); queryDeclareGoods.setWaybillId(emisWaybillOld.getId());
cargoList = emisWaybillCargoMapper.selectEmisWaybillCargoList(queryCargo); declareGoodsList=emisWaybillDeclareGoodsMapper.selectEmisWaybillDeclareGoodsList(queryDeclareGoods);
} }
// 非快递不需要明细 // 非快递不需要明细
else { else {
cargoList = new ArrayList<EmisWaybillCargo>(); declareGoodsList = new ArrayList<EmisWaybillDeclareGoods>();
EmisWaybillCargo cargoGoods = new EmisWaybillCargo();
cargoGoods.setGoodsName(emisWaybillOld.getGoodsInfo()); EmisWaybillDeclareGoods cargoDeclareGoods = new EmisWaybillDeclareGoods();
cargoGoods.setWeight(BigDecimal.valueOf(Double.valueOf(emisWaybillOld.getBillWeight().stripTrailingZeros().toPlainString()))); cargoDeclareGoods.setGoodsName(emisWaybillOld.getGoodsInfo());
cargoGoods.setVolume(BigDecimal.valueOf(Double.valueOf(emisWaybillOld.getTotalVolume().stripTrailingZeros().toPlainString()))); cargoDeclareGoods.setWeight(BigDecimal.valueOf(Double.valueOf(emisWaybillOld.getBillWeight().stripTrailingZeros().toPlainString())));
cargoGoods.setLength(BigDecimal.ZERO); cargoDeclareGoods.setVolume(BigDecimal.valueOf(Double.valueOf(emisWaybillOld.getTotalVolume().stripTrailingZeros().toPlainString())));
cargoGoods.setWidth(BigDecimal.ZERO); cargoDeclareGoods.setLength(BigDecimal.ZERO);
cargoGoods.setHeight(BigDecimal.ZERO); cargoDeclareGoods.setWidth(BigDecimal.ZERO);
cargoGoods.setCargoQty(emisWaybillOld.getParcelQty()); cargoDeclareGoods.setHeight(BigDecimal.ZERO);
cargoList.add(cargoGoods); cargoDeclareGoods.setCargoQty(BigDecimal.valueOf(emisWaybillOld.getParcelQty()));
declareGoodsList.add(cargoDeclareGoods);
} }
// 生成条码 // 生成条码
@ -4135,7 +4137,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
fillMap.put("barcode", Pictures.ofBufferedImage(barcodeImageBuffer, PictureType.JPEG).size(width, height).create()); fillMap.put("barcode", Pictures.ofBufferedImage(barcodeImageBuffer, PictureType.JPEG).size(width, height).create());
fillMap.put("cargoList", cargoList); fillMap.put("cargoList", declareGoodsList);
// fillMap.put("cargoList", emisWaybillOld.getCargoList()); // fillMap.put("cargoList", emisWaybillOld.getCargoList());
// 生成模版 // 生成模版