From b9cf783ccdb0b2e8b7f3cbb6f37c8431809513d9 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Fri, 28 Jun 2024 13:58:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2097=E4=BF=A1=E5=8F=B7=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../b_lms/sch/tasks/slitter/service/SlitterService.java   | 7 +++++++
 .../tasks/slitter/service/impl/SlitterServiceImpl.java    | 8 +++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

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 8626759dc..a662e75e1 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
@@ -147,4 +147,11 @@ public interface SlitterService {
      * @return /
      */
     JSONObject toCleanCutCacheInventory(JSONObject param);
+
+    /**
+     * 分切拼接操作
+     * @param param /
+     * @return /
+     */
+    JSONObject slitterSpliceOperation(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 f77c8121b..517d34fa2 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
@@ -139,7 +139,7 @@ public class SlitterServiceImpl implements SlitterService {
         // point.getTube_code1() 编码 ， getTube_name1() ： 纸制筒管|纸管|6英寸|1300  or  纸制筒管|纸管|3英寸|12|650
         res.put("device_code", deviceCode);
         res.put("data", con);
-        if ("1".equals(autoSendEmpty.getValue())) {
+        if ("1".equals(autoSendEmpty.getValue()) && list.size() == 0) {
             con.put("is_bushing", "2");
         } else {
             con.put("is_bushing", list.size() > 0 ? SlitterConstant.SLITTER_YES : SlitterConstant.SLITTER_NO);
@@ -973,4 +973,10 @@ public class SlitterServiceImpl implements SlitterService {
         res.put("message", "库存清除成功!");
         return res;
     }
+
+    @Override
+    public JSONObject slitterSpliceOperation(JSONObject param) {
+        // todo:
+        return null;
+    }
 }