2025-04-24

派工单生成检验任务批量生成
IPQC任务的页面加一个任务重载

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

@@ -1,163 +1,34 @@
 package com.xujie.sys.modules.pms.data;
 
+import lombok.Data;
+
 import java.math.BigDecimal;
 
-/**
- * @description: 明细记录实体类
- * @author: fengyuan_yang
- * @date: 2023/3/29 16:07
- * @param:
- * @return:
- **/
+@Data
 public class QcDetailInformationData {
-    // 主键
+    /**
+     * ID
+     */
     private Integer id;
-    // 检验编码
+    /**
+     * Site
+     */
+    private String site;
+    /**
+     * BU
+     */
+    private String buNo;
+    /**
+     * 检验编码
+     */
     private String inspectionNo;
-    // 项目编码
-    private String itemNo;
-    // 项目名称
-    private String itemDesc;
-    // 检验类型
-    private String valueTypeDb;
-    // 检验类型
-    private String valueType;
-    // 数字实测值
-    private BigDecimal numberValue;
-    // 是否合格
-    private String isQualified;
-    // 项目默认值
-    private String defaultValue;
-    // 项目最大值
-    private BigDecimal maxValue;
-    // 项目最小值
-    private BigDecimal minValue;
-    // 文本实测值
-    private String textValue;
-    // 检验方法名称
-    private String methodName;
-    // 检验方法描述
-    private String methodRemark;
-    // 提交标识
-    private String isSubmit;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getInspectionNo() {
-        return inspectionNo;
-    }
-
-    public void setInspectionNo(String inspectionNo) {
-        this.inspectionNo = inspectionNo;
-    }
-
-    public String getItemNo() {
-        return itemNo;
-    }
-
-    public void setItemNo(String itemNo) {
-        this.itemNo = itemNo;
-    }
-
-    public String getItemDesc() {
-        return itemDesc;
-    }
-
-    public void setItemDesc(String itemDesc) {
-        this.itemDesc = itemDesc;
-    }
-
-    public String getValueTypeDb() {
-        return valueTypeDb;
-    }
-
-    public void setValueTypeDb(String valueTypeDb) {
-        this.valueTypeDb = valueTypeDb;
-    }
-
-    public String getIsQualified() {
-        return isQualified;
-    }
-
-    public void setIsQualified(String isQualified) {
-        this.isQualified = isQualified;
-    }
-
-    public String getValueType() {
-        return valueType;
-    }
-
-    public void setValueType(String valueType) {
-        this.valueType = valueType;
-    }
 
-    public String getDefaultValue() {
-        return defaultValue;
-    }
-
-    public void setDefaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-    }
-
-    public BigDecimal getNumberValue() {
-        return numberValue;
-    }
-
-    public void setNumberValue(BigDecimal numberValue) {
-        this.numberValue = numberValue;
-    }
-
-    public BigDecimal getMaxValue() {
-        return maxValue;
-    }
-
-    public void setMaxValue(BigDecimal maxValue) {
-        this.maxValue = maxValue;
-    }
-
-    public BigDecimal getMinValue() {
-        return minValue;
-    }
-
-    public void setMinValue(BigDecimal minValue) {
-        this.minValue = minValue;
-    }
-
-    public String getTextValue() {
-        return textValue;
-    }
-
-    public void setTextValue(String textValue) {
-        this.textValue = textValue;
-    }
-
-    public String getMethodName() {
-        return methodName;
-    }
-
-    public void setMethodName(String methodName) {
-        this.methodName = methodName;
-    }
-
-    public String getMethodRemark() {
-        return methodRemark;
-    }
-
-    public void setMethodRemark(String methodRemark) {
-        this.methodRemark = methodRemark;
-    }
-
-    public String getIsSubmit() {
-        return isSubmit;
-    }
-
-    public void setIsSubmit(String isSubmit) {
-        this.isSubmit = isSubmit;
-    }
+    /**
+     * 模板编码
+     */
+    private String templateId;
+    /**
+     * 项目编码
+     */
+    private String itemNo;
 }

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

@@ -597,4 +597,10 @@ public interface QcMapper {
     List<QcRecordData> selectIPQCRecordByType(QcFAIRecordData qcData);
 
     void updateSOScheduledRoutingTypeFlag2(@Param("site") String site, @Param("seqNo") String seqNo, @Param("inspectionTypeNo") String inspectionTypeNo);
+
+    void saveIPQCDetailedRecords(List<QcFAIRecordData> saveItemList);
+
+    List<QcDetailInformationData> getIPQCDetailInfo(@Param("site") String site, @Param("buNo") String buNo, @Param("inspectionNo") String inspectionNo);
+
+    void updateIPQCRecord(QcFAIRecordData recordData);
 }

src/main/java/com/xujie/sys/modules/pms/service/QcService.java

