From 009ed5a278999b2cf32f241fd489a41559923f6c Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 19 四月 2025 20:58:25 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/common/service/CommonService.java | 349 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 192 insertions(+), 157 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 9cc149f..bdbca00 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -59,6 +59,7 @@
/**
* 鐢熸垚宸ヤ綔鍙�
+ *
* @param wrkMk
* @return workNo(宸ヤ綔鍙�)
*/
@@ -71,17 +72,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);
}
@@ -89,7 +90,7 @@
if (workNo == 0) {
throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
} else {
- if (wrkMastService.selectById(workNo)!=null) {
+ if (wrkMastService.selectById(workNo) != null) {
throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
}
}
@@ -98,14 +99,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);
@@ -121,36 +122,69 @@
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
@Transactional
- public StartupDto getLocNo( Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto,boolean mixture) {
- try{
+ public StartupDto getLocNo(Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto, boolean mixture) {
+ try {
Integer whsType = Utils.GetWhsType(sourceStaNo);
RowLastno rowLastno = rowLastnoService.selectById(whsType);
RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(rowLastno.getTypeId());
/**
* 搴撳瀷 1: 鏍囧噯鍫嗗灈鏈哄簱 2: 骞冲簱 3: 绌挎鏉� 4: 鍥涘悜杞︽贩杞� 5: AGV 6锛氬洓鍚戣溅涓嶆贩杞� 0: 鏈煡
*/
- switch (rowLastnoType.getType()){
+ switch (rowLastnoType.getType()) {
case 1:
- return getLocNoRun(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0);
+ return getLocNoRun(whsType, staDescId, sourceStaNo, matnr, batch, grade, 0, locTypeDto, 0);
case 2:
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
+ log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
break;
case 3:
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
+ log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
break;
case 4:
- return getLocNoRun4(whsType,staDescId,sourceStaNo,matnr,batch,grade,4,locTypeDto,0,mixture);
+ //TODO zhangc 涓存椂
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .in("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
+ .eq("crn_no", 7)
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .in("row1", 8).in("bay1", 1, 8).orderBy("row1"));
+ StartupDto startupDto = new StartupDto();
+ if (Utils.BooleanWhsTypeSta(rowLastno, staDescId)) {
+ // 鑾峰彇鐩爣绔�
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no", 7);
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ log.error("鍏ュ簱璺緞涓嶅瓨鍦�:type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, 7);
+ } else {
+ BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
+ if (!staNo.getAutoing().equals("Y")) {
+ log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
+ }
+ startupDto.setStaNo(staNo.getDevNo());
+ }
+ }
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = getWorkNo(0);
+ // 杩斿洖dto
+ startupDto.setWorkNo(workNo);
+ startupDto.setCrnNo(7);
+ startupDto.setSourceStaNo(sourceStaNo);
+ startupDto.setLocNo(locMasts.get(0).getLocNo());
+ return startupDto;
+ //return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade, 4, locTypeDto, 0, mixture);
case 5:
- return getLocNoRun5(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0);
+ return getLocNoRun5(whsType, staDescId, sourceStaNo, matnr, batch, grade, 0, locTypeDto, 0);
case 6:
- return getLocNoRun6(whsType,staDescId,sourceStaNo,matnr,batch,grade,4,locTypeDto,0,mixture);
+ return getLocNoRun6(whsType, staDescId, sourceStaNo, matnr, batch, grade, 4, locTypeDto, 0, mixture);
default:
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
+ log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
break;
}
- }catch (Exception e){
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
}
return null;
}
@@ -200,27 +234,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++) {
- int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber,whsType);
+ for (int i = times; i < crnNumber * 2; i++) {
+ int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber, whsType);
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;
}
@@ -237,9 +271,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;
}
// 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //浜掗�氱増
@@ -247,34 +281,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)) {
@@ -312,9 +346,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())) {
@@ -351,17 +385,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);
}
@@ -373,20 +407,20 @@
if (Cools.isEmpty(locMast) && crnNo != 0) {
List<LocMast> locMasts = null;
- 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));
+ 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));
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;
@@ -399,27 +433,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;
@@ -443,9 +477,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) {
@@ -468,8 +502,8 @@
return startupDto;
}
- public StartupDto getLocNoRun4(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times,boolean mixture) {
- if (mixture){
+ public StartupDto getLocNoRun4(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times, boolean mixture) {
+ if (mixture) {
throw new CoolException("娣疯浇绂佹鍏ュ簱");
}
if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
@@ -505,7 +539,7 @@
// ===============>>>> 寮�濮嬫墽琛�
curRow = rowLastno.getCurrentRow();
- if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){
+ if (!Cools.isEmpty(moveCrnNo) && moveCrnNo != 0) {
crnNumber = moveCrnNo;
// if (times==0){
// curRow = moveCrnNo*4-1;
@@ -515,15 +549,15 @@
}
//姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
- for (int i = times; i < crnNumber*2; i++) {
- int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber,whsType);
- rowCount = locNecessaryParameters[0];
+ for (int i = times; i < crnNumber * 2; i++) {
+ int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber, whsType);
+ rowCount = locNecessaryParameters[0];
curRow = locNecessaryParameters[1];
crnNo = locNecessaryParameters[2];
nearRow = locNecessaryParameters[3];
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("crn_no", crnNo).eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue()));
- if (locMasts.size()<=5){
+ .eq("crn_no", crnNo).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
+ if (locMasts.size() <= 5) {
times++;
continue;
}
@@ -548,10 +582,10 @@
if (Cools.isEmpty(staDesc)) {
log.error("鍏ュ簱璺緞涓嶅瓨鍦�:type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
crnNo = 0;
- }else {
+ } else {
staNo = basDevpService.selectById(staDesc.getCrnStn());
if (!staNo.getAutoing().equals("Y")) {
- log.error("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
crnNo = 0;
}
startupDto.setStaNo(staNo.getDevNo());
@@ -559,10 +593,10 @@
}
// 鏇存柊搴撲綅鎺掑彿
- if (Utils.BooleanWhsTypeSta(rowLastno, staDescId) && Cools.isEmpty(locMast)) {
- rowLastno.setCurrentRow(curRow);
- rowLastnoService.updateById(rowLastno);
- }
+// if (Utils.BooleanWhsTypeSta(rowLastno, staDescId) && Cools.isEmpty(locMast)) {
+// rowLastno.setCurrentRow(curRow);
+// rowLastnoService.updateById(rowLastno);
+// }
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
@@ -570,8 +604,8 @@
if (Cools.isEmpty(locMast) && crnNo != 0) {
List<LocMast> locMasts = new ArrayList<>();
int floor = 0;
- if (locTypeDto.getLev1() == null){
- if (locTypeDto.getLocType1() == 1){
+ if (locTypeDto.getLev1() == null) {
+ if (locTypeDto.getLocType1() == 1) {
int F1count = locMastService.selectCount(new EntityWrapper<LocMast>()
.in("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
.eq("crn_no", 7)
@@ -585,14 +619,14 @@
.eq("lev1", 2));
if (F2count <= 10) {
throw new CoolException("搴撲綅涓嶈冻");
- }else {
+ } else {
floor = 2;
}
- }else {
+ } else {
floor = 1;
}
- }else if (locTypeDto.getLocType1() == 2){
+ } else if (locTypeDto.getLocType1() == 2) {
int F3count = locMastService.selectCount(new EntityWrapper<LocMast>()
.in("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
.eq("crn_no", 7)
@@ -602,51 +636,51 @@
throw new CoolException("搴撲綅涓嶈冻");
}
floor = 3;
- }else {
+ } else {
throw new CoolException("搴撲綅楂樺害鏁版嵁寮傚父");
}
}
- if (locTypeDto.getLev1() != null){
+ if (locTypeDto.getLev1() != null) {
locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("bay1", nearRow)
- .in("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
- .eq("crn_no",7)
- .eq("loc_type1",locTypeDto.getLocType1())
- .eq("lev1",locTypeDto.getLev1()).orderBy("row1",false));//鏈�娴呭簱浣�
- }else {
- if (floor == 0){
+ .in("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
+ .eq("crn_no", 7)
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .eq("lev1", locTypeDto.getLev1()).orderBy("row1", false));//鏈�娴呭簱浣�
+ } else {
+ if (floor == 0) {
throw new CoolException("搴撲綅宸叉弧");
}
locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("bay1", nearRow)
- .in("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
- .eq("crn_no",7)
- .eq("loc_type1",locTypeDto.getLocType1())
- .eq("lev1",floor).orderBy("row1",false));//鏈�娴呭簱浣�
+ .in("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
+ .eq("crn_no", 7)
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .eq("lev1", floor).orderBy("row1", false));//鏈�娴呭簱浣�
}
for (LocMast locMast1 : locMasts) {
- if (locMast != null){
+ if (locMast != null) {
break;
}
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
List<LocMast> locMasts1 = null;
- if (nearRow == 2 || nearRow ==7 || nearRow == 12){
+ if (nearRow == 2 || nearRow == 7 || nearRow == 12) {
locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("gro1", locMast1.getGro1())
- .eq("crn_no",7)
- .eq("loc_type1",locTypeDto.getLocType1())
- .orderBy("bay1",true));
- }else {
+ .eq("crn_no", 7)
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .orderBy("bay1", true));
+ } else {
locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("gro1", locMast1.getGro1())
- .eq("crn_no",7)
- .eq("loc_type1",locTypeDto.getLocType1())
- .orderBy("bay1",false));
+ .eq("crn_no", 7)
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .orderBy("bay1", false));
}
if (Cools.isEmpty(locMasts1)) {
continue;
@@ -655,7 +689,7 @@
if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q") || locMastGro1.getLocSts().equals("R") || locMastGro1.getLocSts().equals("X")) {
break;
}
- if (locMastGro1.getLocSts().equals("O")){
+ if (locMastGro1.getLocSts().equals("O")) {
locMast = locMastGro1;
break;
}
@@ -667,9 +701,9 @@
// 閫掑綊鏌ヨ
if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount*2) {
+ if (times < rowCount * 2) {
times = times + 1;
- return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times,mixture);
+ return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade, moveCrnNo, locTypeDto, times, mixture);
}
log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
throw new CoolException("娌℃湁绌哄簱浣�");
@@ -685,6 +719,7 @@
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 = "";
@@ -714,20 +749,20 @@
}
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;
}
//姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
- int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber,whsType);
+ int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber, whsType);
curRow = locNecessaryParameters[1];
crnNo = locNecessaryParameters[2];
- rowCount = locNecessaryParameters[0];
+ rowCount = locNecessaryParameters[0];
nearRow = locNecessaryParameters[3];
Wrapper<StaDesc> wrapper = null;
@@ -748,10 +783,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;
}
@@ -771,8 +806,8 @@
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;
@@ -781,8 +816,8 @@
// //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
// LocMast locMast2 = locMastService.selectLocByLocStsPakInO(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
// if (!Cools.isEmpty(locMast2) && locMast2.getBay1()==curRow) {
- locMast = locMast1;
- break;
+ locMast = locMast1;
+ break;
// }
// }
}
@@ -791,10 +826,10 @@
// 閫掑綊鏌ヨ
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("娌℃湁绌哄簱浣�");
@@ -811,7 +846,7 @@
return startupDto;
}
- public StartupDto getLocNoRun6(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times,boolean mixture) {
+ public StartupDto getLocNoRun6(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times, boolean mixture) {
if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
matnr = "";
}
@@ -845,20 +880,20 @@
// ===============>>>> 寮�濮嬫墽琛�
curRow = rowLastno.getCurrentRow();
- if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){
+ if (!Cools.isEmpty(moveCrnNo) && moveCrnNo != 0) {
crnNumber = moveCrnNo;
}
//姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
- for (int i = times; i < crnNumber*2; i++) {
- int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber,whsType);
- rowCount = locNecessaryParameters[0];
+ for (int i = times; i < crnNumber * 2; i++) {
+ int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber, whsType);
+ rowCount = locNecessaryParameters[0];
curRow = locNecessaryParameters[1];
crnNo = locNecessaryParameters[2];
nearRow = locNecessaryParameters[3];
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("crn_no", crnNo).eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue()));
- if (locMasts.size()<=5){
+ .eq("crn_no", crnNo).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
+ if (locMasts.size() <= 5) {
times++;
continue;
}
@@ -871,27 +906,27 @@
// 鐩镐技宸ヤ綔妗ｆ --- 鍚屽ぉ鍚岃鏍肩墿鏂�
- if (!Cools.isEmpty(matnr) && !Cools.isEmpty(batch) && (staDescId == 1 || staDescId == 11 || staDescId == 111) && !mixture ) {
+ if (!Cools.isEmpty(matnr) && !Cools.isEmpty(batch) && (staDescId == 1 || staDescId == 11 || staDescId == 111) && !mixture) {
//鏌ヨ鐩镐技宸ヤ綔妗ｆ
- List<WrkMast> wrkMasts = wrkMastService.selectWrkMastWrkDetlMatnrBatch(staDescId, matnr, batch,grade, crnNo);
+ List<WrkMast> wrkMasts = wrkMastService.selectWrkMastWrkDetlMatnrBatch(staDescId, matnr, batch, grade, crnNo);
int nearbay = 0; //鐩镐技宸ヤ綔妗ｆ 鐩爣搴撲綅鍒�
int nearlev = 0; //鐩镐技宸ヤ綔妗ｆ 鐩爣搴撲綅灞�
- for (WrkMast wrkMast:wrkMasts){
+ for (WrkMast wrkMast : wrkMasts) {
LocMast locMastWrk = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
List<LocMast> locMasts = new ArrayList<>();
- if (locMastWrk.getBay1() >=3 && locMastWrk.getBay1()<=6){
+ if (locMastWrk.getBay1() >= 3 && locMastWrk.getBay1() <= 6) {
locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .ge("bay1",3).le("bay1",6)
+ .ge("bay1", 3).le("bay1", 6)
.eq("crn_no", 7)
- .eq("loc_type1",locTypeDto.getLocType1())
- .eq("lev1",locMastWrk.getLev1())
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .eq("lev1", locMastWrk.getLev1())
.orderBy("bay1", true));
- }else {
+ } else {
locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("bay1", locMastWrk.getBay1())
.eq("crn_no", 7)
- .eq("loc_type1",locTypeDto.getLocType1())
- .eq("lev1",locMastWrk.getLev1())
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .eq("lev1", locMastWrk.getLev1())
.orderBy("bay1", false));
}
if (Cools.isEmpty(locMasts)) {
@@ -901,7 +936,7 @@
if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q") || locMastGro1.getLocSts().equals("R") || locMastGro1.getLocSts().equals("X")) {
break;
}
- if (locMastGro1.getLocSts().equals("O")){
+ if (locMastGro1.getLocSts().equals("O")) {
locMast = locMastGro1;
break;
}
@@ -926,10 +961,10 @@
if (Cools.isEmpty(staDesc)) {
log.error("鍏ュ簱璺緞涓嶅瓨鍦�:type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
crnNo = 0;
- }else {
+ } else {
staNo = basDevpService.selectById(staDesc.getCrnStn());
if (!staNo.getAutoing().equals("Y")) {
- log.error("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
crnNo = 0;
}
startupDto.setStaNo(staNo.getDevNo());
@@ -948,47 +983,47 @@
if (Cools.isEmpty(locMast) && crnNo != 0) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("bay1", nearRow)
- .in("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue())
- .eq("crn_no",7)
- .eq("loc_type1",locTypeDto.getLocType1())
- .orderBy("lev1",true).orderBy("row1",false));//鏈�娴呭簱浣�
+ .in("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
+ .eq("crn_no", 7)
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .orderBy("lev1", true).orderBy("row1", false));//鏈�娴呭簱浣�
for (LocMast locMast1 : locMasts) {
- if (locMast != null){
+ if (locMast != null) {
break;
}
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
- if (Utils.BooleanWhsTypeStaIoType(rowLastno)){
+ if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
List<LocMast> locMasts1 = null;
- if (nearRow == 3 && curRow == 6){
+ if (nearRow == 3 && curRow == 6) {
locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
- .ge("bay1",3).le("bay1",6)
- .eq("crn_no",7)
- .eq("loc_type1",locTypeDto.getLocType1())
- .orderBy("bay1",true));
- }else {
+ .ge("bay1", 3).le("bay1", 6)
+ .eq("crn_no", 7)
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .orderBy("bay1", true));
+ } else {
locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("bay1", nearRow)
- .eq("crn_no",7)
- .eq("loc_type1",locTypeDto.getLocType1())
- .orderBy("bay1",false));
+ .eq("crn_no", 7)
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .orderBy("bay1", false));
}
if (Cools.isEmpty(locMasts1)) {
continue;
}
for (LocMast locMastGro1 : locMasts1) {
- if (locMastGro1.getLocSts().equals("F")){
+ if (locMastGro1.getLocSts().equals("F")) {
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_No", locMastGro1.getLocNo()));
- if (!locDetl.getMatnr().equals(matnr) || !locDetl.getBatch().equals(batch)){
+ if (!locDetl.getMatnr().equals(matnr) || !locDetl.getBatch().equals(batch)) {
break;
}
}
if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q") || locMastGro1.getLocSts().equals("R")) {
break;
}
- if (locMastGro1.getLocSts().equals("O")){
+ if (locMastGro1.getLocSts().equals("O")) {
locMast = locMastGro1;
break;
}
@@ -1000,9 +1035,9 @@
// 閫掑綊鏌ヨ
if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount*2) {
+ if (times < rowCount * 2) {
times = times + 1;
- return getLocNoRun6(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times,mixture);
+ return getLocNoRun6(whsType, staDescId, sourceStaNo, matnr, batch, grade, moveCrnNo, locTypeDto, times, mixture);
}
log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
throw new CoolException("娌℃湁绌哄簱浣�");
@@ -1026,7 +1061,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