2023-11-27 设备和质量提交

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

@@ -82,8 +82,8 @@ public class EamObjectServiceImpl implements EamObjectService {
         String locationId = inData.getLocationID();
         String familyId = inData.getFamilyID();
         String groupId = inData.getGroupID();
-        String supplierId = inData.getSupplierID();
-        String manufacturerId = inData.getManufacturerID();
+        String supplierId = inData.getSupplierID() == null ? "" : inData.getSupplierID();
+        String manufacturerId = inData.getManufacturerID() == null ? "" : inData.getManufacturerID();
         String deptID = inData.getDeptID();
         List<Object> params = new ArrayList<>();
         params.add(site);
@@ -126,8 +126,8 @@ public class EamObjectServiceImpl implements EamObjectService {
         String locationId = inData.getLocationID();
         String familyId = inData.getFamilyID();
         String groupId = inData.getGroupID();
-        String supplierId = inData.getSupplierID();
-        String manufacturerId = inData.getManufacturerID();
+        String supplierId = inData.getSupplierID() == null ? "" : inData.getSupplierID();
+        String manufacturerId = inData.getManufacturerID() == null ? "" : inData.getManufacturerID();
         String deptID = inData.getDeptID();
         List<Object> params = new ArrayList<>();
         params.add(site);
@@ -170,8 +170,8 @@ public class EamObjectServiceImpl implements EamObjectService {
         String locationId = inData.getLocationID();
         String familyId = inData.getFamilyID();
         String groupId = inData.getGroupID();
-        String supplierId = inData.getSupplierID();
-        String manufacturerId = inData.getManufacturerID();
+        String supplierId = inData.getSupplierID() == null ? "" : inData.getSupplierID();
+        String manufacturerId = inData.getManufacturerID() == null ? "" : inData.getManufacturerID();
         List<Object> params = new ArrayList<>();
         params.add(site);
         params.add(objectId);

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

@@ -3067,7 +3067,7 @@ public class QcServiceImpl implements QcService {
             qcMapper.updateIQCSubDetailSubmitFlag(qcData);
 
             // 判断检验结论是否合格
-            if ("合格".equals(qcData.getInspectionResult()) || "特采".equals(qcData.getDisposalMeasures())) {
+            if ("合格".equals(qcData.getInspectionResult()) || "让步接受".equals(qcData.getDisposalMeasures()) || "挑选使用".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) {