From 4d1e8953abd9bb35fe6783ccfb4fc6250d13617e Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 09 六月 2025 09:17:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 69 ++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 5298646..bc3d255 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -227,7 +227,35 @@
}
}
if (nearRow == 0) {
- throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
+ if (locTypeDto.getLocType2() == 2) {
+ //灏濊瘯鎵�1鍙峰集杞ㄥ爢鍨涙満搴撲綅
+ crnNo = 1;
+ if (basCrnpService.checkSiteError(crnNo, true)) {
+ List<Integer> nearRowList = new ArrayList<Integer>(){{add(3);add(4);add(1);add(6);}};
+ for (Integer near : nearRowList) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("row1", near)
+ .eq("loc_sts", "O")
+ .eq("whs_type", rowLastnoType.getType().longValue())
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .eq("loc_type2", locTypeDto.getLocType2())
+ );
+ 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 {
+ nearRow = near;
+ break;
+ }
+ }
+ }
+
+ if (nearRow == 0) {
+ throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
+ }
+ }else {
+ throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
+ }
}
boolean signRule1 = false;
@@ -258,6 +286,45 @@
continue;
}
+ if (crnNo == 1) {
+ if (locMast1.getRow1() == 1 || locMast1.getRow1() == 6) {
+ locMast = locMast1;//鍗曟繁搴撲綅鐩存帴浣跨敤
+ break;
+ }
+
+ //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+ List<LocMast> locMastList = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("whs_type", rowLastnoType.getType().longValue())
+ .eq("crn_no", locMast1.getCrnNo())
+ .eq("bay1", locMast1.getBay1())
+ .notIn("loc_sts", "O")
+ .orderBy("row1", true)
+ );
+ if (locMastList.isEmpty()) {
+ locMast = locMast1;
+ break;
+ }
+
+ LocMast locMastF = locMastList.get(0);
+ if (!slaveProperties.getDoubleLocs().contains(locMastF.getRow1())) {
+ continue;
+ }
+
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMastF.getLocNo()));
+ if (!Cools.isEmpty(locDetl) && findLocNoAttributeVo.beSimilar(locDetl)) {
+ String shallowLoc = Utils.getShallowLoc(slaveProperties, locMastF.getLocNo());
+ LocMast shallowLocMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no", shallowLoc)
+ .eq("loc_sts", "O")
+ );
+ if(shallowLocMast != null) {
+ locMast = shallowLocMast;
+ break;
+ }
+ }
+ continue;
+ }
+
//鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("F")) {
--
Gitblit v1.9.1