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 | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index da9f631..0dc32ac 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -137,7 +137,7 @@
if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
matnr = "";
}
- if (Cools.isEmpty(batch)) { //绠卞彿
+ if (Cools.isEmpty(batch)) { //鎵规
batch = "";
}
if (Cools.isEmpty(grade)) { //澶囩敤
@@ -180,11 +180,15 @@
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"));
- int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type",100));
- if (locMasts.size()-crnCountO<=2){
- times++;
- continue;
+ 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 {
@@ -192,7 +196,8 @@
}
}
if (nearRow == 0) {
- throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
+ log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
+ throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満,鏃犲彲鐢ㄧ┖搴撲綅");
}
boolean signRule1 = false;
@@ -238,7 +243,7 @@
if (Utils.isShallowLoc(slaveProperties, locNo)) {
continue;
}
- String shallowLocNo = Utils.getShallowLoc5(slaveProperties, locNo,whsType);
+ String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
// 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
LocMast shallowLoc = locMastService.selectById(shallowLocNo);
if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
@@ -271,18 +276,25 @@
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //浜掗�氱増
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.getShallowLoc5(slaveProperties, loc.getLocNo(),whsType);
+ 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)) {
+ System.out.println("345whsType:"+whsType+"locMast:"+locMast);
+
locMast = shallowLoc;
crnNo = locMast.getCrnNo();
break;
@@ -332,13 +344,17 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("row1", nearRow)
.eq("loc_sts", "O")
- .orderBy("lev1",true).orderBy("bay1",true));
+ .orderBy("inv_wh",false).orderBy("lev1",true).orderBy("bay1",true));
+
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
if (Utils.BooleanWhsTypeStaIoType(whsType)){
- String shallowLoc = Utils.getDeepLoc5(slaveProperties, locMast1.getLocNo(),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)) {
@@ -359,7 +375,7 @@
continue;
}
if (Utils.BooleanWhsTypeStaIoType(whsType)){
- String shallowLoc = Utils.getDeepLoc5(slaveProperties, locMast1.getLocNo(),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)) {
@@ -369,13 +385,13 @@
locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_no", shallowLoc).eq("loc_sts", "F"));
if (!Cools.isEmpty(locMast2)) {
- locMast = locMast2;
+ locMast = locMast1;
break;
} else {
locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_no", shallowLoc).eq("loc_sts", "D"));
if (!Cools.isEmpty(locMast2)) {
- locMast = locMast2;
+ locMast = locMast1;
break;
}
}
--
Gitblit v1.9.1