From 96c5a749f14c3dea75ff774e5eed2921ba0f2555 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 17 十二月 2025 09:52:02 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/common/service/CommonService.java | 729 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 554 insertions(+), 175 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index d60e71b..f94e117 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -6,6 +6,7 @@
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.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
@@ -17,6 +18,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.sql.rowset.WebRowSet;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
@@ -50,9 +54,11 @@
private SlaveProperties slaveProperties;
@Autowired
private WrkDetlService wrkDetlService;
-
+ @Autowired
+ private LocRuleService locRuleService;
/**
* 鐢熸垚宸ヤ綔鍙�
+ *
* @param wrkMk
* @return workNo(宸ヤ綔鍙�)
*/
@@ -65,17 +71,17 @@
int workNo = wrkLastno.getWrkNo();
int sNo = wrkLastno.getSNo();
int eNo = wrkLastno.getENo();
- workNo = workNo>=eNo ? sNo : workNo+1;
+ workNo = workNo >= eNo ? sNo : workNo + 1;
while (true) {
WrkMast wrkMast = wrkMastService.selectById(workNo);
if (null != wrkMast) {
- workNo = workNo>=eNo ? sNo : workNo+1;
+ workNo = workNo >= eNo ? sNo : workNo + 1;
} else {
break;
}
}
// 淇敼搴忓彿璁板綍
- if (workNo > 0){
+ if (workNo > 0) {
wrkLastno.setWrkNo(workNo);
wrkLastnoService.updateById(wrkLastno);
}
@@ -83,7 +89,7 @@
if (workNo == 0) {
throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
} else {
- if (wrkMastService.selectById(workNo)!=null) {
+ if (wrkMastService.selectById(workNo) != null) {
throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
}
}
@@ -92,14 +98,14 @@
//鎷嗙洏鏈哄绌烘澘鎵爜锛岄┍鍔ㄦ墭鐩樺悜鐮佸灈浣嶏紝涓嶅叆搴�
@Transactional
- public StartupDto getScanBarcodeEmptyBoard(){
+ public StartupDto getScanBarcodeEmptyBoard() {
StartupDto startupDto = new StartupDto();
Integer staNo = 0;
- if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 216))<2){
- staNo=216;
+ if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 216)) < 2) {
+ staNo = 216;
}
- if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 220))<2){
- staNo=220;
+ if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 220)) < 2) {
+ staNo = 220;
}
startupDto.setStaNo(staNo);
@@ -115,36 +121,224 @@
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
@Transactional
- public StartupDto getLocNo( Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto) {
- try{
+ public StartupDto getLocNo(Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto) {
+ try {
Integer whsType = Utils.GetWhsType(sourceStaNo);
RowLastno rowLastno = rowLastnoService.selectById(whsType);
RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(rowLastno.getTypeId());
/**
* 搴撳瀷 1: 鏍囧噯鍫嗗灈鏈哄簱 2: 骞冲簱 3: 绌挎鏉� 4: 鍥涘悜杞� 5: AGV 0: 鏈煡
*/
- switch (rowLastnoType.getType()){
- case 1:
- return getLocNoRun(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0);
- case 2:
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
- break;
- case 3:
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
- break;
+ switch (rowLastnoType.getType()) {
case 4:
- return getLocNoRun4(whsType,staDescId,sourceStaNo,matnr,batch,grade,4,locTypeDto,0);
- case 5:
- return getLocNoRun5(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0);
- default:
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
- break;
+ return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade, 4, locTypeDto, 2);
}
-
- }catch (Exception e){
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
+ } catch (CoolException ex) {
+ log.error("鍏ュ簱澶辫触锛岄敊璇俊鎭�: {}", ex.getMessage(), ex);
}
return null;
+ }
+
+ @Transactional
+ public StartupDto getLocNoNew(Integer staDescId, Integer sourceStaNo,FindLocNoAttributeVo findLocNoAttributeVo,LocTypeDto locTypeDto,String barcode){
+ StartupDto startupDto = null;
+ StringBuilder builder = new StringBuilder();
+ try {
+ startupDto = searchLocNoByCrnNo(staDescId,sourceStaNo,findLocNoAttributeVo,locTypeDto);
+ }catch (Exception e){
+ builder.append(e.getMessage()).append(",");
+ }
+
+ if (startupDto == null){
+ builder.append("鎵句笉鍒扮┖搴撲綅");
+ throw new CoolException(builder.toString());
+ }
+ return startupDto;
+ }
+
+ @Transactional
+ public StartupDto searchLocNoByCrnNo(Integer staDescId,Integer sourceStaNo,FindLocNoAttributeVo findLocNoAttributeVo,LocTypeDto locTypeDto){
+ LocMast locMast = null;
+ if (staDescId == 10){
+ //鎼滅储绌烘墭鐩�
+ locMast = searchEmptyPallet(locTypeDto);
+ }else {
+ //婊℃墭鐩�
+ locMast = searchMaxPallet(findLocNoAttributeVo,locTypeDto);
+ }
+
+ if (locMast == null){
+ throw new CoolException("鎵句笉鍒扮鍚堝昂瀵哥殑绌哄簱浣�");
+ }
+
+ StartupDto startupDto = new StartupDto();
+
+ String locNo = locMast.getLocNo();
+ //鐢熸垚宸ヤ綔鍙�
+ int workNo = getWorkNo(0);
+ //杩斿洖dto
+ startupDto.setWorkNo(workNo);
+ startupDto.setCrnNo(locMast.getCrnNo());
+ startupDto.setSourceStaNo(sourceStaNo);
+ startupDto.setLocNo(locNo);
+
+ return startupDto;
+ }
+
+ //鎼滅储婊℃墭鐩樺簱浣�
+ public LocMast searchMaxPallet(FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto){
+ LocMast targetLocMast = null;
+ List<String> locNos = locDetlService.getSameDetlList(findLocNoAttributeVo.getMatnr());
+ for (String locNo : locNos) {
+ //鑾峰彇閫氶亾缁�
+ List<Integer> locRowGroupDesc = Utils.getLocGroupDesc(slaveProperties,locNo);
+ for (Integer row : locRowGroupDesc) {
+ String deepLocNo = Utils.getLocNo(row,Utils.getBay(locNo),Utils.getLev(locNo));
+ LocMast deepLoc = locMastService.selectById(deepLocNo);
+ if (deepLoc == null){
+ continue;
+ }
+
+ if (deepLoc.getLocSts().equals("F")){
+ continue;
+ }else if (deepLoc.getLocSts().equals("O")){
+ targetLocMast = deepLoc;
+ break;
+ }else {
+ break;
+ }
+ }
+ }
+
+ if (targetLocMast == null){
+ //鐩歌繎鐗╂枡鍖归厤澶辫触锛屾悳绱㈠彲鐢ㄧ┖搴撲綅缁�
+
+ //鑾峰彇璁惧妤煎眰
+// List<Integer> levList = basCrnpService.getLevList();
+// Collections.shuffle(levList);
+
+ List<Integer> locLevList = locMastService.getLevList();
+// levList.addAll(locLevList);
+
+ for (Integer lev : locLevList) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("lev1", lev).orderBy("bay1", true).orderBy("row1",true));
+ for (LocMast locMast : locMasts) {
+ String locNo = locMast.getLocNo();
+ //鑾峰彇閫氶亾缁�
+ List<Integer> locRowGroupDesc = Utils.getLocGroupDesc(slaveProperties,locNo);
+
+ boolean flag = true;
+ for (Integer row : locRowGroupDesc) {
+ String deepLocNo = Utils.getLocNo(row,Utils.getBay(locNo),Utils.getLev(locNo));
+ LocMast deepLoc = locMastService.selectById(deepLocNo);
+ if (deepLoc == null){
+ continue;
+ }
+
+ if (!deepLoc.getLocSts().equals("O")){
+ flag = false;
+ break;
+ }
+ }
+
+ if (flag){
+ for (Integer row : locRowGroupDesc) {
+ String deepLocNo = Utils.getLocNo(row,Utils.getBay(locNo),Utils.getLev(locNo));
+ LocMast deepLoc = locMastService.selectById(deepLocNo);
+ if (deepLoc == null){
+ continue;
+ }
+
+ targetLocMast = deepLoc;
+ break;
+ }
+ break;
+ }
+ }
+ if (targetLocMast != null){
+ break;
+ }
+ }
+ }
+ return targetLocMast;
+ }
+
+ //鎼滅储绌烘墭鐩樺簱浣�
+ public LocMast searchEmptyPallet(LocTypeDto locTypeDto){
+ LocMast targetLocMast = null;
+ List<LocMast> locMastsD = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D"));
+ for (LocMast locMast : locMastsD) {
+ String locNo = locMast.getLocNo();
+ //鑾峰彇閫氶亾缁�
+ List<Integer> locGroupDesc = Utils.getLocGroupDesc(slaveProperties, locNo);
+ for (Integer row : locGroupDesc) {
+ String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
+ LocMast deepLoc = locMastService.selectById(deepLocNo);
+ if (deepLoc == null){
+ continue;
+ }
+
+ if (deepLoc.getLocSts().equals("F")){
+ continue;
+ }else if (deepLoc.getLocSts().equals("O")){
+ targetLocMast = deepLoc;
+ break;
+ }else {
+ break;
+ }
+ }
+ }
+
+ if (targetLocMast == null){
+ //鑾峰彇璁惧妤煎眰
+// List<Integer> levList = basCrnpService.getLevList();
+// Collections.shuffle(levList);
+
+ List<Integer> locLevList = locMastService.getLevList();
+// levList.addAll(locLevList);
+
+ for (Integer lev : locLevList) {
+ //鐩歌繎鐗╂枡鍖归厤澶辫触锛屾悳绱㈠彲鐢ㄧ┖搴撲綅缁�
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("lev1", lev).orderBy("bay1", true).orderBy("row1",true));
+ for (LocMast locMast : locMasts) {
+ String locNo = locMast.getLocNo();
+ //鑾峰彇閫氶亾缁�
+ List<Integer> locGroupDesc = Utils.getLocGroupDesc(slaveProperties, locNo);
+
+ boolean flag = true;
+ for (Integer row : locGroupDesc) {
+ String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
+ LocMast deepLoc = locMastService.selectById(deepLocNo);
+ if (deepLoc == null){
+ continue;
+ }
+
+ if (!deepLoc.getLocSts().equals("O")){
+ flag = false;
+ break;
+ }
+ }
+
+ if (flag){
+ for (Integer row : locGroupDesc) {
+ String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
+ LocMast deepLoc = locMastService.selectById(deepLocNo);
+ if (deepLoc == null){
+ continue;
+ }
+
+ targetLocMast = deepLoc;
+ break;
+ }
+ break;
+ }
+ }
+ if (targetLocMast != null){
+ break;
+ }
+ }
+ }
+ return targetLocMast;
}
/**
@@ -192,27 +386,27 @@
// ===============>>>> 寮�濮嬫墽琛�
curRow = rowLastno.getCurrentRow();
- if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){
+ 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++) {
+ 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];
+ 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){
+ .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) {
times++;
continue;
}
@@ -229,9 +423,9 @@
boolean signRule2 = false;
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
+ if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
// 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗�
- if (!Cools.isEmpty(matnr) && staDescId == 1){
+ if (!Cools.isEmpty(matnr) && staDescId == 1) {
signRule1 = true;
}
// 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //浜掗�氱増
@@ -239,34 +433,34 @@
signRule2 = true;
}
- if (!Cools.isEmpty(matnr) && (staDescId == 11 || staDescId == 111)) {
+ if (!Cools.isEmpty(matnr) && (staDescId == 11 || staDescId == 111)) {
signRule1 = true;
}
}
- if (signRule1){
- if (nearRow!=curRow){
+ 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()));
- for (LocMast locMast1:locMasts){
+ .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 locMastGro = locMastService.selectById(wrkMast.getLocNo());
//鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
- LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
- if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("F")){
+ 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()));
if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr())
&& batch.equals(batch.isEmpty() ? "" : locDetl.getBatch())
&& grade.equals(grade.isEmpty() ? "" : locDetl.getBrand())) {
//鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
- locMast = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
+ locMast = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
break;
}
}
}
}
- }else if (signRule2){
+ } else if (signRule2) {
List<String> locNos = locDetlService.getSameDetlToday(matnr, sRow, eRow);
for (String locNo : locNos) {
if (Utils.isShallowLoc(slaveProperties, locNo)) {
@@ -304,9 +498,9 @@
// }
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //浜掗�氱増
- if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+ if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow).eq("whs_type",rowLastnoType.getType().longValue()));
+ .eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow).eq("whs_type", rowLastnoType.getType().longValue()));
if (!locMasts.isEmpty()) {
for (LocMast loc : locMasts) {
if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
@@ -343,17 +537,17 @@
log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
crnNo = 0;
- }else {
+ } else {
staNo = basDevpService.selectById(staDesc.getCrnStn());
if (!staNo.getAutoing().equals("Y")) {
- log.error("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
crnNo = 0;
}
startupDto.setStaNo(staNo.getDevNo());
}
// 鏇存柊搴撲綅鎺掑彿
- if (Cools.isEmpty(locMast)){
+ if (Cools.isEmpty(locMast)) {
rowLastno.setCurrentRow(curRow);
rowLastnoService.updateById(rowLastno);
}
@@ -365,16 +559,16 @@
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())
- .orderBy("lev1",true).orderBy("bay1",true));
+ .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)){
+ 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()));
+ .eq("loc_no", shallowLoc).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
if (!Cools.isEmpty(locMast2)) {
locMast = locMast2;
break;
@@ -387,27 +581,27 @@
}
}
- if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(rowLastno)){
+ if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
+ 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()));
+ .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()));
+ .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()));
+ .eq("loc_no", shallowLoc).eq("loc_sts", "D").eq("whs_type", rowLastnoType.getType().longValue()));
if (!Cools.isEmpty(locMast2)) {
locMast = locMast1;
break;
@@ -431,9 +625,9 @@
// 閫掑綊鏌ヨ
if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount*2) {
+ if (times < rowCount * 2) {
times = times + 1;
- return getLocNoRun(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
+ return getLocNoRun(whsType, staDescId, sourceStaNo, matnr, batch, grade, moveCrnNo, locTypeDto, times);
}
// // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
// if (locTypeDto.getLocType1() < 2) {
@@ -457,123 +651,308 @@
}
public StartupDto getLocNoRun4(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
- int rowCount = 0; //杞杞
- int crnNo = 0;
+ int crnNo = 1;//灏忚溅缂栧彿澶囩敤
+ RowLastno rowLastno = rowLastnoService.selectById(4);
LocMast locMast = null; // 鐩爣搴撲綅
StartupDto startupDto = new StartupDto();
-
-
- if (!Cools.isEmpty(matnr) && staDescId != 10){
- int lev = 0;
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr", matnr));
- if (!Cools.isEmpty(locDetls)){
- for (LocDetl locDetl : locDetls){
- if (locMast != null){
- break;
- }
- LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
- if (Cools.isEmpty(locMast1)) {
- continue;
- }
- if (locMast1.getLev1() != lev && locMast1.getLev1() !=2) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("lev1", locMast1.getLev1())
- .orderBy("bay1",false));
- if (Cools.isEmpty(locMasts)){
- throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===銆嬪簱浣嶆湭鐭�");
- }
- for (LocMast locMast2 : locMasts) {
- if (locMast2.getLocSts().equals("O") ) {
- locMast = locMast2;
- }else if (locMast2.getLocSts().equals("F")){
- locMast = null;
- }
- }
- }
+ int curRow = rowLastno.getCurrentRow();
+ int sRow = rowLastno.getsRow();
+ int eRow = rowLastno.geteRow();
+ int nearRow = 8;//鐗规畩鍗曟帓
+ int orbit = 7;//杞ㄩ亾
+ // 鐩镐技宸ヤ綔妗ｆ --- 鍚屽ぉ鍚岃鏍肩墿鏂�
+ if (!Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111) ) {
+ //鏌ヨ鐩镐技宸ヤ綔妗ｆ
+ List<WrkMast> wrkMasts = wrkMastService.selectWrkMastWrkDetlMatnrBatch(1, matnr, batch,null, crnNo);
+ for (WrkMast wrkMast:wrkMasts){
+ if (Cools.isEmpty(wrkMast.getLocNo())){
+ continue;
}
- }else {
- for (int i = 1; i<=4;i++){
- if (locMast != null){
- break;
- }
- if (i == 2){
- continue;
- }
- List<LocMast> locMastsF = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("lev1", i)
- .eq("loc_sts","F"));
- if (!Cools.isEmpty(locMastsF)){
- continue;
- }
- List<LocMast> locMastsR = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("lev1", i)
- .eq("loc_sts","R"));
- if (!Cools.isEmpty(locMastsR)){
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("loc_no", locMastsR.get(0).getLocNo()));
- if (Cools.isEmpty(wrkMast)){
- continue;
- }
- List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- if (!wrkDetls.get(0).getMatnr().equals(matnr)){
- continue;
- }
- }
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("lev1", i)
- .orderBy("bay1",false));
- if (Cools.isEmpty(locMasts)){
- throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===銆嬪簱浣嶆湭鐭�");
- }
- for (LocMast locmast3 : locMasts) {
- if (locmast3.getLocSts().equals("O")){
- locMast = locmast3;
- }else if (locmast3.getLocSts().equals("F")){
- locMast = null;
- }
- }
+ //鐩爣鎺掍负杞ㄩ亾澶栨帓
+ if (Utils.getRow(wrkMast.getLocNo()) == orbit || Utils.getRow(wrkMast.getLocNo()) == nearRow){
+ continue;
}
-
+ //鏌ユ壘姝ゅ簱浣嶇殑娴呭簱浣嶆槸鍚︿负绌�
+ int value = Integer.valueOf(wrkMast.getLocNo().substring(0, 2)) + 1;
+ String loc="0"+value+wrkMast.getLocNo().substring(2);
+ LocMast locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no",loc)
+ .eq("loc_sts","O")
+ .eq("loc_type1", locTypeDto.getLocType1())
+ );
+ if(Cools.isEmpty(locMast1)){
+ continue;
+ }
+ locMast=locMast1;
+ break;
}
- }else {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("lev1", 2)
- .orderBy("bay1",false));
- if (Cools.isEmpty(locMasts)){
- throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===銆嬪簱浣嶆湭鐭�");
+ }
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
+ if (Cools.isEmpty(locMast)) {
+ List<LocDetl> locNos = locDetlService.getSameDetlToday(matnr, batch,sRow, eRow);
+ for (LocDetl locNo : locNos) {
+ //鐩爣鎺掍负鏈�澶栧眰鎺�
+ if (Utils.getRow(locNo.getLocNo()) == nearRow || Utils.getRow(locNo.getLocNo()) == orbit){
+ continue;
+ }
+ LocMast locMast2=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no",locNo.getLocNo())
+ .eq("loc_sts","F"));
+ if(Cools.isEmpty(locMast2)){
+ continue;
+ }
+ int value = Integer.valueOf(locNo.getLocNo().substring(0, 2)) + 1;
+ String loc="0"+value+locNo.getLocNo().substring(2);
+ LocMast locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no",loc)
+ .eq("loc_sts","O")
+ .eq("loc_type1", locTypeDto.getLocType1())
+ );
+ if(Cools.isEmpty(locMast1)){
+ continue;
+ }
+ locMast=locMast1;
+ break;
}
- for (LocMast locmast : locMasts) {
- if (locmast.getLocSts().equals("O") ) {
- locMast = locmast;
- }else if (locmast.getLocSts().equals("D")){
- locMast = null;
+ }
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+ if (staDescId == 10) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
+ if (locMasts.size() > 0) {
+ for (LocMast loc : locMasts) {
+ if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
+ continue;
+ }
+ String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
+ // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
+ LocMast shallowLoc = locMastService.selectById(shallowLocNo);
+ if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
+ if (shallowLoc.getLocType1()<locTypeDto.getLocType1()){
+ continue;
+ }
+ if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
+ locMast = shallowLoc;
+ crnNo = locMast.getCrnNo();
+ break;
+ }
+ }
}
}
}
+ // 鑾峰彇鐩爣绔�
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no", 1);
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+ throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ }
+ BasDevp staNo = basDevpService.selectById(staDesc.getStnNo());
+ if (!staNo.getAutoing().equals("Y")) {
+ throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ }
-
- // 閫掑綊鏌ヨ
- if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
- // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount*2) {
- times = times + 1;
- return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
+ // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
+ if (null == locMast) {
+ LocMast locMast1 = new LocMast();
+ if(times != 0){
+ locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", 1)
+ .eq("loc_sts","O")
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .orderBy("lev1,bay1 ASC"));
+ } else {
+ locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", 8)
+ .eq("loc_sts","O")
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .orderBy("lev1,bay1 ASC"));
}
- log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
+ if(!Cools.isEmpty(locMast1)){
+ locMast=locMast1;
+ }
+ }
+ // 鏇存柊搴撲綅鎺掑彿
+ rowLastno.setCurrentRow(curRow);
+ rowLastnoService.updateById(rowLastno);
+
+ // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
+ if (Cools.isEmpty(locMast)) {
+ times = times - 1;
+ if (times >= 0) {
+ return getLocNoRun4(whsType,staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo,locTypeDto,times);
+ }
+ log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛�", JSON.toJSONString(locTypeDto));
throw new CoolException("娌℃湁绌哄簱浣�");
}
String locNo = locMast.getLocNo();
-
- // 鐢熸垚宸ヤ綔鍙�
+ // 杩斿洖鎵惧埌鐨勫簱浣�
int workNo = getWorkNo(0);
- // 杩斿洖dto
startupDto.setWorkNo(workNo);
- startupDto.setCrnNo(1);
+ startupDto.setCrnNo(locMast.getCrnNo());
startupDto.setSourceStaNo(sourceStaNo);
startupDto.setLocNo(locNo);
+
return startupDto;
}
+
+ public StartupDto getLocNoRunPick(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
+ int crnNo = 1;//灏忚溅缂栧彿澶囩敤
+ RowLastno rowLastno = rowLastnoService.selectById(4);
+ LocMast locMast = null; // 鐩爣搴撲綅
+ StartupDto startupDto = new StartupDto();
+ int curRow = rowLastno.getCurrentRow();
+ int sRow = rowLastno.getsRow();
+ int eRow = rowLastno.geteRow();
+ int nearRow = 8;//鐗规畩鍗曟帓
+ int orbit = 7;//杞ㄩ亾
+ // 鐩镐技宸ヤ綔妗ｆ --- 鍚屽ぉ鍚岃鏍肩墿鏂�
+ if (!Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111) ) {
+ //鏌ヨ鐩镐技宸ヤ綔妗ｆ
+ List<WrkMast> wrkMasts = wrkMastService.selectWrkMastWrkDetlMatnrBatch(1, matnr, batch,null, crnNo);
+ for (WrkMast wrkMast:wrkMasts){
+ if (Cools.isEmpty(wrkMast.getLocNo())){
+ continue;
+ }
+ //鐩爣鎺掍负杞ㄩ亾澶栨帓
+ if (Utils.getRow(wrkMast.getLocNo()) == orbit || Utils.getRow(wrkMast.getLocNo()) == nearRow){
+ continue;
+ }
+ //鏌ユ壘姝ゅ簱浣嶇殑娴呭簱浣嶆槸鍚︿负绌�
+ int value = Integer.valueOf(wrkMast.getLocNo().substring(0, 2)) + 1;
+ String loc="0"+value+wrkMast.getLocNo().substring(2);
+ LocMast locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no",loc)
+ .eq("loc_sts","O")
+ .eq("loc_type1", locTypeDto.getLocType1())
+ );
+ if(Cools.isEmpty(locMast1)){
+ continue;
+ }
+ locMast=locMast1;
+ break;
+ }
+
+ }
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
+ if (Cools.isEmpty(locMast)) {
+ List<LocDetl> locNos = locDetlService.getSameDetlToday(matnr, batch,sRow, eRow);
+ for (LocDetl locNo : locNos) {
+ //鐩爣鎺掍负鏈�澶栧眰鎺�
+ if (Utils.getRow(locNo.getLocNo()) == nearRow || Utils.getRow(locNo.getLocNo()) == orbit){
+ continue;
+ }
+ LocMast locMast2=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no",locNo.getLocNo())
+ .eq("loc_sts","F"));
+ if(Cools.isEmpty(locMast2)){
+ continue;
+ }
+ int value = Integer.valueOf(locNo.getLocNo().substring(0, 2)) + 1;
+ String loc="0"+value+locNo.getLocNo().substring(2);
+ LocMast locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no",loc)
+ .eq("loc_sts","O")
+ .eq("loc_type1", locTypeDto.getLocType1())
+ );
+ if(Cools.isEmpty(locMast1)){
+ continue;
+ }
+ locMast=locMast1;
+ break;
+ }
+ }
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+ if (staDescId == 10) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
+ if (locMasts.size() > 0) {
+ for (LocMast loc : locMasts) {
+ if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
+ continue;
+ }
+ String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
+ // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
+ LocMast shallowLoc = locMastService.selectById(shallowLocNo);
+ if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
+ if (shallowLoc.getLocType1()<locTypeDto.getLocType1()){
+ continue;
+ }
+ if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
+ locMast = shallowLoc;
+ crnNo = locMast.getCrnNo();
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ // 鑾峰彇鐩爣绔�
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no", 1);
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+ throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ }
+ BasDevp staNo = basDevpService.selectById(staDesc.getStnNo());
+ if (!staNo.getAutoing().equals("Y")) {
+ throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ }
+
+ // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
+ if (null == locMast) {
+ LocMast locMast1 = new LocMast();
+ if(times != 0){
+ locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", 1)
+ .eq("loc_sts","O")
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .orderBy("lev1,bay1 ASC"));
+ } else {
+ locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", 8)
+ .eq("loc_sts","O")
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .orderBy("lev1,bay1 ASC"));
+ }
+ if(!Cools.isEmpty(locMast1)){
+ locMast=locMast1;
+ }
+ }
+ // 鏇存柊搴撲綅鎺掑彿
+ rowLastno.setCurrentRow(curRow);
+ rowLastnoService.updateById(rowLastno);
+
+ // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
+ if (Cools.isEmpty(locMast)) {
+ times = times - 1;
+ if (times >= 0) {
+ return getLocNoRun4(whsType,staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo,locTypeDto,times);
+ }
+ log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛�", JSON.toJSONString(locTypeDto));
+ throw new CoolException("娌℃湁绌哄簱浣�");
+ }
+ String locNo = locMast.getLocNo();
+ // 杩斿洖鎵惧埌鐨勫簱浣�
+ startupDto.setWorkNo(0);
+ startupDto.setCrnNo(locMast.getCrnNo());
+ startupDto.setSourceStaNo(sourceStaNo);
+ startupDto.setLocNo(locNo);
+
+ return startupDto;
+ }
+
public StartupDto getLocNoRun5(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
matnr = "";
@@ -603,12 +982,12 @@
}
int sRow = rowLastno.getsRow();
int eRow = rowLastno.geteRow();
- int crnNumber = eRow-sRow+1;
+ int crnNumber = eRow - sRow + 1;
// ===============>>>> 寮�濮嬫墽琛�
curRow = rowLastno.getCurrentRow();
- if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){
+ if (!Cools.isEmpty(moveCrnNo) && moveCrnNo != 0) {
crnNumber = moveCrnNo;
}
@@ -616,7 +995,7 @@
int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
curRow = locNecessaryParameters[1];
crnNo = locNecessaryParameters[2];
- rowCount = locNecessaryParameters[0];
+ rowCount = locNecessaryParameters[0];
nearRow = locNecessaryParameters[3];
Wrapper<StaDesc> wrapper = null;
@@ -634,10 +1013,10 @@
log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
crnNo = 0;
- }else {
+ } else {
staNo = basDevpService.selectById(staDesc.getCrnStn());
if (!staNo.getAutoing().equals("Y")) {
- log.error("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
crnNo = 0;
}
@@ -657,16 +1036,16 @@
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())
- .orderBy("lev1",true).orderBy("bay1",true));//鏈�娴呭簱浣�
+ .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)){
+ if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
//鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
- LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
- if (!Cools.isEmpty(locMast2) && locMast2.getBay1()==curRow) {
+ LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
+ if (!Cools.isEmpty(locMast2) && locMast2.getBay1() == curRow) {
locMast = locMast2;
break;
}
@@ -677,9 +1056,9 @@
// 閫掑綊鏌ヨ
if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount*2) {
+ if (times < rowCount * 2) {
times = times + 1;
- return getLocNoRun5(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
+ return getLocNoRun5(whsType, staDescId, sourceStaNo, matnr, batch, grade, moveCrnNo, locTypeDto, times);
}
log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
throw new CoolException("娌℃湁绌哄簱浣�");
@@ -703,7 +1082,7 @@
return msg.substring(0, 16);
} else {
StringBuilder msgBuilder = new StringBuilder(msg);
- for(int i = 0; i < count - msg.length(); ++i) {
+ for (int i = 0; i < count - msg.length(); ++i) {
msgBuilder.insert(0, "0");
}
return msgBuilder.toString();
--
Gitblit v1.9.1