报工删除记录 2022年12月08日 sxm

src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java

@@ -3,6 +3,7 @@ package com.gaotao.modules.schedule.controller;
 import com.gaotao.common.annotation.RepeatSubmit;
 import com.gaotao.common.exception.ResponseEnum;
 import com.gaotao.common.utils.R;
+import com.gaotao.modules.rollNoReview.data.SFDCMaterialHistOutData;
 import com.gaotao.modules.schedule.data.*;
 import com.gaotao.modules.schedule.data.dto.ScheduleDateShifDto;
 import com.gaotao.modules.schedule.data.dto.SfdcNewsfdcDto;
@@ -1849,4 +1850,31 @@ public class ScheduleController {
         scheduleService.deleteSfdcDefect(sfdcDefectData);
         return R.ok();
     }
+
+
+    /**
+     * @author: sxm
+     * @description: 删除工单时间记录
+     * @param []
+     * @return: com.gaotao.common.utils.R
+     * @date: 2022/12/7 13:33
+     */
+    @PostMapping("deleteSfdcTimeHist")
+    public R deleteSfdcTimeHist(@RequestBody SearchScheduleData inData){
+        scheduleService.deleteSfdcTimeHist(inData);
+        return R.ok();
+    }
+
+    /**
+     * @author: sxm
+     * @description: 删除物料记录
+     * @param [inData]
+     * @return: com.gaotao.common.utils.R
+     * @date: 2022/12/8 13:38
+     */
+    @PostMapping("deleteSfdcMaterialHist")
+    public R deleteSfdcMaterialHist(@RequestBody SFDCMaterialHistOutData inData){
+        scheduleService.deleteSfdcMaterialHist(inData);
+        return R.ok();
+    }
 }

src/main/java/com/gaotao/modules/schedule/mapper/ScheduleMapper.java

@@ -1,5 +1,6 @@
 package com.gaotao.modules.schedule.mapper;
 
+import com.gaotao.modules.rollNoReview.data.SFDCMaterialHistOutData;
 import com.gaotao.modules.schedule.data.*;
 import com.gaotao.modules.schedule.data.dto.ShopOrderRollDto;
 import com.gaotao.modules.shopOrder.entity.OperatorData;
@@ -647,5 +648,24 @@ public interface ScheduleMapper {
      * @return: java.util.Map<java.lang.String,java.lang.String>
      * @date: 2022/12/7 13:50
      */
-    Map<String,String> deleteSfdcDefect( SfdcDefectData sfdcDefectData);
+    List<Map<String, String>>  deleteSfdcDefect( SfdcDefectData sfdcDefectData);
+
+    /**
+     * @author: sxm
+     * @description: 删除sfdcTimeHist
+     * @param [inData]
+     * @return: java.util.Map<java.lang.String,java.lang.String>
+     * @date: 2022/12/8 11:21
+     */
+    List<Map<String, String>>  deleteSfdcTimeHist(SearchScheduleData inData);
+
+    /**
+     * @author: sxm
+     * @description: 删除物料记录
+     * @param [inData]
+     * @return: java.util.List<java.util.Map<java.lang.String,java.lang.String>>
+     * @date: 2022/12/8 13:40
+     */
+    List<Map<String, String>> deleteSfdcMaterialHist(SFDCMaterialHistOutData inData);
+
 }

src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java

@@ -1,6 +1,7 @@
 package com.gaotao.modules.schedule.service;
 
 import com.gaotao.common.utils.R;
+import com.gaotao.modules.rollNoReview.data.SFDCMaterialHistOutData;
 import com.gaotao.modules.schedule.data.*;
 import com.gaotao.modules.schedule.data.dto.ScheduleDateShifDto;
 import com.gaotao.modules.schedule.data.dto.SfdcNewsfdcDto;
@@ -1150,4 +1151,22 @@ public interface ScheduleService {
      */
     void deleteSfdcDefect(SfdcDefectData sfdcDefectData);
 
+    /**
+     * @author: sxm
+     * @description: 删除sfdctimehist
+     * @param [inData]
+     * @return: void
+     * @date: 2022/12/8 11:20
+     */
+    void deleteSfdcTimeHist(SearchScheduleData inData);
+
+    /**
+     * @author: sxm
+     * @description: 删除物料记录
+     * @param [inData]
+     * @return: void
+     * @date: 2022/12/8 13:39
+     */
+    void deleteSfdcMaterialHist(SFDCMaterialHistOutData inData);
+
 }

