From 443784b4fa8ef4d40f754efa5544183e05bbf43b Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 4 Jul 2024 09:45:04 +0800
Subject: [PATCH] =?UTF-8?q?2024-07-04=20=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/modules/pms/data/QcPartAttributeData.java      | 10 ++++++++++
 src/main/resources/mapper/pms/QcMapper.xml             | 10 +++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/QcPartAttributeData.java b/src/main/java/com/xujie/sys/modules/pms/data/QcPartAttributeData.java
index 2c1f256a..f4e2c50f 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/QcPartAttributeData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/QcPartAttributeData.java
@@ -33,6 +33,16 @@ public class QcPartAttributeData extends QueryPage {
     // 备注
     private String attributeRemark;
 
+    private String spec;
+
+    public String getSpec() {
+        return spec;
+    }
+
+    public void setSpec(String spec) {
+        this.spec = spec;
+    }
+
     public String getSku() {
         return sku;
     }
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 5c31c3d0..e29e26aa 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -645,7 +645,7 @@
         (site, bu_no, template_id, ItemNo, default_value, max_value, min_value)
         VALUES
         <foreach collection="list" item="item" separator=",">
-            (#{item.site}, #{item.buNo}, #{item.templateId}, #{item.itemNo}, #{item.defaultValue}, #{item.maxValue}, #{item.minValue})
+            (#{item.site}, #{item.buNo}, #{item.templateId}, #{item.itemNo}, #{item.defaultValue}, #{item.maxValue,jdbcType=DECIMAL}, #{item.minValue,jdbcType=DECIMAL})
         </foreach>
     </insert>
 
@@ -662,8 +662,7 @@
                ItemRemark,
                ItemType
         FROM eam_properties_item
-        WHERE ItemNo = #{itemNo}
-        AND ItemType = #{itemType}
+        WHERE ItemNo = #{itemNo} AND ItemType = #{itemType}
     </select>
 
     <!-- ================================================= 样本量维护 ================================================= -->
@@ -975,7 +974,8 @@
             dbo.qc_get_cinv_source_code(p.part_no) as cinvSourceCode,
             dbo.qc_get_sku(part_no) as sku,
             p.FamilyID,
-            p.spec as FamilyName,
+            p.invtype as familyName,
+            p.spec,
             p.umid,
             qa.supplier_no,
             dbo.qc_get_supplier_name(qa.site, qa.supplier_no) as supplierDesc,
@@ -1008,7 +1008,7 @@
                 AND dbo.qc_get_sku(part_no) LIKE '%' + #{query.sku}+'%'
             </if>
             <if test = "query.familyName != null and query.familyName != ''">
-                AND p.spec LIKE '%' + #{query.familyName}+'%'
+                AND p.invtype LIKE '%' + #{query.familyName}+'%'
             </if>
         </where>
     </select>