From e5cf12d2e3441b83cc3aeafd4f7f23d4075ab5fc Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 07 一月 2025 14:56:14 +0800
Subject: [PATCH] #并板出库
---
src/main/java/com/zy/common/service/CommonService.java | 67 ++++++++++++++-------------------
1 files changed, 28 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 7e9701e..a8e9ebf 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -121,7 +121,7 @@
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
@Transactional
- public StartupDto getLocNo( Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto) {
+ 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);
@@ -139,7 +139,7 @@
log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
break;
case 4:
- return getLocNoRun4(whsType,staDescId,sourceStaNo,matnr,batch,grade,4,locTypeDto,0);
+ 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);
default:
@@ -471,7 +471,7 @@
return startupDto;
}
- public StartupDto getLocNoRun4(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
+ public StartupDto getLocNoRun4(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 = "";
}
@@ -536,7 +536,7 @@
// 鐩镐技宸ヤ綔妗ｆ --- 鍚屽ぉ鍚岃鏍肩墿鏂�
- if (!Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111) ) {
+ if (!Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111) && !mixture ) {
//鏌ヨ鐩镐技宸ヤ綔妗ｆ
List<WrkMast> wrkMasts = wrkMastService.selectWrkMastWrkDetlMatnrBatch(staDescId, matnr, batch,grade, crnNo);
int nearbay = 0; //鐩镐技宸ヤ綔妗ｆ 鐩爣搴撲綅鍒�
@@ -548,26 +548,33 @@
locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("gro1", locMastWrk.getGro1())
.eq("crn_no", 7)
+ .eq("loc_type1",locTypeDto.getLocType1())
.orderBy("bay1", true));
}else if (locMastWrk.getBay1() >=4 && locMastWrk.getBay1()<=12){
locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("gro1", locMastWrk.getGro1())
.eq("crn_no", 7)
+ .eq("loc_type1",locTypeDto.getLocType1())
.orderBy("bay1", false));
}else {
locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("gro1", locMastWrk.getGro1())
.eq("crn_no", 7)
+ .eq("loc_type1",locTypeDto.getLocType1())
.orderBy("bay1", true));
}
if (Cools.isEmpty(locMasts)) {
continue;
}
for (LocMast locMastGro1 : locMasts) {
+
+ if (locMastGro1.getBay1() == 2){ //wcs闂闄愬埗
+ continue;
+ }
if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q")) {
break;
}
- if (locMastGro1.getLocSts().equals("O") || locMastGro1.getLocSts().equals("S")){
+ if (locMastGro1.getLocSts().equals("O")){
locMast = locMastGro1;
break;
}
@@ -616,6 +623,7 @@
.eq("bay1", nearRow)
.eq("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) {
@@ -637,30 +645,42 @@
locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("gro1", locMast1.getGro1())
.eq("crn_no",7)
+ .eq("loc_type1",locTypeDto.getLocType1())
.orderBy("bay1",true));
- if(locMasts1.size() == 3 || (curRow>20 && locMasts1.size() == 2)){
+ if(locMast1.getBay1()>= 4 && locMast1.getBay1()<=12){
locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("gro1", locMast1.getGro1())
.eq("crn_no",7)
+ .eq("loc_type1",locTypeDto.getLocType1())
.orderBy("bay1",false));
}
}else {
locMasts1 = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("gro1", locMast1.getGro1())
.eq("crn_no",7)
+ .eq("loc_type1",locTypeDto.getLocType1())
.orderBy("bay1",false));
}
if (Cools.isEmpty(locMasts1)) {
continue;
}
for (LocMast locMastGro1 : locMasts1) {
+ if (mixture){ //娣锋枡鍙厑璁告斁 7 12 14
+ if (locMastGro1.getBay1() != 7 && locMastGro1.getBay1() != 12 && locMastGro1.getBay1() != 14){
+ continue;
+ }
+ }else { //涓嶆贩鏂欎笉鍏佽鏀� 7 12 14
+ if (locMastGro1.getBay1() == 7 || locMastGro1.getBay1() == 12 || locMastGro1.getBay1() == 14){
+ continue;
+ }
+ }
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)){
break;
}
}
- if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q")) {
+ if (locMastGro1.getLocSts().equals("P") || locMastGro1.getLocSts().equals("Q") || locMastGro1.getLocSts().equals("R")) {
break;
}
if (locMastGro1.getLocSts().equals("O")){
@@ -673,37 +693,6 @@
}
}
-
- //鏈壘鍒� 鍏佽娣锋枡
- 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);
-
- //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
- LocMast locMast2 = locMastService.selectLocByLocStsPakInF(curRow,nearRow,locMast1,rowLastnoType.getType().longValue());
- if (Cools.isEmpty(locMast2)) {
- 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 (!Cools.isEmpty(locMast3)) {
- locMast = locMast3;
- break;
- }
- }
- }
- }
- }
- }
}
// 閫掑綊鏌ヨ
@@ -711,7 +700,7 @@
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
if (times < rowCount*2) {
times = times + 1;
- return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
+ return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times,mixture);
}
log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
throw new CoolException("娌℃湁绌哄簱浣�");
--
Gitblit v1.9.1