2023-10-17，设备和质量修改

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

@@ -550,10 +550,14 @@ public class QcServiceImpl implements QcService {
     @Override
     @Transactional
     public void delItemDetails(QcTemplateData data) {
-        for (QcTemplateData qcData : data.getItemList()){
-            qcData.setItemType(data.getItemType());
-            qcData.setTemplateId(data.getTemplateId());
-            qcMapper.delItemDetails(qcData);
+        if (data.getItemList() != null && data.getItemList().size() > 0){ // 批量删除
+            for (QcTemplateData qcData : data.getItemList()){
+                qcData.setItemType(data.getItemType());
+                qcData.setTemplateId(data.getTemplateId());
+                qcMapper.delItemDetails(qcData);
+            }
+        }else { // 单条删除
+            qcMapper.delItemDetails(data);
         }
     }
 
@@ -2501,6 +2505,7 @@ public class QcServiceImpl implements QcService {
             qcFAIRecordData.setInspectionNo(recordData.getInspectionNo()); // 检验单号
             qcFAIRecordData.setInspectionTypeNo("105"); // 检验类型编码
             qcFAIRecordData.setPartDesc(recordData.getPartDesc());
+            qcFAIRecordData.setRollQty(recordData.getRollQty());
             // 明细记录信息赋值
             String partNo = recordData.getPartNo();
             String attributeType1 = "A";
@@ -2529,7 +2534,8 @@ public class QcServiceImpl implements QcService {
                     qcFAIRecordData.setSamplingQty(partAttribute.get(0).getDefaultSamplingQuantity());
                 } else if (partAttribute.get(0).getDefaultSamplingProportion() != null) {
                     // 也没有维护默认抽样数，最后根据默认抽样比例来确定
-                    qcFAIRecordData.setSamplingQty(partAttribute.get(0).getDefaultSamplingProportion().multiply(qcFAIRecordData.getRollQty()).divide(new BigDecimal(100),3,BigDecimal.ROUND_HALF_UP));
+                    BigDecimal d = partAttribute.get(0).getDefaultSamplingProportion().multiply(qcFAIRecordData.getRollQty()).divide(new BigDecimal(100), 3, BigDecimal.ROUND_HALF_UP);
+                    qcFAIRecordData.setSamplingQty(d);
                 }
 
                 // 获取根据该检验模板下维护的检验项目

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

@@ -933,6 +933,7 @@
     <!-- 查询类别模板 -->
     <select id="searchPartAttributeDetails" resultType="QcTemplateData" parameterType="QcTemplateData">
         SELECT
+            qat.site,
             qpa.attribute_no,
             qpa.attribute_type,
             qt.template_id,