From c81c28a3f41446ed67d035bfaa998ef9d69c0095 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期三, 31 十二月 2025 17:48:54 +0800
Subject: [PATCH] 修复了AGV工作档日志与工作历史档日志界面一模一样的问题
---
src/main/java/com/zy/common/service/CommonService.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index baf4f20..f01b610 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -170,11 +170,16 @@
throw new CoolException("鍏ュ簱璇锋眰搴撲綅澶辫触锛氳矾寰勪笉瀛樺湪" + staDescId +"," + sourceStaNo);
}
- Short locType1 = 1;
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("loc_type1", locType1).orderBy("lev1").orderBy("bay1").orderBy("row1"));
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "O")
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .eq("loc_type2", locTypeDto.getLocType2())
+ .orderBy("lev1")
+ .orderBy("bay1")
+ .orderBy("row1"));
if (locMast == null) {
- log.error("鍏ュ簱璇锋眰搴撲綅澶辫触锛氭棤搴撲綅" + locType1);
- throw new CoolException("鍏ュ簱璇锋眰搴撲綅澶辫触锛氭棤搴撲綅" + locType1);
+ log.error("鍏ュ簱璇锋眰搴撲綅澶辫触锛氭棤搴撲綅" + locTypeDto.getLocType1());
+ throw new CoolException("鍏ュ簱璇锋眰搴撲綅澶辫触锛氭棤搴撲綅" + locTypeDto.getLocType1());
}
StartupDto startupDto = new StartupDto();
--
Gitblit v1.9.1