From 4b6e6d95ae6fbbccc4351db366b99fa05288877f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 11 六月 2025 10:09:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 399 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 344 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 adfcf81..9ff589c 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -19,6 +19,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
/**
@@ -50,6 +52,7 @@
/**
* 鐢熸垚宸ヤ綔鍙�
+ *
* @param wrkMk
* @return workNo(宸ヤ綔鍙�)
*/
@@ -62,17 +65,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);
}
@@ -80,7 +83,7 @@
if (workNo == 0) {
throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
} else {
- if (wrkMastService.selectById(workNo)!=null) {
+ if (wrkMastService.selectById(workNo) != null) {
throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
}
}
@@ -89,88 +92,374 @@
/**
* 妫�绱㈠簱浣嶅彿
- * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
- * @param staDescId 璺緞宸ヤ綔绫诲瀷
+ *
+ * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
+ * @param staDescId 璺緞宸ヤ綔绫诲瀷
* @param sourceStaNo 婧愮珯
-
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
@Transactional
public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
- // 鐩爣搴撲綅
- LocMast locMast = null;
+ return getLocNoRun(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0);
- // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
- locMast = getLocNoStep4(staDescId, locTypeDto, sourceStaNo);
- if (locMast != null) {
- //鎵惧埌搴撲綅锛岃繑鍥瀌to
- return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
+ }
+
+ @Transactional
+ public StartupDto getLocNoRun(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
+ if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
+ matnr = "";
+ }
+ if (Cools.isEmpty(batch)) { //绠卞彿
+ batch = "";
+ }
+ if (Cools.isEmpty(grade)) { //澶囩敤
+ grade = "";
}
- //搴撲綅瑙勫垯
-// locMast = getLocNoStepRule(matnr, locTypeDto);
-// if (locMast != null) {
-// //鎵惧埌搴撲綅锛岃繑鍥瀌to
-// return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
+ // 鍒濆鍖栧弬鏁�
+ int crnNo = 0; //鍫嗗灈鏈哄彿
+ int nearRow = 0; //鏈�娴呭簱浣嶆帓
+ int curRow = 0; //鏈�娣卞簱浣嶆帓
+ int rowCount = 0; //杞杞
+ LocMast locMast = null; // 鐩爣搴撲綅
+
+ StartupDto startupDto = new StartupDto();
+ RowLastno rowLastno = rowLastnoService.selectById(whsType);
+ int sRow = rowLastno.getsRow();
+ int eRow = rowLastno.geteRow();
+ int crnNumber = rowLastno.getCrnQty();
+
+ if (Cools.isEmpty(rowLastno)) {
+ throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ }
+ // ===============>>>> 寮�濮嬫墽琛�
+ curRow = rowLastno.getCurrentRow();
+
+ if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){
+ crnNumber = moveCrnNo;
+ if (times==0){
+ curRow = moveCrnNo*4-1;
+ }else {
+ curRow = moveCrnNo*4-2;
+ }
+ }
+
+ //姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
+ for (int i = times; i <= crnNumber*2; i++) {
+ int[] locNecessaryParameters = Utils.LocNecessaryParameters(whsType, curRow, crnNumber);
+ log.info(Arrays.toString(locNecessaryParameters));
+ 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"));
+ if (locMasts.size()<=10){
+ times++;
+ continue;
+ }
+ break;
+ } else {
+ times++;
+ }
+ }
+ if (nearRow == 0) {
+ throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
+ }
+
+ boolean signRule1 = false;
+ boolean signRule2 = false;
+
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗�
+// if (!Cools.isEmpty(matnr) && (staDescId == 1)){
+// signRule1 = true;
+// }
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //浜掗�氱増
+ if (!Cools.isEmpty(matnr) && staDescId == 1) {
+ signRule2 = true;
+ }
+
+ if (!Cools.isEmpty(matnr) && (staDescId == 11 || staDescId == 111)) {
+ signRule1 = true;
+ }
+
+// if (signRule1){
+// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+// for (LocMast locMast1:locMasts){
+// if (VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+// continue;
+// }
+// String shallowLoc = Utils.getDeepLoc(slaveProperties,locMast1.getLocNo());
+// LocMast locMast2 = locMastService.selectById(shallowLoc);
+// if (!Cools.isEmpty(locMast2) && locMast2.getLocSts().equals("F")){
+// LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast2.getLocNo()));
+// if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr())) {
+// locMast = locMast1;
+// break;
+// }
+// }
+// }
+// }else if (signRule2){
+// List<String> locNos = locDetlService.getSameDetlToday(matnr, sRow, eRow);
+// for (String locNo : locNos) {
+// if (Utils.isShallowLoc(slaveProperties, locNo)) {
+// continue;
+// }
+// String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
+// // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
+// LocMast shallowLoc = locMastService.selectById(shallowLocNo);
+// if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
+// if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
+// if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
+// locMast = shallowLoc;
+// crnNo = locMast.getCrnNo();
+// break;
+// }
+// }
+// }
+// }
// }
- // 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
- locMast = getLocNoStep3(staDescId, matnr, batch, grade, locTypeDto,sourceStaNo);
- if (locMast != null) {
- //鎵惧埌搴撲綅锛岃繑鍥瀌to
- return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
+// // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //鍒嗙鐗�
+// if (staDescId == 10) {
+// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+// for (LocMast locMast1:locMasts){
+// if (VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+// continue;
+// }
+// String shallowLoc = Utils.getDeepLoc(slaveProperties,locMast1.getLocNo());
+// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",shallowLoc));
+// if (!Cools.isEmpty(locMast2) && locMast2.getLocSts().equals("D")){
+// locMast = locMast1;
+// break;
+// }
+// }
+// }
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //浜掗�氱増
+// if (staDescId == 10) {
+// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().in("crn_no",1,2).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 (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
+// if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
+// locMast = shallowLoc;
+// crnNo = locMast.getCrnNo();
+// log.error("闈犺繎鎽嗘斁搴撲綅鍙�");
+// break;
+// }
+// }
+// }
+// }
+// }
+// }
+
+ Wrapper<StaDesc> wrapper = null;
+ StaDesc staDesc = null;
+ BasDevp staNo = null;
+
+ if (Utils.BooleanWhsTypeSta(whsType)) {
+ // 鑾峰彇鐩爣绔�
+ wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no", crnNo);
+ staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ crnNo = 0;
+ locMast = null;
+ }else {
+ staNo = basDevpService.selectById(staDesc.getCrnStn());
+ if (!staNo.getAutoing().equals("Y")) {
+// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ crnNo = 0;
+ locMast = null;
+ }
+ startupDto.setStaNo(staNo.getDevNo());
+ }
}
- //鎼滅储鏁翠釜绌哄簱浣嶇粍
- locMast = getLocNoStepSingle(locTypeDto,sourceStaNo);
- if (locMast != null) {
- //鎵惧埌搴撲綅锛岃繑鍥瀌to
- return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
+ // 鏇存柊搴撲綅鎺掑彿
+ if (Utils.BooleanWhsTypeSta(whsType) && Cools.isEmpty(locMast)) {
+ rowLastno.setCurrentRow(curRow);
+ rowLastnoService.updateById(rowLastno);
}
- //鎵句笉鍒板簱浣嶏紝鎶涘嚭寮傚父
- throw new CoolException("娌℃湁绌哄簱浣�");
+ // 1.鎸夎鍒欐煡鎵惧簱浣�
+ if (Cools.isEmpty(locMast) && crnNo != 0) {
+ List<LocMast> locMasts = null;
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("row1", nearRow)
+ .eq("loc_sts", "O")
+ .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"));
+ if (!Cools.isEmpty(locMast2)) {
+ locMast = locMast2;
+ break;
+ }
+ } else {
+ if (!Cools.isEmpty(locMast1)) {
+ locMast = locMast1;
+ break;
+ }
+ }
+ }
+
+ if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(rowLastno)) {
+ 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"));
+ if (!Cools.isEmpty(locMast2)) {
+ locMast = locMast2;
+ break;
+ } else {
+ locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no", shallowLoc).eq("loc_sts", "F"));
+ if (!Cools.isEmpty(locMast2)) {
+ locMast = locMast1;
+ break;
+ } else {
+ locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no", shallowLoc).eq("loc_sts", "D"));
+ if (!Cools.isEmpty(locMast2)) {
+ locMast = locMast1;
+ break;
+ }
+ }
+ }
+ } else {
+ if (!Cools.isEmpty(locMast1)) {
+ locMast = locMast1;
+ break;
+ }
+ }
+ }
+ }
+ }
+ //鏌ヨ褰撳墠搴撲綅绫诲瀷绌哄簱浣� 灏忎簬5涓垯locmast = null
+ List<LocMast> locTypeLocMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "O").eq("crn_no", crnNo).eq("loc_type1", locTypeDto.getLocType1())
+ );
+ if (null !=locTypeLocMasts && locTypeLocMasts.size()<=5){
+ locMast = null;
+ }
+
+ if (!Cools.isEmpty(locMast) && !basCrnpService.checkSiteError(crnNo, true)) {
+ locMast = null;
+ }
+
+ // 閫掑綊鏌ヨ
+ if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
+ // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
+ if (times < rowCount*2) {
+ times = times + 1;
+ return getLocNoRun(1, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
+ }
+ // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
+ if (locTypeDto.getLocType1() < 2) {
+ int i = locTypeDto.getLocType1() + 1;
+ locTypeDto.setLocType1((short)i);
+ return getLocNoRun(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0);
+ }
+ log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
+ throw new CoolException("娌℃湁绌哄簱浣�");
+ }
+ String locNo = locMast.getLocNo();
+
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = getWorkNo(0);
+ // 杩斿洖dto
+ startupDto.setWorkNo(workNo);
+ startupDto.setCrnNo(crnNo);
+ startupDto.setSourceStaNo(sourceStaNo);
+ startupDto.setLocNo(locNo);
+ return startupDto;
}
// 鎼滅储鍗曞搧(鏁翠釜搴撲綅缁�)
- private LocMast getLocNoStepSingle(LocTypeDto locTypeDto,Integer sourceStaNo) {
+ private LocMast getLocNoStepSingle(LocTypeDto locTypeDto, Integer sourceStaNo) {
LocMast locMast = null;
- StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("type_no", 1).eq("stn_no", sourceStaNo));
+ List<StaDesc> staDescs = staDescService.selectList(new EntityWrapper<StaDesc>().eq("type_no", 1).eq("stn_no", sourceStaNo));
+ int num = 0;
+ int crn_no = 1;
+ for (StaDesc staDesc : staDescs) {
+ List<LocMast> locMasts = locMastService.selectAreaEmpty(locTypeDto.getLocType1(), staDesc.getCrnNo());//鎼滅储璐х墿
+ int temp = locMast == null ? 0 : locMasts.size();
+ if (num <= temp) {
+ num = temp;
+ crn_no = staDesc.getCrnNo();
+ }
+ }
+ //for (StaDesc staDesc : staDescs) {
//鍗曞搧
- List<LocMast> locMasts = locMastService.selectAreaEmpty(locTypeDto.getLocType1(),staDesc.getCrnNo());//鎼滅储璐х墿
+ List<LocMast> locMasts = locMastService.selectAreaEmpty(locTypeDto.getLocType1(), crn_no);//鎼滅储璐х墿
for (LocMast mast : locMasts) {
LocMast tmp = null;
- boolean groupLoc = Utils.isShallowLoc(slaveProperties,mast.getLocNo());
+ boolean groupLoc = Utils.isShallowLoc(slaveProperties, mast.getLocNo());
if (groupLoc) {
String shallowLoc = Utils.getDeepLoc(slaveProperties, mast.getLocNo());
LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", shallowLoc).eq("loc_sts", "O"));
+ .eq("loc_no", shallowLoc));
if (!Cools.isEmpty(locMast2)) {
- tmp = locMast2;
-
- }else {
- tmp = mast;
+ if (locMast2.getLocSts().equals("F") || locMast2.getLocSts().equals("D")) {
+ tmp = mast;
+ if (!Cools.isEmpty(mast)) {
+ if (mast.getLocSts().equals("O")) {
+ tmp = mast;
+ }
+ }
+ }
+ //棰勭暀绌哄簱浣�
+ if (tmp != null && locMastService.checkEmptyCount(mast, 10)) {
+ locMast = tmp;
+ return locMast;
+ }
}
- }else {
- if (!Cools.isEmpty(mast)) {
- tmp = mast;
+ } else {
+ tmp = mast;
+ //棰勭暀绌哄簱浣�
+ if (tmp != null && locMastService.checkEmptyCount(mast, 10)) {
+ locMast = tmp;
+ return locMast;
}
}
- //棰勭暀绌哄簱浣�
- if (tmp != null && locMastService.checkEmptyCount(mast, 10)) {
- locMast = tmp;
- break;
- }
+
+
+ // }
}
-
return locMast;
}
+
// 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
- private LocMast getLocNoStep3(Integer staDescId, String matnr, String batch, String grade, LocTypeDto locTypeDto,Integer sourceStaNo) {
+ private LocMast getLocNoStep3(Integer staDescId, String matnr, String batch, String grade, LocTypeDto
+ locTypeDto, Integer sourceStaNo) {
LocMast locMast = null;
StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("type_no", 1).eq("stn_no", sourceStaNo));
if (staDescId == 1) {
@@ -179,7 +468,7 @@
for (WrkMast wrkMast : wrkMasts) {
LocMast locMast0 = locMastService.findNearloc(wrkMast.getLocNo());
if (null != locMast0) {
- if (!staDesc.getCrnNo().equals(locMast0.getCrnNo())){
+ if (!staDesc.getCrnNo().equals(locMast0.getCrnNo())) {
continue;
}
// 娴呭簱浣嶇鍚堝昂瀵告娴�
@@ -194,7 +483,7 @@
for (String locNo : locNos) {
LocMast locMast0 = locMastService.findNearloc(locNo);
if (null != locMast0) {
- if (!staDesc.getCrnNo().equals(locMast0.getCrnNo())){
+ if (!staDesc.getCrnNo().equals(locMast0.getCrnNo())) {
continue;
}
// 娴呭簱浣嶇鍚堝昂瀵告娴�
@@ -218,7 +507,7 @@
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", staDescId)
.eq("stn_no", sourceStaNo)
- .eq("crn_no",locMast.getCrnNo());
+ .eq("crn_no", locMast.getCrnNo());
StaDesc staDesc = staDescService.selectOne(wrapper);
if (Cools.isEmpty(staDesc)) {
log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}", staDescId, sourceStaNo);
@@ -259,7 +548,7 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("loc_sts", "O")
.eq("crn_no", staDesc.getCrnNo())
- .eq("loc_type1",locTypeDto.getLocType1())
+ .eq("loc_type1", locTypeDto.getLocType1())
.orderBy("lev1,bay1,row1"));
if (!locMasts.isEmpty()) {
for (LocMast loc : locMasts) {
@@ -287,7 +576,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