From 18ceb374c46b17a7925d7bb19e3c9a187912d32d Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Fri, 3 Jan 2025 15:11:06 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E9=87=87=E8=B4=AD=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E9=87=87=E8=B4=AD=E6=8A=A5=E4=BB=B7=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E8=A1=A8=E3=80=81=E5=AE=9E=E4=BD=93=E7=B1=BB=E3=80=81?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=89=80=E6=9C=89=E9=A1=B5=E9=9D=A2=E3=80=81?=
 =?UTF-8?q?mapper.xml=E5=B1=82=E7=9A=84=E6=89=80=E6=9C=89=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99=E5=9E=8B=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

---
 .../ruoyi/purchase/domain/PurchaseQuoteChild.java | 15 +++++++++++++++
 .../mapper/purchase/PurchaseQuoteChildMapper.xml  |  8 ++++++--
 .../templates/purchase/purchaseQuote/add.html     |  2 ++
 .../templates/purchase/purchaseQuote/detail.html  |  1 +
 .../templates/purchase/purchaseQuote/edit.html    |  2 ++
 .../purchase/purchaseQuote/taskCgjlVerify.html    |  1 +
 .../purchase/purchaseQuote/taskFzjlVerify.html    |  1 +
 .../purchase/purchaseQuote/taskModifyApply.html   |  2 ++
 8 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseQuoteChild.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseQuoteChild.java
index d1e987fe..751969ef 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseQuoteChild.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/purchase/domain/PurchaseQuoteChild.java
@@ -42,6 +42,11 @@ public class PurchaseQuoteChild extends BaseEntity
     @Excel(name = "物料的加工方式")
     private String processMethod;
 
+
+    /** 物料的型号 */
+    @Excel(name = "物料的型号")
+    private String materialModel;
+
     /** 物料的品牌 */
     @Excel(name = "物料的品牌")
     private String brand;
@@ -294,6 +299,15 @@ public class PurchaseQuoteChild extends BaseEntity
     public String getCorrelationCode() {
         return correlationCode;
     }
+
+    public String getMaterialModel() {
+        return materialModel;
+    }
+
+    public void setMaterialModel(String materialModel) {
+        this.materialModel = materialModel;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -304,6 +318,7 @@ public class PurchaseQuoteChild extends BaseEntity
             .append("materialName", getMaterialName())
             .append("materialType", getMaterialType())
             .append("processMethod", getProcessMethod())
+            .append("materialModel", getMaterialModel())
             .append("brand", getBrand())
             .append("photoUrl", getPhotoUrl())
             .append("describe", getDescribe())
diff --git a/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseQuoteChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseQuoteChildMapper.xml
index d0d84d89..a8a70d03 100644
--- a/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseQuoteChildMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/purchase/PurchaseQuoteChildMapper.xml
@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="materialName"             column="material_name"              />
         <result property="materialType"             column="material_type"              />
         <result property="processMethod"            column="processMethod"              />
+        <result property="materialModel"            column="material_model"              />
         <result property="brand"                    column="brand"                      />
         <result property="photoUrl"                 column="photoUrl"                   />
         <result property="describe"                 column="describe"                   />
@@ -34,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectPurchaseQuoteChildVo">
         select purchase_quote_child_id, purchase_quote_code, material_id, material_code,
-            material_name, material_type, processMethod, brand, photoUrl, `describe`, tax_rate, usd_rate,
+            material_name, material_type, processMethod, material_model, brand, photoUrl, `describe`, tax_rate, usd_rate,
             material_num, material_sole, material_rmb, material_noRmb,supplier_code, supplier_name,
             create_by, create_time, update_by, update_time, remark, use_status, audit_status,
             del_flag from purchase_quote_child
@@ -42,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectPurchaseQuoteChildList" parameterType="PurchaseQuoteChild" resultMap="PurchaseQuoteChildResult">
         select purchase_quote_child_id, purchase_quote_code, material_id, material_code,
-        material_name, material_type, processMethod, brand, photoUrl, `describe`, tax_rate, usd_rate,
+        material_name, material_type, processMethod, material_model, brand, photoUrl, `describe`, tax_rate, usd_rate,
         material_num, material_sole, material_rmb, material_noRmb,supplier_code, supplier_name,
         create_by, create_time, update_by, update_time, remark, use_status, audit_status,
         del_flag from purchase_quote_child
@@ -108,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialName != null">material_name,</if>
             <if test="materialType != null">material_type,</if>
             <if test="processMethod != null">processMethod,</if>
+            <if test="materialModel != null">material_model,</if>
             <if test="brand != null">brand,</if>
             <if test="photoUrl != null">photoUrl,</if>
             <if test="describe != null">`describe`,</if>
@@ -135,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">#{materialModel},</if>
             <if test="brand != null">#{brand},</if>
             <if test="photoUrl != null">#{photoUrl},</if>
             <if test="describe != null">#{describe},</if>
@@ -166,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="materialName != null">material_name = #{materialName},</if>
             <if test="materialType != null">material_type = #{materialType},</if>
             <if test="processMethod != null">processMethod = #{processMethod},</if>
+            <if test="materialModel != null">material_model = #{materialModel},</if>
             <if test="brand != null">brand = #{brand},</if>
             <if test="photoUrl != null">photoUrl = #{photoUrl},</if>
             <if test="describe != null">`describe` = #{describe},</if>
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html
index ca20d3ee..570b8be2 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html
@@ -149,6 +149,7 @@
                         }
                     },
                     { title: '描述',field: 'describe',align: 'center'},
