From a43d44d39732bb13f047e076570f5603a952e60f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Fri, 22 Nov 2024 15:48:54 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E5=85=A5=E5=BA=93=E5=8D=95=20=E4=BF=AE=E6=94=B9=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=AF=B9=E8=B1=A1=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=93=81=E8=B4=A8=E5=8D=95=E5=8F=B7=E5=AD=97=E6=AE=B5=EF=BC=9B?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E5=8D=95mapper=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=96=B9=E6=B3=95=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=93=81?=
 =?UTF-8?q?=E8=B4=A8=E5=8D=95=E5=8F=B7=E5=AD=97=E6=AE=B5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/warehouse/domain/WarehouseStorageOrder.java  | 10 ++++++++++
 .../mapper/warehouse/WarehouseStorageOrderMapper.xml   |  7 ++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

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 659e1ddc..120b0dda 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
@@ -31,6 +31,8 @@ public class WarehouseStorageOrder extends BaseEntity
     @Excel(name = "关联订单号")
     private String relatedOrderCode;
 
+    private String qualityOrderCode;
+
     /** 仓库入库状态(0待暂收、1已暂收、2待入库、3部分入库、4全部入库) */
     @Excel(name = "仓库入库状态",dictType = "warehouse_storage_status")
     private String warehouseStorageStatus;
@@ -363,6 +365,14 @@ public class WarehouseStorageOrder extends BaseEntity
         this.warehouseStorageOrderDetailList = warehouseStorageOrderDetailList;
     }
 
+    public String getQualityOrderCode() {
+        return qualityOrderCode;
+    }
+
+    public void setQualityOrderCode(String qualityOrderCode) {
+        this.qualityOrderCode = qualityOrderCode;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml
index 522a7fbd..993025dd 100644
--- a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml
@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="warehouseStorageId"               column="warehouse_storage_id"    />
         <result property="warehouseStorageCode"             column="warehouse_storage_code"    />
         <result property="relatedOrderCode"                 column="related_order_code"    />
+        <result property="qualityOrderCode"                 column="quality_order_code"    />
         <result property="warehouseStorageStatus"           column="warehouse_storage_status"    />
         <result property="warehouseQualityStatus"           column="warehouse_quality_status"    />
         <result property="warehouseStorageType"             column="warehouse_storage_type"    />
@@ -43,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                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,
-               make_in_total_price
+               make_in_total_price, quality_order_code
         from warehouse_storage_order
     </sql>
 
@@ -88,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="warehouseStorageCode != null">warehouse_storage_code,</if>
             <if test="relatedOrderCode != null">related_order_code,</if>
+            <if test="qualityOrderCode != null">quality_order_code,</if>
             <if test="warehouseStorageStatus != null">warehouse_storage_status,</if>
             <if test="warehouseQualityStatus != null">warehouse_quality_status,</if>
             <if test="warehouseStorageType != null">warehouse_storage_type,</if>
@@ -118,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="warehouseStorageCode != null">#{warehouseStorageCode},</if>
             <if test="relatedOrderCode != null">#{relatedOrderCode},</if>
+            <if test="qualityOrderCode != null">#{qualityOrderCode},</if>
             <if test="warehouseStorageStatus != null">#{warehouseStorageStatus},</if>
             <if test="warehouseQualityStatus != null">#{warehouseQualityStatus},</if>
             <if test="warehouseStorageType != null">#{warehouseStorageType},</if>
@@ -152,6 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="warehouseStorageCode != null">warehouse_storage_code = #{warehouseStorageCode},</if>
             <if test="relatedOrderCode != null">related_order_code = #{relatedOrderCode},</if>
+            <if test="qualityOrderCode != null">quality_order_code = #{qualityOrderCode},</if>
             <if test="warehouseStorageStatus != null">warehouse_storage_status = #{warehouseStorageStatus},</if>
             <if test="warehouseQualityStatus != null">warehouse_quality_status = #{warehouseQualityStatus},</if>
             <if test="warehouseStorageType != null">warehouse_storage_type = #{warehouseStorageType},</if>
@@ -188,6 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="warehouseStorageCode != null">warehouse_storage_code = #{warehouseStorageCode},</if>
             <if test="relatedOrderCode != null">related_order_code = #{relatedOrderCode},</if>
+            <if test="qualityOrderCode != null">quality_order_code = #{qualityOrderCode},</if>
             <if test="warehouseStorageStatus != null">warehouse_storage_status = #{warehouseStorageStatus},</if>
             <if test="warehouseQualityStatus != null">warehouse_quality_status = #{warehouseQualityStatus},</if>
             <if test="warehouseStorageType != null">warehouse_storage_type = #{warehouseStorageType},</if>