产量报告

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

@@ -1091,5 +1091,35 @@ public class ScheduleController {
                 .put("row", resultRow);
     }
 
+    /**
+     * @Author LR
+     * @Description 处理结束工具使用的方法
+     * @DateTime  2022/2/18 9:53
+     * @Param [inData]
+     * @return com.gaotao.common.utils.R
+     **/
+    @RequestMapping(value = "processFinishTool")
+    public R processFinishTool(@RequestBody SearchScheduleData inData){
+        scheduleService.processFinishTool(inData);
+        return R.ok()
+                .put("code", 200)
+                .put("msg", "操作成功!");
+    }
+
+    /**
+     * @Author LR
+     * @Description 材料卷结束使用 且没有剩余
+     * @DateTime  2022/2/18 10:50
+     * @Param [inData]
+     * @return com.gaotao.common.utils.R
+     **/
+    @RequestMapping(value = "processFinishMaterialWithNoRemainder")
+    public R processFinishMaterialWithNoRemainder(@RequestBody SearchScheduleData inData){
+        scheduleService.processFinishMaterialWithNoRemainder(inData);
+        return R.ok()
+                .put("code", 200)
+                .put("msg", "操作成功!");
+    }
+
 
 }

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

@@ -617,4 +617,22 @@ public interface ScheduleService {
      * @Param [inData]
      **/
     Map<String, Object> getMergeRollPageData(SearchScheduleData inData);
+
+    /**
+     * @Author LR
+     * @Description 处理结束工具使用的方法
+     * @DateTime  2022/2/18 9:59
+     * @Param [inData]
+     * @return void
+     **/
+    void processFinishTool(SearchScheduleData inData);
+
+    /**
+     * @Author LR
+     * @Description 材料卷结束使用 且没有剩余
+     * @DateTime  2022/2/18 10:50
+     * @Param [inData]
+     * @return void
+     **/
+    void processFinishMaterialWithNoRemainder(SearchScheduleData inData);
 }

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

@@ -2980,4 +2980,94 @@ public class ScheduleServiceImpl implements ScheduleService {
         return resultList.get(0);
     }
 
+    @Override
+    @Transactional
+    public void processFinishTool(SearchScheduleData inData) {
+        //公共参数
+        String site = inData.getSite();
+        String orderNo = inData.getOrderNo();
+        Integer itemNo = inData.getItemNo();
+        String seqNo = inData.getSeqNo();
+        String rollNo = inData.getRollNo();
+        String username = inData.getOperatorId();
+        String currentTime = DateUtil.getStringDate(new Date(), "yyyy-MM-dd HH:mm:ss");
+        int histSeqNo = inData.getHistSeqNo();
+        String toolInstanceId = inData.getToolInstanceId();
+
+        //执行存储过程 处理结束工具使用的方法
+        Map<String, Object> resultMap =  this.workBenchFinishTool(site, orderNo, itemNo, seqNo, histSeqNo, toolInstanceId);
+        //判断结果是否成功
+        String resultCode = String.valueOf(resultMap.get("resultCode"));
+        if ("400".equalsIgnoreCase(resultCode)) {
+            String msg = String.valueOf(resultMap.get("resultMsg"));
+            throw new RRException(msg);
+        }
+    }
+
+    /**
+     * @Author LR
+     * @Description 执行存储过程 处理结束工具使用的方法
+     * @DateTime  2022/2/18 10:29
+     * @Param [site, orderNo, itemNo, seqNo, histSeqNo, toolInstanceId]
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     **/
+    public Map<String, Object> workBenchFinishTool(String site, String orderNo, Integer itemNo, String seqNo, int histSeqNo, String toolInstanceId) {
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(orderNo);
+        params.add(itemNo);
+        params.add(seqNo);
+        params.add(histSeqNo);
+        params.add(toolInstanceId);
+        //调用存储过程
+        List<Map<String, Object>> resultList = procedureMapper.getProcedureData("workbench_finishtool", params);
+        //处理返回的结果
+        return resultList.get(0);
+    }
+
+    @Override
+    @Transactional
+    public void processFinishMaterialWithNoRemainder(SearchScheduleData inData) {
+        //公共参数
+        String site = inData.getSite();
+        String orderNo = inData.getOrderNo();
+        Integer itemNo = inData.getItemNo();
+        String seqNo = inData.getSeqNo();
+        String rollNo = inData.getRollNo();
+        String username = inData.getOperatorId();
+        String currentTime = DateUtil.getStringDate(new Date(), "yyyy-MM-dd HH:mm:ss");
+        int histSeqNo = inData.getHistSeqNo();
+
+        //存储过程  执行材料卷结束使用 且无剩余
+        Map<String, Object> resultMap =  this.processFinishMaterialWithNoRemainder(site, orderNo, itemNo, seqNo, histSeqNo, rollNo);
+        //判断结果是否成功
+        String resultCode = String.valueOf(resultMap.get("resultCode"));
+        if ("400".equalsIgnoreCase(resultCode)) {
+            String msg = String.valueOf(resultMap.get("resultMsg"));
+            throw new RRException(msg);
+        }
+    }
+
+    /**
+     * @Author LR
+     * @Description 执行材料使用结束  且无剩余
+     * @DateTime  2022/2/18 11:05
+     * @Param [site, orderNo, itemNo, seqNo, histSeqNo, rollNo]
+     * @return java.util.Map<java.lang.String,java.lang.Object>
+     **/
+    public Map<String, Object> processFinishMaterialWithNoRemainder(String site, String orderNo, Integer itemNo, String seqNo, int histSeqNo, String rollNo) {
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(orderNo);
+        params.add(itemNo);
+        params.add(seqNo);
+        params.add(histSeqNo);
+        params.add(rollNo);
+        //调用存储过程
+        List<Map<String, Object>> resultList = procedureMapper.getProcedureData("workbench_finishmaterial_usage", params);
+        //处理返回的结果
+        return resultList.get(0);
+    }
+
+
 }