From e4e2d567836dcc9a96275086cbb42b62bfce16db Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Thu, 7 Nov 2024 15:29:32 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=94=AE=E5=90=8E=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E5=87=BA=E8=B4=A7=E8=AE=BE=E5=A4=87=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E7=B1=BB=E6=96=B0=E5=A2=9E=20=E5=87=BA=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5=20=E5=87=BA=E8=B4=A7=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87mapper.xml=E5=B1=82=E6=89=80=E6=9C=89=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=8A=A0=E4=B8=8A=E5=87=BA=E5=BA=93=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/AfterSalesShippingDevice.java           | 14 ++++++++++++++
 .../aftersales/AfterSalesShippingDeviceMapper.xml  |  8 +++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AfterSalesShippingDevice.java b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AfterSalesShippingDevice.java
index 9487be72..d13b75eb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AfterSalesShippingDevice.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/aftersales/domain/AfterSalesShippingDevice.java
@@ -33,6 +33,11 @@ public class AfterSalesShippingDevice extends BaseEntity
     @Excel(name = "关联销售单号")
     private String salesOrderCode;
 
+
+    /** 出库单号 */
+    @Excel(name = "出库单号")
+    private String outOrderCode;
+
     /** 料号 */
     @Excel(name = "料号")
     private String materialNo;
@@ -518,6 +523,14 @@ public class AfterSalesShippingDevice extends BaseEntity
         this.qualityStatus = qualityStatus;
     }
 
+    public String getOutOrderCode() {
+        return outOrderCode;
+    }
+
+    public void setOutOrderCode(String outOrderCode) {
+        this.outOrderCode = outOrderCode;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -560,6 +573,7 @@ public class AfterSalesShippingDevice extends BaseEntity
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
             .append("addShippingDeviceFlag",getAddShippingDeviceFlag())
+            .append("outOrderCode",getOutOrderCode())
             .toString();
     }
 }
diff --git a/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml b/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
index 96118079..6ed26895 100644
--- a/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/aftersales/AfterSalesShippingDeviceMapper.xml
@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="shippingDeviceId"    column="shipping_device_id"    />
         <result property="makeNo"    column="make_no"    />
         <result property="salesOrderCode"    column="sales_order_code"    />
+        <result property="outOrderCode"    column="out_order_code"    />
         <result property="materialNo"    column="material_no"    />
         <result property="materialPhotourl"    column="material_photoUrl"    />
         <result property="materialName"    column="material_name"    />
@@ -52,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectAfterSalesShippingDeviceVo">
-        select shipping_device_code, shipping_device_id, make_no,sales_order_code, material_no, material_photoUrl, material_name, material_type, material_class, material_model_code, material_unit, material_brand, material_describe,
+        select shipping_device_code, shipping_device_id, make_no,sales_order_code, out_order_code, material_no, material_photoUrl, material_name, material_type, material_class, material_model_code, material_unit, material_brand, material_describe,
                device_model_code, device_running_number, make_photoUrl, sn_code, aftersales_photoUrl, factory_date, guarantee_period, guarantee_period_flag, lock_date, lock_date_flag, wastage_expire_date, wastage_expire_flag,
                component_guarantee_date, component_guarantee_flag, engineer_name, salesman_name, make_name,customer_id, customer_name, maintain_order_code, maintain_time, create_by, create_time, update_by, update_time,
                add_shipping_device_flag, start_make_time, end_make_time, add_process_issue_record_flag,quality_status from aftersales_shipping_device
@@ -139,12 +140,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <foreach item="salesOrderCode" collection="array" open="(" separator="," close=")">
             #{salesOrderCode}
         </foreach>
-        and add_shipping_device_flag = '1'
     </select>
 
     <select id="selectAllShippingDevices" resultMap="AfterSalesShippingDeviceResult">
         <include refid="selectAfterSalesShippingDeviceVo"/>
-        where add_shipping_device_flag = '1'
     </select>
 
     <select id="selectBatchShippingDeviceById" parameterType="String" resultMap="AfterSalesShippingDeviceResult">
@@ -162,6 +161,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="shippingDeviceId != null and shippingDeviceId != ''">shipping_device_id,</if>
             <if test="salesOrderCode != null">sales_order_code,</if>
             <if test="makeNo != null">make_no,</if>
+            <if test="outOrderCode != null">out_order_code,</if>
             <if test="materialNo != null">material_no,</if>
             <if test="materialPhotourl != null">material_photoUrl,</if>
             <if test="materialName != null">material_name,</if>
@@ -205,6 +205,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="shippingDeviceId != null and shippingDeviceId != ''">#{shippingDeviceId},</if>
             <if test="salesOrderCode != null">#{salesOrderCode},</if>
             <if test="makeNo != null">#{makeNo},</if>
+            <if test="outOrderCode != null">#{outOrderCode},</if>
             <if test="materialNo != null">#{materialNo},</if>
             <if test="materialPhotourl != null">#{materialPhotourl},</if>
             <if test="materialName != null">#{materialName},</if>
@@ -252,6 +253,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="shippingDeviceId != null and shippingDeviceId != ''">shipping_device_id = #{shippingDeviceId},</if>
             <if test="salesOrderCode != null">sales_order_code = #{salesOrderCode},</if>
             <if test="makeNo != null">make_no = #{makeNo},</if>
+            <if test="outOrderCode != null">out_order_code = #{outOrderCode},</if>
             <if test="materialNo != null">material_no = #{materialNo},</if>
             <if test="materialPhotourl != null">material_photoUrl = #{materialPhotourl},</if>
             <if test="materialName != null">material_name = #{materialName},</if>