From 028eb1391f081f0cd29bd323f261da69d13fc5a2 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Sat, 17 Aug 2024 10:55:27 +0800 Subject: [PATCH] =?UTF-8?q?2024-08-17=20iqc=E8=B4=A3=E4=BB=BB=E4=BA=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xujie/sys/modules/pms/data/SupplierData.java | 11 +++++++++++ .../com/xujie/sys/modules/pms/mapper/QcMapper.java | 2 ++ .../sys/modules/pms/service/Impl/QcServiceImpl.java | 11 ++++++++++- src/main/resources/mapper/pms/QcMapper.xml | 12 ++++++++++-- src/main/resources/mapper/pms/QcReportMapper.xml | 8 ++++---- 5 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/xujie/sys/modules/pms/data/SupplierData.java diff --git a/src/main/java/com/xujie/sys/modules/pms/data/SupplierData.java b/src/main/java/com/xujie/sys/modules/pms/data/SupplierData.java new file mode 100644 index 0000000..eedc9eb --- /dev/null +++ b/src/main/java/com/xujie/sys/modules/pms/data/SupplierData.java @@ -0,0 +1,11 @@ +package com.xujie.sys.modules.pms.data; + +import lombok.Data; + +@Data +public class SupplierData { + private String site; + private String supplierID; + private String supplierName; + private String active; +} diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java index 6965aff..53dc75f 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java +++ b/src/main/java/com/xujie/sys/modules/pms/mapper/QcMapper.java @@ -574,4 +574,6 @@ public interface QcMapper { List getCustomerList(QcPartAttributeData data); List getPA3(QcTemplateData partData); + + List getSupplier(@Param("site") String site, @Param("supplierID") String supplierID, @Param("active") String active); } 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 1fb703a..3248da5 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 @@ -10,6 +10,7 @@ import com.xujie.sys.common.utils.RandomUtil; import com.xujie.sys.modules.oss.entity.SysOssEntity; import com.xujie.sys.modules.oss.service.SysOssService; import com.xujie.sys.modules.pms.data.*; +import com.xujie.sys.modules.pms.entity.SupplierEntity; import com.xujie.sys.modules.pms.entity.vo.CheckSubDetailValueVo; import com.xujie.sys.modules.pms.mapper.QcDao; import com.xujie.sys.modules.pms.mapper.QcMapper; @@ -4035,6 +4036,14 @@ public class QcServiceImpl implements QcService { @Override @Transactional public void saveIQCDetailedRecord(QcFAIRecordData data) { + // 校验供应商 + if (data.getResponsiblePerson() != null && !"".equals(data.getResponsiblePerson())){ + List suppliers = qcMapper.getSupplier(data.getSite(), data.getResponsiblePerson(), "Y"); + if (suppliers.isEmpty()) { + throw new RuntimeException("供应商不存在！"); + } + } + data.setState("待审核"); qcMapper.updateIQCMasterRecord(data); // 修改明细记录信息 @@ -4064,7 +4073,7 @@ public class QcServiceImpl implements QcService { QcOperatorData recordData = new QcOperatorData(); recordData.setSite(data.getSite()); recordData.setOrderNo(data.getInspectionNo()); - recordData.setFunctionType("responsible"); + recordData.setFunctionType("supplier"); recordData.setBuNo(data.getBuNo()); recordData.setOperator(s); operators.add(recordData); diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index a408d04..956b63a 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -2284,8 +2284,7 @@ action_by, isnull(dbo.joint_id(site, bu_no, inspection_no, 'coordination'), '') as operator, isnull(dbo.joint_name(site, bu_no, inspection_no, 'coordination'), '') as operatorName, - isnull(dbo.joint_id(site, bu_no, inspection_no, 'responsible'), '') as responsiblePerson, - isnull(dbo.joint_name(site, bu_no, inspection_no, 'responsible'), '') as responsiblePersonName, + isnull(dbo.joint_id(site, bu_no, inspection_no, 'supplier'), '') as responsiblePerson, receipt_no, receipt_item_no, pass_qty, @@ -4179,6 +4178,15 @@ WHEN state = '已完成' THEN 3 END, create_date desc + + diff --git a/src/main/resources/mapper/pms/QcReportMapper.xml b/src/main/resources/mapper/pms/QcReportMapper.xml index 28b2168..e7a0ded 100644 --- a/src/main/resources/mapper/pms/QcReportMapper.xml +++ b/src/main/resources/mapper/pms/QcReportMapper.xml @@ -132,7 +132,7 @@ AND a.ref_info5 LIKE #{query.refInfo5} - AND b.item_result LIKE #{query.itemResult} + AND b.item_result = #{query.itemResult} ORDER BY @@ -246,7 +246,7 @@ AND #{query.endDate2} >= a.task_date - AND b.item_result LIKE #{query.itemResult} + AND b.item_result = #{query.itemResult} ORDER BY @@ -368,7 +368,7 @@ AND a.order_ref5 LIKE #{query.orderRef5} - AND b.item_result LIKE #{query.itemResult} + AND b.item_result = #{query.itemResult} ORDER BY @@ -490,7 +490,7 @@ AND a.order_ref5 LIKE #{query.orderRef5} - AND b.item_result LIKE #{query.itemResult} + AND b.item_result = #{query.itemResult} ORDER BY