From c9fb1a3d1a2295088b568bfce4bb70105124d299 Mon Sep 17 00:00:00 2001 From: DouDou <877258667@qq.com> Date: Thu, 13 Jun 2024 13:10:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E9=83=A8=E5=88=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ScheduleController.java | 28 ++++++++ .../schedule/service/ScheduleService.java | 16 +++++ .../service/impl/ScheduleServiceImpl.java | 64 +++++++++++++++++++ .../mapper/schedule/ScheduleMapper.xml | 6 ++ 4 files changed, 114 insertions(+) diff --git a/src/main/java/com/spring/modules/schedule/controller/ScheduleController.java b/src/main/java/com/spring/modules/schedule/controller/ScheduleController.java index bf40d53..6942d4b 100644 --- a/src/main/java/com/spring/modules/schedule/controller/ScheduleController.java +++ b/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", "操作成功!"); + } + } \ No newline at end of file diff --git a/src/main/java/com/spring/modules/schedule/service/ScheduleService.java b/src/main/java/com/spring/modules/schedule/service/ScheduleService.java index 9d18cbf..4a61e7a 100644 --- a/src/main/java/com/spring/modules/schedule/service/ScheduleService.java +++ b/src/main/java/com/spring/modules/schedule/service/ScheduleService.java @@ -106,4 +106,20 @@ public interface ScheduleService { * @version 1.0 */ Map 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); } \ No newline at end of file diff --git a/src/main/java/com/spring/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/spring/modules/schedule/service/impl/ScheduleServiceImpl.java index d4a4923..5661501 100644 --- a/src/main/java/com/spring/modules/schedule/service/impl/ScheduleServiceImpl.java +++ b/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 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 checkAndDeleteSoFinalRoll(String site, String finalRollNo) { + List params = new ArrayList<>(); + params.add(site); + params.add(finalRollNo); + //存储过程 调用存储过程 创建分卷 + List> 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 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 cancelCheckSoFinalRollWithFqc(String site, String finalRollNo) { + List params = new ArrayList<>(); + params.add(site); + params.add(finalRollNo); + //存储过程 调用存储过程 创建分卷 + List> resultList = procedureMapper.getProcedureData("cancelCheckSoFinalRollWithFqc", params); + //处理结果集 + return resultList.get(0); + } } diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index dfc1617..36cb360 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/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 = ]]> #{statusCode} + + ORDER BY created_date DESC, final_roll_no DESC + + + ORDER BY fqc_date DESC, final_roll_no DESC + \ No newline at end of file