From 053bd1cc2693589840bfad523c954960db654f54 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期日, 01 二月 2026 17:24:19 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/common/service/CommonService.java | 353 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 208 insertions(+), 145 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 8f8280f..73a65f0 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -3,17 +3,14 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.core.common.Arith;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
-import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocTypeDto;
-import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
import com.zy.common.properties.SlaveProperties;
import lombok.extern.slf4j.Slf4j;
@@ -21,10 +18,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -99,7 +92,7 @@
return workNo;
}
- //鎷嗙洏鏈哄绌烘澘鎵爜锛岄┍鍔ㄦ墭鐩樺悜鐮佸灈浣嶏紝涓嶅叆搴�
+ // 鎷嗙洏鏈哄绌烘澘鎵爜锛岄┍鍔ㄦ墭鐩樺悜鐮佸灈浣嶏紝涓嶅叆搴�
@Transactional
public StartupDto getScanBarcodeEmptyBoard() {
StartupDto startupDto = new StartupDto();
@@ -120,36 +113,43 @@
*
* @param staDescId 璺緞ID
* @param sourceStaNo 婧愮珯
+ * @param whsType
* @param findLocNoAttributeVo 灞炴��
* @param locTypeDto 绫诲瀷
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
@Transactional
- public StartupDto getLocNo(Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto) {
+ public StartupDto getLocNo(Integer staDescId, Integer sourceStaNo, Integer whsType, FindLocNoAttributeVo findLocNoAttributeVo,
+ LocTypeDto locTypeDto) {
try {
- Integer whsType = Utils.GetWhsType(sourceStaNo);
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
- RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(rowLastno.getTypeId());
+// Integer whsType = Utils.GetWhsType(sourceStaNo);
+// 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;
- case 3:
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
- break;
- case 4:
- return getLocNoRun4(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 4, locTypeDto, 0);
- case 5:
- return getLocNoRun5(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);
- default:
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
- break;
- }
+ return getLocNoRun(staDescId, whsType, sourceStaNo, findLocNoAttributeVo, 0, locTypeDto, 0);
+
+ // switch (rowLastnoType.getType()) {
+ // case 1:
+ // return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, 0,
+ // locTypeDto, 0);
+ //// case 2:
+ //// log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
+ //// break;
+ //// case 3:
+ //// log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
+ //// break;
+ //// case 4:
+ //// return getLocNoRun4(whsType, staDescId, sourceStaNo, findLocNoAttributeVo,
+ // 4, locTypeDto, 0);
+ //// case 5:
+ //// return getLocNoRun5(whsType, staDescId, sourceStaNo, findLocNoAttributeVo,
+ // 0, locTypeDto, 0);
+ //// default:
+ //// log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
+ //// break;
+ // }
} catch (Exception e) {
log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
@@ -170,24 +170,37 @@
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
@Transactional
- public StartupDto getLocNoRun(Integer whsType, Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
+ public StartupDto getLocNoRun( Integer staDescId, Integer whsType, Integer sourceStaNo,
+ FindLocNoAttributeVo findLocNoAttributeVo, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
staDescId = 1;
// 鍒濆鍖栧弬鏁�
- int crnNo = 0; //鍫嗗灈鏈哄彿
- int nearRow = 0; //鏈�娴呭簱浣嶆帓
- LocMast locMast = null; // 鐩爣搴撲綅
+ int crnNo = 0; // 鍫嗗灈鏈哄彿
+ int nearRow = 0; // 鏈�娴呭簱浣嶆帓
+ LocMast locMast = null; // 鐩爣搴撲綅
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
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;
+ }
+ }
StartupDto startupDto = new StartupDto();
- locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
- .ne("row1", rowLastno.getsRow())
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .ge("row1", rowLastno.getsRow())
.le("row1", rowLastno.geteRow())
+ .eq("crn_no", crnNo)
.eq("loc_sts", "O")
- .orderAsc(Arrays.asList("row1", "bay1", "lev1")));
-// int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type", 100));
+ .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);
@@ -199,14 +212,15 @@
return startupDto;
}
- public StartupDto getLocNoRun4(Integer whsType, Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
+ public StartupDto getLocNoRun4(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; //杞杞
- LocMast locMast = null; // 鐩爣搴撲綅
+ int crnNo = 0; // 鍫嗗灈鏈哄彿
+ int nearRow = 0; // 鏈�娴呭簱浣嶆帓
+ int curRow = 0; // 鏈�娣卞簱浣嶆帓
+ int rowCount = 0; // 杞杞
+ LocMast locMast = null; // 鐩爣搴撲綅
StartupDto startupDto = new StartupDto();
RowLastno rowLastno = rowLastnoService.selectById(whsType);
@@ -226,14 +240,14 @@
if (!Cools.isEmpty(moveCrnNo) && moveCrnNo != 0) {
crnNumber = moveCrnNo;
-// if (times==0){
-// curRow = moveCrnNo*4-1;
-// }else {
-// curRow = moveCrnNo*4-2;
-// }
+ // if (times==0){
+ // curRow = moveCrnNo*4-1;
+ // }else {
+ // curRow = moveCrnNo*4-2;
+ // }
}
- //姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
+ // 姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
for (int i = times; i < crnNumber * 2; i++) {
int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
rowCount = locNecessaryParameters[0];
@@ -254,28 +268,28 @@
throw new CoolException("鏃犲彲鐢ㄥ簱浣�");
}
-
// 鐩镐技宸ヤ綔妗ｆ --- 鍚屽ぉ鍚岃鏍肩墿鏂�
- if (!Cools.isEmpty(findLocNoAttributeVo.getMatnr()) && (staDescId == 1 || staDescId == 11 || staDescId == 111)) {
- //鏌ヨ鐩镐技宸ヤ綔妗ｆ
+ if (!Cools.isEmpty(findLocNoAttributeVo.getMatnr())
+ && (staDescId == 1 || staDescId == 11 || staDescId == 111)) {
+ // 鏌ヨ鐩镐技宸ヤ綔妗ｆ
List<WrkMast> wrkMasts = wrkMastService.selectWrkMastWrkDetl(staDescId, findLocNoAttributeVo, crnNo);
- int nearbay = 0; //鐩镐技宸ヤ綔妗ｆ 鐩爣搴撲綅鍒�
- int nearlev = 0; //鐩镐技宸ヤ綔妗ｆ 鐩爣搴撲綅灞�
+ int nearbay = 0; // 鐩镐技宸ヤ綔妗ｆ 鐩爣搴撲綅鍒�
+ int nearlev = 0; // 鐩镐技宸ヤ綔妗ｆ 鐩爣搴撲綅灞�
for (WrkMast wrkMast : wrkMasts) {
- int curRowW = curRow; //鐩镐技宸ヤ綔妗ｆ 鏈�娣卞簱浣嶆帓
- int nearRowW = nearRow; //鐩镐技宸ヤ綔妗ｆ 鏈�娴呭簱浣嶆帓
+ int curRowW = curRow; // 鐩镐技宸ヤ綔妗ｆ 鏈�娣卞簱浣嶆帓
+ int nearRowW = nearRow; // 鐩镐技宸ヤ綔妗ｆ 鏈�娴呭簱浣嶆帓
if (Cools.isEmpty(wrkMast.getLocNo())) {
continue;
}
- //鐩爣鎺掍负鏈�澶栧眰鎺�
+ // 鐩爣鎺掍负鏈�澶栧眰鎺�
if (Utils.getRow(wrkMast.getLocNo()) == nearRow) {
continue;
}
- //璧峰绔欎笉涓�鑷�
+ // 璧峰绔欎笉涓�鑷�
if (!wrkMast.getSourceStaNo().equals(sourceStaNo)) {
continue;
}
- //鐩稿悓鍒椼�佸眰杩囨护
+ // 鐩稿悓鍒椼�佸眰杩囨护
if (Utils.getBay(wrkMast.getLocNo()) == nearbay && Utils.getLev(wrkMast.getLocNo()) == nearlev) {
continue;
} else {
@@ -283,12 +297,16 @@
nearlev = Utils.getLev(wrkMast.getLocNo());
}
- //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撳苟鎺掑簭
-// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow);
+ // 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撳苟鎺掑簭
+ // List<String> groupOutsideLocCrn =
+ // Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow);
LocMast locMastGro = locMastService.selectById(wrkMast.getLocNo());
for (int i = 0; i < crnNumber * 2; i++) {
- if (!(Utils.getRow(locMastGro.getLocNo()) > nearRowW && Utils.getRow(locMastGro.getLocNo()) <= curRowW) && !(Utils.getRow(locMastGro.getLocNo()) < nearRowW && Utils.getRow(locMastGro.getLocNo()) >= curRowW)) {
+ if (!(Utils.getRow(locMastGro.getLocNo()) > nearRowW
+ && Utils.getRow(locMastGro.getLocNo()) <= curRowW)
+ && !(Utils.getRow(locMastGro.getLocNo()) < nearRowW
+ && Utils.getRow(locMastGro.getLocNo()) >= curRowW)) {
int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRowW, crnNumber);
curRowW = locNecessaryParameters[1];
nearRowW = locNecessaryParameters[3];
@@ -297,14 +315,17 @@
}
}
- //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
- LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW, nearRowW, locMastGro, rowLastnoType.getType().longValue());
+ // 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+ LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW, nearRowW, locMastGro,
+ rowLastnoType.getType().longValue());
- //鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣嶅瓨鍦�&&闈炴渶澶栦晶搴撲綅&&鍏ュ簱鐘舵��
- if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo()) != nearRowW && (locMast2.getLocSts().equals("S") || locMast2.getLocSts().equals("Q"))) {
- //鑾峰彇搴撳瓨鏄庣粏
- WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
- //鍒ゆ柇鍚岃鏍肩墿鏂�
+ // 鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣嶅瓨鍦�&&闈炴渶澶栦晶搴撲綅&&鍏ュ簱鐘舵��
+ if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo()) != nearRowW
+ && (locMast2.getLocSts().equals("S") || locMast2.getLocSts().equals("Q"))) {
+ // 鑾峰彇搴撳瓨鏄庣粏
+ WrkDetl wrkDetl = wrkDetlService
+ .selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ // 鍒ゆ柇鍚岃鏍肩墿鏂�
if (!Cools.isEmpty(wrkDetl) && findLocNoAttributeVo.beSimilar(wrkDetl)) {
int row2 = 0;
if (Utils.getRow(locMast2.getLocNo()) > nearRowW) {
@@ -313,7 +334,8 @@
row2 = Utils.getRow(locMast2.getLocNo()) + 1;
}
String targetLocNo = zerofill(String.valueOf(row2), 2) + locMast2.getLocNo().substring(2);
- locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", targetLocNo).eq("loc_sts", "O"));
+ locMast = locMastService
+ .selectOne(new EntityWrapper<LocMast>().eq("loc_no", targetLocNo).eq("loc_sts", "O"));
if (Cools.isEmpty(locMast)) {
continue;
}
@@ -326,19 +348,20 @@
// 鐩镐技宸ヤ綔妗� --- 绌烘墭
if (Cools.isEmpty(locMast) && staDescId == 10) {
- List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("io_type", 10).eq("crn_no", crnNo).eq("whs_type", rowLastnoType.getType().longValue()));
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("io_type", 10)
+ .eq("crn_no", crnNo).eq("whs_type", rowLastnoType.getType().longValue()));
int nearbay = 0;
int nearlev = 0;
for (WrkMast wrkMast : wrkMasts) {
- int curRowW = curRow; //鐩镐技宸ヤ綔妗ｆ 鏈�娣卞簱浣嶆帓
- int nearRowW = nearRow; //鐩镐技宸ヤ綔妗ｆ 鏈�娴呭簱浣嶆帓
+ int curRowW = curRow; // 鐩镐技宸ヤ綔妗ｆ 鏈�娣卞簱浣嶆帓
+ int nearRowW = nearRow; // 鐩镐技宸ヤ綔妗ｆ 鏈�娴呭簱浣嶆帓
if (Cools.isEmpty(wrkMast.getLocNo())) {
continue;
}
if (Utils.getRow(wrkMast.getLocNo()) == nearRow) {
continue;
}
- //璧峰绔欎笉涓�鑷�
+ // 璧峰绔欎笉涓�鑷�
if (!wrkMast.getSourceStaNo().equals(sourceStaNo)) {
continue;
}
@@ -348,11 +371,15 @@
nearbay = Utils.getBay(wrkMast.getLocNo());
nearlev = Utils.getLev(wrkMast.getLocNo());
}
-// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow);
+ // List<String> groupOutsideLocCrn =
+ // Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow);
LocMast locMastGro = locMastService.selectById(wrkMast.getLocNo());
for (int i = 0; i < crnNumber * 2; i++) {
- if (!(Utils.getRow(locMastGro.getLocNo()) > nearRowW && Utils.getRow(locMastGro.getLocNo()) <= curRowW) && !(Utils.getRow(locMastGro.getLocNo()) < nearRowW && Utils.getRow(locMastGro.getLocNo()) >= curRowW)) {
+ if (!(Utils.getRow(locMastGro.getLocNo()) > nearRowW
+ && Utils.getRow(locMastGro.getLocNo()) <= curRowW)
+ && !(Utils.getRow(locMastGro.getLocNo()) < nearRowW
+ && Utils.getRow(locMastGro.getLocNo()) >= curRowW)) {
int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRowW, crnNumber);
curRowW = locNecessaryParameters[1];
nearRowW = locNecessaryParameters[3];
@@ -361,9 +388,11 @@
}
}
- LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW, nearRowW, locMastGro, rowLastnoType.getType().longValue());
+ LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW, nearRowW, locMastGro,
+ rowLastnoType.getType().longValue());
- if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo()) != nearRowW && locMast2.getLocSts().equals("S")) {
+ if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo()) != nearRowW
+ && locMast2.getLocSts().equals("S")) {
int row2 = 0;
if (Utils.getRow(locMast2.getLocNo()) > nearRowW) {
row2 = Utils.getRow(locMast2.getLocNo()) - 1;
@@ -371,7 +400,8 @@
row2 = Utils.getRow(locMast2.getLocNo()) + 1;
}
String targetLocNo = zerofill(String.valueOf(row2), 2) + locMast2.getLocNo().substring(2);
- locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", targetLocNo).eq("loc_sts", "O"));
+ locMast = locMastService
+ .selectOne(new EntityWrapper<LocMast>().eq("loc_no", targetLocNo).eq("loc_sts", "O"));
if (Cools.isEmpty(locMast)) {
continue;
}
@@ -383,11 +413,10 @@
boolean signRule1 = false;
boolean signRule2 = false;
-
if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
// 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗�
if (!Cools.isEmpty(findLocNoAttributeVo.getMatnr()) && staDescId == 1) {
-// signRule1 = true;
+ // signRule1 = true;
}
// 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //浜掗�氱増
if (!Cools.isEmpty(findLocNoAttributeVo.getMatnr()) && staDescId == 1) {
@@ -404,15 +433,19 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
for (LocMast locMast1 : locMasts) {
- //鑾峰彇宸烽亾
-// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
- //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
- LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
+ // 鑾峰彇宸烽亾
+ // List<String> groupOutsideLocCrn =
+ // Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
+ // 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+ LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow, nearRow, locMast1,
+ rowLastnoType.getType().longValue());
if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("F")) {
- LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMastF.getLocNo()));
+ LocDetl locDetl = locDetlService
+ .selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMastF.getLocNo()));
if (!Cools.isEmpty(locDetl) && findLocNoAttributeVo.beSimilar(locDetl)) {
- //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
- locMast = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
+ // 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
+ locMast = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1,
+ rowLastnoType.getType().longValue());
break;
}
}
@@ -423,8 +456,8 @@
int nearbay = 0;
int nearlev = 0;
for (String locNo : locNos) {
- int curRowW = curRow; //鐩镐技宸ヤ綔妗ｆ 鏈�娣卞簱浣嶆帓
- int nearRowW = nearRow; //鐩镐技宸ヤ綔妗ｆ 鏈�娴呭簱浣嶆帓
+ int curRowW = curRow; // 鐩镐技宸ヤ綔妗ｆ 鏈�娣卞簱浣嶆帓
+ int nearRowW = nearRow; // 鐩镐技宸ヤ綔妗ｆ 鏈�娴呭簱浣嶆帓
if (Cools.isEmpty(locNo)) {
continue;
}
@@ -437,11 +470,15 @@
nearbay = Utils.getBay(locNo);
nearlev = Utils.getLev(locNo);
}
-// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow);
+ // List<String> groupOutsideLocCrn =
+ // Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow);
LocMast locMastGro = locMastService.selectById(locNo);
for (int i = 0; i < crnNumber * 2; i++) {
- if (!(Utils.getRow(locMastGro.getLocNo()) > nearRowW && Utils.getRow(locMastGro.getLocNo()) <= curRowW) && !(Utils.getRow(locMastGro.getLocNo()) < nearRowW && Utils.getRow(locMastGro.getLocNo()) >= curRowW)) {
+ if (!(Utils.getRow(locMastGro.getLocNo()) > nearRowW
+ && Utils.getRow(locMastGro.getLocNo()) <= curRowW)
+ && !(Utils.getRow(locMastGro.getLocNo()) < nearRowW
+ && Utils.getRow(locMastGro.getLocNo()) >= curRowW)) {
int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRowW, crnNumber);
curRowW = locNecessaryParameters[1];
nearRowW = locNecessaryParameters[3];
@@ -450,9 +487,11 @@
}
}
- LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW, nearRowW, locMastGro, rowLastnoType.getType().longValue());
+ LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW, nearRowW, locMastGro,
+ rowLastnoType.getType().longValue());
- if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo()) != nearRowW && locMast2.getLocSts().equals("S")) {
+ if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo()) != nearRowW
+ && locMast2.getLocSts().equals("S")) {
int row2 = 0;
if (Utils.getRow(locMast2.getLocNo()) > nearRowW) {
row2 = Utils.getRow(locMast2.getLocNo()) - 1;
@@ -460,7 +499,8 @@
row2 = Utils.getRow(locMast2.getLocNo()) + 1;
}
String targetLocNo = zerofill(String.valueOf(row2), 2) + locMast2.getLocNo().substring(2);
- locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", targetLocNo).eq("loc_sts", "O"));
+ locMast = locMastService
+ .selectOne(new EntityWrapper<LocMast>().eq("loc_no", targetLocNo).eq("loc_sts", "O"));
if (Cools.isEmpty(locMast)) {
continue;
}
@@ -469,47 +509,57 @@
}
}
-// // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //鍒嗙鐗�
-// if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
-// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
-// for (LocMast locMast1:locMasts){
-// //鑾峰彇宸烽亾
-//// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
-// //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
-// LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
-// if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("D")){
-// //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
-// locMast = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
-// break;
-// }
-// }
-// }
+ // // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //鍒嗙鐗�
+ // if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+ // List<LocMast> locMasts = locMastService.selectList(new
+ // EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+ // for (LocMast locMast1:locMasts){
+ // //鑾峰彇宸烽亾
+ //// List<String> groupOutsideLocCrn =
+ // Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
+ // //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+ // LocMast locMastF =
+ // locMastService.selectLocByLocStsPakInF(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
+ // if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("D")){
+ // //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+ // locMast =
+ // locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
+ // break;
+ // }
+ // }
+ // }
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //浜掗�氱増
if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
+ List<LocMast> locMasts = locMastService
+ .selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
int nearbay = 0;
int nearlev = 0;
for (LocMast locMastSign : locMasts) {
- int curRowW = curRow; //鐩镐技宸ヤ綔妗ｆ 鏈�娣卞簱浣嶆帓
- int nearRowW = nearRow; //鐩镐技宸ヤ綔妗ｆ 鏈�娴呭簱浣嶆帓
+ int curRowW = curRow; // 鐩镐技宸ヤ綔妗ｆ 鏈�娣卞簱浣嶆帓
+ int nearRowW = nearRow; // 鐩镐技宸ヤ綔妗ｆ 鏈�娴呭簱浣嶆帓
if (Cools.isEmpty(locMastSign.getLocNo())) {
continue;
}
if (Utils.getRow(locMastSign.getLocNo()) == nearRow) {
continue;
}
- if (Utils.getBay(locMastSign.getLocNo()) == nearbay && Utils.getLev(locMastSign.getLocNo()) == nearlev) {
+ if (Utils.getBay(locMastSign.getLocNo()) == nearbay
+ && Utils.getLev(locMastSign.getLocNo()) == nearlev) {
continue;
} else {
nearbay = Utils.getBay(locMastSign.getLocNo());
nearlev = Utils.getLev(locMastSign.getLocNo());
}
-// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow);
+ // List<String> groupOutsideLocCrn =
+ // Utils.getGroupOutLocCrn(curRow,nearRow,wrkMast.getLocNo(), curRow>nearRow);
LocMast locMastGro = locMastService.selectById(locMastSign.getLocNo());
for (int i = 0; i < crnNumber * 2; i++) {
- if (!(Utils.getRow(locMastGro.getLocNo()) > nearRowW && Utils.getRow(locMastGro.getLocNo()) <= curRowW) && !(Utils.getRow(locMastGro.getLocNo()) < nearRowW && Utils.getRow(locMastGro.getLocNo()) >= curRowW)) {
+ if (!(Utils.getRow(locMastGro.getLocNo()) > nearRowW
+ && Utils.getRow(locMastGro.getLocNo()) <= curRowW)
+ && !(Utils.getRow(locMastGro.getLocNo()) < nearRowW
+ && Utils.getRow(locMastGro.getLocNo()) >= curRowW)) {
int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRowW, crnNumber);
curRowW = locNecessaryParameters[1];
nearRowW = locNecessaryParameters[3];
@@ -518,9 +568,11 @@
}
}
- LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW, nearRowW, locMastGro, rowLastnoType.getType().longValue());
+ LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRowW, nearRowW, locMastGro,
+ rowLastnoType.getType().longValue());
- if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo()) != nearRowW && locMast2.getLocSts().equals("S")) {
+ if (!Cools.isEmpty(locMast2) && Utils.getRow(locMast2.getLocNo()) != nearRowW
+ && locMast2.getLocSts().equals("S")) {
int row2 = 0;
if (Utils.getRow(locMast2.getLocNo()) > nearRowW) {
row2 = Utils.getRow(locMast2.getLocNo()) - 1;
@@ -528,7 +580,8 @@
row2 = Utils.getRow(locMast2.getLocNo()) + 1;
}
String targetLocNo = zerofill(String.valueOf(row2), 2) + locMast2.getLocNo().substring(2);
- locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", targetLocNo).eq("loc_sts", "O"));
+ locMast = locMastService
+ .selectOne(new EntityWrapper<LocMast>().eq("loc_no", targetLocNo).eq("loc_sts", "O"));
if (Cools.isEmpty(locMast)) {
continue;
}
@@ -574,14 +627,15 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("row1", nearRow)
.eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
- .orderBy("lev1", true).orderBy("bay1", true));//鏈�娴呭簱浣�
+ .orderBy("lev1", true).orderBy("bay1", true));// 鏈�娴呭簱浣�
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
- //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
- LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
+ // 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
+ LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1,
+ rowLastnoType.getType().longValue());
if (!Cools.isEmpty(locMast2) && locMast2.getBay1() == curRow) {
locMast = locMast2;
break;
@@ -589,27 +643,32 @@
}
}
- //鏈壘鍒� 鍏佽娣锋枡
+ // 鏈壘鍒� 鍏佽娣锋枡
if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
- //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撳苟鎺掑簭
-// List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
+ // 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撳苟鎺掑簭
+ // List<String> groupOutsideLocCrn =
+ // Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
- //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
- LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
+ // 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+ LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRow, nearRow, locMast1,
+ rowLastnoType.getType().longValue());
if (Cools.isEmpty(locMast2)) {
- LocMast locMast3 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
+ LocMast locMast3 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1,
+ rowLastnoType.getType().longValue());
if (!Cools.isEmpty(locMast3)) {
locMast = locMast3;
break;
}
} else {
- if ((locMast2.getLocSts().equals("F") && staDescId == 1) || (locMast2.getLocSts().equals("D") && staDescId == 10)) {
- LocMast locMast3 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
+ if ((locMast2.getLocSts().equals("F") && staDescId == 1)
+ || (locMast2.getLocSts().equals("D") && staDescId == 10)) {
+ LocMast locMast3 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1,
+ rowLastnoType.getType().longValue());
if (!Cools.isEmpty(locMast3)) {
locMast = locMast3;
break;
@@ -626,7 +685,8 @@
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
if (times < rowCount * 2) {
times = times + 1;
- return getLocNoRun4(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, locTypeDto, times);
+ return getLocNoRun4(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, locTypeDto,
+ times);
}
log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
throw new CoolException("娌℃湁绌哄簱浣�");
@@ -643,14 +703,15 @@
return startupDto;
}
- public StartupDto getLocNoRun5(Integer whsType, Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
+ public StartupDto getLocNoRun5(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; //杞杞
- LocMast locMast = null; // 鐩爣搴撲綅
+ int crnNo = 0; // 鍫嗗灈鏈哄彿
+ int nearRow = 0; // 鏈�娴呭簱浣嶆帓
+ int curRow = 0; // 鏈�娣卞簱浣嶆帓
+ int rowCount = 0; // 杞杞
+ LocMast locMast = null; // 鐩爣搴撲綅
StartupDto startupDto = new StartupDto();
RowLastno rowLastno = rowLastnoService.selectById(whsType);
@@ -672,7 +733,7 @@
crnNumber = moveCrnNo;
}
- //姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
+ // 姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
curRow = locNecessaryParameters[1];
crnNo = locNecessaryParameters[2];
@@ -692,13 +753,13 @@
staDesc = staDescService.selectOne(wrapper);
if (Cools.isEmpty(staDesc)) {
log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
-// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ // throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
crnNo = 0;
} else {
staNo = basDevpService.selectById(staDesc.getCrnStn());
if (!staNo.getAutoing().equals("Y")) {
log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
-// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ // throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
crnNo = 0;
}
startupDto.setStaNo(staNo.getDevNo());
@@ -718,14 +779,15 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("row1", nearRow)
.eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
- .orderBy("lev1", true).orderBy("bay1", true));//鏈�娴呭簱浣�
+ .orderBy("lev1", true).orderBy("bay1", true));// 鏈�娴呭簱浣�
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
- //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
- LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
+ // 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
+ LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1,
+ rowLastnoType.getType().longValue());
if (!Cools.isEmpty(locMast2) && locMast2.getBay1() == curRow) {
locMast = locMast2;
break;
@@ -739,7 +801,8 @@
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
if (times < rowCount * 2) {
times = times + 1;
- return getLocNoRun5(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, locTypeDto, times);
+ return getLocNoRun5(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, locTypeDto,
+ times);
}
log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
throw new CoolException("娌℃湁绌哄簱浣�");
--
Gitblit v1.9.1