[feat] 采购管理

采购报价数据库表、实体类、前端所有页面、mapper.xml层的所有方法新增物料型号字段

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())

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>

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,

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) {

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,

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) {

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) {

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,