From 08915b05c42b2ba97a8bb0809aeb48802ae63b46 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 27 三月 2026 20:42:32 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/common/service/CommonService.java | 22 ++++++++++++++++++----
1 files changed, 18 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 425e95a..0810c88 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -182,7 +182,7 @@
int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", i));
if (count < minCount) {
minCount = count;
- crnNo = 6;
+ crnNo = i;
}
}
@@ -202,13 +202,27 @@
}
StartupDto startupDto = new StartupDto();
- locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+
+// new EntityWrapper<LocMast>(new EntityWrapper<LocMast>()
+// .ge("row1", rowLastno.getsRow())
+// .le("row1", rowLastno.geteRow())
+// .eq("crn_no", crnNo)
+// .eq("loc_type1", locTypeDto.getLocType1())
+// .eq("loc_sts", "O")
+// .orderAsc(Arrays.asList("lev1", "row1", "bay1")))
+
+ Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>()
.ge("row1", rowLastno.getsRow())
.le("row1", rowLastno.geteRow())
- .eq("crn_no", crnNo)
.eq("loc_type1", locTypeDto.getLocType1())
.eq("loc_sts", "O")
- .orderAsc(Arrays.asList("lev1", "row1", "bay1")));
+ .orderAsc(Arrays.asList( "row1", "lev1", "bay1"));
+
+ if (locTypeDto.getLocType1() != 2) {
+ wrapper.eq("crn_no", crnNo);
+ }
+
+ locMast = locMastService.selectOne(wrapper);
// int crnCountO = wrkMastService.selectCount(new
// EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type", 100));
// 鐢熸垚宸ヤ綔鍙�
--
Gitblit v1.9.1