From c47395fe29493062a3f0bc2cf1d02a2946b20b88 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期日, 04 一月 2026 08:41:35 +0800
Subject: [PATCH] 修改了判断空库位，查询语句的bug,和摄像头的连接
---
src/main/java/com/zy/common/service/CommonService.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 51 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 e659ad1..a5bd580 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -156,6 +156,57 @@
return null;
}
+ @Transactional
+ public StartupDto getLocNoNew(Integer staDescId,Integer sourceStaNo, LocTypeDto locTypeDto) {
+// List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts", 3).eq("crn_err", 0).eq("in_enable", "Y"));
+// if(basCrnps.size() == 0) {
+// log.error("鍏ュ簱璇锋眰搴撲綅澶辫触锛氬爢鍨涙満鎶ヨ/鏃犲彲鐢�/鏃犲彲鍏�");
+// throw new CoolException("鍏ュ簱璇锋眰搴撲綅澶辫触锛氬爢鍨涙満鎶ヨ/鏃犲彲鐢�/鏃犲彲鍏�");
+// }
+
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("type_no", staDescId).eq("stn_no", sourceStaNo).eq("crn_no", 1));
+ if (staDesc == null) {
+ log.error("鍏ュ簱璇锋眰搴撲綅澶辫触锛氳矾寰勪笉瀛樺湪" + staDescId +"," + sourceStaNo);
+ throw new CoolException("鍏ュ簱璇锋眰搴撲綅澶辫触锛氳矾寰勪笉瀛樺湪" + staDescId +"," + sourceStaNo);
+ }
+
+ 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 && locTypeDto.getLocType1() ==1) {
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "O")
+ .eq("loc_type1", locTypeDto.getLocType1() + 1)
+ .eq("loc_type2", locTypeDto.getLocType2())
+ .orderBy("lev1")
+ .orderBy("bay1")
+ .orderBy("row1"));
+ if (locMast1 == null){
+ log.error("鍏ュ簱璇锋眰搴撲綅澶辫触锛氭棤搴撲綅" + locTypeDto.getLocType1());
+ throw new CoolException("鍏ュ簱璇锋眰搴撲綅澶辫触锛氭棤搴撲綅" + locTypeDto.getLocType1());
+ }else {
+ locMast =locMast1;
+ }
+
+ }else if (locMast ==null){
+ log.error("鍏ュ簱璇锋眰搴撲綅澶辫触锛氭棤搴撲綅" + locTypeDto.getLocType1());
+ throw new CoolException("鍏ュ簱璇锋眰搴撲綅澶辫触锛氭棤搴撲綅" + locTypeDto.getLocType1());
+ }
+
+ StartupDto startupDto = new StartupDto();
+ startupDto.setWorkNo(getWorkNo(0));
+ startupDto.setCrnNo(locMast.getCrnNo());
+ startupDto.setSourceStaNo(staDesc.getCrnStn());
+ startupDto.setStaNo(staDesc.getStnNo());
+ startupDto.setLocNo(locMast.getLocNo());
+
+ return startupDto;
+ }
+
/**
* 妫�绱㈠簱浣嶅彿
*
--
Gitblit v1.9.1