From 0dd37c3cdfa1cac2a9b048a8d6c9f622963f4b1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Wed, 11 Mar 2026 14:31:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../production/entity/SOOPInspectData.java | 1 + .../production/service/InspectService.java | 16 ++++++++++++ .../service/impl/InspectServiceImpl.java | 25 +++++++++++++++++++ .../production/SoScheduledListMapper.xml | 7 +++++- 4 files changed, 48 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/heai/modules/production/entity/SOOPInspectData.java b/src/main/java/com/heai/modules/production/entity/SOOPInspectData.java index ce0d5a4..80b33dc 100644 --- a/src/main/java/com/heai/modules/production/entity/SOOPInspectData.java +++ b/src/main/java/com/heai/modules/production/entity/SOOPInspectData.java @@ -9,6 +9,7 @@ import java.util.Date; @Data public class SOOPInspectData extends SOOpsTransferHeaderData{ private Integer SeqNo; + private Integer itemNo; private String workCenterNo; private String orderNo; private String partNo; diff --git a/src/main/java/com/heai/modules/production/service/InspectService.java b/src/main/java/com/heai/modules/production/service/InspectService.java index 5bec00f..1b26b75 100644 --- a/src/main/java/com/heai/modules/production/service/InspectService.java +++ b/src/main/java/com/heai/modules/production/service/InspectService.java @@ -62,4 +62,20 @@ public interface InspectService { * @throw */ List getSOScheduleRoutingDataForShiyanshi(SOScheduledRoutingOutData inData); + + /** + * + * @description QMS检验登记通用接口 + * @author 常熟吴彦祖 + * @param site 工厂编码 + * TransNo 检验单号 + * item 子表序号 + * actionType 操作类型 （submit/cancel） + * inspectResult 检验结果 （合格/不合格/让步接收） + * inspectRemark 检验备注 随意填可为空（之前薛总要求必须填的，迁移后需要后期确认） + * user 操作人 + * @date 2026/3/11 13:37 + * @return SOScheduledRoutingOutData + */ + SOScheduledRoutingOutData inspectForQMS(String site,String TransNo,Integer item,String actionType,String inspectResult,String inspectRemark,String user); } diff --git a/src/main/java/com/heai/modules/production/service/impl/InspectServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/InspectServiceImpl.java index 5ecfa97..ac26e56 100644 --- a/src/main/java/com/heai/modules/production/service/impl/InspectServiceImpl.java +++ b/src/main/java/com/heai/modules/production/service/impl/InspectServiceImpl.java @@ -213,4 +213,29 @@ public class InspectServiceImpl implements InspectService { public List getSOScheduleRoutingDataForShiyanshi(SOScheduledRoutingOutData inData){ return dailyPlanMapper.getSOScheduleRoutingDataForShiyanshi(inData); } + + @Override + @Transactional + public SOScheduledRoutingOutData inspectForQMS(String site,String TransNo,Integer item,String actionType,String inspectResult,String inspectRemark,String user){ + SOOPInspectData inData=new SOOPInspectData(); + inData.setSite(site); + inData.setTransNo(TransNo); + inData.setItemNo(item); + List checkData= soScheduledListMapper.getInspectData(inData); + if(checkData.isEmpty()){ + throw new RuntimeException("该检验单不存在！"); + } + SOOPInspectData data=checkData.get(0); + data.setInspectResult(inspectResult); + data.setInspectRemark(inspectRemark); + data.setUser( user); + if("submit".equals(actionType)){ + return inspectSave(data); + }else if("cancel".equals(actionType)){ + cancelInspectResult( data); + }else { + throw new RuntimeException("请传入正确的操作类型！"); + } + return null; + } } diff --git a/src/main/resources/mapper/production/SoScheduledListMapper.xml b/src/main/resources/mapper/production/SoScheduledListMapper.xml index 0c59991..a8b2552 100644 --- a/src/main/resources/mapper/production/SoScheduledListMapper.xml +++ b/src/main/resources/mapper/production/SoScheduledListMapper.xml @@ -67,7 +67,9 @@