From 94a7230af27a1e7d1d79b896d6a7375f02b71b74 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Wed, 12 Mar 2025 21:16:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=8B=E6=8C=81=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=A5=97=E8=BD=B4=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pda/controller/SlitterPdaController.java  |  6 +++
 .../tasks/slitter/mapper/SlitterMapper.java   |  3 ++
 .../tasks/slitter/mapper/SlitterMapper.xml    | 34 +++++++++++++++
 .../slitter/mapper/dto/CallPlanViewVO.java    | 42 +++++++++++++++++++
 .../tasks/slitter/service/SlitterService.java |  8 ++++
 .../service/impl/SlitterServiceImpl.java      |  6 +++
 6 files changed, 99 insertions(+)
 create mode 100644 lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/CallPlanViewVO.java

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 b318642a6..373db2c5f 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
@@ -200,4 +200,10 @@ public class SlitterPdaController {
     public ResponseEntity<Object> forcedFeedShaft(@RequestBody JSONObject param) {
         return new ResponseEntity<>(slitterDevices.forcedFeedShaft(param), HttpStatus.OK);
     }
+    @PostMapping("/showManualView")
+    @Log("送轴情况")
+    @SaIgnore
+    public ResponseEntity<Object> showManualView(@RequestBody JSONObject param) {
+        return new ResponseEntity<>(slitterDevices.showManualView(param), HttpStatus.OK);
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.java
index 7b99c9dfd..7f3030ba6 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/SlitterMapper.java
@@ -2,6 +2,7 @@ package org.nl.b_lms.sch.tasks.slitter.mapper;
 
 import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
+import org.nl.b_lms.sch.tasks.slitter.mapper.dto.CallPlanViewVO;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -59,4 +60,6 @@ public interface SlitterMapper {
      * @return
      */
     List<BstIvtCutpointivt> nbjGetEmptyCutPointNotTask(String area, BigDecimal sortSeq, String location);
+
+    List<CallPlanViewVO> showManualView();
 }
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 a1ee9462e..c53beff9c 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
@@ -136,4 +136,38 @@
         )
         AND 0 = ABS(bcp.sort_seq - #{sortSeq})
     </select>
+    <select id="showManualView" resultType="org.nl.b_lms.sch.tasks.slitter.mapper.dto.CallPlanViewVO">
+        SELECT
+        p.resource_name,
+        CASE
+        WHEN LENGTH(p.parent_container_name) > 0 THEN
+        p.parent_container_name ELSE p.restruct_container_name
+        END AS parent_container_name,
+        p.split_group,
+        p.up_or_down,
+        p.qzz_size,
+        p.`status`,
+        p.qzz_generation,
+        MIN(p.start_time) AS start_time
+        FROM
+        `pdm_bi_slittingproductionplan` p
+        WHERE
+        p.`status` <![CDATA[ < ]]> '09'
+        AND p.is_delete = '0'
+        AND IFNULL(p.up_or_down, '') <![CDATA[ <> ]]> ''
+        AND IFNULL(p.left_or_right, '') <![CDATA[ <> ]]> ''
+        AND DATE(p.start_time) >= DATE_SUB(CURDATE(), INTERVAL 0 DAY)
+        AND '1' = (SELECT c.is_used FROM st_ivt_cutpointivt c WHERE c.ext_code = p.resource_name)
+        AND p.parent_container_name LIKE '%虚拟%'
+        GROUP BY
+        p.resource_name,
+        p.parent_container_name,
+        p.restruct_container_name,
+        p.split_group,
+        p.up_or_down,
+        p.qzz_size,
+        p.qzz_generation
+        ORDER BY
+        start_time DESC, `status`
+    </select>
 </mapper>
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
new file mode 100644
index 000000000..eef2b0525
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/mapper/dto/CallPlanViewVO.java
@@ -0,0 +1,42 @@
+package org.nl.b_lms.sch.tasks.slitter.mapper.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author: lyd
+ * @Date: 2025/3/11
+ */
+@Data
+public class CallPlanViewVO implements Serializable {
+    /**
+     * 分切设备
+     */
+    private String resource_name;
+    /**
+     * 母卷
+     */
+    private String parent_container_name;
+    /**
+     * 分切组
+     */
+    private String split_group;
+    /**
+     * 上轴/下轴
+     */
+    private String up_or_down;
+    /**
+     * 数量
+     */
+    private String status;
+    /**
+     * 气胀轴尺寸
+     */
+    private String qzz_size;
+    /**
+     * 气胀轴代数
+     */
+    private String qzz_generation;
+    private String start_time;
+}
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 1cb543bde..194302f36 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
@@ -3,6 +3,7 @@ package org.nl.b_lms.sch.tasks.slitter.service;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt;
+import org.nl.b_lms.sch.tasks.slitter.mapper.dto.CallPlanViewVO;
 
 import java.util.List;
 
@@ -305,4 +306,11 @@ public interface SlitterService {
      * @return
      */
     JSONObject forcedFeedShaft(JSONObject param);
+
+    /**
+     * 查看人工套轴信息
+     * @param param
+     * @return
+     */
+    List<CallPlanViewVO> showManualView(JSONObject 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 411ef4407..765002c5e 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
@@ -38,6 +38,7 @@ import org.nl.b_lms.sch.tasks.slitter.*;
 import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant;
 import org.nl.b_lms.sch.tasks.slitter.constant.SlitterEnum;
 import org.nl.b_lms.sch.tasks.slitter.mapper.SlitterMapper;
+import org.nl.b_lms.sch.tasks.slitter.mapper.dto.CallPlanViewVO;
 import org.nl.b_lms.sch.tasks.slitter.service.SlitterService;
 import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil;
 import org.nl.common.utils.SecurityUtils;
@@ -2112,4 +2113,9 @@ public class SlitterServiceImpl implements SlitterService {
         res.put("message", "呼叫送轴成功!");
         return res;
     }
+
+    @Override
+    public List<CallPlanViewVO> showManualView(JSONObject param) {
+        return slitterMapper.showManualView();
+    }
 }