@@ -322,4 +322,8 @@ public interface QcService {
     PageUtils searchSeqInfo2(QcFAIRecordData data);
 
     List<ShiftData> getShiftList(ShiftData data);
+
+    void batchSaveOsInspection(QcFAIRecordData data);
+
+    void ipqcRecordOverLoad(QcFAIRecordData data);
 }

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

@@ -1894,8 +1894,27 @@
 
     <!-- 新增IPQC明细记录信息 -->
     <insert id="saveIPQCDetailedRecord" parameterType="QcFAIRecordData">
-        INSERT INTO qc_ipqc_detailed_record (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc, AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, max_value, value_type_db, value_type, site, sampling_qty, bu_no, serial_no)
-        VALUES(#{inspectionNo}, #{orderNo}, #{templateId}, #{samplingLevelNo}, #{samplingLevelDesc}, #{samplingProgrammeNo}, #{samplingProgrammeDesc}, #{aql,jdbcType=DECIMAL}, #{ac,jdbcType=DECIMAL}, #{re,jdbcType=DECIMAL}, #{itemNo}, #{itemDesc}, #{objectId}, #{objectDesc}, #{defaultValue}, #{minValue,jdbcType=DECIMAL}, #{maxValue,jdbcType=DECIMAL}, #{valueTypeDb}, #{valueType}, #{site}, #{samplingQty,jdbcType=DECIMAL}, #{buNo}, #{serialNo})
+        INSERT INTO qc_ipqc_detailed_record
+        (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc,
+         AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, max_value,
+         value_type_db, value_type, site, sampling_qty, bu_no, serial_no)
+        VALUES
+        (#{inspectionNo}, #{orderNo}, #{templateId}, #{samplingLevelNo}, #{samplingLevelDesc}, #{samplingProgrammeNo}, #{samplingProgrammeDesc},
+         #{aql,jdbcType=DECIMAL}, #{ac,jdbcType=DECIMAL}, #{re,jdbcType=DECIMAL}, #{itemNo}, #{itemDesc}, #{objectId}, #{objectDesc}, #{defaultValue}, #{minValue,jdbcType=DECIMAL}, #{maxValue,jdbcType=DECIMAL},
+         #{valueTypeDb}, #{valueType}, #{site}, #{samplingQty,jdbcType=DECIMAL}, #{buNo}, #{serialNo})
+    </insert>
+
+    <insert id="saveIPQCDetailedRecords">
+        INSERT INTO qc_ipqc_detailed_record
+        (inspection_no, order_no, template_id, sampling_level_no, sampling_level_desc, sampling_programme_no, sampling_programme_desc,
+        AQL, AC, RE, item_no, item_desc, object_id, object_desc, default_value, min_value, max_value,
+        value_type_db, value_type, site, sampling_qty, bu_no, serial_no)
+        VALUES
+        <foreach collection="list" item="item" separator=",">
+            (#{item.inspectionNo}, #{item.orderNo}, #{item.templateId}, #{item.samplingLevelNo}, #{item.samplingLevelDesc}, #{item.samplingProgrammeNo}, #{item.samplingProgrammeDesc},
+            #{item.aql,jdbcType=DECIMAL}, #{item.ac,jdbcType=DECIMAL}, #{item.re,jdbcType=DECIMAL}, #{item.itemNo}, #{item.itemDesc}, #{item.objectId}, #{item.objectDesc}, #{item.defaultValue}, #{item.minValue,jdbcType=DECIMAL}, #{item.maxValue,jdbcType=DECIMAL},
+            #{item.valueTypeDb}, #{item.valueType}, #{item.site}, #{item.samplingQty,jdbcType=DECIMAL}, #{item.buNo}, #{item.serialNo})
+        </foreach>
     </insert>
 
     <!-- 新增IPQC记录到count表 -->
@@ -4484,6 +4503,25 @@
         FROM calendar_datetype_shift
         WHERE site = #{site}
     </select>
+
+    <select id="getIPQCDetailInfo" resultType="com.xujie.sys.modules.pms.data.QcDetailInformationData">
+        SELECT
+            site,
+            bu_no,
+            inspection_no,
+            template_id
+        FROM qc_ipqc_detailed_record
+        where site = #{site} and bu_no = #{buNo} and inspection_no = #{inspectionNo}
+    </select>
+
+    <update id="updateIPQCRecord" parameterType="com.xujie.sys.modules.pms.data.QcFAIRecordData">
+        UPDATE qc_ipqc_record
+        SET sampling_qty = #{samplingQty},
+            inspection_cycle = #{inspectionCycle},
+            pass_qty = #{samplingQty},
+            not_pass_qty = 0
+        WHERE site = #{site} and bu_no = #{buNo} and inspection_no = #{inspectionNo}
+    </update>
 </mapper>