From 32b43ed0161dc30a0c5de214f1a101366239b944 Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 7 Jan 2025 16:56:22 +0800 Subject: [PATCH] md --- .../erp/emis/domain/EmisWaybillCargo.java | 3 ++ .../service/impl/EmisWaybillServiceImpl.java | 37 ++++++++++-------- .../src/main/resources/tpl/ws_kd_in_tpl.docx | Bin 30127 -> 30509 bytes 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java index 0cbb0bab1..a3302777e 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java @@ -54,6 +54,7 @@ public class EmisWaybillCargo extends BaseEntity private BigDecimal weight; /* 货物单价 */ private BigDecimal price; + /* 货物币种 */ private String currency; /* 原产国 */ @@ -99,5 +100,7 @@ public class EmisWaybillCargo extends BaseEntity private String billCode; private String orderSn; + // 扩展信息 货值 + private BigDecimal realValue; } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 0c84bce27..cb15f8acc 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -4058,23 +4058,28 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb /*1.根据模板生成文档*/ String fileName = URLEncoder.encode(emisWaybillOld.getIntoWarehouseBillCode(), "UTF-8"); + List cargoList = null; - // 货物清单 使用货物总览 - EmisWaybillCargo queryCargo = new EmisWaybillCargo(); -// queryCargo.setWaybillId(emisWaybillOld.getId()); -// List cargoList = emisWaybillCargoMapper.selectEmisWaybillCargoList(queryCargo); - List cargoList = new ArrayList(); - - EmisWaybillCargo cargoGoods = new EmisWaybillCargo(); -// [cargoQty] [weight] [volume] [length]*[width]*[height] [goodsName] - cargoGoods.setGoodsName(emisWaybillOld.getGoodsInfo()); - cargoGoods.setWeight(BigDecimal.valueOf(Double.valueOf(emisWaybillOld.getBillWeight().stripTrailingZeros().toPlainString()))); - cargoGoods.setVolume(BigDecimal.valueOf(Double.valueOf(emisWaybillOld.getTotalVolume().stripTrailingZeros().toPlainString()))); - cargoGoods.setLength(BigDecimal.ZERO); - cargoGoods.setWidth(BigDecimal.ZERO); - cargoGoods.setHeight(BigDecimal.ZERO); - cargoGoods.setCargoQty(emisWaybillOld.getParcelQty()); - cargoList.add(cargoGoods); + // 快递需要明细 + if("1".equals(emisTransLine.getTransType()) ){ + // 货物清单 使用货物总览 + EmisWaybillCargo queryCargo = new EmisWaybillCargo(); + queryCargo.setWaybillId(emisWaybillOld.getId()); + cargoList = emisWaybillCargoMapper.selectEmisWaybillCargoList(queryCargo); + } + // 非快递不需要明细 + else { + cargoList = new ArrayList(); + EmisWaybillCargo cargoGoods = new EmisWaybillCargo(); + cargoGoods.setGoodsName(emisWaybillOld.getGoodsInfo()); + cargoGoods.setWeight(BigDecimal.valueOf(Double.valueOf(emisWaybillOld.getBillWeight().stripTrailingZeros().toPlainString()))); + cargoGoods.setVolume(BigDecimal.valueOf(Double.valueOf(emisWaybillOld.getTotalVolume().stripTrailingZeros().toPlainString()))); + cargoGoods.setLength(BigDecimal.ZERO); + cargoGoods.setWidth(BigDecimal.ZERO); + cargoGoods.setHeight(BigDecimal.ZERO); + cargoGoods.setCargoQty(emisWaybillOld.getParcelQty()); + cargoList.add(cargoGoods); + } // 生成条码 int width = 400; diff --git a/emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx b/emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx index bcd823e0c4541caf163629765190d4e08001fb1c..08f75adb8d9958f8118f01d83f458767bb6fbe4c 100644 GIT binary patch delta 13150 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 u|4Y%wOmW7