From 78067a1c03707766f3d6561c22e165af68ad36b9 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 18 十二月 2025 14:38:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 9733d3d..1c4bc4f 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
@@ -212,20 +213,6 @@
StartupDto startupDto = new StartupDto();
- // 鑾峰彇鐩爣绔�
-// Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>().eq("type_no", staDescId).eq("stn_no", sourceStaNo).eq("crn_no", locMast.getCrnNo());
-// StaDesc staDesc = staDescService.selectOne(wrapper);
-// if (Cools.isEmpty(staDesc)) {
-// log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
-// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
-// } else {
-// BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
-// if (!staNo.getAutoing().equals("Y")) {
-// log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
-// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
-// }
-// startupDto.setStaNo(staNo.getDevNo());
-// }
String locNo = locMast.getLocNo();
// 鐢熸垚宸ヤ綔鍙�
int workNo = getWorkNo(0);
@@ -513,4 +500,23 @@
}
}
+ //绉诲簱浠诲姟鑾峰彇绌哄簱浣�
+ public String getLocTransferLocNo(String locNo){
+ List<Integer> locGroupDesc = Utils.getLocGroupDesc(slaveProperties, locNo);
+ //鍏堟壘娣卞簱浣�
+ List<LocMast> locMastList = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").in("row1", locGroupDesc));
+ if (locMastList.isEmpty()) {
+ //鎼滅储娴呭簱浣�
+ List<Integer> locGroupAsc = Utils.getLocGroupAsc(slaveProperties, locNo);
+ locMastList = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").in("row1", locGroupAsc));
+ }
+
+ if (locMastList.isEmpty()) {
+ return null;
+ }
+
+ LocMast locMast = locMastList.get(0);
+ return locMast.getLocNo();
+ }
+
}
--
Gitblit v1.9.1