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 16:56:22 +08:00
parent ebb64dba39
commit 32b43ed016
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybillCargo.java
View File

@ -54,6 +54,7 @@ public class EmisWaybillCargo extends BaseEntity
private BigDecimal weight; private BigDecimal weight;
/* 货物单价 */ /* 货物单价 */
private BigDecimal price; private BigDecimal price;
/* 货物币种 */ /* 货物币种 */
private String currency; private String currency;
/* 原产国 */ /* 原产国 */
@ -99,5 +100,7 @@ public class EmisWaybillCargo extends BaseEntity
private String billCode; private String billCode;
private String orderSn; private String orderSn;
// 扩展信息 货值
private BigDecimal realValue;
} }

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

@ -4058,23 +4058,28 @@ 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;
// 货物清单 使用货物总览 // 快递需要明细
EmisWaybillCargo queryCargo = new EmisWaybillCargo(); if("1".equals(emisTransLine.getTransType()) ){
// queryCargo.setWaybillId(emisWaybillOld.getId()); // 货物清单 使用货物总览
// List<EmisWaybillCargo> cargoList = emisWaybillCargoMapper.selectEmisWaybillCargoList(queryCargo); EmisWaybillCargo queryCargo = new EmisWaybillCargo();
List<EmisWaybillCargo> cargoList = new ArrayList<EmisWaybillCargo>(); queryCargo.setWaybillId(emisWaybillOld.getId());
cargoList = emisWaybillCargoMapper.selectEmisWaybillCargoList(queryCargo);
EmisWaybillCargo cargoGoods = new EmisWaybillCargo(); }
// [cargoQty] [weight] [volume] [length]*[width]*[height] [goodsName] // 非快递不需要明细
cargoGoods.setGoodsName(emisWaybillOld.getGoodsInfo()); else {
cargoGoods.setWeight(BigDecimal.valueOf(Double.valueOf(emisWaybillOld.getBillWeight().stripTrailingZeros().toPlainString()))); cargoList = new ArrayList<EmisWaybillCargo>();
cargoGoods.setVolume(BigDecimal.valueOf(Double.valueOf(emisWaybillOld.getTotalVolume().stripTrailingZeros().toPlainString()))); EmisWaybillCargo cargoGoods = new EmisWaybillCargo();
cargoGoods.setLength(BigDecimal.ZERO); cargoGoods.setGoodsName(emisWaybillOld.getGoodsInfo());
cargoGoods.setWidth(BigDecimal.ZERO); cargoGoods.setWeight(BigDecimal.valueOf(Double.valueOf(emisWaybillOld.getBillWeight().stripTrailingZeros().toPlainString())));
cargoGoods.setHeight(BigDecimal.ZERO); cargoGoods.setVolume(BigDecimal.valueOf(Double.valueOf(emisWaybillOld.getTotalVolume().stripTrailingZeros().toPlainString())));
cargoGoods.setCargoQty(emisWaybillOld.getParcelQty()); cargoGoods.setLength(BigDecimal.ZERO);
cargoList.add(cargoGoods); cargoGoods.setWidth(BigDecimal.ZERO);
cargoGoods.setHeight(BigDecimal.ZERO);
cargoGoods.setCargoQty(emisWaybillOld.getParcelQty());
cargoList.add(cargoGoods);
}
// 生成条码 // 生成条码
int width = 400; int width = 400;

BIN
emis-biz/src/main/resources/tpl/ws_kd_in_tpl.docx
View File

Binary file not shown.