From bab6283f5c0b5da44b7a342f9daef35473a13ab7 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 16 四月 2026 14:54:57 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/common/service/CommonService.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 8b8f807..343e4b1 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -12,6 +12,7 @@
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
import com.zy.common.properties.SlaveProperties;
+import com.zy.common.web.param.ChangeLocParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -836,4 +837,31 @@
}
}
+ public StartupDto changeLocNo(ChangeLocParam param) {
+ StartupDto startupDto = null;
+ LocMast targetLocNo = null;
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getLocNo()));
+ if (!locMast.getLocSts().equals("F")){
+ return startupDto;
+ }
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().in("row1", 3,4,5,6)
+ .eq("loc_sts", "O")
+ .orderBy("lev1", true).orderBy("bay1", false));
+ for (LocMast loc : locMasts) {
+ String deepLoc = Utils.getDeepLoc(slaveProperties, loc.getLocNo());
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", deepLoc).eq("loc_sts", "O"));
+ if (!Cools.isEmpty(locMast1)) {
+ targetLocNo = locMast1;
+ break;
+ }
+ targetLocNo = loc;
+ break;
+ }
+ int workNo = getWorkNo(3);
+ startupDto.setWorkNo(workNo);
+ startupDto.setLocNo(targetLocNo.getLocNo());
+ startupDto.setCrnNo(targetLocNo.getCrnNo());
+ return startupDto;
+
+ }
}
--
Gitblit v1.9.1