From 886c8af8268ac4c6b30b533a75af0b286743eee7 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Fri, 12 Jul 2024 09:16:55 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E6=89=8B=E6=8C=81=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E6=B0=94=E8=83=80=E8=BD=B4=E5=BA=93=E5=BA=93=E5=AD=98=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pda/controller/SlitterPdaController.java  |  7 +++++
 .../sch/task/dao/mapper/SchBaseTaskMapper.xml |  2 +-
 .../tasks/slitter/service/SlitterService.java | 10 ++++++-
 .../service/impl/SlitterServiceImpl.java      | 28 +++++++++++++++++--
 4 files changed, 43 insertions(+), 4 deletions(-)

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 460b17b8e..c46d61be7 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
@@ -93,4 +93,11 @@ public class SlitterPdaController {
     public ResponseEntity<Object> toSubvolumeBinding(@RequestBody JSONObject param) {
         return new ResponseEntity<>(slitterDevices.toSubvolumeBinding(param), HttpStatus.OK);
     }
+
+    @PostMapping("/shaftMaintenanceInventory")
+    @Log("气胀轴库维护库存")
+    @SaIgnore
+    public ResponseEntity<Object> shaftMaintenanceInventory(@RequestBody JSONObject param) {
+        return new ResponseEntity<>(slitterDevices.shaftMaintenanceInventory(param), HttpStatus.OK);
+    }
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml
index 0cfebb4cd..8fe74cbea 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml
@@ -6,7 +6,7 @@
     <select id="checkHaveTask" resultType="org.nl.b_lms.sch.task.dao.SchBaseTask">
         SELECT *
         FROM sch_base_task
-        WHERE task_code <![CDATA[ < ]]> '07'
+        WHERE task_code <![CDATA[ <= ]]> '071' AND task_status <![CDATA[ <> ]]> '07'
         AND ( point_code1 = #{code}
             OR point_code2 = #{code}
             OR point_code3 = #{code}
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 12c334a48..f97fdee52 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
@@ -103,7 +103,8 @@ public interface SlitterService {
 
     /**
      * 下卷
-     * @param param
+     * @param param /
+     * @return /
      */
     JSONObject downRolls(JSONObject param);
 
@@ -178,4 +179,11 @@ public interface SlitterService {
      * @return /
      */
     JSONObject toSubvolumeBinding(JSONObject param);
+
+    /**
+     * 气胀轴库维护库存
+     * @param param /
+     * @return /
+     */
+    JSONObject shaftMaintenanceInventory(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 f5e146093..fdc6f501f 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
@@ -867,7 +867,7 @@ public class SlitterServiceImpl implements SlitterService {
         //1、判断当前点位不能存在其他任务
         List<SchBaseTask> taskList = taskService.checkHaveTask(pointCode);
         if (taskList.size() > 0) {
-            throw new BadRequestException("操作失败，点位存在未完成的任务!");
+            throw new BadRequestException("操作失败，点位[" + pointCode + "]存在未完成的任务!");
         }
         //2、把当前点位上子卷号对应的is_paper_ok改为1
         BstIvtShafttubeivt shaftPoint = shafttubeivtService.getByPointCode(pointCode, false);
@@ -963,6 +963,11 @@ public class SlitterServiceImpl implements SlitterService {
         }
         try {
             if (openLock) {
+                // 校验是否存在任务
+                List<SchBaseTask> taskList = taskService.checkHaveTask(pointCode);
+                if (taskList.size() > 0) {
+                    throw new BadRequestException("操作失败，点位[" + pointCode + "]存在未完成的任务!");
+                }
                 BstIvtCutpointivt point = bcutpointivtService.getPintByAgvCode(pointCode, false);
                 if (Objects.equals(point.getPoint_status(), "1")) {
                     // 如果是没货
@@ -1009,7 +1014,7 @@ public class SlitterServiceImpl implements SlitterService {
         }
         JSONObject res = new JSONObject();
         res.put("status", HttpStatus.HTTP_OK);
-        res.put("message", "请求成功!");
+        res.put("message", "创建AGV任务请求成功!");
         return res;
     }
 
@@ -1147,4 +1152,23 @@ public class SlitterServiceImpl implements SlitterService {
         res.put("message", "子卷绑定成功!");
         return res;
     }
+
+    @Override
+    public JSONObject shaftMaintenanceInventory(JSONObject param) {
+        log.info("手持维护气胀轴库库存：{}", param);
+        // param : point_code, type
+        BstIvtShafttubeivt shafttubeivt = new BstIvtShafttubeivt();
+        if (SlitterConstant.SLITTER_YES.equals(param.getString("type"))) {
+            shafttubeivt.setHave_qzz(SlitterConstant.SLITTER_YES);
+        } else {
+            shafttubeivt.setHave_qzz(SlitterConstant.SLITTER_NO);
+        }
+        TaskUtils.updateOptMessageByBShaftPoint(shafttubeivt);
+        shafttubeivtService.update(shafttubeivt, new LambdaQueryWrapper<BstIvtShafttubeivt>()
+                .eq(BstIvtShafttubeivt::getPoint_code, param.getString("point_code")));
+        JSONObject res = new JSONObject();
+        res.put("status", HttpStatus.HTTP_OK);
+        res.put("message", "气胀轴库设置成功!");
+        return res;
+    }
 }