diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java index 8d28fcab2..404010bf8 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java @@ -846,7 +846,14 @@ public class MesReportWorkController extends BaseController { return dates; } - + /** + * 报工撤销 + */ + @RequiresPermissions("mes:reportWork:report") + @PostMapping("/updateReportWorkW3") + public AjaxResult updateReportWorkW3(@RequestBody MesReportWork mesReportWork) { + return toAjax(mesReportWorkService.updateReportWorkW3(mesReportWork)); + } } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java index 0e9db0e89..0fa14b461 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java @@ -233,4 +233,6 @@ public interface MesReportWorkMapper { List getHFEquNames(MesHourReport mesHourReport); List getCXJEquNames(MesHourReport mesHourReport); + + int updateReportWorkW3(MesReportWork mesReportWork); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java index 62a7e8d0d..664a327ba 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java @@ -146,4 +146,6 @@ public interface IMesReportWorkService { AjaxResult PlanAchievementRate(); List getStartEndTimeByProDate(MesHourReport mesHourReport); + + int updateReportWorkW3(MesReportWork mesReportWork); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java index e05e58acf..23fd92d64 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java @@ -1083,4 +1083,13 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService { System.out.println("原始字符串: " + originalString); System.out.println("替换后的字符串: " + replacedString); } + + @Override + @DS("#header.poolName") + public int updateReportWorkW3(MesReportWork mesReportWork) { + mesReportWork.setUpdateBy(SecurityUtils.getUsername()+"w3"); + mesReportWork.setUpdateTime(DateUtils.getNowDate()); + int reportNum = mesReportWorkMapper.updateReportWorkW3(mesReportWork); + return reportNum; + } } diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index be271d0af..3934a5495 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -1612,6 +1612,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update mes_report_work set attr1 = #{attr1} where report_code = #{reportCode} + + update pro_order_workorder + set status = 'w3', + update_by = #{updateBy}, + update_time = #{updateTime} + where belong_work_order = #{workorderCode} + and del_flag = '0' + update mes_report_work set del_flag = '1' where id = #{id}