2024-08-17

iqc责任人优化

src/main/java/com/xujie/sys/modules/pms/data/SupplierData.java

@@ -0,0 +1,11 @@
+package com.xujie.sys.modules.pms.data;
+
+import lombok.Data;
+
+@Data
+public class SupplierData {
+    private String site;
+    private String supplierID;
+    private String supplierName;
+    private String active;
+}

src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java

@@ -574,4 +574,6 @@ public interface QcMapper {
     List<QcPartAttributeData> getCustomerList(QcPartAttributeData data);
 
     List<QcTemplateData> getPA3(QcTemplateData partData);
+
+    List<SupplierData> getSupplier(@Param("site") String site, @Param("supplierID") String supplierID, @Param("active") String active);
 }

src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java

@@ -10,6 +10,7 @@ import com.xujie.sys.common.utils.RandomUtil;
 import com.xujie.sys.modules.oss.entity.SysOssEntity;
 import com.xujie.sys.modules.oss.service.SysOssService;
 import com.xujie.sys.modules.pms.data.*;
+import com.xujie.sys.modules.pms.entity.SupplierEntity;
 import com.xujie.sys.modules.pms.entity.vo.CheckSubDetailValueVo;
 import com.xujie.sys.modules.pms.mapper.QcDao;
 import com.xujie.sys.modules.pms.mapper.QcMapper;
@@ -4035,6 +4036,14 @@ public class QcServiceImpl implements QcService {
     @Override
     @Transactional
     public void saveIQCDetailedRecord(QcFAIRecordData data) {
+        // 校验供应商
+        if (data.getResponsiblePerson() != null && !"".equals(data.getResponsiblePerson())){
+            List<SupplierData> suppliers = qcMapper.getSupplier(data.getSite(), data.getResponsiblePerson(), "Y");
+            if (suppliers.isEmpty()) {
+                throw new RuntimeException("供应商不存在！");
+            }
+        }
+
         data.setState("待审核");
         qcMapper.updateIQCMasterRecord(data);
         // 修改明细记录信息
@@ -4064,7 +4073,7 @@ public class QcServiceImpl implements QcService {
                 QcOperatorData recordData = new QcOperatorData();
                 recordData.setSite(data.getSite());
                 recordData.setOrderNo(data.getInspectionNo());
-                recordData.setFunctionType("responsible");
+                recordData.setFunctionType("supplier");
                 recordData.setBuNo(data.getBuNo());
                 recordData.setOperator(s);
                 operators.add(recordData);

src/main/resources/mapper/pms/QcMapper.xml

@@ -2284,8 +2284,7 @@
         action_by,
         isnull(dbo.joint_id(site, bu_no, inspection_no, 'coordination'), '') as operator,
         isnull(dbo.joint_name(site, bu_no, inspection_no, 'coordination'), '') as operatorName,
-        isnull(dbo.joint_id(site, bu_no, inspection_no, 'responsible'), '') as responsiblePerson,
-        isnull(dbo.joint_name(site, bu_no, inspection_no, 'responsible'), '') as responsiblePersonName,
+        isnull(dbo.joint_id(site, bu_no, inspection_no, 'supplier'), '') as responsiblePerson,
         receipt_no,
         receipt_item_no,
         pass_qty,
@@ -4179,6 +4178,15 @@
         WHEN state = '已完成' THEN 3
         END, create_date desc
     </select>
+
+    <select id="getSupplier" parameterType="java.lang.String" resultType="SupplierData">
+        SELECT
+            site,
+            SupplierID,
+            SupplierName
+        FROM Supplier
+        WHERE site = #{site} and SupplierID = #{supplierID} and Active = #{active}
+    </select>
 </mapper>
 
 

src/main/resources/mapper/pms/QcReportMapper.xml

@@ -132,7 +132,7 @@
                 AND a.ref_info5 LIKE #{query.refInfo5}
             </if>
             <if test = "query.itemResult != null and query.itemResult != ''">
-                AND b.item_result LIKE #{query.itemResult}
+                AND b.item_result = #{query.itemResult}
             </if>
         </where>
         ORDER BY
@@ -246,7 +246,7 @@
                 AND #{query.endDate2} >= a.task_date
             </if>
             <if test = "query.itemResult != null and query.itemResult != ''">
-                AND b.item_result LIKE #{query.itemResult}
+                AND b.item_result = #{query.itemResult}
             </if>
         </where>
         ORDER BY
@@ -368,7 +368,7 @@
                 AND a.order_ref5 LIKE #{query.orderRef5}
             </if>
             <if test = "query.itemResult != null and query.itemResult != ''">
-                AND b.item_result LIKE #{query.itemResult}
+                AND b.item_result = #{query.itemResult}
             </if>
         </where>
         ORDER BY
@@ -490,7 +490,7 @@
                 AND a.order_ref5 LIKE #{query.orderRef5}
             </if>
             <if test = "query.itemResult != null and query.itemResult != ''">
-                AND b.item_result LIKE #{query.itemResult}
+                AND b.item_result = #{query.itemResult}
             </if>
         </where>
         ORDER BY