删除卷,选择报工单校验机台,异常结束卷

sxm 2022-3-15

src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java

@@ -1363,4 +1363,30 @@ public class ScheduleController {
                 .put("total", resultList.size());
     }
 
+   /**
+    * @Author sxm
+    * @Description 删除卷
+    * @Date 2022/3/15 16:20
+    * @Param
+    * @return
+    **/
+    @RequestMapping(value = "switchrollReverse")
+    public R switchrollReverse(@RequestBody SearchScheduleData inData){
+         scheduleService.switchrollReverse(inData);
+        return R.ok("验证通过");
+    }
+
+    /**
+     * @Author sxm
+     * @Description 报工校验
+     * @Date 2022/3/15 16:20
+     * @Param
+     * @return
+     **/
+    @RequestMapping(value = "reportCheck")
+    public R reportCheck(@RequestBody SearchScheduleData inData){
+        scheduleService.reportCheck(inData);
+        return R.ok("验证通过");
+    }
+
 }

src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java

@@ -3,6 +3,7 @@ package com.gaotao.modules.schedule.mapper;
 import com.gaotao.modules.schedule.data.*;
 import com.gaotao.modules.shopOrder.entity.OperatorData;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -440,4 +441,23 @@ public interface ScheduleMapper {
      * @return
      **/
     List<SfdcRollData> getReworkSfdcRollByCon(SearchScheduleData inData);
+
+    /**
+     * @Author sxm
+     * @Description 检查是否正在报工
+     * @Date 2022/3/15 17:10
+     * @Param
+     * @return
+     **/
+    int reportCheck(SearchScheduleData inData);
+
+    /**
+     * @Author sxm
+     * @Description 判断权限
+     * @Date 2022/3/15 17:28
+     * @Param
+     * @return
+     **/
+    String getUserSpecialSecurity(@Param("username") String username,@Param("sNo") String sNo);
+
 }

src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java

@@ -781,4 +781,22 @@ public interface ScheduleService {
      **/
     List<SfdcRollData> getReworkSfdcRollByCon(SearchScheduleData inData);
 
+    /**
+     * @Author sxm
+     * @Description 删除卷操作
+     * @Date 2022/3/15 16:23
+     * @Param
+     * @return
+     **/
+    void switchrollReverse(SearchScheduleData inData);
+
+    /**
+     * @Author sxm
+     * @Description 检查是否又正在报工
+     * @Date 2022/3/15 17:09
+     * @Param
+     * @return
+     **/
+    void reportCheck(SearchScheduleData inData);
+
 }

src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -2141,7 +2141,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         this.finishRollProcessSfdcAndSchedule(site, orderNo, itemNo, seqNo, rollNo, sfdcReportedQty, sfdcApprovedQty,
                 sfdcSetupTime, sfdcProdTime, sfdcDownTime, eventTime, tillTime, remark,
                 sfdcSetupDownTime, sfdcProdSetupTime, defectedQty, sfdcManufactureTime, operatorId, reportedTime);
-        //7.调用存储过程 处理异常信息
+        //7.正常结束卷还是 异常下机
         if ("Y".equalsIgnoreCase(exceptionFlag)) {
             this.finishRollProcessException(site, orderNo, itemNo, seqNo, rollNo, exceptionReason, username);
         }
@@ -3838,4 +3838,28 @@ public class ScheduleServiceImpl implements ScheduleService {
         }
         return scheduleMapper.getReworkSfdcRollByCon(inData);
     }
+
+    @Override
+    public void switchrollReverse(SearchScheduleData inData) {
+        List<Object> params = new ArrayList<>();
+        params.add(inData.getSite());
+        params.add(inData.getOrderNo());
+        params.add(inData.getItemNo());
+        params.add(inData.getSeqNo());
+        params.add(inData.getRollNo());
+        workbenchCreateslittingrollFqcCheck("switchroll_reverse", params);
+    }
+
+    @Override
+    public void reportCheck(SearchScheduleData inData) {
+        int i = scheduleMapper.reportCheck(inData);
+        if (i > 0) {
+            String flag = scheduleMapper.getUserSpecialSecurity(inData.getUsername(), "236");
+            if ("Y".equals(flag)) {
+                throw new RRException("该机台尚有未结束的其他派工单，确实要继续对该派工单进行报工吗？", 400);
+            } else {
+                throw new RRException("  该机台尚有未结束的其他派工单，不能对其他的派工单进行报工！", 300);
+            }
+        }
+    }
 }

src/main/resources/mapper/schedule/ScheduleMapper.xml

@@ -1053,6 +1053,44 @@
         and T.Remark='直接送检'
         ORDER BY sfr.RollNo
     </select>
+    <select id="reportCheck" resultType="java.lang.Integer">
+        Select count(1) from SOScheduledRouting as T
+        Where Site=#{site}
+        and S_ResourceID = #{resourceId}
+        and S_WorkCenterNo = #{workCenterNo}
+        and SeqNo != #{seqNo}
+        and ClosedFlag = 'N'
+        and StartProdFlag = 'Y'
+        and (
+        (case when exists(select 1 from SFDC_MaterialHist as T1
+        where T1.Site=T.Site and T1.OrderNo=T.OrderNo and T1.ItemNo=T.ItemNo and T1.SeqNo=T.SeqNo and T1.FinishFlag='N'
+        )
+        then 1 else 0 end
+        )
+        +
+        (case when exists(select 1 from SFDC_ToolingHist as T2
+        where T2.Site=T.Site and T2.OrderNo=T.OrderNo and T2.ItemNo=T.ItemNo and T2.SeqNo=T.SeqNo and T2.FinishFlag='N'
+        )
+        then 1 else 0 end
+        )
+        +
+        (case when exists(select 1 from SFDC_TimeHist as T3
+        where T3.Site=T.Site and T3.OrderNo=T.OrderNo and T3.ItemNo=T.ItemNo and T3.SeqNo=T.SeqNo and T3.CompletedFlag='N'
+        )
+        then 1 else 0 end
+        )
+        +
+        (case when exists(select 1 from SFDC_RollOps as T4
+        where T4.Site=T.Site and T4.OrderNo=T.OrderNo and T4.ItemNo=T.ItemNo and T4.SeqNo=T.SeqNo and T4.FinishedFlag='N'
+        )
+        then 1 else 0 end
+        )
+        )>0
+
+    </select>
+    <select id="getUserSpecialSecurity" resultType="java.lang.String">
+        select  dbo.Get_User_Special_Security (#{username},#{sNo})
+    </select>
 
 
     <insert id="saveSfdcDefect"  parameterType="SfdcDefectData">