其它报工 sxm 2021-12-27

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

@@ -1339,7 +1339,7 @@ public class ScheduleController {
      * @Author sxm
      * @Description 批量直接送检
      * @Date 2022/3/8 17:54
-     * @Param
+     * @Param rollDatas
      * @return
      **/
     @PostMapping("workbenchPostinspection")
@@ -1348,4 +1348,19 @@ public class ScheduleController {
         return R.ok();
     }
 
+    /**
+     * @Author sxm
+     * @Description 返工重检下机卷列表
+     * @Date 2022/3/9 11:48
+     * @Param SearchScheduleData
+     * @return
+     **/
+    @RequestMapping(value = "getReworkSfdcRollByCon")
+    public R getReworkSfdcRollByCon(@RequestBody SearchScheduleData inData){
+        List<SfdcRollData> resultList = scheduleService.getReworkSfdcRollByCon(inData);
+        return R.ok().put("code", 200)
+                .put("rows", resultList)
+                .put("total", resultList.size());
+    }
+
 }

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

@@ -432,4 +432,12 @@ public interface ScheduleMapper {
      **/
     List<SfdcRollData> searchFqcSfdcRolls(SfdcRollData inData);
 
+    /**
+     * @Author sxm
+     * @Description 返工重检下机卷
+     * @Date 2022/3/9 11:22
+     * @Param
+     * @return
+     **/
+    List<SfdcRollData> getReworkSfdcRollByCon(SearchScheduleData inData);
 }

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

@@ -771,4 +771,14 @@ public interface ScheduleService {
      * @return
      **/
     void workbenchPostinspection(List<WorkbenchPostinspection> rollDatas);
+
+    /**
+     * @Author sxm
+     * @Description 返工重检 下级卷列表
+     * @Date 2022/3/9 11:20
+     * @Param
+     * @return
+     **/
+    List<SfdcRollData> getReworkSfdcRollByCon(SearchScheduleData inData);
+
 }

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

@@ -3613,7 +3613,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         }
 
         //2.调用存储过程  --校验数量  是否返回确认按钮的 没有权限直接报错
-        Map<String, Object> resultMap = this.otherCheckSplitRollWithSfdcRollAndSecurity(site, orderNo, rollNo, rollQty, "N");
+        Map<String, Object> resultMap = this.otherCheckSplitRollWithSfdcRollAndSecurity(site, orderNo, rollNo, rollQty, inData.getsFQCSlitFlag());
         //判断结果是否成功
         String resultCode = String.valueOf(resultMap.get("resultCode"));
         if ("201".equalsIgnoreCase(resultCode)) {
@@ -3794,4 +3794,15 @@ public class ScheduleServiceImpl implements ScheduleService {
             }
         }
     }
+
+    @Override
+    public List<SfdcRollData> getReworkSfdcRollByCon(SearchScheduleData inData) {
+        //判断是否查询当前卷的
+        boolean currentRollFlag = inData.isCurrentRollFlag();
+        if(!currentRollFlag){
+            inData.setRollNo(null);
+        }
+
+        return scheduleMapper.getReworkSfdcRollByCon(inData);
+    }
 }

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

@@ -1015,6 +1015,43 @@
             </if>
         </where>
     </select>
+    <select id="getReworkSfdcRollByCon" resultType="com.gaotao.modules.schedule.data.SfdcRollData">
+        SELECT sfr.Site site, sfr.OrderNo orderNo, sfr.RollNo rollNo, sfr.CreatedDate createdDate, sfr.Createdby createdby, sfr.CurrentOpsItemNo currentOpsItemNo,
+        sfr.LastFinishedOpsItemNo lastFinishedOpsItemNo, sfr.FinishedDate finishedDate,	sfr.FinishedFlag finishedFlag, sfr.OnLineFlag onLineFlag,
+        sfr.PauseFlag pauseFlag, sfr.OriRollNo oriRollNo, sfr.StartOpsItemNo startOpsItemNo, sfr.RollType rollType, sfr.CreatedOpsItemNo createdOpsItemNo,
+        sfr.CreatedOpsSeqNo createdOpsSeqNo, sfr.RollQty rollQty, sfr.FirstLevelRollNo firstLevelRollNo, sfr.VirtualRollFlag virtualRollFlag,
+        sfr.CombineFlag combineFlag
+        FROM SFDC_Rolls sfr
+        <where>
+            <if test="site != null and site != ''">
+                AND sfr.Site = #{site}
+            </if>
+            <if test="orderNo != null and orderNo != ''">
+                AND sfr.OrderNo = #{orderNo}
+            </if>
+            <if test="itemNo != null and itemNo != ''">
+                AND sfr.CreatedOpsItemNo = #{itemNo}
+            </if>
+            <if test="seqNo != null and seqNo != ''">
+                AND sfr.CreatedOpsSeqNo = #{seqNo}
+            </if>
+            <if test="rollNo != null and rollNo != ''">
+                AND sfr.RollNo = #{rollNo}
+            </if>
+        </where>
+        Union all
+        Select T.Site,T.OrderNo,D.RollNo,D.CreatedDate,D.Createdby,D.CurrentOpsItemNo,D.LastFinishedOpsItemNo,D.FinishedDate,D.FinishedFlag
+        ,D.OnLineFlag,D.PauseFlag,D.OriRollNo,D.StartOpsItemNo,D.RollType,D.CreatedOpsItemNo,D.CreatedOpsSeqNo,D.RollQty,D.FirstLevelRollNo
+        ,D.FGRollFlag,D.CombineFlag
+        from SFDC_RollOps as T,SFDC_Rolls as D
+        Where T.Site=D.Site and T.OrderNo=D.OrderNo and T.RollNo=D.RollNo
+        and T.Site=#{site}
+        and T.OrderNo=#{orderNo}
+        and T.ItemNo=#{itemNo}
+        and T.SeqNo=#{seqNo}
+        and T.Remark='直接送检'
+        ORDER BY sfr.RollNo
+    </select>
 
 
     <insert id="saveSfdcDefect"  parameterType="SfdcDefectData">