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 20ea14a40..7268915c5 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 @@ -3022,6 +3022,34 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb declareGoodsItem.setBillCode(emisWaybillSave.getBillCode()); emisWaybillDeclareGoodsMapper.insertEmisWaybillDeclareGoods(declareGoodsItem); } + }else{ + if(!CollectionUtil.isEmpty(emisWaybillSave.getCargoList() )){ + List cargoList=emisWaybillSave.getCargoList(); + for (EmisWaybillCargo cargoItem:cargoList) { + EmisWaybillDeclareGoods declareGoodsItem = new EmisWaybillDeclareGoods(); + declareGoodsItem.setWaybillId(emisWaybillSave.getId()); + declareGoodsItem.setBillCode(emisWaybillSave.getBillCode()); + + declareGoodsItem.setGoodsName(cargoItem.getGoodsName()); + declareGoodsItem.setBrand(cargoItem.getBrand()); + declareGoodsItem.setCargoQty(BigDecimal.valueOf(Long.valueOf(cargoItem.getCargoQty()))); + declareGoodsItem.setFunction(cargoItem.getFunction()); + declareGoodsItem.setHscode(cargoItem.getHscode()); + declareGoodsItem.setIngredients(cargoItem.getIngredients()); + declareGoodsItem.setNationArea(cargoItem.getNationArea()); + declareGoodsItem.setPrice(cargoItem.getPrice()); + declareGoodsItem.setPurpose(cargoItem.getPurpose()); + declareGoodsItem.setSupplier(cargoItem.getSupplier()); + declareGoodsItem.setUnit(cargoItem.getUnit()); + declareGoodsItem.setTaxNo(cargoItem.getTaxNo()); + declareGoodsItem.setMaterial(cargoItem.getMaterial()); + declareGoodsItem.setLength(cargoItem.getLength()); + declareGoodsItem.setWidth(cargoItem.getWidth()); + declareGoodsItem.setHeight(cargoItem.getHeight()); + + emisWaybillDeclareGoodsMapper.insertEmisWaybillDeclareGoods(declareGoodsItem); + } + } } // 插入申报资料信息