src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -6,6 +6,7 @@ import com.gaotao.common.exception.XJException;
 import com.gaotao.common.utils.DateUtil;
 import com.gaotao.common.utils.DateUtils;
 import com.gaotao.common.utils.R;
+import com.gaotao.modules.rollNoReview.data.SFDCMaterialHistOutData;
 import com.gaotao.modules.schedule.data.*;
 import com.gaotao.modules.schedule.data.dto.ScheduleDateShifDto;
 import com.gaotao.modules.schedule.data.dto.SfdcNewsfdcDto;
@@ -5221,10 +5222,30 @@ public class ScheduleServiceImpl implements ScheduleService {
 
     @Override
     public void deleteSfdcDefect(SfdcDefectData sfdcDefectData) {
-        Map<String, String> resMap = scheduleMapper.deleteSfdcDefect(sfdcDefectData);
+        List<Map<String, String>> resMap = scheduleMapper.deleteSfdcDefect(sfdcDefectData);
         if (CollectionUtil.isNotEmpty(resMap)) {
-            if (!"200".equals(resMap.get("resultCode"))) {
-                throw new XJException(resMap.get("resultMsg"));
+            if (!"200".equals(resMap.get(0).get("resultCode"))) {
+                throw new XJException(resMap.get(0).get("resultMsg"));
+            }
+        }
+    }
+
+    @Override
+    public void deleteSfdcTimeHist(SearchScheduleData inData) {
+        List<Map<String, String>> resMap = scheduleMapper.deleteSfdcTimeHist(inData);
+        if (CollectionUtil.isNotEmpty(resMap)) {
+            if (!"200".equals(resMap.get(0).get("resultCode"))) {
+                throw new XJException(resMap.get(0).get("resultMsg"));
+            }
+        }
+    }
+
+    @Override
+    public void deleteSfdcMaterialHist(SFDCMaterialHistOutData inData) {
+        List<Map<String, String>> resMap = scheduleMapper.deleteSfdcMaterialHist(inData);
+        if (CollectionUtil.isNotEmpty(resMap)) {
+            if (!"200".equals(resMap.get(0).get("resultCode"))) {
+                throw new XJException(resMap.get(0).get("resultMsg"));
             }
         }
     }

src/main/resources/mapper/schedule/ProcedureMapper.xml

@@ -9,7 +9,7 @@
   	</foreach>
   </select>
   <!-- 通用无结果集返回 -->
-  <select id="execProduceData">
+  <select id="execProduceData" statementType="CALLABLE">
   	exec ${procedureName} 
   	<foreach collection="params" item="param" index="index" separator=",">
   		#{param}

src/main/resources/mapper/schedule/ScheduleMapper.xml

@@ -39,6 +39,7 @@
     </update>
 
 
+
     <!--查询加工中心机台的信息-->
     <select id="getResourceLIst" parameterType="SearchScheduleData" resultType="ResourceOutData">
         SELECT wcr.Site site, wcr.WorkCenterNo workCenterNo, wcr.ResourceID resourceId, wcr.ResourceDesc resourceDEsc,
@@ -1562,7 +1563,15 @@
     </select>
 
 
-    <update id="deleteSfdcDefect">
-        dbo.RemoveSfdcDefect #{site},#{orderNo},#{itemNo},#{seqNo},#{rollNo},#{histSeqNo}
-    </update>
+    <select id="deleteSfdcDefect"  resultType="java.util.Map">
+        exec dbo.RemoveSfdcDefect #{site},#{orderNo},#{itemNo},#{seqNo},#{rollNo},#{histSeqNo}
+    </select>
+
+    <select id="deleteSfdcTimeHist" resultType="java.util.Map">
+        exec dbo.RemoveSfdcTimeHist #{site},#{orderNo},#{itemNo},#{seqNo},#{rollNo},#{histSeqNo}
+    </select>
+
+    <select id="deleteSfdcMaterialHist" resultType="java.util.Map">
+        exec dbo.RemoveSfdcMaterialHist #{site},#{orderNo},#{itemNo},#{seqNo},#{rollNo},#{histSeqNo},#{histType}
+    </select>
 </mapper>