From 7e8c672d13a4d5c9ef6d8b62f6fc1ce092a6c123 Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期一, 11 八月 2025 08:23:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 86 +++++++++++++++++++++++++++---------------
1 files changed, 55 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index aa8979c..bb25796 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -235,7 +235,12 @@
//灏濊瘯鎵�1鍙峰集杞ㄥ爢鍨涙満搴撲綅
crnNo = 1;
if (basCrnpService.checkSiteError(crnNo, true)) {
- List<Integer> nearRowList = new ArrayList<Integer>(){{add(4);add(6);add(3);add(1);}};
+ List<Integer> nearRowList = new ArrayList<Integer>() {{
+ add(4);
+ add(6);
+ add(3);
+ add(1);
+ }};
for (Integer near : nearRowList) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("row1", near)
@@ -247,7 +252,7 @@
int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type", 100));
if (locMasts.size() - crnCountO <= 2) {
log.error(crnNo + "鍙峰爢鍨涙満娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
- }else {
+ } else {
nearRow = near;
break;
}
@@ -261,7 +266,12 @@
//灏濊瘯鎵�1鍙峰集杞ㄥ爢鍨涙満搴撲綅
crnNo = 1;
if (basCrnpService.checkSiteError(crnNo, true)) {
- List<Integer> nearRowList = new ArrayList<Integer>(){{add(4);add(6);add(3);add(1);}};
+ List<Integer> nearRowList = new ArrayList<Integer>() {{
+ add(4);
+ add(6);
+ add(3);
+ add(1);
+ }};
for (Integer near : nearRowList) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("row1", near)
@@ -273,7 +283,7 @@
int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type", 100));
if (locMasts.size() - crnCountO <= 2) {
log.error(crnNo + "鍙峰爢鍨涙満娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
- }else {
+ } else {
nearRow = near;
break;
}
@@ -283,9 +293,10 @@
if (nearRow == 0) {
throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
}
- }else {
- throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
}
+// else {
+// throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
+// }
}
boolean signRule1 = false;
@@ -347,7 +358,7 @@
.eq("loc_no", shallowLoc)
.eq("loc_sts", "O")
);
- if(shallowLocMast != null) {
+ if (shallowLocMast != null) {
locMast = shallowLocMast;
break;
}
@@ -433,40 +444,22 @@
StaDesc staDesc = null;
BasDevp staNo = null;
+
if (Utils.BooleanWhsTypeSta(rowLastno, staDescId)) {
- // 鑾峰彇鐩爣绔�
- 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;
- } else {
- staNo = basDevpService.selectById(staDesc.getCrnStn());
- if (!staNo.getAutoing().equals("Y")) {
- log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
-// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
- crnNo = 0;
- }
- startupDto.setStaNo(staNo.getDevNo());
- }
+
// 鏇存柊搴撲綅鎺掑彿
if (Cools.isEmpty(locMast)) {
rowLastno.setCurrentRow(curRow);
rowLastnoService.updateById(rowLastno);
}
}
-
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
// 1.鎸夎鍒欐煡鎵惧簱浣�
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())
+ .eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()).ne("inv_wh",1)
.orderBy("lev1", true).orderBy("bay1", true));
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
@@ -542,7 +535,7 @@
// locTypeDto.setLocType1((short)i);
// return getLocNo(1, staDescId, sourceStaNo, matnr,batch,grade, locTypeDto, 0);
// }
- log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
+ log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿},{}", JSON.toJSONString(locTypeDto), times,moveCrnNo);
throw new CoolException("娌℃湁绌哄簱浣�");
}
@@ -554,14 +547,43 @@
if (crnNo == 1) {
configService.updateValue("123CrnSearchList", String.valueOf(0));
}
+ //閽堝1鍙峰爢鍨涙満鎵撶殑琛ヤ竵锛岄槻姝㈡壘鍒板簱浣嶆椂锛屾壘鍒版渶娴呭簱浣�
+ String deepLoc2 = Utils.getDeepLoc2(slaveProperties, locMast.getLocNo());
+ if (!Cools.isEmpty(deepLoc2)) {
+ LocMast locMastNew = locMastService.selectOne(new EntityWrapper<LocMast>().eq("crn_no",locMast.getCrnNo())
+ .eq("loc_no", deepLoc2).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
+ if (!Cools.isEmpty(locMastNew)) {
+ locMast = locMastNew;
+ }
+ }
+
+
+ // 鑾峰彇鐩爣绔�
+ wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no", locMast.getCrnNo());
+ staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ crnNo = 0;
+ } else {
+ staNo = basDevpService.selectById(staDesc.getCrnStn());
+ if (!staNo.getAutoing().equals("Y")) {
+ log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
+// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ crnNo = 0;
+ }
+ startupDto.setStaNo(staNo.getDevNo());
+ }
String locNo = locMast.getLocNo();
-
// 鐢熸垚宸ヤ綔鍙�
int workNo = getWorkNo(0);
// 杩斿洖dto
startupDto.setWorkNo(workNo);
- startupDto.setCrnNo(crnNo);
+ startupDto.setCrnNo(locMast.getCrnNo());
startupDto.setSourceStaNo(sourceStaNo);
startupDto.setLocNo(locNo);
return startupDto;
@@ -943,6 +965,8 @@
.eq("row1", nearRow)
.eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
.orderBy("lev1", true).orderBy("bay1", true));//鏈�娴呭簱浣�
+ //System.out.println(nearRow);
+ //System.out.println(curRow);
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
--
Gitblit v1.9.1