diff --git a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java index 18970eb..e019928 100644 --- a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java +++ b/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 resultList = scheduleService.getReworkSfdcRollByCon(inData); + return R.ok().put("code", 200) + .put("rows", resultList) + .put("total", resultList.size()); + } + } diff --git a/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java b/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java index 534cd94..d0a6b73 100644 --- a/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java +++ b/src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java @@ -432,4 +432,12 @@ public interface ScheduleMapper { **/ List searchFqcSfdcRolls(SfdcRollData inData); + /** + * @Author sxm + * @Description 返工重检下机卷 + * @Date 2022/3/9 11:22 + * @Param + * @return + **/ + List getReworkSfdcRollByCon(SearchScheduleData inData); } diff --git a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java index d26436b..fa76db9 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java +++ b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java @@ -771,4 +771,14 @@ public interface ScheduleService { * @return **/ void workbenchPostinspection(List rollDatas); + + /** + * @Author sxm + * @Description 返工重检 下级卷列表 + * @Date 2022/3/9 11:20 + * @Param + * @return + **/ + List getReworkSfdcRollByCon(SearchScheduleData inData); + } \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java index 53525db..6e556be 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java +++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java @@ -3613,7 +3613,7 @@ public class ScheduleServiceImpl implements ScheduleService { } //2.调用存储过程 --校验数量 是否返回确认按钮的 没有权限直接报错 - Map resultMap = this.otherCheckSplitRollWithSfdcRollAndSecurity(site, orderNo, rollNo, rollQty, "N"); + Map 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 getReworkSfdcRollByCon(SearchScheduleData inData) { + //判断是否查询当前卷的 + boolean currentRollFlag = inData.isCurrentRollFlag(); + if(!currentRollFlag){ + inData.setRollNo(null); + } + + return scheduleMapper.getReworkSfdcRollByCon(inData); + } } \ No newline at end of file diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index d013609..a6b3f24 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -1015,6 +1015,43 @@ +