2025-11-06

oqc优化

src/main/resources/mapper/oss/SysOssDao.xml

@@ -98,8 +98,7 @@
             order_ref4,
             file_type,
             file_suffix,
-            file_type_code,
-            file_type2
+            file_type_code
         FROM sys_oss
         where order_ref1 = #{site} and order_ref2 = #{inspectionNo} and order_ref4 = #{buNo}
     </select>
@@ -118,8 +117,7 @@
             order_ref4,
             file_type,
             file_suffix,
-            file_type_code,
-            file_type2
+            file_type_code
         FROM sys_oss
         where order_ref1 = #{site} and order_ref2 = #{partNo} and order_ref3 = #{inspectionTypeNo} and order_ref4 = #{buNo}
     </select>

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

@@ -2751,10 +2751,10 @@
     <insert id="saveFQASDetailedRecord" parameterType="com.gaotao.modules.pms.data.QcFAIRecordData">
         INSERT INTO qc_oqc_detailed_record
         (inspection_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)
+         item_no, item_desc, object_id, object_desc, default_value, min_value, max_value, value_type_db, value_type, site, sampling_qty, bu_no, order_id)
         VALUES
             (#{inspectionNo}, #{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}, #{buNo}, #{serialNo})
+             #{itemNo}, #{itemDesc}, #{objectId}, #{objectDesc}, #{defaultValue}, #{minValue,jdbcType=DECIMAL}, #{maxValue,jdbcType=DECIMAL}, #{valueTypeDb}, #{valueType}, #{site}, #{samplingQty}, #{buNo}, #{orderId})
     </insert>
 
     <!-- 修改OQC检验记录 -->
@@ -2902,7 +2902,7 @@
                  LEFT JOIN qc_method_item as b on a.site = b.site and a.item_no = b.ItemNo and a.bu_no = b.bu_no
                  LEFT JOIN qc_method as c on b.site = c.site and b.method_no = c.method_no and b.bu_no = c.bu_no
         WHERE a.inspection_no = #{inspectionNo} and a.site = #{site} and a.bu_no = #{buNo}
-        ORDER BY COALESCE(a.serial_no, 99999) ASC
+        ORDER BY COALESCE(a.order_id, 99999) ASC
     </select>
 
     <!-- 查询FQAS的子明细 -->
@@ -2913,7 +2913,12 @@
             sub_detail_value,
             sampling_location,
             is_submit,
-            sampling_location_b
+            sampling_location_b,
+            num,
+            sub_detail_value_b,
+            sub_detail_value_c,
+            sub_detail_value_d,
+            sub_detail_value_e
         FROM qc_oqc_sub_detail_record
         WHERE inspection_no = #{inspectionNo} and item_no = #{itemNo} and site = #{site} and bu_no = #{buNo}
     </select>