From 3ab48fb61e173d91de9394fa1986f2ed6959de68 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Mon, 4 Nov 2024 08:43:36 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=AD=90=E8=A1=A8=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E7=B1=BB=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5=EF=BC=8Cmapper.xml=E5=B1=82?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E6=96=B9=E6=B3=95=E6=96=B0=E5=A2=9EmaterialM?=
 =?UTF-8?q?odel=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/system/domain/SysSalesOrderChild.java | 17 +++++++++++++++++
 .../mapper/system/SysSalesOrderChildMapper.xml  | 13 +++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java
index 97ac7d1b..511c3d22 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysSalesOrderChild.java
@@ -2,6 +2,7 @@ package com.ruoyi.system.domain;
 
 import com.google.common.base.Objects;
 import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.FieldCompare;
 import com.ruoyi.common.core.domain.BaseEntity;
 
 import java.math.BigDecimal;
@@ -53,6 +54,12 @@ public class SysSalesOrderChild extends BaseEntity {
     @Excel(name = "物料的加工方式")
     private String processMethod;
 
+
+
+    /** 物料型号 */
+    @Excel(name = "型号")
+    private String materialModel;
+
     /** 物料的品牌 */
     @Excel(name = "物料的品牌")
     private String brand;
@@ -266,6 +273,15 @@ public class SysSalesOrderChild extends BaseEntity {
         this.processMethod = processMethod;
     }
 
+
+    public String getMaterialModel() {
+        return materialModel;
+    }
+
+    public void setMaterialModel(String materialModel) {
+        this.materialModel = materialModel;
+    }
+
     public String getBrand() {
         return brand;
     }
@@ -537,6 +553,7 @@ public class SysSalesOrderChild extends BaseEntity {
                 .add("materialName", materialName)
                 .add("materialType", materialType)
                 .add("processMethod", processMethod)
+                .add("materialModel", materialModel)
                 .add("brand", brand)
                 .add("unit", unit)
                 .add("photoUrl", photoUrl)
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml
index ff34bbff..8abd7010 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml
@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="materialName"         column="materialName"           />
         <result property="materialType"         column="materialType"           />
         <result property="processMethod"        column="processMethod"          />
+        <result property="materialModel"       column="material_model"           />
         <result property="brand"                column="brand"                  />
         <result property="unit"                 column="unit"                   />
         <result property="photoUrl"             column="photoUrl"               />
@@ -50,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSysSalesOrderChild">
-        select a.id, a.quoteId, a.materialId, a.materialCode, a.materialName, a.materialType, a.processMethod, a.brand, a.photoUrl,a.unit, a.`describe`,
+        select a.id, a.quoteId, a.materialId, a.materialCode, a.materialName, a.materialType, a.processMethod, a.material_model, a.brand, a.photoUrl,a.unit, a.`describe`,
             a.warehouseDept,a.countTax, a.usdTax, a.materialNum,a.materialSole,  a.recentQuotation_rmb, a.recentQuotation_usd, a.materialRmb, a.materialNoRmb, a.materialNoUsd, a.materialUsd, a.materialUsdSum,
             a.materialNoUsdSum, a.materialNoRmbSum, a.materialRmbSum,a.delivery_time, a.expiry_day,
             a.out_bound_quantity, a.un_bound_quantity, a.create_by, a.create_time, a.update_by,
@@ -73,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by a.id desc
     </select>
     <select id="selectSysSalesOrderChildListAll" parameterType="SysSalesOrderChild" resultMap="SysSalesOrderChildResult">
-       select  id, quoteId, materialId, materialCode, materialName, materialType, processMethod, brand, photoUrl,unit, `describe`,
+       select  id, quoteId, materialId, materialCode, materialName, materialType, processMethod,  material_model, brand, photoUrl,unit, `describe`,
             warehouseDept,countTax, usdTax, materialNum,materialSole , recentQuotation_rmb, recentQuotation_usd, materialRmb, materialNoRmb, materialNoUsd, materialUsd, materialUsdSum,
             materialNoUsdSum, materialNoRmbSum, materialRmbSum,delivery_time, expiry_day,
             out_bound_quantity, un_bound_quantity, create_by, create_time, update_by,
@@ -102,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectSalesOrderChildByCodeAndNo" resultMap="SysSalesOrderChildResult">
-        select id, quoteId, materialId, materialCode, materialName, materialType, processMethod, brand,
+        select id, quoteId, materialId, materialCode, materialName, materialType, processMethod,  material_model, brand,
                warehouseDept,materialNum, has_check_num, apply_shipping_num, out_bound_quantity
         from sys_sales_order_child
         where quoteId = #{quoteId}
@@ -110,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectOrderChildListBySalesOrderCode" resultMap="SysSalesOrderChildResult">
-        select id, quoteId, materialId, materialCode, materialName, materialType, processMethod, brand, materialRmbSum, materialRmb, materialUsd, materialUsdSum,
+        select id, quoteId, materialId, materialCode, materialName, materialType, processMethod, material_model, brand, materialRmbSum, materialRmb, materialUsd, materialUsdSum,
                warehouseDept,materialNum, photoUrl,finish_num,apply_shipping_num,has_apply_shipping_num, has_check_num, out_bound_quantity,delivery_time,countTax,
                materialRmb, materialNoRmb, materialNoUsd, materialUsd
         from sys_sales_order_child
@@ -136,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialName != null">materialName,</if>
             <if test="materialType != null">materialType,</if>
             <if test="processMethod != null">processMethod,</if>
+            <if test="materialModel != null">material_model,</if>
             <if test="brand != null">brand,</if>
             <if test="unit != null">unit,</if>
             <if test="photoUrl != null">photoUrl,</if>
@@ -178,6 +180,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialName != null">#{materialName},</if>
             <if test="materialType != null">#{materialType},</if>
             <if test="processMethod != null">#{processMethod},</if>
+            <if test="materialModel != null">#{materialModel},</if>
             <if test="brand != null">#{brand},</if>
             <if test="unit != null">#{unit},</if>
             <if test="photoUrl != null">#{photoUrl},</if>
@@ -224,6 +227,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialName != null">materialName = #{materialName},</if>
             <if test="materialType != null">materialType = #{materialType},</if>
             <if test="processMethod != null">processMethod = #{processMethod},</if>
+            <if test="materialModel != null">materialModel = #{materialModel},</if>
             <if test="brand != null">brand = #{brand},</if>
             <if test="photoUrl != null">photoUrl = #{photoUrl},</if>
             <if test="unit != null">unit = #{unit},</if>
@@ -271,6 +275,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialName != null">materialName = #{materialName},</if>
             <if test="materialType != null">materialType = #{materialType},</if>
             <if test="processMethod != null">processMethod = #{processMethod},</if>
+            <if test="materialModel != null">materialModel = #{materialModel},</if>
             <if test="brand != null">brand = #{brand},</if>
             <if test="photoUrl != null">photoUrl = #{photoUrl},</if>
             <if test="unit != null">unit = #{unit},</if>