不合规问题处理+报工问题修改

op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java

@@ -136,6 +136,15 @@ public class MesReportWorkController extends BaseController {
 		 }
 	}
 
+	/**
+	 * 报工撤销
+	 */
+	@RequiresPermissions("mes:reportWork:edit")
+	@PutMapping("/reportSapCancel")
+	public AjaxResult reportSapCancel(@RequestBody MesReportWork mesReportWork) {
+		return toAjax(mesReportWorkService.reportSapCancel(mesReportWork));
+	}
+
 	/**
 	 * 删除报工报表
 	 */

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

@@ -127,4 +127,6 @@ public interface MesReportWorkMapper {
 	MesReportWork getEndReport(MesReportWork pWork);
 
 	List<MesReportWork> selectMesReportWorkList_S(MesReportWork mesReportWork);
+
+    int reportSapCancel(MesReportWork mesReportWork);
 }

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

@@ -101,4 +101,6 @@ public interface IMesReportWorkService {
     List<MesPrepareDetail> getPrepareList(MesPrepareDetail mesPrepareDetail);
 
 	List<MesReportWork> selectMesReportWorkList_S(MesReportWork mesReportWork);
+
+    int reportSapCancel(MesReportWork mesReportWork);
 }

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

@@ -40,4 +40,5 @@ public interface IWCSInterfaceService {
     Map dryRoomDataHeader(BoardDTO boardDTO);
 
     Map dryRoomDataCarousel(BoardDTO boardDTO);
+
 }

op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java

@@ -536,57 +536,4 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
         return map;
     }
 
-
-//    public static void main(String[] args) {
-//        param param=new param();
-//        param.setReqCode(IdUtils.fastSimpleUUID());
-//        param.setReqTime(DateUtils.dateTimeNow());
-//        param.setBufferType("10");
-//        param.setFactory("999");
-//        try {
-//            String res= HttpUtils.sendPost("http://192.168.109.36:5001/api/ReceivingAndFeedingMaterials/bufferInfoSync", JSON.toJSONString(param));
-//            System.out.println(res);
-//        }catch (Exception e){
-//            System.out.println(e.getMessage());
-//        }
-//
-//    }
-//    static class param{
-//               String reqCode;
-//               String reqTime;
-//               String factory;
-//               String bufferType;
-//
-//        public String getReqCode() {
-//            return reqCode;
-//        }
-//
-//        public void setReqCode(String reqCode) {
-//            this.reqCode = reqCode;
-//        }
-//
-//        public String getReqTime() {
-//            return reqTime;
-//        }
-//
-//        public void setReqTime(String reqTime) {
-//            this.reqTime = reqTime;
-//        }
-//
-//        public String getFactory() {
-//            return factory;
-//        }
-//
-//        public void setFactory(String factory) {
-//            this.factory = factory;
-//        }
-//
-//        public String getBufferType() {
-//            return bufferType;
-//        }
-//
-//        public void setBufferType(String bufferType) {
-//            this.bufferType = bufferType;
-//        }
-//    }
 }

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java

@@ -176,6 +176,14 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 		return dtos;
 	}
 
+	@Override
+	@DS("#header.poolName")
+	public int reportSapCancel(MesReportWork mesReportWork) {
+		mesReportWork.setFactoryCode(ServletUtils.getRequest().getHeader("PoolName"));
+		int m = mesReportWorkMapper.reportSapCancel(mesReportWork);
+		return m;
+	}
+
 	/**
 	 * 修改报工报表
 	 *

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

@@ -813,8 +813,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			id = #{item.id}
 		</foreach>
 	</update>
+    <update id="reportSapCancel">
+		update mes_report_work set
+			upload_time = null,
+			upload_status = '0',
+			upload_msg = null
+		where workorder_code = #{workorderCode}
+	</update>
 
-	<delete id="deleteMesReportWorkById" parameterType="String">
+    <delete id="deleteMesReportWorkById" parameterType="String">
 		update mes_report_work set del_flag = '1' where id = #{id}
 	</delete>