From bfa307fb0fe82ce6f5a2ea354fcee43d9d1f0fa1 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 13 四月 2026 09:53:06 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/common/service/CommonService.java | 92 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 91 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 05a3fa9..e41cfae 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -216,7 +216,97 @@
.le("row1", rowLastno.geteRow())
.eq("loc_type1", locTypeDto.getLocType1())
.eq("loc_sts", "O")
- .orderAsc(Arrays.asList("lev1", "row1", "bay1"));
+ .orderAsc(Arrays.asList( "row1", "bay1","lev1"));
+
+ 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));
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo;
+ if (whsType == 2) {
+ // 鐢熸垚宸ヤ綔鍙�
+ workNo = getWorkNo(3);
+ } else {
+ // 鐢熸垚宸ヤ綔鍙�
+ workNo = getWorkNo(0);
+ }
+ // 杩斿洖dto
+ startupDto.setWorkNo(workNo);
+ startupDto.setCrnNo(locMast.getCrnNo());
+ startupDto.setSourceStaNo(sourceStaNo);
+ startupDto.setLocNo(locMast.getLocNo());
+ return startupDto;
+ }
+
+
+ public StartupDto getChecklocNoRun(Integer whsType, Integer staDescId, Integer sourceStaNo,
+ FindLocNoAttributeVo findLocNoAttributeVo, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
+ staDescId = 1;
+ // 鍒濆鍖栧弬鏁�
+ int crnNo = 0; // 鍫嗗灈鏈哄彿
+ int nearRow = 0; // 鏈�娴呭簱浣嶆帓
+ LocMast locMast = null; // 鐩爣搴撲綅
+
+ RowLastno rowLastno = rowLastnoService.selectById(whsType);
+ if (Cools.isEmpty(rowLastno)) {
+ throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===>搴撲綅瑙勫垯鏈煡");
+ }
+
+ int minCount = Integer.MAX_VALUE;
+ if (whsType == 2) {
+ if (locTypeDto.getLocType1() == 2) {
+ // 鍧囪 鍒嗗竷鍫嗗灈鏈�
+ for (int i = 4; i <= 5; i++) {
+ int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", i));
+ if (count < minCount) {
+ minCount = count;
+ crnNo = i;
+ }
+ }
+ } else {
+ for (int i = 4; i <= 6; i++) {
+ int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", i));
+ if (count < minCount) {
+ minCount = count;
+ crnNo = i;
+ }
+ }
+
+ if (crnNo == 6) {
+ return getDoubleLocNoRun(3, 1, sourceStaNo, findLocNoAttributeVo, null, locTypeDto, times);
+ }
+ }
+ } else {
+ // 鍧囪 鍒嗗竷鍫嗗灈鏈�
+ for (int i = rowLastno.getsCrnNo(); i <= rowLastno.geteCrnNo(); i++) {
+ int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", i));
+ if (count < minCount) {
+ minCount = count;
+ crnNo = i;
+ }
+ }
+ }
+
+ StartupDto startupDto = new StartupDto();
+
+// 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("loc_type1", locTypeDto.getLocType1())
+ .eq("loc_sts", "O")
+ .orderAsc(Arrays.asList( "row1", "bay1","lev1"));
if (locTypeDto.getLocType1() != 2) {
wrapper.eq("crn_no", crnNo);
--
Gitblit v1.9.1