From 8eb5adcf2bcf20e1fc4385441ed280989e09ace1 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Thu, 11 Dec 2025 14:35:06 +0800 Subject: [PATCH] =?UTF-8?q?feat(WmsShippingBill):=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=81=94=E7=B3=BB=E4=BA=BAID=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在WmsShippingBill实体和Bo对象中添加customerContactId字段 - 在WmsShippingBillVo中新增customerContactId导出属性 - 修改WmsShippingBillMapper.xml，查询及条件中加入customerContactId字段 - 实现查询接口及批量查询接口支持客户联系人ID字段 - 保证客户联系人ID在数据导出及数据库操作中的正确映射和使用 --- .../dromara/wms/domain/WmsShippingBill.java | 5 +++ .../wms/domain/bo/WmsShippingBillBo.java | 5 +++ .../wms/domain/vo/WmsShippingBillVo.java | 6 +++ .../mapper/wms/WmsShippingBillMapper.xml | 37 +++++++++++++++++-- 4 files changed, 49 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsShippingBill.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsShippingBill.java index 6f33d85b..67115027 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsShippingBill.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/WmsShippingBill.java @@ -69,6 +69,11 @@ public class WmsShippingBill extends TenantEntity { */ private Long customerId; + /** + * 客户联系人ID（逻辑外键） + */ + private Long customerContactId; + /** * 客户名称（冗余，方便导出） */ diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsShippingBillBo.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsShippingBillBo.java index 7c39b2ac..30496c84 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsShippingBillBo.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/bo/WmsShippingBillBo.java @@ -70,6 +70,11 @@ public class WmsShippingBillBo extends BaseEntity { */ private Long customerId; + /** + * 客户联系人ID（逻辑外键） + */ + private Long customerContactId; + /** * 客户名称（冗余，方便导出） */ diff --git a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsShippingBillVo.java b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsShippingBillVo.java index fef9eb94..14bc74b0 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsShippingBillVo.java +++ b/ruoyi-modules/ruoyi-wms/src/main/java/org/dromara/wms/domain/vo/WmsShippingBillVo.java @@ -86,6 +86,12 @@ public class WmsShippingBillVo implements Serializable { @ExcelDictFormat(readConverterExp = "逻=辑外键") private Long customerId; + /** + * 客户联系人ID（逻辑外键） + */ + @ExcelProperty(value = "客户联系人ID") + private Long customerContactId; + /** * 客户名称（冗余，方便导出） */ diff --git a/ruoyi-modules/ruoyi-wms/src/main/resources/mapper/wms/WmsShippingBillMapper.xml b/ruoyi-modules/ruoyi-wms/src/main/resources/mapper/wms/WmsShippingBillMapper.xml index 68879c81..64058355 100644 --- a/ruoyi-modules/ruoyi-wms/src/main/resources/mapper/wms/WmsShippingBillMapper.xml +++ b/ruoyi-modules/ruoyi-wms/src/main/resources/mapper/wms/WmsShippingBillMapper.xml @@ -7,7 +7,13 @@ - select t.shipping_bill_id, t.tenant_id, t.shipping_code, t.shipping_type, t.shipping_mode, t.bind_type, t.project_id, t.project_code, t.project_name, t.customer_id, t.customer_name, t.shipping_address, t.inventory_amount, t.source_bill_type, t.source_bill_id, t.source_bill_code, t.contract_id, t.contract_code, t.contract_name, c.order_contract_code as orderContractCode, t.supplier, t.supplier_id, t.contact_user, t.contact_number, t.receiver_name, t.receiver_phone, t.logistics_company, t.tracking_no, t.logistics_phone, t.directions, t.plan_arrival_time, t.shipping_time, t.received_time, t.completed_time, t.out_stock_bill_status, t.flow_status, t.shipping_status, t.warehouse_id, t.warehouse_name, t.remark, t.del_flag, t.create_dept, t.create_by, t.create_time, t.update_by, t.update_time + select t.shipping_bill_id, t.tenant_id, t.shipping_code, t.shipping_type, + t.shipping_mode, t.bind_type, t.project_id, t.project_code, t.project_name, + t.customer_id, t.customer_contact_id, t.customer_name, t.shipping_address, + t.inventory_amount, t.source_bill_type, t.source_bill_id, t.source_bill_code, + t.contract_id, t.contract_code, t.contract_name, + c.order_contract_code as orderContractCode, + t.supplier, t.supplier_id, t.contact_user, + t.contact_number, t.receiver_name, t.receiver_phone, t.logistics_company, t.tracking_no, t.logistics_phone, t.directions, t.plan_arrival_time, t.shipping_time, t.received_time, t.completed_time, t.out_stock_bill_status, t.flow_status, t.shipping_status, t.warehouse_id, t.warehouse_name, t.remark, t.del_flag, t.create_dept, t.create_by, t.create_time, t.update_by, t.update_time from wms_shipping_bill t left join erp_contract_info c on t.contract_id = c.contract_id where t.shipping_bill_id = #{shippingBillId} @@ -23,7 +36,16 @@ - select t.shipping_bill_id, t.tenant_id, t.shipping_code, t.shipping_type, t.shipping_mode, t.bind_type, t.project_id, t.project_code, t.project_name, t.customer_id, t.customer_name, t.shipping_address, t.inventory_amount, t.source_bill_type, t.source_bill_id, t.source_bill_code, t.contract_id, t.contract_code, t.contract_name, c.order_contract_code as orderContractCode, t.supplier, t.supplier_id, t.contact_user, t.contact_number, t.receiver_name, t.receiver_phone, t.logistics_company, t.tracking_no, t.logistics_phone, t.directions, t.plan_arrival_time, t.shipping_time, t.received_time, t.completed_time, t.out_stock_bill_status, t.flow_status, t.shipping_status, t.warehouse_id, t.warehouse_name, t.remark, t.del_flag, t.create_dept, t.create_by, t.create_time, t.update_by, t.update_time + select t.shipping_bill_id, t.tenant_id, t.shipping_code, t.shipping_type, t.shipping_mode, t.bind_type, t.project_id, t.project_code, t.project_name, t.customer_id, t.customer_contact_id, t.customer_name, t.shipping_address, t.inventory_amount, t.source_bill_type, t.source_bill_id, t.source_bill_code, t.contract_id, t.contract_code, t.contract_name, c.order_contract_code as orderContractCode, t.supplier, t.supplier_id, t.contact_user, t.contact_number, t.receiver_name, t.receiver_phone, t.logistics_company, t.tracking_no, t.logistics_phone, t.directions, t.plan_arrival_time, t.shipping_time, t.received_time, t.completed_time, t.out_stock_bill_status, t.flow_status, t.shipping_status, t.warehouse_id, t.warehouse_name, t.remark, t.del_flag, t.create_dept, t.create_by, t.create_time, t.update_by, t.update_time from wms_shipping_bill t left join erp_contract_info c on t.contract_id = c.contract_id ${ew.getCustomSqlSegment} @@ -67,6 +89,8 @@ customer_id, + customer_contact_id, + customer_name, shipping_address, @@ -159,6 +183,8 @@ #{item.customerId}, + #{item.customerContactId}, + #{item.customerName}, #{item.shippingAddress}, @@ -265,6 +291,9 @@ t.customer_id = #{item.customerId}, + + t.customer_contact_id = #{item.customerContactId}, + t.customer_name = #{item.customerName},