From 2fc477de92ef724cd37a79a3679c7d605adb94ab Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:57:06 +0800
Subject: [PATCH] 添加MES库存同步功能及配置
---
src/main/java/com/zy/common/service/AgvCommonService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index 76a2b87..5be7c9a 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -120,12 +120,12 @@
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
// 鍥涙湡椤圭洰锛氶渶瑕佹敼鏌ユ壘搴撲綅閫昏緫
// 绠卞３鍏ュ簱
- if (type == 3) {
+ if (type == 3 && factory != null) {
//浼樺厛鍏ュ簱鍚稿1妤硷紝鍦�2妤�
- locMast = locUtils.getLocNoRuleByFactory(type, factory);
+ locMast = locUtils.getLocNoRuleByFactory(type, isEmpty, factory);
} else if (type == 6) {
//鍗婃垚鍝佺澹冲叆搴擄紝鍏ュ埌鍚稿2妤肩殑370涓簱浣嶉噷
- locMast = locUtils.getLocNoRuleByFloor(type, floor, 2);
+ locMast = locUtils.getLocNoRuleByFloor(type, floor, isEmpty, 2);
} else {
//涓嶅姩杩欎釜閫昏緫
locMast = getLocNoRule(type, floor, isEmpty, isCurrLev);
--
Gitblit v1.9.1