From 24ad5b75f5244b8057be1ff07d75b58aa248dda5 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Thu, 8 Aug 2024 15:44:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/Schedule/dao/ScheduleMapper.java   |  2 ++
 .../service/impl/ScheduleServiceImpl.java      | 18 ++++++++++++++++++
 .../mapper/schedule/ScheduleMapper.xml         |  6 ++++++
 3 files changed, 26 insertions(+)

diff --git a/src/main/java/com/jianteng/modules/Schedule/dao/ScheduleMapper.java b/src/main/java/com/jianteng/modules/Schedule/dao/ScheduleMapper.java
index f574e3f..a1912f2 100644
--- a/src/main/java/com/jianteng/modules/Schedule/dao/ScheduleMapper.java
+++ b/src/main/java/com/jianteng/modules/Schedule/dao/ScheduleMapper.java
@@ -522,4 +522,6 @@ public interface ScheduleMapper {
     void deleteWorkCenterDefectWithDefect(WorkCenterDefectData inData);
 
     void saveBatchWorkCenterDefectData(@Param("list") List<WorkCenterDefectData> inList);
+
+    List<ShopOrderData> checkOrderNoStatusForSchedule(@Param("site")String site,@Param("seqNo")Integer seqNo);
 }
diff --git a/src/main/java/com/jianteng/modules/Schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/jianteng/modules/Schedule/service/impl/ScheduleServiceImpl.java
index 9612ef7..8759670 100644
--- a/src/main/java/com/jianteng/modules/Schedule/service/impl/ScheduleServiceImpl.java
+++ b/src/main/java/com/jianteng/modules/Schedule/service/impl/ScheduleServiceImpl.java
@@ -240,6 +240,7 @@ public class ScheduleServiceImpl implements ScheduleService {
 
     @Override
     public SORoutingData searchReportedQty(GenerateReportData generateReportData){
+        checkOrderNoStatusForSchedule(generateReportData.getSite(),generateReportData.getSeqNo());
         return scheduleMapper.searchReportedQty(generateReportData);
     }
 
@@ -278,6 +279,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         if("N".equals(result.getOutWorkFlag())){
             throw new RuntimeException("派工单已经开始生产！");
         }
+        checkOrderNoStatusForSchedule(result.getSite(),inData.getSeqNo());
         //----------检查下是否第一道工序 -----------------
         List<SOScheduledRoutingOutData> checkFirstItem=scheduleMapper.checkFirstItem(result);
         // if(checkFirstItem.size()==0&&"N".equals(result.getMatIssueflag())){
@@ -535,8 +537,24 @@ public class ScheduleServiceImpl implements ScheduleService {
     }
 
     @Override
+    @Transactional
     public void saveWorkCenterDefect(List<WorkCenterDefectData> inList){
         scheduleMapper.deleteWorkCenterDefectWithDefect(inList.get(0));
             scheduleMapper.saveBatchWorkCenterDefectData(inList);
     }
+
+    public void checkOrderNoStatusForSchedule(String site,Integer seqNo){
+        List<ShopOrderData> checkOrderNoStatusForSchedule=scheduleMapper.checkOrderNoStatusForSchedule(site,seqNo);
+        if(checkOrderNoStatusForSchedule.size()==0){
+            throw new RuntimeException("ERP生产订单状态不对无法操作！");
+        }
+        String status=checkOrderNoStatusForSchedule.get(0).getStatus();
+
+        if("已计划".equals(status)||"已下达".equals(status)||"已取消".equals(status)||"已关闭".equals(status)||"已停工".equals(status)){
+            throw new RuntimeException("ERP生产订单状态为"+status+" 不允许操作！");
+        }
+
+
+    }
+
 }
diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml
index 13a487f..02f3d21 100644
--- a/src/main/resources/mapper/schedule/ScheduleMapper.xml
+++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml
@@ -520,4 +520,10 @@ Freezeflag,QtyTmp,ManufactureDate,ExpiredDate,QtytoIssue,DemandPartnerType,Deman
             (#{item.site}, #{item.workCenterNo}, #{item.defectNo})
         </foreach>
     </insert>
+        <select id="checkOrderNoStatusForSchedule" resultType="ShopOrderData">
+        select b.site,b.status from SOScheduledRouting a left join shopOrder b on a.site=b.site and
+        a.orderNo=b.orderNo
+        where a.site=#{site} and a.seqNo=#{seqNo}
+    </select>
+
 </mapper>