From a6f3454a486d3d4275cc31fba1b50d689466f927 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Wed, 2 Apr 2025 17:21:19 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=9A=E6=8F=90=E5=8D=95=E5=8F=B7=EF=BC=88=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=B5=B7=E8=BF=90=E6=8F=90=E5=8D=95=E4=BF=A1=E6=81=AF=EF=BC=89?= =?UTF-8?q?=E3=80=81=E8=B4=B5=E5=8F=B8=E7=BC=96=E5=8F=B7=EF=BC=88=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=9B=B8=E5=85=B3=E4=B8=9A=E5=8A=A1=E7=9A=84=E8=B4=B5?= =?UTF-8?q?=E5=8F=B8=E7=BC=96=E5=8F=B7=EF=BC=89=E3=80=81=E8=B5=B7=E8=BF=90?= =?UTF-8?q?=E6=B8=AF=EF=BC=88=E5=85=B3=E8=81=94=E7=BD=91=E7=82=B9=E8=A1=A8?= =?UTF-8?q?=EF=BC=89=E3=80=81=E7=9B=AE=E7=9A=84=E6=B8=AF=EF=BC=88=E5=85=B3?= =?UTF-8?q?=E8=81=94=E7=BD=91=E7=82=B9=E8=A1=A8=EF=BC=89=E3=80=81=E7=AE=B1?= =?UTF-8?q?=E9=87=8F=E3=80=82=E5=8A=A0=E5=9C=A8=E8=BF=90=E5=8D=95=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E7=95=8C=E9=9D=A2=E3=80=82=20committer:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xdadan/erp/emis/domain/EmisWaybill.java | 19 +++++++++++++ .../erp/emis/domain/vo/WaybillOrder.java | 27 +++++++++++++++++++ .../resources/mapper/EmisWaybillMapper.xml | 15 +++++++++++ 3 files changed, 61 insertions(+) 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}