diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
index b8187a940..9197fad63 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
@@ -680,5 +680,24 @@ public class EmisWaybill extends BaseEntity
@TableField(exist = false)
private String transType;
+ @TableField
+ @DataAuditField(fieldComment = "提单号(记录海运提单信息)")
+ private String ladingBillCode ;
+
+ @TableField
+ @DataAuditField(fieldComment = "贵司编号(记录相关业务的贵司编号)")
+ private String companyCode ;
+
+ @TableField
+ @DataAuditField(fieldComment = "起运港")
+ private String departurePort ;
+
+ @TableField
+ @DataAuditField(fieldComment = "目的港")
+ private String destinationPort;
+
+ @TableField
+ @DataAuditField(fieldComment = "箱量")
+ private String boxQuantity;
}
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 c25184891..671095a0f 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
@@ -367,6 +367,21 @@ public class WaybillOrder implements Serializable {
/* 录单人 */
private String registerManName;
+ /* 提单号(记录海运提单信息) */
+ private String ladingBillCode ;
+
+ /* 贵司编号(记录相关业务的贵司编号) */
+ private String companyCode ;
+
+ /* 起运港 */
+ private String departurePort ;
+
+ /* 目的港 */
+ private String destinationPort;
+
+ /* 箱量 */
+ private String boxQuantity;
+
// 销售,回款
// private String salesmenName;
// private String payeeName;
@@ -661,6 +676,12 @@ public class WaybillOrder implements Serializable {
voItem.setOrderRemark(dbWaybill.getOrderRemark());
+ voItem.setLadingBillCode(dbWaybill.getLadingBillCode());
+ voItem.setCompanyCode(dbWaybill.getCompanyCode());
+ voItem.setDeparturePort(dbWaybill.getDeparturePort());
+ voItem.setDestinationPort(dbWaybill.getDestinationPort());
+ voItem.setBoxQuantity(dbWaybill.getBoxQuantity());
+
return voItem;
}
@@ -880,6 +901,12 @@ public class WaybillOrder implements Serializable {
dbWaybill.setOrderRemark(this.getOrderRemark());
dbWaybill.setExtInfo(this.getExtInfo());
+ dbWaybill.setLadingBillCode(this.getLadingBillCode());
+ dbWaybill.setCompanyCode(this.getCompanyCode());
+ dbWaybill.setDeparturePort(this.getDeparturePort());
+ dbWaybill.setDestinationPort(this.getDestinationPort());
+ dbWaybill.setBoxQuantity(this.getBoxQuantity());
+
return dbWaybill;
}
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 13334584e..aa585f057 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -2440,6 +2440,11 @@
update_time,
create_site,
update_site,
+ lading_bill_code ,
+ company_code ,
+ departure_port ,
+ destination_port ,
+ box_quantity ,
#{orderSn},
@@ -2619,6 +2624,11 @@
#{updateTime},
#{createSite},
#{updateSite},
+ #{ladingBillCode},
+ #{companyCode},
+ #{departurePort},
+ #{destinationPort},
+ #{boxQuantity},
@@ -2800,6 +2810,11 @@
update_time = #{updateTime},
create_site = #{createSite},
update_site = #{updateSite},
+ lading_bill_code = #{ladingBillCode},
+ company_code = #{companyCode},
+ departure_port = #{departurePort},
+ destination_port = #{destinationPort},
+ box_quantity = #{boxQuantity},
where id = #{id}