diff --git a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java index ce0e69b..f4a1efe 100644 --- a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java +++ b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java @@ -988,7 +988,7 @@ public class DailyPlanController { @PostMapping("/startRework") public R startRework(@RequestBody ReworkRecord reworkRecord){ - reworkRecordService.startRework(reworkRecord.getSeqNo(),reworkRecord.getSite(),reworkRecord.getCreateTime(),reworkRecord.getCreateBy()); + reworkRecordService.startRework(reworkRecord.getSeqNo(),reworkRecord.getSite(),reworkRecord.getType(),reworkRecord.getCreateTime(),reworkRecord.getCreateBy()); return R.ok("操作成功"); } diff --git a/src/main/java/com/heai/modules/production/entity/ReworkRecord.java b/src/main/java/com/heai/modules/production/entity/ReworkRecord.java index bb5b7c0..c0e4b13 100644 --- a/src/main/java/com/heai/modules/production/entity/ReworkRecord.java +++ b/src/main/java/com/heai/modules/production/entity/ReworkRecord.java @@ -145,6 +145,9 @@ public class ReworkRecord { private String createBy; private String orderNo; + + + private String type; } diff --git a/src/main/java/com/heai/modules/production/service/ReworkRecordService.java b/src/main/java/com/heai/modules/production/service/ReworkRecordService.java index f4deef3..1f763c1 100644 --- a/src/main/java/com/heai/modules/production/service/ReworkRecordService.java +++ b/src/main/java/com/heai/modules/production/service/ReworkRecordService.java @@ -15,7 +15,7 @@ public interface ReworkRecordService extends IService { * @author zelian_wu * date 2024/1/17 */ - void startRework(Integer seqNo, String site, Date createTime, String createBy); + void startRework(Integer seqNo, String site,String type, Date createTime, String createBy); /** * 查询返工返修单 diff --git a/src/main/java/com/heai/modules/production/service/impl/ReworkRecordServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/ReworkRecordServiceImpl.java index f058c5b..4b01e61 100644 --- a/src/main/java/com/heai/modules/production/service/impl/ReworkRecordServiceImpl.java +++ b/src/main/java/com/heai/modules/production/service/impl/ReworkRecordServiceImpl.java @@ -27,7 +27,7 @@ public class ReworkRecordServiceImpl extends ServiceImpl @@ -129,6 +130,9 @@ and create_time <= #{reworkEndDate} + + and rw.type = #{type} + \ No newline at end of file