From cecd24a9fcf5caab352f64a98b63b6924462753a Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Mon, 25 Nov 2024 11:17:12 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E6=96=B0=E7=89=88prd=E8=B0=83=E6=95=B4:?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=85=A5=E5=BA=93=E5=8D=95=E4=B8=BB=E8=A1=A8?= =?UTF-8?q?=E3=80=81=E5=AE=9E=E4=BD=93=E7=B1=BB=E3=80=81mapper.xml?= =?UTF-8?q?=E5=B1=82=E7=9A=84=E6=89=80=E6=9C=89=E6=96=B9=E6=B3=95=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BE=9B=E5=BA=94=E5=95=86Id=E3=80=81=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E5=90=8D=E7=A7=B0=E3=80=81=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E4=BA=BA=E3=80=81=E8=81=94=E7=B3=BB=E7=94=B5=E8=AF=9D=E3=80=81?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=9C=B0=E5=9D=80=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=97=A7=E7=89=88=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=BA=E9=87=87=E8=B4=AD=E7=9A=84=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/WarehouseStorageOrder.java | 68 +++++++++++++++++++ .../mapper/WarehouseStorageOrderMapper.java | 8 --- .../warehouse/WarehouseStorageOrderMapper.xml | 42 +++++++----- 3 files changed, 94 insertions(+), 24 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseStorageOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseStorageOrder.java index 120b0dda..91635b48 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseStorageOrder.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseStorageOrder.java @@ -129,6 +129,27 @@ public class WarehouseStorageOrder extends BaseEntity @Excel(name = "仓库详细地址") private String warehouseDetailAddress; + /** 供应商ID */ + @Excel(name = "供应商ID") + private String supplierCode; + + /** 供应商名称 */ + @Excel(name = "供应商名称") + private String supplierName; + + /** 联系人 */ + @Excel(name = "联系人") + private String customerContact; + + /** 联系电话 */ + @Excel(name = "联系电话") + private String contactNumber; + + /** 公司地址 */ + @Excel(name = "公司地址") + private String supplierAddress; + + /** 仓库入库单详情 */ @Excel(name = "仓库名称") private List warehouseStorageOrderDetailList; @@ -357,6 +378,47 @@ public class WarehouseStorageOrder extends BaseEntity this.warehouseDetailAddress = warehouseDetailAddress; } + + public String getSupplierCode() { + return supplierCode; + } + + public void setSupplierCode(String supplierCode) { + this.supplierCode = supplierCode; + } + + public String getSupplierName() { + return supplierName; + } + + public void setSupplierName(String supplierName) { + this.supplierName = supplierName; + } + + public String getCustomerContact() { + return customerContact; + } + + public void setCustomerContact(String customerContact) { + this.customerContact = customerContact; + } + + public String getContactNumber() { + return contactNumber; + } + + public void setContactNumber(String contactNumber) { + this.contactNumber = contactNumber; + } + + public String getSupplierAddress() { + return supplierAddress; + } + + public void setSupplierAddress(String supplierAddress) { + this.supplierAddress = supplierAddress; + } + public List getWarehouseStorageOrderDetailList() { return warehouseStorageOrderDetailList; } @@ -373,6 +435,7 @@ public class WarehouseStorageOrder extends BaseEntity this.qualityOrderCode = qualityOrderCode; } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -401,6 +464,11 @@ public class WarehouseStorageOrder extends BaseEntity .append("warehouseCode", getWarehouseCode()) .append("warehouseName", getWarehouseName()) .append("warehouseDetailAddress",getWarehouseDetailAddress()) + .append("supplierCode",getSupplierCode()) + .append("supplierName",getSupplierName()) + .append("customerContact",getCustomerContact()) + .append("contactNumber",getContactNumber()) + .append("supplierAddress",getSupplierAddress()) .append("createTime", getCreateTime()) .append("createBy", getCreateBy()) .append("updateBy", getUpdateBy()) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderMapper.java index 788b1c0e..16e7abcb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderMapper.java @@ -31,14 +31,6 @@ public interface WarehouseStorageOrderMapper - /** - * 采购入库通知单查询仓库入库单列表 - * - * @param warehouseStorageOrder 仓库入库单 - * @return 仓库入库单集合 - */ - public List selectPurchaseStorageList(WarehouseStorageOrder warehouseStorageOrder); - /** * 新增仓库入库单 * diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml index 43228376..2896e5d3 100644 --- a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml @@ -31,6 +31,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + @@ -43,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" notify_arrived_num, actual_arrived_num, temporary_qualified_num, temporary_unqualified_num, quality_qualified_num, quality_unqualified_num ,storage_num, arrived_time, temporary_time, delivery_inspection_time, quality_time, storage_time, warehouse_employee, warehouse_code, - warehouse_name, warehouse_detail_address ,create_time, create_by, update_by, update_time, + warehouse_name, warehouse_detail_address, supplier_code, supplier_name, supplier_address, customer_contact, contact_number, create_time, create_by, update_by, update_time, make_in_total_price, quality_order_code from warehouse_storage_order @@ -66,21 +71,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - -