最终报工

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));
+	}
 
 }
 

op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java

@@ -233,4 +233,6 @@ public interface MesReportWorkMapper {
 
     List<MesHourReport> getHFEquNames(MesHourReport mesHourReport);
     List<MesHourReport> getCXJEquNames(MesHourReport mesHourReport);
+
+    int updateReportWorkW3(MesReportWork mesReportWork);
 }

op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkService.java

@@ -146,4 +146,6 @@ public interface IMesReportWorkService {
     AjaxResult PlanAchievementRate();
 
     List<String> getStartEndTimeByProDate(MesHourReport mesHourReport);
+
+    int updateReportWorkW3(MesReportWork mesReportWork);
 }

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;
+	}
 }

op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml

@@ -1612,6 +1612,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<update id="updatePreReportAttr1">
 		update mes_report_work set attr1 = #{attr1} where report_code = #{reportCode}
 	</update>
+	<update id="updateReportWorkW3">
+		update pro_order_workorder
+		set status = 'w3',
+			update_by = #{updateBy},
+			update_time = #{updateTime}
+		where belong_work_order = #{workorderCode}
+        and del_flag = '0'
+	</update>
 
 	<delete id="deleteMesReportWorkById" parameterType="String">
 		update mes_report_work set del_flag = '1' where id = #{id}