From e6331956bea5502e1d5294ac0b76a0ae575c7619 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Sat, 3 May 2025 14:56:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8B=94=E8=BD=B4=E6=9C=BA=E6=9C=89?=
 =?UTF-8?q?=E8=BD=B4=E4=B9=9F=E4=B8=8D=E4=B8=80=E5=AE=9A=E8=83=BD=E7=94=A8?=
 =?UTF-8?q?=EF=BC=8C=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E6=90=AC=E8=B5=B0=E7=9A=84=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/sch/manage/AutoSendOutShaft.java   |  2 +-
 .../java/org/nl/wms/sch/tasks/PaperTubeTask.java  | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendOutShaft.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendOutShaft.java
index d414a91f8..0fcb924dc 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendOutShaft.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendOutShaft.java
@@ -46,7 +46,7 @@ public class AutoSendOutShaft {
             queryRgvParam.put("product_area", rgv_jo.getString("product_area"));
             JSONObject canUseRgv = wmsToAcsService.queryRGVStatus(queryRgvParam);
             String rgvResStatus = canUseRgv.getString("status");
-            boolean canUse = true;
+            boolean canUse = false;
             if (rgvResStatus.equals("200")) {
                 int qty = canUseRgv.getInteger("qty");
                 IschBaseTaskService taskService = SpringContextHolder.getBean(IschBaseTaskService.class);
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java
index f2968bc35..b332a8838 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PaperTubeTask.java
@@ -127,11 +127,22 @@ public class PaperTubeTask extends AbstractAcsTask {
             JSONObject rgv_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("point_type = '5' AND product_area = '" + product_area + "'").uniqueResult(0);
             //判断是否存在未完成的成品下卷任务
             JSONObject container_jo = WQLObject.getWQLObject("sch_base_task").query("task_type = '010605' AND product_area = '"+product_area+"' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
-
+            boolean needCallShaft = false;
+            if ("1".equals(have_qzz)) {
+                // 有轴也不一定能用，判断是否存在搬走的任务
+                JSONObject haveTask = WQLObject.getWQLObject("sch_base_task")
+                        .query("point_code1 = '" + cbz_jo.getString("point_code")
+                                + "' AND product_area = '"+product_area+"' AND task_status < '07' AND is_delete = '0'")
+                        .uniqueResult(0);
+                if (ObjectUtil.isNotEmpty(haveTask)) {
+                    needCallShaft = true;
+                }
+            }
             if (("0".equals(have_qzz) && "0".equals(rgv_jo.getString("have_qzz")) && ObjectUtil.isEmpty(container_jo))
                     || (ObjectUtil.isNotEmpty(container_jo) && (
                     container_jo.getString("point_code2").contains("RG_RGV")
-                            || container_jo.getString("point_code2").contains("CPZC")))) {
+                            || container_jo.getString("point_code2").contains("CPZC")))
+                    || needCallShaft) {
                 PaperTrussTask paperTrussTask = SpringContextHolder.getBean(PaperTrussTask.class);
                 // 创建桁架任务搬运一个符合的气涨轴
                 JSONObject jo = new JSONObject();