From 8ce4dcbd701b40165b0dbf365f667932cf2a8916 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 06 三月 2026 08:21:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 119 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 64 insertions(+), 55 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 8b161f9..7b507a6 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -130,14 +130,13 @@
RowLastno rowLastno = rowLastnoService.selectById(whsType);
RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(rowLastno.getTypeId());
/**
- * 搴撳瀷 1: 鏍囧噯鍫嗗灈鏈哄簱 2: 骞冲簱 3: 绌挎鏉� 4: 鍥涘悜杞� 5: AGV 0: 鏈煡
+ * 搴撳瀷 1: 鏍囧噯鍫嗗灈鏈哄簱 2: 鍚屽贩閬撴壘搴撲綅 3: 绌挎鏉� 4: 鍥涘悜杞� 5: AGV 0: 鏈煡
*/
switch (rowLastnoType.getType()) {
case 1:
return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);
case 2:
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
- break;
+ return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);
case 3:
log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
break;
@@ -154,6 +153,33 @@
log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
}
return null;
+ }
+
+ /**
+ * 妫�绱㈠簱浣嶅彿
+ */
+ @Transactional
+ public StartupDto getLocNo1(Integer crnNo) {
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("crn_no", crnNo)
+ .eq("loc_sts","O")
+ .eq("whs_type",1)
+ .orderBy("lev1,bay1"));
+ if (Cools.isEmpty(locMast)) {
+ return null;
+ }
+ StartupDto startupDto = new StartupDto();
+
+ String locNo = locMast.getLocNo();
+
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = getWorkNo(0);
+ // 杩斿洖dto
+ startupDto.setWorkNo(workNo);
+ startupDto.setCrnNo(crnNo);
+// startupDto.setSourceStaNo(sourceStaNo);
+ startupDto.setLocNo(locNo);
+ return startupDto;
}
/**
@@ -217,7 +243,7 @@
.eq("loc_sts", "O")
.eq("frozen", 0)
.eq("deleted", 0)
- .eq("whs_type", rowLastnoType.getType().longValue()));
+ .eq("loc_type1",locTypeDto.getLocType1()));
int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type", 100));
if (locMasts.size() - crnCountO <= 2) {
log.error(crnNo + "鍙峰爢鍨涙満娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
@@ -259,7 +285,7 @@
.eq("row1", nearRow)
.eq("frozen", 0).eq("deleted", 0)
.eq("loc_sts", "O")
- .eq("whs_type", rowLastnoType.getType().longValue()));
+ .eq("loc_type1", locTypeDto.getLocType1()));
for (LocMast locMast1 : locMasts) {
//鑾峰彇宸烽亾
// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
@@ -317,7 +343,7 @@
if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("loc_sts", "D").eq("frozen", 0).eq("deleted", 0)
- .ge("row1", sRow).le("row1", eRow).eq("whs_type", rowLastnoType.getType().longValue()));
+ .ge("row1", sRow).le("row1", eRow).eq("loc_type1", locTypeDto.getLocType1()));
if (!locMasts.isEmpty()) {
for (LocMast loc : locMasts) {
if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
@@ -351,7 +377,7 @@
.eq("crn_no", crnNo);
staDesc = staDescService.selectOne(wrapper);
if (Cools.isEmpty(staDesc)) {
- log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+ log.error("鍏ュ簱鍏ュ緞涓嶅瓨鍦紝type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
crnNo = 0;
} else {
@@ -374,65 +400,48 @@
// 1.鎸夎鍒欐煡鎵惧簱浣�
if (Cools.isEmpty(locMast) && crnNo != 0) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("row1", nearRow)
- .eq("frozen", 0).eq("deleted", 0)
- .eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
- .orderBy("lev1", true).orderBy("bay1", true));
- for (LocMast locMast1 : locMasts) {
- if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
- continue;
- }
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
- String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
- LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", shallowLoc).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
- if (!Cools.isEmpty(locMast2)) {
- locMast = locMast2;
- break;
- }
- } else {
- if (!Cools.isEmpty(locMast1)) {
- locMast = locMast1;
- break;
- }
- }
- }
-
- if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("crn_no", crnNo).eq("whs_type", rowLastnoType.getType().longValue()).orderBy("lev1").orderBy("bay1"));
+ if (!locMasts.isEmpty()) {
for (LocMast locMast1 : locMasts) {
- if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
- continue;
- }
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
- String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
- LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", shallowLoc).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
- if (!Cools.isEmpty(locMast2)) {
- locMast = locMast2;
- break;
- } else {
- locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", shallowLoc).eq("loc_sts", "F").eq("whs_type", rowLastnoType.getType().longValue()));
- if (!Cools.isEmpty(locMast2)) {
- locMast = locMast1;
+ if (basCrnpService.checkSiteError(crnNo, true)) {
+ //鍒ゆ柇鏄惁涓烘祬搴撲綅锛屾祬搴撲綅鍒ゆ柇娣卞簱浣嶆槸鍚︽湁璐э紝鏃犺揣鐨勪紭鍏堟斁鍒版繁搴撲綅涓�
+ Integer row1 = locMast1.getRow1();
+ Boolean boo=false;
+ if(locMast1.getRow1()==2){
+ row1 = 1;
+ boo=true;
+ }else if(locMast1.getRow1()==3){
+ row1 = 4;
+ boo=true;
+ }
+ if(boo){
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", row1)
+ .eq("bay1", locMast1.getBay1())
+ .eq("lev1", locMast1.getLev1())
+ .eq("loc_sts", "O"));
+ if(!Cools.isEmpty(locMast2)) {
+ locMast = locMast2;
break;
- } else {
- locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", shallowLoc).eq("loc_sts", "D").eq("whs_type", rowLastnoType.getType().longValue()));
- if (!Cools.isEmpty(locMast2)) {
+ }else {
+ LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", row1)
+ .eq("bay1", locMast1.getBay1())
+ .eq("lev1", locMast1.getLev1())
+ .eq("loc_sts", "F"));
+ if(!Cools.isEmpty(locMast3)) {
locMast = locMast1;
break;
}
}
- }
- } else {
- if (!Cools.isEmpty(locMast1)) {
+ }else {
locMast = locMast1;
break;
}
+
}
}
+
}
}
--
Gitblit v1.9.1