From 72c06d5800d3a99dbd7002a6946be749d9264b15 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 26 六月 2025 10:44:26 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    7 +++++--
 1 files changed, 5 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 c7b620e..4c9d443 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -105,6 +105,9 @@
     @Value("${loc-move.enable}")
     private boolean enable;
 
+    @Value("${config.outloading}")
+    private boolean outloading;
+
 
     public synchronized void generateStoreWrkFile() {
         try {
@@ -353,7 +356,7 @@
 
                 LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
                 if (!locMast.getLocSts().equals("O")) {
-                    if(taskWrk.getWrkSts() == 2) {
+                    if (taskWrk.getWrkSts() == 2) {
                         log.error("鍏ュ簱WMS鍒嗛厤搴撲綅{}鏈夎锛屽簱浣嶇姸鎬佷负{}", locMast.getLocNo(), locMast.getLocSts());
                         taskWrk.setWrkSts(5);
                         taskWrk.setMemo("WMS鍒嗛厤搴撲綅鏈夎");
@@ -483,7 +486,7 @@
                     }
 
                     // 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
-                    if (staProtocol.isAutoing() && !staProtocol.isLoading() && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
+                    if (staProtocol.isAutoing() && (outloading || !staProtocol.isLoading()) && staDetl.getCanouting() != null && staDetl.getCanouting().equals("Y")
                             && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
                         // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
 

--
Gitblit v1.9.1