2024-12-24

优化

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

@@ -297,6 +297,43 @@ public class QcFAIRecordData extends QueryPage {
 
     private String shiftDesc;
 
+    private String typeFlag1;
+    private String typeFlag2;
+    private String typeFlag3;
+    private String typeFlag4;
+
+    public String getTypeFlag1() {
+        return typeFlag1;
+    }
+
+    public void setTypeFlag1(String typeFlag1) {
+        this.typeFlag1 = typeFlag1;
+    }
+
+    public String getTypeFlag2() {
+        return typeFlag2;
+    }
+
+    public void setTypeFlag2(String typeFlag2) {
+        this.typeFlag2 = typeFlag2;
+    }
+
+    public String getTypeFlag3() {
+        return typeFlag3;
+    }
+
+    public void setTypeFlag3(String typeFlag3) {
+        this.typeFlag3 = typeFlag3;
+    }
+
+    public String getTypeFlag4() {
+        return typeFlag4;
+    }
+
+    public void setTypeFlag4(String typeFlag4) {
+        this.typeFlag4 = typeFlag4;
+    }
+
     public String getShiftNo() {
         return shiftNo;
     }

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

@@ -0,0 +1,11 @@
+package com.xujie.sys.modules.pms.data;
+
+import lombok.Data;
+
+@Data
+public class QcRecordData {
+    private String site;
+    private String buNo;
+    private String inspectionNo;
+    private String inspectionTypeNo;
+}

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

@@ -591,4 +591,10 @@ public interface QcMapper {
     void updateSOScheduledRoutingRollQty(@Param("site") String site, @Param("seqNo") String seqNo, @Param("rollQty") BigDecimal rollQty);
 
     List<ShiftData> getShiftList(ShiftData data);
+
+    void updateSOScheduledRoutingTypeFlag(@Param("site") String site, @Param("seqNo") String seqNo, @Param("inspectionTypeNo") String inspectionTypeNo);
+
+    List<QcRecordData> selectIPQCRecordByType(QcFAIRecordData qcData);
+
+    void updateSOScheduledRoutingTypeFlag2(@Param("site") String site, @Param("seqNo") String seqNo, @Param("inspectionTypeNo") String inspectionTypeNo);
 }

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

@@ -3427,11 +3427,12 @@ public class QcServiceImpl implements QcService {
             data.setImportantFlag("N");
         }
         qcMapper.saveIPQCRecord(data);
-
         // 派工单生成检验任务, 更新已送检数量
         if ("doInspection".equals(data.getFlag())) {
             qcMapper.updateSOScheduledRoutingRollQty(data.getSite(), data.getSeqNo(), data.getRollQty());
         }
+        // 修改派工单表里的记录标识 2024-12-23
+        qcMapper.updateSOScheduledRoutingTypeFlag(data.getSite(), data.getSeqNo(), data.getInspectionTypeNo());
         return data.getInspectionNo();
     }
 
@@ -3477,6 +3478,12 @@ public class QcServiceImpl implements QcService {
             qcMapper.deleteIPQCSubDetailedRecord(qcData);
             // 删除文件
             qcMapper.deleteInspectionFiles(qcData);
+            // 检查该检验类型的检验单还有没有
+            List<QcRecordData> typeList = qcMapper.selectIPQCRecordByType(qcData);
+            if (typeList.isEmpty()) {
+                // 修改type_flag
+                qcMapper.updateSOScheduledRoutingTypeFlag2(qcData.getSite(), qcData.getSeqNo(), qcData.getInspectionTypeNo());
+            }
         }
     }
 

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

@@ -3370,7 +3370,11 @@
         a.ScheduledDate,
         a.CreatedBy as createBy,
         isnull(a.roll_qty, 0) as rollQty,
-        u.UserName as OperatorName
+        u.UserName as OperatorName,
+        type_flag1,
+        type_flag2,
+        type_flag3,
+        type_flag4
         FROM SOScheduledRouting AS a
         inner join ShopOrder as t ON t.Site = a.Site AND t.OrderNo = a.SOOrderNo
         inner join WorkCenterResource as w ON w.Site = a.Site AND w.WorkCenterNo = a.S_WorkCenterNo and w.ResourceID = a.S_ResourceID
@@ -3413,6 +3417,18 @@
         <if test="query.endDate != null">
             AND #{query.endDate} >= a.ScheduledDate
         </if>
+        <if test="query.inspectionTypeNo != null and query.inspectionTypeNo != '' and query.inspectionTypeNo == '首件检'">
+            AND a.type_flag1 = 'Y'
+        </if>
+        <if test="query.inspectionTypeNo != null and query.inspectionTypeNo != '' and query.inspectionTypeNo == '自检'">
+            AND a.type_flag2 = 'Y'
+        </if>
+        <if test="query.inspectionTypeNo != null and query.inspectionTypeNo != '' and query.inspectionTypeNo == '巡检'">
+            AND a.type_flag3 = 'Y'
+        </if>
+        <if test="query.inspectionTypeNo != null and query.inspectionTypeNo != '' and query.inspectionTypeNo == '末件检'">
+            AND a.type_flag4 = 'Y'
+        </if>
     </select>
 
     <select id="searchPartInfo" parameterType="com.xujie.sys.modules.pms.data.QcFAIRecordData" resultType="com.xujie.sys.modules.pms.data.QcFAIRecordData">
@@ -4392,6 +4408,54 @@
         WHERE site = #{site} and BarcodeID = #{seqNo}
     </update>
 
+    <update id="updateSOScheduledRoutingTypeFlag">
+        UPDATE SOScheduledRouting
+        <set>
+            <if test="inspectionTypeNo == '首件检'">
+                type_flag1 = 'Y',
+            </if>
+            <if test="inspectionTypeNo == '自检'">
+                type_flag2 = 'Y',
+            </if>
+            <if test="inspectionTypeNo == '巡检'">
+                type_flag3 = 'Y',
+            </if>
+            <if test="inspectionTypeNo == '末件检'">
+                type_flag4 = 'Y'
+            </if>
+        </set>
+        WHERE site = #{site} and BarcodeID = #{seqNo}
+    </update>
+
+    <!-- 修改IQC明细记录信息 -->
+    <update id="updateSOScheduledRoutingTypeFlag2">
+        UPDATE SOScheduledRouting
+        <set>
+            <if test="inspectionTypeNo == '首件检'">
+                type_flag1 = '',
+            </if>
+            <if test="inspectionTypeNo == '自检'">
+                type_flag2 = '',
+            </if>
+            <if test="inspectionTypeNo == '巡检'">
+                type_flag3 = '',
+            </if>
+            <if test="inspectionTypeNo == '末件检'">
+                type_flag4 = ''
+            </if>
+        </set>
+        WHERE site = #{site} and BarcodeID = #{seqNo}
+    </update>
+
+    <select id="selectIPQCRecordByType" parameterType="QcFAIRecordData" resultType="QcRecordData">
+        SELECT
+            site,
+            bu_no,
+            inspection_no
+        FROM qc_ipqc_record
+        WHERE site = #{site} and bu_no = #{buNo} and seq_no = #{seqNo} and inspection_type_no = #{inspectionTypeNo}
+    </select>
+
     <select id="getShiftList" parameterType="ShiftData" resultType="ShiftData">
         SELECT distinct
             shiftdesc