From f666f0b94d46cc3c1db7ffec7d166472ead07f2c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 17 六月 2025 20:40:21 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 7 +++++--
src/main/resources/application.yml | 4 ++++
2 files changed, 9 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()) {
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f1e711c..6d853af 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -84,3 +84,7 @@
crn2: false
crn3: false
crn4: false
+
+config:
+ # 涓簍rue锛屽綋鍫嗗灈鏈烘斁璐х珯鏈夌墿涔熸墽琛屽嚭搴擄紙浼氬鑷村爢鍨涙満涓婃斁浜嗙墿鏂欙紝鑰屾棤娉曟墽琛屽埆鐨勪换鍔★級;涓簍rue锛屽綋鍫嗗灈鏈烘斁璐х珯鏈夌墿涓嶆墽琛屽嚭搴擄紙涓轰簡鏁堢巼锛�
+ outloading: false
--
Gitblit v1.9.1