From d2db6380a41024fd2f32672eaf075d6812d58d26 Mon Sep 17 00:00:00 2001 From: linfso Date: Fri, 3 Jan 2025 07:37:42 +0800 Subject: [PATCH] md --- .../erp/emis/domain/vo/DeclareAttachment.java | 78 ++++++++ .../erp/emis/domain/vo/DeclareGoods.java | 176 ++++++++++++++++++ .../erp/emis/domain/vo/WaybillOrder.java | 4 + 3 files changed, 258 insertions(+) create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/DeclareAttachment.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/DeclareGoods.java diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/DeclareAttachment.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/DeclareAttachment.java new file mode 100644 index 000000000..bd2b9fa86 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/DeclareAttachment.java @@ -0,0 +1,78 @@ +package com.xdadan.erp.emis.domain.vo; + +import com.xdadan.erp.emis.domain.EmisWaybillAttachment; +import com.xdadan.erp.emis.domain.EmisWaybillDeclareAttachment; +import lombok.Data; + +import java.util.List; + + +@Data +public class DeclareAttachment extends VoBase { + + private static final long serialVersionUID = 1L; + + /* id */ + private Long id; + + /* 附件类型 1-清关文件 2-揽收底单 3-签收底单 */ + private String attachType; + /* 文件名称 */ + private String fileName; + /* 文件地址 */ + private String fileUrl; + /* 文件描述 */ + private String fileDesc; + /* 排序 */ + private Integer orderNum; + + private String remark; + + + @Override + public DeclareAttachment toVo(EmisWaybillDeclareAttachment dbItem) { + DeclareAttachment voItem = new DeclareAttachment(); + voItem.setId(dbItem.getId()); +// this.setWaybillId(dbAttachment.getWaybillId()); + voItem.setAttachType(dbItem.getAttachType()); + voItem.setFileName(dbItem.getFileName()); + voItem.setFileUrl(dbItem.getFileUrl()); + voItem.setFileDesc(dbItem.getFileDesc()); + voItem.setOrderNum(dbItem.getOrderNum()); +// this.setDelFlag(dbAttachment.getDelFlag()); +// this.setCreateBy(dbAttachment.getCreateBy()); +// this.setCreateTime(dbAttachment.getCreateTime()); +// this.setUpdateBy(dbAttachment.getUpdateBy()); +// this.setUpdateTime(dbAttachment.getUpdateTime()); + voItem.setRemark(dbItem.getRemark()); + return voItem; + } + + + @Override + public EmisWaybillDeclareAttachment toDb(DeclareAttachment voItem){ + EmisWaybillDeclareAttachment dbItem = new EmisWaybillDeclareAttachment(); + dbItem.setId(voItem.getId()); +// dbAttachment.setWaybillId(this.getWaybillId()); + dbItem.setAttachType(voItem.getAttachType()); + dbItem.setFileName(voItem.getFileName()); + dbItem.setFileUrl(voItem.getFileUrl()); + dbItem.setFileDesc(voItem.getFileDesc()); + dbItem.setOrderNum(voItem.getOrderNum()); +// dbAttachment.setDelFlag(this.getDelFlag()); +// dbAttachment.setCreateBy(this.getCreateBy()); +// dbAttachment.setCreateTime(this.getCreateTime()); +// dbAttachment.setUpdateBy(this.getUpdateBy()); +// dbAttachment.setUpdateTime(this.getUpdateTime()); + dbItem.setRemark(voItem.getRemark()); + return dbItem; + } + + public List cvtToDbList(List voList){ + return toDbList(voList); + } + + public List cvtToVoList(List dbList){ + return toVoList(dbList); + } +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/DeclareGoods.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/DeclareGoods.java new file mode 100644 index 000000000..0404b07a0 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/DeclareGoods.java @@ -0,0 +1,176 @@ +package com.xdadan.erp.emis.domain.vo; + +import com.xdadan.erp.emis.domain.EmisWaybillCargo; +import com.xdadan.erp.emis.domain.EmisWaybillDeclareGoods; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + +@Data +public class DeclareGoods extends VoBase implements Serializable { + + private static final long serialVersionUID = 1L; + + /* id */ + private Long id; + + /* 货物编码 */ + private String goodsCode; + /* 货物名称 */ + private String goodsName; + /* 货物数量 */ + private BigDecimal cargoQty; + + /* 异常数量 */ + private BigDecimal abnormalQty; + + /* 单位 */ + private String unit; + /* 重量 */ + private BigDecimal weight; + /* 货物单价 */ + private BigDecimal price; + /* 货物币种 */ + private String currency; + /* 原产国 */ + private String nationArea; + /* 行邮税号 */ + private String taxNo; + /* 海关编码 */ + private String hscode; + /* 品牌 */ + private String brand; + /* 材质 */ + private String material; + /* 用途 */ + private String purpose; + /* 成分 */ + private String ingredients; + /* 厂家 */ + private String manufacturer; + + /* 供应商 */ + private String supplier; + + /* 规格型号 */ + private String goodsModel; + /* 毛重 */ + private BigDecimal grossWeight; + /* 净重 */ + private BigDecimal netWeight; + /* 排序 */ + private Integer orderNum; + + private Integer isSave; + + /* 长 */ + private BigDecimal length; + /* 宽 */ + private BigDecimal width; + /* 高 */ + private BigDecimal height; + /* 体积 */ + private BigDecimal volume; + + private String remark; + + + @Override + public DeclareGoods toVo(EmisWaybillDeclareGoods dbItem) { + + DeclareGoods voItem = new DeclareGoods(); + + voItem.setId(dbItem.getId()); +// voItem.setWaybillId(dbItem.getWaybillId()); + voItem.setGoodsCode(dbItem.getGoodsCode()); + voItem.setGoodsName(dbItem.getGoodsName()); + voItem.setCargoQty(dbItem.getCargoQty()); + voItem.setAbnormalQty(dbItem.getAbnormalQty()); + voItem.setUnit(dbItem.getUnit()); + voItem.setWeight(dbItem.getWeight()); + voItem.setPrice(dbItem.getPrice()); + voItem.setCurrency(dbItem.getCurrency()); + voItem.setNationArea(dbItem.getNationArea()); + voItem.setTaxNo(dbItem.getTaxNo()); + voItem.setHscode(dbItem.getHscode()); + voItem.setBrand(dbItem.getBrand()); + voItem.setMaterial(dbItem.getMaterial()); + voItem.setPurpose(dbItem.getPurpose()); + voItem.setIngredients(dbItem.getIngredients()); + voItem.setManufacturer(dbItem.getManufacturer()); + voItem.setSupplier(dbItem.getSupplier()); +// voItem.setFunction(dbItem.getFunction()); + voItem.setGoodsModel(dbItem.getGoodsModel()); + voItem.setGrossWeight(dbItem.getGrossWeight()); + voItem.setNetWeight(dbItem.getNetWeight()); + voItem.setLength(dbItem.getLength()); + voItem.setWidth(dbItem.getWidth()); + voItem.setHeight(dbItem.getHeight()); + voItem.setVolume(dbItem.getVolume()); +// voItem.setBarcode(dbItem.getBarcode()); + voItem.setOrderNum(dbItem.getOrderNum()); +// voItem.setDelFlag(dbItem.getDelFlag()); +// voItem.setCreateBy(dbItem.getCreateBy()); +// voItem.setCreateTime(dbItem.getCreateTime()); +// voItem.setUpdateBy(dbItem.getUpdateBy()); +// voItem.setUpdateTime(dbItem.getUpdateTime()); + voItem.setRemark(dbItem.getRemark()); + + + + return voItem; + } + + @Override + public EmisWaybillDeclareGoods toDb(DeclareGoods voItem) { + EmisWaybillDeclareGoods dbItem = new EmisWaybillDeclareGoods(); + +// dbItem.setId(voItem.getId()); +// dbItem.setWaybillId(voItem.getWaybillId()); + dbItem.setGoodsCode(voItem.getGoodsCode()); + dbItem.setGoodsName(voItem.getGoodsName()); + dbItem.setCargoQty(voItem.getCargoQty()); + dbItem.setAbnormalQty(voItem.getAbnormalQty()); + dbItem.setUnit(voItem.getUnit()); + dbItem.setWeight(voItem.getWeight()); + dbItem.setPrice(voItem.getPrice()); + dbItem.setCurrency(voItem.getCurrency()); + dbItem.setNationArea(voItem.getNationArea()); + dbItem.setTaxNo(voItem.getTaxNo()); + dbItem.setHscode(voItem.getHscode()); + dbItem.setBrand(voItem.getBrand()); + dbItem.setMaterial(voItem.getMaterial()); + dbItem.setPurpose(voItem.getPurpose()); + dbItem.setIngredients(voItem.getIngredients()); + dbItem.setManufacturer(voItem.getManufacturer()); + dbItem.setSupplier(voItem.getSupplier()); +// dbItem.setFunction(voItem.getFunction()); + dbItem.setGoodsModel(voItem.getGoodsModel()); + dbItem.setGrossWeight(voItem.getGrossWeight()); + dbItem.setNetWeight(voItem.getNetWeight()); + dbItem.setLength(voItem.getLength()); + dbItem.setWidth(voItem.getWidth()); + dbItem.setHeight(voItem.getHeight()); + dbItem.setVolume(voItem.getVolume()); +// dbItem.setBarcode(voItem.getBarcode()); + dbItem.setOrderNum(voItem.getOrderNum()); +// dbItem.setDelFlag(voItem.getDelFlag()); +// dbItem.setCreateBy(voItem.getCreateBy()); +// dbItem.setCreateTime(voItem.getCreateTime()); +// dbItem.setUpdateBy(voItem.getUpdateBy()); +// dbItem.setUpdateTime(voItem.getUpdateTime()); + dbItem.setRemark(voItem.getRemark()); + + return dbItem; + } + + public List cvtToDbList(List voList){ + return toDbList(voList); + } + + public List cvtToVoList(List dbList){ + return toVoList(dbList); + } +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java index 59765be3b..d3ea1a772 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java @@ -32,9 +32,13 @@ public class WaybillOrder implements Serializable { // 货物清单 private List cargoList; + // 附件清单 private List attachmentList; + private List declareGoodsList; + private List declareAttachmentList; + /* 客户单号，合同号 */ private String custOrderId;