+                    { title: '型号',field: 'materialModel',align: 'center'},
                     {title: '品牌',field: 'brand',align: 'center'},
                     { title: '单位',field: 'unit',align: 'center',
                         formatter: function(value, row, index) {
@@ -286,6 +287,7 @@
                             materialCode: rowData.materialNo,
                             materialName: rowData.materialName,
                             materialType: rowData.materialType,
+                            materialModel: rowData.materialModel,
                             describe: rowData.describe,
                             brand: rowData.brand,
                             unit: rowData.unit,
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/detail.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/detail.html
index 5869e0e6..1b4b7724 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/detail.html
@@ -191,6 +191,7 @@
                         }
                     },
                     { title: '描述',field: 'describe',align: 'center'},
+                    { title: '型号',field: 'materialModel',align: 'center'},
                     {title: '品牌',field: 'brand',align: 'center'},
                     { title: '单位',field: 'unit',align: 'center',
                         formatter: function(value, row, index) {
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/edit.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/edit.html
index 91435206..1d0807e3 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/edit.html
@@ -199,6 +199,7 @@
                         }
                     },
                     { title: '描述',field: 'describe',align: 'center'},
+                    { title: '型号',field: 'materialModel',align: 'center'},
                     {title: '品牌',field: 'brand',align: 'center'},
                     { title: '单位',field: 'unit',align: 'center',
                         formatter: function(value, row, index) {
@@ -271,6 +272,7 @@
                     materialCode: rowData.materialNo,
                     materialName: rowData.materialName,
                     materialType: rowData.materialType,
+                    materialModel: rowData.materialModel,
                     describe: rowData.describe,
                     brand: rowData.brand,
                     unit: rowData.unit,
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskCgjlVerify.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskCgjlVerify.html
index ec98dd45..b7355dbc 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskCgjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskCgjlVerify.html
@@ -234,6 +234,7 @@
                         }
                     },
                     { title: '描述',field: 'describe',align: 'center'},
+                    { title: '型号',field: 'materialModel',align: 'center'},
                     {title: '品牌',field: 'brand',align: 'center'},
                     { title: '单位',field: 'unit',align: 'center',
                         formatter: function(value, row, index) {
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskFzjlVerify.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskFzjlVerify.html
index ea5db1bb..c30ecdba 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskFzjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskFzjlVerify.html
@@ -234,6 +234,7 @@
                         }
                     },
                     { title: '描述',field: 'describe',align: 'center'},
+                    { title: '型号',field: 'materialModel',align: 'center'},
                     {title: '品牌',field: 'brand',align: 'center'},
                     { title: '单位',field: 'unit',align: 'center',
                         formatter: function(value, row, index) {
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskModifyApply.html
index 56ef0032..716ea865 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskModifyApply.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskModifyApply.html
@@ -217,6 +217,7 @@
                         }
                     },
                     { title: '描述',field: 'describe',align: 'center'},
+                    { title: '型号',field: 'materialModel',align: 'center'},
                     {title: '品牌',field: 'brand',align: 'center'},
                     { title: '单位',field: 'unit',align: 'center',
                         formatter: function(value, row, index) {
@@ -280,6 +281,7 @@
                     materialCode: rowData.materialNo,
                     materialName: rowData.materialName,
                     materialType: rowData.materialType,
+                    materialModel: rowData.materialModel,
                     describe: rowData.describe,
                     brand: rowData.brand,
                     unit: rowData.unit,