sfdcRolls小功能

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

@@ -983,4 +983,35 @@ public class ScheduleController {
                 .put("msg", "操作成功!");
     }
 
+    /**
+     * TODO  重新打开当前下架卷的数据
+     * @author LR
+     * @date 2022/2/16 14:24
+     * @param inData
+     * @return com.gaotao.common.utils.R
+     **/
+    @RequestMapping(value = "reopenSfdcRolls")
+    public R reopenSfdcRolls(@RequestBody SearchScheduleData inData) {
+        scheduleService.reopenSfdcRolls(inData);
+        return R.ok()
+                .put("code", 200)
+                .put("msg", "操作成功!");
+    }
+
+    /**
+     * TODO 删除sfdcRolls卷的操作
+     * @author LR
+     * @date 2022/2/16 16:07
+     * @param inData
+     * @return com.gaotao.common.utils.R
+     **/
+    @RequestMapping(value = "deleteSfdcRolls")
+    public R deleteSfdcRolls(@RequestBody SearchScheduleData inData) {
+        scheduleService.deleteSfdcRolls(inData);
+        return R.ok()
+                .put("code", 200)
+                .put("msg", "操作成功!");
+    }
+
+
 }

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

@@ -97,6 +97,7 @@ public class SearchScheduleData extends BaseData {
     private String showNoFinishedMaterialFlag;//显示材料
     private String autoTool;//是否自动处理工具
     private Float transQty;//交易的数量
+    private String oriRollNo;//原始卷号
 
     public SearchScheduleData() {
     }
@@ -652,4 +653,12 @@ public class SearchScheduleData extends BaseData {
     public void setTransQty(Float transQty) {
         this.transQty = transQty;
     }
+
+    public String getOriRollNo() {
+        return oriRollNo;
+    }
+
+    public void setOriRollNo(String oriRollNo) {
+        this.oriRollNo = oriRollNo;
+    }
 }

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

@@ -555,4 +555,22 @@ public interface ScheduleService {
      * @return void
      **/
     void processCuttingMaterialRoll(SearchScheduleData inData);
+
+    /**
+     * TODO 重新打开当前下架卷的数据
+     * @author LR
+     * @date 2022/2/16 14:25
+     * @param inData
+     * @return void
+     **/
+    void reopenSfdcRolls(SearchScheduleData inData);
+
+    /**
+     * TODO 删除sfdcRolls卷的操作
+     * @author LR
+     * @date 2022/2/16 16:08
+     * @param inData
+     * @return void
+     **/
+    void deleteSfdcRolls(SearchScheduleData inData);
 }

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

@@ -2602,4 +2602,90 @@ public class ScheduleServiceImpl implements ScheduleService {
        procedureMapper.execProduceData("processCuttingMaterialRoll", params);
     }
 
+    @Override
+    @Transactional
+    public void reopenSfdcRolls(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");
+        //调用存储过程  执行打开卷的操作  根据状态判断是否成功过
+        Map<String, Object> resultMap = this.workBenchReopenRoll(site, orderNo, itemNo, seqNo, rollNo, username);
+        //判断结果是否成功
+        String resultCode = String.valueOf(resultMap.get("resultCode"));
+        if ("400".equalsIgnoreCase(resultCode)) {
+            String msg = String.valueOf(resultMap.get("resultMsg"));
+            throw new RRException(msg);
+        }
+    }
+
+    /**
+     * TODO  执行打开卷的操作  根据状态判断是否成功过
+     * @author LR
+     * @date 2022/2/16 14:30
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     **/
+    public Map<String, Object> workBenchReopenRoll(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String username) {
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(orderNo);
+        params.add(itemNo);
+        params.add(seqNo);
+        params.add(rollNo);
+        params.add(username);
+        //调用存储过程
+        List<Map<String, Object>> resultList = procedureMapper.getProcedureData("workbench_reopenroll", params);
+        //处理返回的结果
+        return resultList.get(0);
+    }
+
+    @Override
+    @Transactional
+    public void deleteSfdcRolls(SearchScheduleData inData) {
+        //公共参数
+        String site = inData.getSite();
+        String orderNo = inData.getOrderNo();
+        Integer itemNo = inData.getItemNo();
+        String seqNo = inData.getSeqNo();
+        String oriRollNo = inData.getOriRollNo();
+        String rollNo = inData.getRollNo();
+        String username = inData.getOperatorId();
+        String currentTime = DateUtil.getStringDate(new Date(), "yyyy-MM-dd HH:mm:ss");
+
+        //调用存储过程  执行删除卷的操作  根据状态判断是否成功过
+        Map<String, Object> resultMap = this.workBenchDeleteRoll(site, orderNo, itemNo, seqNo, rollNo, oriRollNo, username);
+        //判断结果是否成功
+        String resultCode = String.valueOf(resultMap.get("resultCode"));
+        if ("400".equalsIgnoreCase(resultCode)) {
+            String msg = String.valueOf(resultMap.get("resultMsg"));
+            throw new RRException(msg);
+        }
+    }
+
+    /**
+     * TODO 调用存储过程  执行删除卷的操作  根据状态判断是否成功过
+     * @author LR
+     * @date 2022/2/16 16:19
+     * @param [site, orderNo, itemNo, seqNo, rollNo, oriRollNo, username]
+     * @return java.util.Map<java.lang.String, java.lang.Object>
+     **/
+    public Map<String, Object> workBenchDeleteRoll(String site, String orderNo, Integer itemNo, String seqNo, String rollNo, String oriRollNo, String username) {
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(orderNo);
+        params.add(itemNo);
+        params.add(seqNo);
+        params.add(rollNo);
+        params.add(oriRollNo);
+        params.add(username);
+        //调用存储过程
+        List<Map<String, Object>> resultList = procedureMapper.getProcedureData("workbench_deleteroll", params);
+        //处理返回的结果
+        return resultList.get(0);
+    }
+
 }