From fcd1e5a035cf26e6384613fa47f8c50675b6521f Mon Sep 17 00:00:00 2001
From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com>
Date: Thu, 10 Apr 2025 14:29:40 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E5=8A=A0=E6=80=A5=E9=80=81=E8=BD=B4?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pda/controller/SlitterPdaController.java  |  6 ++++
 .../tasks/slitter/mapper/SlitterMapper.xml    |  2 ++
 .../slitter/mapper/dto/CallPlanViewVO.java    |  4 +++
 .../tasks/slitter/service/SlitterService.java |  7 +++++
 .../service/impl/SlitterServiceImpl.java      | 29 ++++++++++++++++++-
 5 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java
index ae0abe769..85ec42d52 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java
@@ -219,6 +219,12 @@ public class SlitterPdaController {
     public ResponseEntity<Object> showManualView(@RequestBody JSONObject param) {
         return new ResponseEntity<>(slitterDevices.showManualView(param), HttpStatus.OK);
     }
+    @PostMapping("/urgentPlan")
+    @Log("加急送轴")
+    @SaIgnore
+    public ResponseEntity<Object> urgentPlan(@RequestBody JSONObject param) {
+        return new ResponseEntity<>(slitterDevices.urgentPlan(param), HttpStatus.OK);
+    }
     @PostMapping("/rollCacheManage")
     @Log("母卷暂存架子管理")
     @SaIgnore
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml
index f578cce30..34b3b742c 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.xml
@@ -138,6 +138,7 @@
     </select>
     <select id="showManualView" resultType="org.nl.b_lms.sch.tasks.slitter.mapper.dto.CallPlanViewVO">
         SELECT
+        p.workorder_id,
         p.resource_name,
         CASE
         WHEN LENGTH(p.parent_container_name) > 0 THEN
@@ -161,6 +162,7 @@
         AND '1' = (SELECT c.is_used FROM st_ivt_cutpointivt c WHERE c.ext_code = p.resource_name)
         AND p.parent_container_name LIKE '%虚拟-B%'
         GROUP BY
+        p.workorder_id,
         p.resource_name,
         p.parent_container_name,
         p.restruct_container_name,
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/CallPlanViewVO.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/CallPlanViewVO.java
index 4786c365a..b45fb644e 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/CallPlanViewVO.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/CallPlanViewVO.java
@@ -10,6 +10,10 @@ import java.io.Serializable;
  */
 @Data
 public class CallPlanViewVO implements Serializable {
+    /**
+     * uuid
+     */
+    private String workorder_id;
     /**
      * 分切设备
      */
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java
index 10ea40978..8600417a0 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/SlitterService.java
@@ -314,6 +314,13 @@ public interface SlitterService {
      */
     List<CallPlanViewVO> showManualView(JSONObject param);
 
+    /**
+     * 加急送轴
+     * @param param
+     * @return
+     */
+    JSONObject urgentPlan(JSONObject param);
+
     /**
      * 子卷下料2
      * @param param
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
index 6c93bbb57..a1b53bfcb 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
@@ -2181,7 +2181,34 @@ public class SlitterServiceImpl implements SlitterService {
     public List<CallPlanViewVO> showManualView(JSONObject param) {
         return slitterMapper.showManualView();
     }
-
+    @Override
+    public JSONObject urgentPlan(JSONObject param) {
+        JSONObject res = new JSONObject();
+        log.info("加急送轴的输入参数为：{}", param);
+        String workorder_id = param.getString("workorder_id");
+        PdmBiSlittingproductionplan plan = slittingproductionplanService.getById(workorder_id);
+        log.info("当前加急送轴的计划为：{}", plan);
+        if(!"01".equals(plan.getStatus())){
+            res.put("status", HttpStatus.HTTP_OK);
+            res.put("message", "加急失败,当前计划正在套轴!");
+            return res;
+        }
+        //更新套轴计划开始时间为当前时间
+        LambdaUpdateWrapper<PdmBiSlittingproductionplan> updateWrapper = new LambdaUpdateWrapper<PdmBiSlittingproductionplan>();
+        updateWrapper.set(PdmBiSlittingproductionplan::getStart_time, DateUtil.now())
+                .eq(PdmBiSlittingproductionplan::getWorkorder_id, workorder_id)
+                .eq(PdmBiSlittingproductionplan::getIs_delete, SlitterConstant.SLITTER_NO);
+        //判断更新是否成功
+        boolean flag = slittingproductionplanService.update(updateWrapper);
+        if(flag){
+            res.put("status", HttpStatus.HTTP_OK);
+            res.put("message", "加急成功!");
+        }else{
+            res.put("status", HttpStatus.HTTP_OK);
+            res.put("message", "加急失败,请刷新再试!");
+        }
+        return res;
+    }
     @Override
     public JSONObject downRolls2(JSONObject param) {
         log.info("下卷2的输入参数为：{}", param);