From fed38e8a453ff56691555d9a34dd65d8ff1f5e4c Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 21 三月 2026 17:48:23 +0800
Subject: [PATCH] 优化找库位规则
---
src/main/java/com/zy/common/model/LocTypeDto.java | 3 ++-
src/main/java/com/zy/common/service/CommonService.java | 2 ++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index 637278d..b2ad0d2 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -31,7 +31,8 @@
if (basDevp.getLocType1() == null) {
throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
}
- if (basDevp.getLocType1() == 0) {
+ // PLC 鍘熷淇″彿 0=浣庝綅锛屽叾瀹冩寜楂樹綅澶勭悊锛岃繖閲屼繚鐣欐槧灏勭粨鏋滅粰鍚庣画鎵句綅/鍏煎閲嶈瘯浣跨敤銆�
+ if (basDevp.getLocType1() == 1) {
this.locType1 = 1; // 浣庡簱浣�
} else {
this.locType1 = 2; // 楂樺簱浣�
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 819e6e9..95363ed 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -793,6 +793,8 @@
locTypeDto == null || locTypeDto.getLocType1() == null ? null : locTypeDto.getLocType1().intValue(),
findLocNoAttributeVo == null ? null : findLocNoAttributeVo.getMatnr());
if (!Cools.isEmpty(stationCrnLocTypes)) {
+ // 绔欑偣浼樺厛绾у彧鏄�滀紭鍏堝皾璇曗�濓紝娌℃湁鍛戒腑鏃跺繀椤荤户缁蛋榛樿/搴撳尯鍥為��锛�
+ // 鍚﹀垯浼氭妸鈥滀紭鍏堝�欓�夋棤浣嶁�濊鍒ゆ垚鈥滄暣浠撴棤浣嶁�濄��
LocMast locMast = findRun2EmptyLocByCrnLocTypeEntries(rowLastno, rowLastnoType, stationCrnLocTypes,
locTypeDto, staDescId, sourceStaNo, startupDto, preferredArea, "station-priority");
if (!Cools.isEmpty(locMast)) {
--
Gitblit v1.9.1