From 2cdd34531f68bd8308d536aa770b2220d4798384 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 27 Nov 2023 16:40:18 +0800 Subject: [PATCH] =?UTF-8?q?2023-11-27=20=E8=AE=BE=E5=A4=87=E5=92=8C?= =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/service/Impl/EamObjectServiceImpl.java | 12 ++++++------ .../sys/modules/pms/service/Impl/QcServiceImpl.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamObjectServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamObjectServiceImpl.java index 785a8b75..27eff7db 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamObjectServiceImpl.java +++ b/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 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 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 params = new ArrayList<>(); params.add(site); params.add(objectId); diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java index 7994863d..95a080ac 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java +++ b/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 = qcMapper.queryDataFromViewPoOrder(qcData); if (poOrderData.size() > 0 && poOrderData.get(0) != null) {