From 0056c53750675d03cd67fc55b80c081d2340eafb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=89=E6=BA=90?= <1976974459@qq.com>
Date: Wed, 18 Oct 2023 11:29:03 +0800
Subject: [PATCH] =?UTF-8?q?2023-10-18=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=92=8C?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/pms/data/QcPartAttributeData.java | 10 ++++
 .../pms/service/Impl/QcServiceImpl.java       |  2 +-
 src/main/resources/mapper/pms/QcMapper.xml    | 53 ++++++++++---------
 3 files changed, 40 insertions(+), 25 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 60563d7f..b15188e9 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
@@ -50,6 +50,16 @@ public class QcPartAttributeData extends QueryPage {
     private String manufacturerID;
     // 供应商名称
     private String manufacturerName;
+    // 是否免检
+    private String exemptInspection;
+
+    public String getExemptInspection() {
+        return exemptInspection;
+    }
+
+    public void setExemptInspection(String exemptInspection) {
+        this.exemptInspection = exemptInspection;
+    }
 
     public String getInvdefineType() {
         return invdefineType;
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
index b80ab8e1..346502c6 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
@@ -997,7 +997,7 @@ public class QcServiceImpl implements QcService {
     public void qcPartAttributeSave(QcPartAttributeData data) {
         // 查询是否已有该物料属性
         QcPartAttributeData partAttributeData = qcMapper.selectPartAttributeByNo(data);
-        if (partAttributeData != null){
+        if (partAttributeData != null) {
             throw new RuntimeException("该物料属性已存在！");
         }
         qcMapper.qcPartAttributeSave(data);
diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml
index 8ed7cc1f..6d70a5d1 100644
--- a/src/main/resources/mapper/pms/QcMapper.xml
+++ b/src/main/resources/mapper/pms/QcMapper.xml
@@ -8,15 +8,16 @@
     <!-- 条件查询检验方法 -->
     <select id="qcMethodSearch"  parameterType="QcMethodData" resultType="QcMethodData">
         SELECT
-        qm.method_no,
-        qm.method_name,
-        qm.create_date,
-        qm.create_by,
-        qm.method_remark,
-        qm.update_date,
-        qm.update_by,
-        qm.inspection_type_no,
-        qit.inspection_type_name
+            qm.site,
+            qm.method_no,
+            qm.method_name,
+            qm.create_date,
+            qm.create_by,
+            qm.method_remark,
+            qm.update_date,
+            qm.update_by,
+            qm.inspection_type_no,
+            qit.inspection_type_name
         FROM qc_method as qm
         LEFT JOIN qc_inspection_type as qit on qm.site = qit.site and qm.inspection_type_no = qit.inspection_type_no
         <where>
@@ -86,6 +87,7 @@
     <!-- 根据条件查询检验项目 -->
     <select id="qcItemSearch" parameterType="QcItemData" resultType="QcItemData">
         SELECT
+            epi.site,
             epi.ItemNo,
             epi.ItemDesc,
             epi.DefaultValue,
@@ -870,19 +872,21 @@
     <!-- 查询物料属性 -->
     <select id="qcPartAttributeSearch" parameterType="QcPartAttributeData" resultType="QcPartAttributeData">
         SELECT
-        p.part_no,
-        p.part_desc,
-        p.FamilyID,
-        p.spec as FamilyName,
-        p.umid,
-        qa.supplier_no,
-        dbo.qc_get_supplier_name(qa.site, qa.supplier_no) as supplierDesc,
-        qa.attribute_remark,
-        qa.create_time,
-        qa.create_by,
-        qa.attribute_type,
-        qa.update_date,
-        qa.update_by
+            qa.site,
+            p.part_no,
+            p.part_desc,
+            p.FamilyID,
+            p.spec as FamilyName,
+            p.umid,
+            qa.supplier_no,
+            dbo.qc_get_supplier_name(qa.site, qa.supplier_no) as supplierDesc,
+            qa.attribute_remark,
+            qa.create_time,
+            qa.create_by,
+            qa.attribute_type,
+            qa.update_date,
+            qa.update_by,
+            qa.exempt_inspection
         FROM qc_part_attribute as qa
         LEFT JOIN part as p on qa.attribute_no = p.part_no and qa.site = p.site
         LEFT JOIN PartFamily as pf on p.FamilyID = pf.FamilyID and p.site = pf.site
@@ -914,8 +918,8 @@
 
     <!-- 新增物料属性 -->
     <insert id="qcPartAttributeSave" parameterType="QcPartAttributeData">
-        INSERT INTO qc_part_attribute (attribute_no, supplier_no, attribute_remark, create_time, create_by, attribute_type, site)
-        VALUES(#{partNo}, #{supplierNo}, #{attributeRemark}, getDate(), #{createBy}, #{attributeType}, #{site})
+        INSERT INTO qc_part_attribute (attribute_no, supplier_no, attribute_remark, create_time, create_by, attribute_type, site, exempt_inspection)
+        VALUES(#{partNo}, #{supplierNo}, #{attributeRemark}, getDate(), #{createBy}, #{attributeType}, #{site}, #{exemptInspection})
     </insert>
 
     <!-- 删除物料属性 -->
@@ -1121,6 +1125,7 @@
     <!-- 查询类别属性 -->
     <select id="qcFamilyAttributeSearch" parameterType="QcPartAttributeData" resultType="QcPartAttributeData">
         SELECT
+            qa.site,
             qa.attribute_no as familyID,
             pf.FamilyName,
             qa.supplier_no,