aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

demand: 新增字段：提单号（记录海运提单信息）、贵司编号（记录相关业务的贵司编号）、起运港（关联网点表）、目的港（关联网点表）、箱量。加在运单录入界面。

Browse Source 
committer: heyu
This commit is contained in:
aike 2025-04-02 17:21:19 +08:00
parent 864cc35107
commit a6f3454a48
3 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
View File

@ -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;
}

27
emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
View File

@ -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;
}

15
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -2440,6 +2440,11 @@
<if test="updateTime != null">update_time,</if>
<if test="createSite != null and createSite != ''">create_site,</if>
<if test="updateSite != null and updateSite != ''">update_site,</if>
<if test="ladingBillCode != null and ladingBillCode != ''">lading_bill_code ,</if>
<if test="companyCode != null and companyCode != ''">company_code ,</if>
<if test="departurePort != null and departurePort != ''">departure_port ,</if>
<if test="destinationPort != null and destinationPort != ''">destination_port ,</if>
<if test="boxQuantity != null and boxQuantity != ''">box_quantity ,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderSn != null and orderSn != ''">#{orderSn},</if>
@ -2619,6 +2624,11 @@
<if test="updateTime != null">#{updateTime},</if>
<if test="createSite != null and createSite != ''">#{createSite},</if>
<if test="updateSite != null and updateSite != ''">#{updateSite},</if>
<if test="ladingBillCode != null and ladingBillCode != ''">#{ladingBillCode},</if>
<if test="companyCode != null and companyCode != ''">#{companyCode},</if>
<if test="departurePort != null and departurePort != ''">#{departurePort},</if>
<if test="destinationPort != null and destinationPort != ''">#{destinationPort},</if>
<if test="boxQuantity != null and boxQuantity != ''">#{boxQuantity},</if>
</trim>
</insert>
@ -2800,6 +2810,11 @@
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
<if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
<if test="ladingBillCode != null and ladingBillCode != ''">lading_bill_code = #{ladingBillCode},</if>
<if test="companyCode != null and companyCode != ''">company_code = #{companyCode},</if>
<if test="departurePort != null and departurePort != ''">departure_port = #{departurePort},</if>
<if test="destinationPort != null and destinationPort != ''">destination_port = #{destinationPort},</if>
<if test="boxQuantity != null and boxQuantity != ''">box_quantity = #{boxQuantity},</if>
</trim>
where id = #{id}
</update>