From 1bd6ba2af0bbc44bb12b2e8c1cd1529610c56ee9 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期一, 09 三月 2026 19:51:38 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/common/service/CommonService.java | 206 ++++++++++++++++++++++++++++-----------------------
1 files changed, 114 insertions(+), 92 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 45d8fbf..b5d3a0c 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -127,12 +127,13 @@
// /**
// * 搴撳瀷 1: 鏍囧噯鍫嗗灈鏈哄簱 2: 骞冲簱 3: 绌挎鏉� 4: 鍥涘悜杞� 5: AGV 0: 鏈煡
// */
- if (rowLastnoType.getType() == 3) {
- return getDoubleLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo,
- 4, locTypeDto, 0);
- } else {
- return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);
- }
+// if (rowLastnoType.getType() == 3) {
+// return getDoubleLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo,
+// 4, locTypeDto, 0);
+// } else {
+//
+// }
+ return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);
} catch (Exception e) {
log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
}
@@ -152,7 +153,7 @@
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
@Transactional
- public StartupDto getLocNoRun(Integer staDescId, Integer whsType, Integer sourceStaNo,
+ public StartupDto getLocNoRun(Integer whsType, Integer staDescId, Integer sourceStaNo,
FindLocNoAttributeVo findLocNoAttributeVo, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
staDescId = 1;
// 鍒濆鍖栧弬鏁�
@@ -165,28 +166,60 @@
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===>搴撲綅瑙勫垯鏈煡");
}
- // 鍧囪 鍒嗗竷鍫嗗灈鏈�
int minCount = Integer.MAX_VALUE;
- 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;
+ 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 = 6;
+ }
+ }
+
+ 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();
locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
.ge("row1", rowLastno.getsRow())
.le("row1", rowLastno.geteRow())
.eq("crn_no", crnNo)
-// .eq("move_status", 0)
+ .eq("loc_type1", locTypeDto.getLocType1())
.eq("loc_sts", "O")
.orderAsc(Arrays.asList("lev1", "row1", "bay1")));
// int crnCountO = wrkMastService.selectCount(new
// EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type", 100));
-
// 鐢熸垚宸ヤ綔鍙�
- int workNo = getWorkNo(0);
+ int workNo;
+ if (whsType == 2) {
+ // 鐢熸垚宸ヤ綔鍙�
+ workNo = getWorkNo(3);
+ } else {
+ // 鐢熸垚宸ヤ綔鍙�
+ workNo = getWorkNo(0);
+ }
// 杩斿洖dto
startupDto.setWorkNo(workNo);
startupDto.setCrnNo(locMast.getCrnNo());
@@ -210,10 +243,10 @@
*/
public StartupDto getDoubleLocNoRun(Integer whsType, Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
// 鍒濆鍖栧弬鏁�
- int crnNo = 0; //鍫嗗灈鏈哄彿
- int nearRow = 0; //鏈�娴呭簱浣嶆帓
- int curRow = 0; //鏈�娣卞簱浣嶆帓
- int rowCount = 0; //杞杞
+ int crnNo = 6; //鍫嗗灈鏈哄彿
+ int nearRow = 12; //娴呭簱浣嶆帓 (涓�11瀵瑰簲)
+ int curRow = 11; //娣卞簱浣嶆帓
+ int rowCount = 2; //杞杞 (12/11 瀵� 鍜� 13/14 瀵�)
LocMast locMast = null; // 鐩爣搴撲綅
StartupDto startupDto = new StartupDto();
@@ -229,6 +262,15 @@
int eRow = rowLastno.geteRow();
int crnNumber = rowLastno.getCrnQty();
+ // 鏍规嵁杞娆℃暟鍒囨崲鎺� (浼樺厛娣卞簱浣嶆帓 11, 14)
+ if (times % 2 == 0) {
+ nearRow = 12;
+ curRow = 11;
+ } else {
+ nearRow = 13;
+ curRow = 14;
+ }
+
// ===============>>>> 寮�濮嬫墽琛�
curRow = rowLastno.getCurrentRow();
@@ -242,28 +284,28 @@
}
}
- //姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
- for (int i = times; i < crnNumber * 2; i++) {
- int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
- curRow = locNecessaryParameters[1];
- crnNo = locNecessaryParameters[2];
- if (basCrnpService.checkSiteError(crnNo, true)) {
- rowCount = locNecessaryParameters[0];
- nearRow = locNecessaryParameters[3];
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
- 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);
- nearRow = 0;
- times++;
- continue;
- }
- break;
- } else {
- times++;
- }
- }
+// //姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
+// for (int i = times; i < crnNumber * 2; i++) {
+// int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
+// curRow = locNecessaryParameters[1];
+// crnNo = locNecessaryParameters[2];
+// if (basCrnpService.checkSiteError(crnNo, true)) {
+// rowCount = locNecessaryParameters[0];
+// nearRow = locNecessaryParameters[3];
+// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+// .eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
+// 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);
+// nearRow = 0;
+// times++;
+// continue;
+// }
+// break;
+// } else {
+// times++;
+// }
+// }
if (nearRow == 0) {
throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
}
@@ -290,7 +332,7 @@
if (signRule1) {
if (nearRow != curRow) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
+ .eq("row1", nearRow).eq("loc_sts", "O").eq("crn_no", crnNo));
for (LocMast locMast1 : locMasts) {
//鑾峰彇宸烽亾
// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
@@ -405,63 +447,43 @@
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
// 1.鎸夎鍒欐煡鎵惧簱浣�
if (Cools.isEmpty(locMast) && crnNo != 0) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("row1", nearRow)
- .eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
+ // 棣栧厛灏濊瘯鏌ユ壘瀵瑰簲鐨勬繁搴撲綅鎺� (11 鎴� 14)
+ List<LocMast> deepLocMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("row1", curRow)
+ .eq("loc_sts", "O").eq("crn_no", crnNo)
.orderBy("lev1", true).orderBy("bay1", true));
- for (LocMast locMast1 : locMasts) {
- if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+
+ for (LocMast deepLoc : deepLocMasts) {
+ if (!VersionUtils.locMoveCheckLocTypeComplete(deepLoc, 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;
- }
+ // 鑾峰彇瀵瑰簲鐨勬祬搴撲綅锛岀‘淇濇祬搴撲綅涓嶆尅浣忓叆搴�
+ String shallowLocNo = Utils.getShallowLoc(slaveProperties, deepLoc.getLocNo());
+ LocMast shallowLoc = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no", shallowLocNo).eq("crn_no", crnNo));
+
+ // 鍙湁娴呭簱浣嶄负绌猴紝鎴栬�呮祬搴撲綅宸茬粡鏈夎揣锛堜笖涓嶆槸鎸′綇鍏ュ簱鐨勭姸鎬侊紝杩欓噷绠�鍗曞垽鏂负绌哄嵆鍙斁鍏ユ繁搴撲綅锛�
+ // 瀹為檯涓婏紝鍙屾繁鍏ュ簱鏃讹紝濡傛灉娣卞簱浣嶄负绌轰笖娴呭簱浣嶄负绌猴紝搴斾紭鍏堝叆娣卞簱浣�
+ if (!Cools.isEmpty(shallowLoc) && (shallowLoc.getLocSts().equals("O") || shallowLoc.getLocSts().equals("F"))) {
+ locMast = deepLoc;
+ break;
}
}
- if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
- for (LocMast locMast1 : locMasts) {
- if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+ // 濡傛灉娌℃壘鍒版繁搴撲綅锛屽啀灏濊瘯鎵炬祬搴撲綅鎺� (12 鎴� 13)
+ if (Cools.isEmpty(locMast)) {
+ List<LocMast> shallowLocMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("row1", nearRow)
+ .eq("loc_sts", "O").eq("crn_no", crnNo)
+ .orderBy("lev1", true).orderBy("bay1", true));
+
+ for (LocMast shallowLoc : shallowLocMasts) {
+ if (!VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, 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;
- 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)) {
- locMast = locMast1;
- break;
- }
- }
- }
- } else {
- if (!Cools.isEmpty(locMast1)) {
- locMast = locMast1;
- break;
- }
- }
+ // 娴呭簱浣嶅叆搴撶殑鍓嶆彁鏄繁搴撲綅宸茬粡婊′簡锛屾垨鑰呮湁鐗规畩瑕佹眰銆傝繖閲岀洿鎺ュ厑璁稿叆娴呭簱浣嶃��
+ locMast = shallowLoc;
+ break;
}
}
}
--
Gitblit v1.9.1