刀模上机

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

@@ -691,8 +691,36 @@ public class ScheduleController {
                 .put("success", true)
                 .put("msg", "操作成功!");
     }
-    //
-    //创建新卷的功能
+
+    /**
+     * TODO 检查工具实例的编码
+     * @author LR
+     * @date 2021/12/28 18:33
+     * @param inData
+     * @return com.gaotao.common.utils.R
+     **/
+    @RequestMapping(value = "checkToolInstanceId")
+    public R checkToolInstanceId(@RequestBody SearchScheduleData inData){
+        Map<String, Object> resultMap = scheduleService.checkToolInstanceId(inData);
+        return R.ok()
+                .put("resultMap", resultMap);
+    }
+
+    /**
+     * TODO 添加工具实例
+     * @author LR
+     * @date 2021/12/28 18:45
+     * @param inData
+     * @return com.gaotao.common.utils.R
+     **/
+    @RequestMapping(value = "addToolInstanceId")
+    public R addToolInstanceId(@RequestBody SearchScheduleData inData){
+        scheduleService.addToolInstanceId(inData);
+        return R.ok()
+                .put("code", 200)
+                .put("success", true)
+                .put("msg", "操作成功!");
+    }
     //
     //
 

src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java

@@ -66,6 +66,7 @@ public class SearchScheduleData extends BaseData {
     private Float totalTime;//报告的时间
     private String defectCode;//不良代码
     private Float defectQty;//不良的数量
+    private String toolInstanceId;//工具实例的编码
 
     public SearchScheduleData() {
     }
@@ -373,4 +374,12 @@ public class SearchScheduleData extends BaseData {
     public void setDefectQty(Float defectQty) {
         this.defectQty = defectQty;
     }
+
+    public String getToolInstanceId() {
+        return toolInstanceId;
+    }
+
+    public void setToolInstanceId(String toolInstanceId) {
+        this.toolInstanceId = toolInstanceId;
+    }
 }

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

@@ -382,4 +382,22 @@ public interface ScheduleService {
      * @return void
      **/
     void reportDefectCode(SearchScheduleData inData);
+
+    /**
+     * TODO 检查工具实例的编码
+     * @author LR
+     * @date 2021/12/28 18:33
+     * @param inData
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     **/
+    Map<String, Object> checkToolInstanceId(SearchScheduleData inData);
+
+    /**
+     * TODO 添加工具实例
+     * @author LR
+     * @date 2021/12/28 18:46
+     * @param inData
+     * @return void
+     **/
+    void addToolInstanceId(SearchScheduleData inData);
 }

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

@@ -1131,5 +1131,92 @@ public class ScheduleServiceImpl implements ScheduleService {
         procedureMapper.execProduceData("reportDefectCode-", params);
     }
 
+    @Override
+    public Map<String, Object> checkToolInstanceId(SearchScheduleData inData) {
+        //公共参数
+        String site = inData.getSite();
+        String orderNo = inData.getOrderNo();
+        Integer itemNo = inData.getItemNo();
+        String seqNo = inData.getSeqNo();
+        String rollNo = inData.getRollNo();
+        String toolInstanceId = inData.getDefectCode();
+        String currentTime = DateUtil.getStringDate(new Date(), "yyyy-MM-dd HH:mm:ss");
+
+        //调用存储过程判断是否可以上工具
+        Map<String, Object> checkMap = this.checkProcessToolInstanceId(site, orderNo, itemNo, seqNo, rollNo, currentTime);
+        //判断是否检验成功
+        String checkFlag = String.valueOf(checkMap.get("resultCode"));
+        if (!"Y".equalsIgnoreCase(checkFlag)){
+            throw  new RRException("当前卷号不在调试过程中，不允许上/更换工具!");
+        }
+
+        //调用存储过程判断是否可以上工具
+        Map<String, Object> resultMap = this.checkToolInstanceId(site, orderNo, itemNo, seqNo, rollNo, toolInstanceId);
+        //判断是否检验成功
+        String code = String.valueOf(resultMap.get("resultCode"));
+        if (!"200".equalsIgnoreCase(code)){
+            String msg = String.valueOf(resultMap.get("resultMsg"));
+            throw  new RRException(msg);
+        }
+        return resultMap;
+    }
+
+    /**
+     * TODO 检查是否处于上工具的时机
+     * @author LR
+     * @date 2021/12/28 18:54
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     **/
+    public Map<String, Object> checkProcessToolInstanceId(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String currentTime) {
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(orderNo);
+        params.add(itemNo);
+        params.add(seqNo);
+        params.add(rollNo);
+        params.add(currentTime);
+        List<Map<String, Object>> resultList = procedureMapper.getProcedureData("checkProcessToolInstanceId", params);
+        return  resultList.get(0);
+    }
+
+    /**
+     * TODO 检查工具实例的编码
+     * @author LR
+     * @date 2021/12/28 18:44
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     **/
+    public Map<String, Object> checkToolInstanceId(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String toolInstanceId) {
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(orderNo);
+        params.add(itemNo);
+        params.add(seqNo);
+        params.add(rollNo);
+        params.add(toolInstanceId);
+        List<Map<String, Object>> resultList = procedureMapper.getProcedureData("checkToolInstanceId", params);
+        return  resultList.get(0);
+    }
+
+    @Override
+    @Transactional
+    public void addToolInstanceId(SearchScheduleData inData) {
+        //公共参数
+        String site = inData.getSite();
+        String orderNo = inData.getOrderNo();
+        Integer itemNo = inData.getItemNo();
+        String seqNo = inData.getSeqNo();
+        String rollNo = inData.getRollNo();
+        String toolInstanceId = inData.getToolInstanceId();
+        String username = inData.getOperatorId();
+        String currentTime = DateUtil.getStringDate(new Date(), "yyyy-MM-dd HH:mm:ss");
+
+        //首先调用检查方法
+        this.checkToolInstanceId(inData);
+
+        //调用存储过程生成记录的数据
+        //this.addToolInstanceId();
+    }
+
+
 
 }