报工部分代码修改

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

@@ -176,5 +176,33 @@ public class ScheduleController {
                 .put("msg", "操作成功!");
     }
 
+    /**
+    * @description: 删除成品卷
+    * @author LR
+    * @date 2024/6/13 10:51
+    * @version 1.0
+    */
+    @RequestMapping(value = "deleteSoFinalRoll")
+    public R deleteSoFinalRoll(@RequestBody SoFinalRollData inData){
+        scheduleService.deleteSoFinalRoll(inData);
+        return R.ok()
+                .put("code", 200)
+                .put("msg", "操作成功!");
+    }
+
+    /**
+    * @description: 取消成品卷的检验
+    * @author LR
+    * @date 2024/6/13 11:16
+    * @version 1.0
+    */
+    @RequestMapping(value = "cancelCheckSoFinalRoll")
+    public R cancelCheckSoFinalRoll(@RequestBody SoFinalRollData inData){
+        scheduleService.cancelCheckSoFinalRoll(inData);
+        return R.ok()
+                .put("code", 200)
+                .put("msg", "操作成功!");
+    }
+
 
 }

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

@@ -106,4 +106,20 @@ public interface ScheduleService {
     * @version 1.0
     */
     Map<String, Object> scanFinalRollNo(BaseRollData inData);
+
+    /**
+    * @description: 删除成品卷
+    * @author LR
+    * @date 2024/6/13 10:51
+    * @version 1.0
+    */
+    void deleteSoFinalRoll(SoFinalRollData inData);
+
+    /**
+    * @description: 取消检验成品卷
+    * @author LR
+    * @date 2024/6/13 11:19
+    * @version 1.0
+    */
+    void cancelCheckSoFinalRoll(SoFinalRollData inData);
 }

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

@@ -393,4 +393,68 @@ public class ScheduleServiceImpl implements ScheduleService {
         //处理结果集
         return resultList.get(0);
     }
+
+    @Override
+    @Transactional
+    public void deleteSoFinalRoll(SoFinalRollData inData) {
+        //公共参数
+        String site = inData.getSite();
+        String finalRollNo = inData.getFinalRollNo();
+        //调用存储过程  检查 删除成品卷
+        Map<String, Object> resultMap = this.checkAndDeleteSoFinalRoll(site, finalRollNo);
+        //判断是否继续
+        String code = String.valueOf(resultMap.get("result_code"));
+        if ("400".equalsIgnoreCase(code)) {
+            String msg = String.valueOf(resultMap.get("result_msg"));
+            throw new RuntimeException(msg);
+        }
+    }
+
+    /**
+    * @description: 调用存储过程  检查 删除成品卷
+    * @author LR
+    * @date 2024/6/13 11:02
+    * @version 1.0
+    */
+    public Map<String, Object> checkAndDeleteSoFinalRoll(String site, String finalRollNo) {
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(finalRollNo);
+        //存储过程 调用存储过程  创建分卷
+        List<Map<String, Object>> resultList = procedureMapper.getProcedureData("checkAndDeleteSoFinalRoll", params);
+        //处理结果集
+        return resultList.get(0);
+    }
+
+    @Override
+    @Transactional
+    public void cancelCheckSoFinalRoll(SoFinalRollData inData) {
+        //公共参数
+        String site = inData.getSite();
+        String finalRollNo = inData.getFinalRollNo();
+        //调用存储过程  检查 取消检验成品卷
+        Map<String, Object> resultMap = this.cancelCheckSoFinalRollWithFqc(site, finalRollNo);
+        //判断是否继续
+        String code = String.valueOf(resultMap.get("result_code"));
+        if ("400".equalsIgnoreCase(code)) {
+            String msg = String.valueOf(resultMap.get("result_msg"));
+            throw new RuntimeException(msg);
+        }
+    }
+
+    /**
+    * @description: TODO
+    * @author LR
+    * @date 2024/6/13 11:20
+    * @version 1.0
+    */
+    public Map<String, Object> cancelCheckSoFinalRollWithFqc(String site, String finalRollNo) {
+        List<Object> params = new ArrayList<>();
+        params.add(site);
+        params.add(finalRollNo);
+        //存储过程 调用存储过程  创建分卷
+        List<Map<String, Object>> resultList = procedureMapper.getProcedureData("cancelCheckSoFinalRollWithFqc", params);
+        //处理结果集
+        return resultList.get(0);
+    }
 }

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

@@ -134,6 +134,12 @@
         rm_roll_no, manufacture_date
         FROM so_final_roll
         WHERE site = #{site} AND order_no = #{orderNo}  AND status_code <![CDATA[ >= ]]> #{statusCode}
+        <if test="statusCode != null and statusCode == 0">
+            ORDER BY created_date DESC, final_roll_no DESC
+        </if>
+        <if test="statusCode != null and statusCode >= 1">
+            ORDER BY fqc_date DESC, final_roll_no DESC
+        </if>
     </select>
 
 </mapper>