iqc修改

src/main/java/com/heai/modules/pms/service/Impl/QcServiceImpl.java

@@ -3997,20 +3997,20 @@ public class QcServiceImpl implements QcService {
             if (partInformationList.isEmpty()) {
                 throw new RuntimeException("未查到该物料数据!");
             }
-            if ("G".equals(partInformationList.get(0).getControlMes())) {
+            /*if ("G".equals(partInformationList.get(0).getControlMes())) {
                 throw new RuntimeException("检验单物料的管控类型为不适用，不允许取消审核 {" + qcData.getInspectionNo() + "} ！");
-            }
+            }*/
             // po_order_roll_no里如果有数据则不允许取消审核
-            List<PoOrderRollNoData> rollNos = qcMapper.selectInfoByInspectionNo(qcData);
+            /*List<PoOrderRollNoData> rollNos = qcMapper.selectInfoByInspectionNo(qcData);
             if (!rollNos.isEmpty()) {
                 throw new RuntimeException("该检验单已发行入库标签，不允许取消审核 {" +  qcData.getInspectionNo() + "} ！");
-            }
+            }*/
             // 状态改为待检验,并将提交标识改为N
             qcMapper.updateIQCMasterSubmitFlag2(qcData);
             qcMapper.updateIQCDetailSubmitFlag2(qcData);
             qcMapper.updateIQCSubDetailSubmitFlag2(qcData);
             // 删除相应task表的数据
-            qcMapper.deleteReceivingTaskByInspectionNo(qcData);
+            //qcMapper.deleteReceivingTaskByInspectionNo(qcData);
             if (StringUtils.isNotBlank(qcData.getRefInfo1()) && StringUtils.isNotBlank(qcData.getRefInfo2())){
                 inspectService.inspectForQMS(qcData.getSite(), qcData.getRefInfo1(), Integer.parseInt(qcData.getRefInfo2()), "cancel", qcData.getInspectionResult(), qcData.getInspectionRemark(), currentUser.getUsername());
             }

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

@@ -4496,12 +4496,11 @@
     <!-- 查询检验模板列表 -->
     <select id="getPartInformation" resultType="com.heai.modules.pms.data.QcFAIRecordData" parameterType="com.heai.modules.pms.data.QcFAIRecordData">
         select
-            part_no,
-            part_desc,
-            spec,
-            sku,
-            control_mes,
-            DefaultWarehouseID as defaultWarehouseId
+        PartNo,
+        PartDescription,
+        spec,
+        sku,
+        DefaultWarehouseID as defaultWarehouseId
         from part
         where site = #{site} and part_no = #{partNo}
     </select>