From d60e84cbedb554555578f071de95c4a8049183db Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 13 六月 2025 15:16:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 149 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 112 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index a6d7812..0dc32ac 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -119,6 +119,7 @@
*/
@Transactional
public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto) {
+ whsType = Utils.GetWhsType(sourceStaNo);
return getLocNoRun(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0);
}
@@ -136,7 +137,7 @@
if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
matnr = "";
}
- if (Cools.isEmpty(batch)) { //绠卞彿
+ if (Cools.isEmpty(batch)) { //鎵规
batch = "";
}
if (Cools.isEmpty(grade)) { //澶囩敤
@@ -172,52 +173,67 @@
}
//姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
- for (int i = times; i < crnNumber; i++) {
+ for (int i = times; i < crnNumber*2; i++) {
int[] locNecessaryParameters = Utils.LocNecessaryParameters(whsType, curRow, crnNumber);
curRow = locNecessaryParameters[1];
crnNo = locNecessaryParameters[2];
if (basCrnpService.checkSiteError(crnNo, true)) {
rowCount = locNecessaryParameters[0];
nearRow = locNecessaryParameters[3];
+ if (crnNo>5 || crnNo<3){
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+ int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type",100).ne("source_sta_no",100).and().ne("source_sta_no",148));
+ if (locMasts.size()-crnCountO<=2){
+ log.error(crnNo+"鍙峰爢鍨涙満娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
+ nearRow = 0;
+ times++;
+ continue;
+ }
+ }
break;
} else {
times++;
}
}
if (nearRow == 0) {
- throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
+ log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
+ 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 (Utils.BooleanWhsTypeStaIoType(whsType)){
+// // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗�
+// 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 (!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;
+ if (nearRow!=curRow){
+ 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,groupOutsideLocCrn);
+ 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(Cools.isEmpty(locDetl.getBatch()) ? "" : locDetl.getBatch()) && grade.equals(Cools.isEmpty(locDetl.getBrand()) ? "" : locDetl.getBrand())) {
+ //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+ locMast = locMastService.selectLocByLocStsPakInO(curRow,nearRow,groupOutsideLocCrn);
+ break;
+ }
}
}
}
@@ -243,7 +259,7 @@
}
// // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //鍒嗙鐗�
-// if (staDescId == 10) {
+// if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(whsType)) {
// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
// for (LocMast locMast1:locMasts){
// if (VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
@@ -259,11 +275,16 @@
// }
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //浜掗�氱増
- if (staDescId == 10) {
+ if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(whsType)) {
+ System.out.println("123whsType:"+whsType+"locMast:"+locMast);
+
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
if (locMasts.size() > 0) {
+ System.out.println("234whsType:"+whsType+"locMast:"+locMast);
+
+
for (LocMast loc : locMasts) {
- if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
+ if (!Utils.isDeepLoc(slaveProperties, loc.getLocNo())) {
continue;
}
String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
@@ -272,6 +293,8 @@
if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
+ System.out.println("345whsType:"+whsType+"locMast:"+locMast);
+
locMast = shallowLoc;
crnNo = locMast.getCrnNo();
break;
@@ -300,6 +323,7 @@
}else {
staNo = basDevpService.selectById(staDesc.getCrnStn());
if (!staNo.getAutoing().equals("Y")) {
+ log.error("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
crnNo = 0;
}
@@ -308,7 +332,7 @@
}
// 鏇存柊搴撲綅鎺掑彿
- if (Utils.BooleanWhsTypeSta(whsType, staDescId)) {
+ if (Utils.BooleanWhsTypeSta(whsType, staDescId) && Cools.isEmpty(locMast)) {
rowLastno.setCurrentRow(curRow);
rowLastnoService.updateById(rowLastno);
}
@@ -317,16 +341,67 @@
// 1.鎸夎鍒欐煡鎵惧簱浣�
if (Cools.isEmpty(locMast) && crnNo != 0) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("row1", nearRow)
+ .eq("loc_sts", "O")
+ .orderBy("inv_wh",false).orderBy("lev1",true).orderBy("bay1",true));
+
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).eq("loc_sts", "O"));
- if (!Cools.isEmpty(locMast2)) {
- locMast = locMast2;
- break;
+ if (Utils.BooleanWhsTypeStaIoType(whsType)){
+ String shallowLoc = locMast1.getLocNo();
+ if (locMast1.getRow1()!=25){
+ 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(whsType)){
+ for (LocMast locMast1 : locMasts) {
+ if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+ continue;
+ }
+ if (Utils.BooleanWhsTypeStaIoType(whsType)){
+ 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;
+ }
+ }
}
}
}
@@ -338,9 +413,9 @@
// 閫掑綊鏌ヨ
if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount) {
+ if (times < rowCount*2) {
times = times + 1;
- return getLocNoRun(1, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
+ return getLocNoRun(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
}
// // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
// if (locTypeDto.getLocType1() < 2) {
--
Gitblit v1.9.1