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

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

@@ -1745,6 +1745,7 @@ public class QcServiceImpl implements QcService {
             return;
         }
         for (int i = 0; i < subDetailValues.size(); i++) {
+            subDetailValues.get(i).setSite(data.getSite());
             subDetailValues.get(i).setInspectionNo(data.getInspectionNo());
             subDetailValues.get(i).setItemNo(data.getItemNo());
         }
@@ -2039,6 +2040,7 @@ public class QcServiceImpl implements QcService {
             return;
         }
         for (int i = 0; i < subDetailValues.size(); i++) {
+            subDetailValues.get(i).setSite(data.getSite());
             subDetailValues.get(i).setInspectionNo(data.getInspectionNo());
             subDetailValues.get(i).setItemNo(data.getItemNo());
         }
@@ -2728,6 +2730,7 @@ public class QcServiceImpl implements QcService {
             return;
         }
         for (int i = 0; i < subDetailValues.size(); i++) {
+            subDetailValues.get(i).setSite(data.getSite());
             subDetailValues.get(i).setInspectionNo(data.getInspectionNo());
             subDetailValues.get(i).setItemNo(data.getItemNo());
         }
@@ -2752,15 +2755,19 @@ public class QcServiceImpl implements QcService {
             qcMapper.updateIQCDetailSubmitFlag(qcData);
             // 修改子明细记录标识为已提交
             qcMapper.updateIQCSubDetailSubmitFlag(qcData);
-            // 根据 site、po_orderNo、po_itemNo 从 view_po_order 中查出数据
-            List<PoOrderData> poOrderData = qcMapper.queryDataFromViewPoOrder(qcData);
-            if (poOrderData.size() > 0 && poOrderData.get(0) != null) {
-                // 修改order_qty为送检数量
-                poOrderData.get(0).setOrderQty(qcData.getRollQty().toString());
-                // 向收货任务表里添加数据
-                qcMapper.saveReceivingTask(poOrderData.get(0));
-            } else {
-                throw new RuntimeException("未在po_order中查出数据!");
+
+            // 判断检验结论是否合格
+            if ("合格".equals(qcData.getInspectionResult()) || "特采".equals(qcData.getDisposalMeasures())) {
+                // 根据 site、po_orderNo、po_itemNo 从 view_po_order 中查出数据
+                List<PoOrderData> poOrderData = qcMapper.queryDataFromViewPoOrder(qcData);
+                if (poOrderData.size() > 0 && poOrderData.get(0) != null) {
+                    // 修改order_qty为送检数量
+                    poOrderData.get(0).setOrderQty(qcData.getRollQty().toString());
+                    // 向收货任务表里添加数据
+                    qcMapper.saveReceivingTask(poOrderData.get(0));
+                } else {
+                    throw new RuntimeException("未在po_order中查出数据!");
+                }
             }
         }
     }

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

@@ -873,7 +873,7 @@
         p.part_no,
         p.part_desc,
         p.FamilyID,
-        pf.FamilyName,
+        p.spec as FamilyName,
         p.umid,
         qa.supplier_no,
         dbo.qc_get_supplier_name(qa.site, qa.supplier_no) as supplierDesc,
@@ -896,7 +896,7 @@
                 AND p.part_desc LIKE '%' + #{query.partDesc}+'%'
             </if>
             <if test = "query.familyName != null and query.familyName != ''">
-                AND pf.FamilyName LIKE '%' + #{query.familyName}+'%'
+                AND p.spec LIKE '%' + #{query.familyName}+'%'
             </if>
         </where>
     </select>