From db88462ae6850a42d58c6e04b500975c8d9806c9 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 16 一月 2026 08:16:54 +0800
Subject: [PATCH] 堆垛机连续出库
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 893075b..837db12 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -38,6 +38,8 @@
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.LedThread;
import com.zy.core.thread.SiemensDevpThread;
+import com.zy.system.entity.Config;
+import com.zy.system.service.impl.ConfigServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -88,6 +90,8 @@
private String wmsUrl;
@Autowired
private WrkMastServiceImpl wrkMastService;
+ @Autowired
+ private ConfigServiceImpl configService;
/**
* 缁勬墭
@@ -857,9 +861,14 @@
break;
// continue;
}
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("ContinuousOutboundShipment","Y"));
+ boolean flag = false;
+ if (!Cools.isEmpty(config)||!staProtocol.isLoading() && staProtocol.isOutEnable()){
+ flag = true;
+ }
// 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
- if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() !=null && staDetl.getCanouting().equals("Y")
- && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
+ if (staProtocol.isAutoing() && flag && staDetl.getCanouting() !=null && staDetl.getCanouting().equals("Y")
+ && staProtocol.getWorkNo() == 0 ) {
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
// 鍫嗗灈鏈烘帶鍒惰繃婊�
--
Gitblit v1.9.1