From 23564a6742efa824a45acb8b7974675509895c8a Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 23 May 2025 11:45:34 +0800
Subject: [PATCH] =?UTF-8?q?2025-05-23=20=20=E6=B5=81=E7=A8=8B=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E4=B8=AD=E5=A2=9E=E5=8A=A0=E7=AE=A1=E6=8E=A7=EF=BC=9A?=
 =?UTF-8?q?Production=20Stage=E7=9A=84=E5=80=BC=E5=BF=85=E9=A1=BB=E6=98=AF?=
 =?UTF-8?q?"Mass=20Production"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TechnicalSpecificationServiceImpl.java    | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
index 1be03fc0..32937f20 100644
--- a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
+++ b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java
@@ -27,6 +27,7 @@ import com.spring.modules.quotation.entity.QuotationHeader;
 import com.spring.modules.quotation.mapper.QuotationInformationMapper;
 import com.spring.modules.quotation.vo.QuotationDetailVo;
 import com.spring.modules.report.dao.ProcedureDao;
+import com.spring.modules.request.mapper.RequestManageMapper;
 import com.spring.modules.request.service.RequestManageService;
 import com.spring.modules.request.vo.PlmRequestDetailVo;
 import com.spring.modules.sampleManagement.dao.TechnicalSpecificationMapper;
@@ -74,6 +75,9 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
     @Autowired
     private ChangeManagementServiceImpl changeManagementService;
 
+    @Autowired
+    private RequestManageMapper requestManageMapper;
+
     @Autowired
     private SysUserDao sysUserDao;
 
@@ -1392,7 +1396,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
 
         if ("Y".equals(data.getNodeConclusion())) { // 同意
             // 2024-11-25 RQ新增，判断是否有特殊控制
-            PlmProcessControllBaseData cData=new PlmProcessControllBaseData();
+            PlmProcessControllBaseData cData = new PlmProcessControllBaseData();
             cData.setSite(data.getSite());
             cData.setNodeId(paramData.getNodeId());
             cData.setWorkflowId(paramData.getWorkflowId());
@@ -1402,6 +1406,19 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
                     requestManageService.doProcessControl(controlList.get(i).getRoleId(),data.getSite(),data.getCodeNo());
                 }
             }
+
+            // 2025-05-23 CS Sample Closed节点提交时，需校验Production Stage的值必须是"Mass Production"
+            cData.setRoleId(6);
+            controlList =  requestManageMapper.getProcessSelect2(cData);
+            if (!controlList.isEmpty()) {
+                if (data.getStage() == null || data.getStage().isEmpty()) {
+                    throw new RuntimeException("Production Stage必填!");
+                }
+                if ("Mass Production".equals(data.getStage())) {
+                    throw new RuntimeException("Production Stage的值必须是Mass Production!");
+                }
+            }
+
             List<MainData> mainData = getMainData(data.getSite(), baseData, changeRequest, engineers, technicians, dccs, cqcs, fais);
             paramData.setMainData(mainData);
             SubmitRequestParam submitRequestParam = new SubmitRequestParam();