From 1ac371f7085b008b0fd03e8ee60b4708f886ada5 Mon Sep 17 00:00:00 2001 From: linfso Date: Sat, 11 Jan 2025 07:20:57 +0800 Subject: [PATCH] md --- .../xdadan/erp/oms/domain/vo/Attachment.java | 2 +- .../com/xdadan/erp/oms/domain/vo/Cargo.java | 2 +- .../erp/oms/domain/vo/DeclareAttachment.java | 77 ++++++++ .../erp/oms/domain/vo/DeclareGoods.java | 175 ++++++++++++++++++ .../com/xdadan/erp/oms/domain/vo/FeeItem.java | 2 +- .../erp/oms/domain/vo/WaybillOrder.java | 106 ++++++++--- 6 files changed, 331 insertions(+), 33 deletions(-) create mode 100644 emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/DeclareAttachment.java create mode 100644 emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/DeclareGoods.java diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/Attachment.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/Attachment.java index 8b23d10..0297ee4 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/Attachment.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/Attachment.java @@ -1,6 +1,6 @@ package com.xdadan.erp.oms.domain.vo; -import com.xdadan.erp.oms.domain.EmisWaybillAttachment; +import com.xdadan.erp.emis.domain.EmisWaybillAttachment; import lombok.Data; import java.util.List; diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/Cargo.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/Cargo.java index 1f7f6e6..0aa717c 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/Cargo.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/Cargo.java @@ -1,6 +1,6 @@ package com.xdadan.erp.oms.domain.vo; -import com.xdadan.erp.oms.domain.EmisWaybillCargo; +import com.xdadan.erp.emis.domain.EmisWaybillCargo; import lombok.Data; import java.io.Serializable; diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/DeclareAttachment.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/DeclareAttachment.java new file mode 100644 index 0000000..72337d0 --- /dev/null +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/DeclareAttachment.java @@ -0,0 +1,77 @@ +package com.xdadan.erp.oms.domain.vo; + +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-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/DeclareGoods.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/DeclareGoods.java new file mode 100644 index 0000000..53a02f3 --- /dev/null +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/DeclareGoods.java @@ -0,0 +1,175 @@ +package com.xdadan.erp.oms.domain.vo; + +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-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/FeeItem.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/FeeItem.java index 0e84cc5..8a338ac 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/FeeItem.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/FeeItem.java @@ -1,6 +1,6 @@ package com.xdadan.erp.oms.domain.vo; -import com.xdadan.erp.oms.domain.EmisWaybillFeeitem; +import com.xdadan.erp.emis.domain.EmisWaybillFeeitem; import lombok.Data; import java.math.BigDecimal; diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/WaybillOrder.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/WaybillOrder.java index dcf9dcd..d2f4cbc 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/WaybillOrder.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/WaybillOrder.java @@ -1,10 +1,7 @@ package com.xdadan.erp.oms.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; -import com.xdadan.erp.oms.domain.EmisWaybill; -import com.xdadan.erp.oms.domain.EmisWaybillAttachment; -import com.xdadan.erp.oms.domain.EmisWaybillCargo; -import com.xdadan.erp.oms.domain.EmisWaybillFeeitem; +import com.xdadan.erp.emis.domain.*; import lombok.Data; import java.io.Serializable; @@ -16,6 +13,8 @@ import java.util.List; public class WaybillOrder implements Serializable { private static final long serialVersionUID = 1L; + private Long id; + // 收件人 private Reciever reciever; @@ -28,9 +27,13 @@ public class WaybillOrder implements Serializable { // 货物清单 private List cargoList; + // 附件清单 private List attachmentList; + private List declareGoodsList; + private List declareAttachmentList; + /* 客户单号，合同号 */ private String custOrderId; @@ -46,16 +49,11 @@ public class WaybillOrder implements Serializable { /* 订单号 */ private String orderSn; - /* 订单备注 */ - private String orderRemark; - - - /* 子单号,逗号隔开 */ private String billCodeSub; /* 下单时间 - 取客户当地时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date orderDate; /* 客户ID */ @@ -70,11 +68,14 @@ public class WaybillOrder implements Serializable { /* 支付方式 : 现金或月结 */ private String paymentType; + private String paymentStatus; + /* 计费方式 01-按重量 02-按体积 03-一口价 */ private String calcFeeType; /* 支付月结编号 */ private String custNo; + private String custName; /* 快递线路 */ private String transLine; @@ -82,6 +83,8 @@ public class WaybillOrder implements Serializable { private String timeType; /* 计泡比例 */ private String meterType; + /* 取重方式 */ + private String carryType; /* 快递产品类型 */ private String productType; @@ -93,7 +96,7 @@ public class WaybillOrder implements Serializable { private String customsEclaration; /* 预计到达时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date estimateDate; /* 包装类型 */ @@ -106,10 +109,10 @@ public class WaybillOrder implements Serializable { private String pickupMethod; /* 预计上门取件开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date pickStartDate; /* 预计上门取件结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date pickFinishDate; /* 入仓代码 */ @@ -182,7 +185,7 @@ public class WaybillOrder implements Serializable { /* 转单单号 */ private String transferBillcode; /* 转单时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date dispFdDate; /* 转单原因 */ @@ -194,7 +197,7 @@ public class WaybillOrder implements Serializable { /* 登记站点代码 */ private String registerSiteCode; /* 登记时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date registerDate; /* 登记人编号 */ private String registerManCode; @@ -207,11 +210,12 @@ public class WaybillOrder implements Serializable { private String dispatchManCode; /* 派件网点代码 */ private String dispatchSiteCode; + /* 派件时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date dispatchDate; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date sendDate; /* 目的地编号 */ @@ -259,16 +263,29 @@ public class WaybillOrder implements Serializable { /* 预入仓供应商 */ private String prepareInSupplier; + // 录单备注 private String remark; + /* 订单备注 */ + private String orderRemark; + /* 揽收图片备注 */ private String billPicSendRmk; - /* 签收底单图片 */ + /* 派件签收底单图片 */ private String billPicDispatchRmk; // 货物图片 private String billPicGoodsRmk; + /* 是否特殊报价 */ + private String blSpecialQuote; + + /* 是否敏感物 */ + private String blSpecialGoods; + + + /* ext_info */ + private String extInfo; /* 扩展信息 */ /* 是否生成子单 1-是 0-否 */ @@ -285,9 +302,6 @@ public class WaybillOrder implements Serializable { private String transLineTypeName; private String productTypeName; - - //扩展信息------- - /* 客户名称 */ private String customerName; @@ -312,6 +326,7 @@ public class WaybillOrder implements Serializable { private String printManName; private String printSiteName; + private String blSign; /* 签收人 */ private String signMan; /* 签收人代码 */ @@ -319,7 +334,7 @@ public class WaybillOrder implements Serializable { /* 签收站点代码 */ private String signSiteCode; /* 签收时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date signDate; /* 当前网点编号 */ @@ -345,9 +360,6 @@ public class WaybillOrder implements Serializable { /* 录单人 */ private String registerManName; - /* 数据来源 */ - private String dataFrom; - // 销售,回款 // private String salesmenName; // private String payeeName; @@ -382,7 +394,9 @@ public class WaybillOrder implements Serializable { public static WaybillOrder toVo(EmisWaybill dbWaybill, List dbCargoList, List dbFeeitemList, - List dbAttachmentList + List dbAttachmentList, + List dbDecareGoodsList, + List dbDeclareAttachmentList ){ WaybillOrder voItem = new WaybillOrder(); @@ -391,11 +405,18 @@ public class WaybillOrder implements Serializable { FeeItem feeItemCvt = new FeeItem(); Attachment attachmentCvt = new Attachment(); + + DeclareGoods declareGoodsCvt = new DeclareGoods(); + DeclareAttachment declareAttachmentCvt = new DeclareAttachment(); + // 转换其他list voItem.setCargoList(cargoCvt.cvtToVoList(dbCargoList)); voItem.setFeeItems(feeItemCvt.cvtToVoList(dbFeeitemList)); voItem.setAttachmentList(attachmentCvt.cvtToVoList(dbAttachmentList)); + voItem.setDeclareGoodsList(declareGoodsCvt.cvtToVoList(dbDecareGoodsList)); + voItem.setDeclareAttachmentList(declareAttachmentCvt.cvtToVoList(dbDeclareAttachmentList)); + // 收件人 Reciever reciever = new Reciever(); @@ -416,6 +437,9 @@ public class WaybillOrder implements Serializable { reciever.setAddress(dbWaybill.getReceiveAddress()); reciever.setPostCode(dbWaybill.getReceivePostcode()); reciever.setCompany(dbWaybill.getReceiveCompany()); + + voItem.setId(dbWaybill.getId()); + voItem.setReciever(reciever); // 发件人 @@ -468,18 +492,22 @@ public class WaybillOrder implements Serializable { voItem.setPaymentType(dbWaybill.getPaymentType()); voItem.setCalcFeeType(dbWaybill.getCalcFeeType()); voItem.setCustNo(dbWaybill.getCustNo()); + voItem.setCustName(dbWaybill.getCustName()); voItem.setTransLine(dbWaybill.getTransLineType()); voItem.setProductType(dbWaybill.getProductType()); voItem.setTimeType(dbWaybill.getTimeType()); voItem.setMeterType(dbWaybill.getMeterType()); + voItem.setCarryType(dbWaybill.getCarryType()); voItem.setCustomsClear(dbWaybill.getCustomsClear()); voItem.setCustomsEclaration(dbWaybill.getCustomsEclaration()); voItem.setEstimateDate(dbWaybill.getEstimateDate()); + voItem.setPaymentStatus(dbWaybill.getPaymentStatus()); + voItem.setPackType(dbWaybill.getPackType()); voItem.setDispatchMethod(dbWaybill.getDispatchMethod()); voItem.setPickupMethod(dbWaybill.getPickupMethod()); @@ -530,9 +558,14 @@ public class WaybillOrder implements Serializable { voItem.setOverWeightNumber(dbWaybill.getOverWeightNumber()); voItem.setFeeRemark(dbWaybill.getFeeRemark()); + voItem.setBlSpecialQuote(dbWaybill.getBlSpecialQuote()); + voItem.setBlSpecialGoods(dbWaybill.getBlSpecialGoods()); + // voItem.setThirdCode(dbWaybill.getThirdCode()); voItem.setRealValue(dbWaybill.getRealValue()); + + voItem.setExtInfo(dbWaybill.getExtInfo()); // voItem.setBlInsure(dbWaybill.getBlInsure()); // voItem.setInsureValue(dbWaybill.getInsureValue()); // voItem.setInsureValueCurrency(dbWaybill.getInsureValueCurrency()); @@ -596,12 +629,14 @@ public class WaybillOrder implements Serializable { voItem.setBlAcceptMessage(dbWaybill.getBlAcceptMessage()); voItem.setBlGenSubbill(dbWaybill.getBlGenSubbill()); + voItem.setBlSign(dbWaybill.getBlSign()); voItem.setSignMan(dbWaybill.getSignMan()); voItem.setSignManCode(dbWaybill.getSignManCode()); voItem.setSignSiteCode(dbWaybill.getSignSiteCode()); voItem.setSignDate(dbWaybill.getSignDate()); voItem.setBillPicSendRmk(dbWaybill.getBillPicSendRmk()); voItem.setBillPicDispatchRmk(dbWaybill.getBillPicDispatchRmk()); + voItem.setBillPicGoodsRmk(dbWaybill.getBillPicGoodsRmk()); // voItem.setTimezoneOffset(dbWaybill.getTimezoneOffset()); // voItem.setDelFlag(dbWaybill.getDelFlag()); // voItem.setCreateBy(dbWaybill.getCreateBy()); @@ -612,12 +647,10 @@ public class WaybillOrder implements Serializable { // voItem.setCreateSite(dbWaybill.getCreateSite()); // voItem.setUpdateSite(dbWaybill.getUpdateSite()); - voItem.setDataFrom(dbWaybill.getDataFrom()); - voItem.setLockFlag(dbWaybill.getLockFlag()); voItem.setLockReason(dbWaybill.getLockReason()); - + voItem.setOrderRemark(dbWaybill.getOrderRemark()); return voItem; } @@ -632,12 +665,20 @@ public class WaybillOrder implements Serializable { Cargo cargoCvt = new Cargo(); FeeItem feeItemCvt = new FeeItem(); + Attachment attachmentCvt = new Attachment(); + + DeclareGoods declareGoodsCvt = new DeclareGoods(); + DeclareAttachment declareAttachmentCvt = new DeclareAttachment(); + // 设置货物信息 dbWaybill.setCargoList(cargoCvt.cvtToDbList(this.getCargoList())); dbWaybill.setFeeitemList(feeItemCvt.cvtToDbList(this.getFeeItems())); dbWaybill.setAttachmentList(attachmentCvt.cvtToDbList(this.getAttachmentList())); + dbWaybill.setDeclareGoodsList(declareGoodsCvt.cvtToDbList(this.getDeclareGoodsList())); + dbWaybill.setDeclareAttachmentList(declareAttachmentCvt.cvtToDbList(this.getDeclareAttachmentList())); + dbWaybill.setOrderSn(this.getOrderSn()); dbWaybill.setCustOrderId(this.getCustOrderId()); dbWaybill.setBillCode(this.getBillCode()); @@ -694,6 +735,7 @@ public class WaybillOrder implements Serializable { dbWaybill.setTimeType(this.getTimeType()); dbWaybill.setMeterType(this.getMeterType()); + dbWaybill.setCarryType(this.getCarryType()); dbWaybill.setCustomsClear(this.getCustomsClear()); dbWaybill.setCustomsEclaration(this.getCustomsEclaration()); @@ -746,6 +788,9 @@ public class WaybillOrder implements Serializable { // dbWaybill.setBlBill(this.getBlBill()); // dbWaybill.setBlBillText(this.getBlBillText()); + dbWaybill.setBlSpecialQuote(this.getBlSpecialQuote()); + dbWaybill.setBlSpecialGoods(this.getBlSpecialGoods()); + dbWaybill.setBlOverWeight(this.getBlOverWeight()); dbWaybill.setOverWeightNumber(this.getOverWeightNumber()); @@ -820,7 +865,8 @@ public class WaybillOrder implements Serializable { // dbWaybill.setCreateSite(this.getCreateSite()); // dbWaybill.setUpdateSite(this.getUpdateSite()); - dbWaybill.setDataFrom(this.getDataFrom()); + dbWaybill.setOrderRemark(this.getOrderRemark()); + dbWaybill.setExtInfo(this.getExtInfo()); return dbWaybill;