From 94c1bea63d0557a1f806e13df95074d652d26ad8 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 03 一月 2025 09:11:31 +0800
Subject: [PATCH] #ddth开发
---
src/main/java/com/zy/common/service/CommonService.java | 265 ++++++++++++++++++++++++++--------------------------
1 files changed, 132 insertions(+), 133 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index e3f1e21..a841d2b 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -17,6 +17,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Arrays;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
@@ -50,7 +51,8 @@
private SlaveProperties slaveProperties;
@Autowired
private WrkDetlService wrkDetlService;
-
+ @Autowired
+ private LocRuleService locRuleService;
/**
* 鐢熸垚宸ヤ綔鍙�
*
@@ -128,9 +130,8 @@
case 4:
return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade, 4, locTypeDto, 0);
}
-
- } catch (Exception e) {
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
+ } catch (CoolException ex) {
+ log.error("鍏ュ簱澶辫触锛岄敊璇俊鎭�: {}", ex.getMessage(), ex);
}
return null;
}
@@ -445,150 +446,148 @@
}
public StartupDto getLocNoRun4(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
- int rowCount = 0; //杞杞
- int crnNo = 0;
+ int crnNo = 1;//灏忚溅缂栧彿澶囩敤
+ RowLastno rowLastno = rowLastnoService.selectById(4);
LocMast locMast = null; // 鐩爣搴撲綅
StartupDto startupDto = new StartupDto();
+ int MaxBay = rowLastno.getCurrentRow();
+ int sRow = rowLastno.getsRow();
+ int eRow = rowLastno.geteRow();
+ //婊＄増绌烘澘鍏ュ簱瑙勫垯
+ switch (staDescId){
+ //鍏ㄦ澘
+ case 1:
+ // 浠庣 3 鍒楀紑濮� 杞姣忎竴鍒�
+ int currentBay = 1;
+ while (currentBay <= MaxBay) { //
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .ge("row1", sRow) // 鎺掕寖鍥达細璧峰鍒扮粨鏉�
+ .le("row1", eRow)
+ .ne("row1", 8) // 鎺掗櫎绗�8鎺�
+ .eq("loc_sts", "O") // 绌哄簱浣�
+ .eq("bay1", currentBay) // 褰撳墠鍒�
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .orderBy("row1 ASC, lev1 ASC")); // 鎸夋帓鍜屽眰鎺掑簭
+ if (!Cools.isEmpty(locMast)) {
+ // 妫�鏌ユ槸鍚︾鍚堝晢鍝佺紪鍙峰拰鎵瑰彿瑙勫垯
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>()
+ .eq("loc_no", locMast.getLocNo())
+ .andNew()
+ .eq("matnr", matnr)
+ .eq("batch", batch));
- if (!Cools.isEmpty(matnr) && staDescId != 10) {
- int lev = 0;
-// List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr", matnr));
-// if (!Cools.isEmpty(locDetls)){
-// for (LocDetl locDetl : locDetls){
-// if (locMast != null){
-// break;
-// }
-// LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
-// if (Cools.isEmpty(locMast1)) {
-// continue;
-// }
-// if (locMast1.getLev1() != lev && locMast1.getLev1() !=3) {
-// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
-// .eq("lev1", locMast1.getLev1())
-// .orderBy("bay1",false));
-// if (Cools.isEmpty(locMasts)){
-// throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===銆嬪簱浣嶆湭鐭�");
-// }
-// for (LocMast locMast2 : locMasts) {
-// if (locMast2.getLocSts().equals("O") ) {
-// if (locMast == null){
-// locMast = locMast2;
-// }
-// }else if (locMast2.getLocSts().equals("F")){
-// locMast = null;
-// }
-// }
-// }
-// }
-// if(Cools.isEmpty(locMast)){
-// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
-// .eq("lev1", 1)
-// .orderBy("bay1",false));
-// for (LocMast locMast2 : locMasts) {
-// if (locMast2.getLocSts().equals("O") ) {
-// if (locMast == null){
-// locMast = locMast2;
-// }
-// }else if (locMast2.getLocSts().equals("F")){
-// locMast = null;
-// }
-// }
-// }
-// if(Cools.isEmpty(locMast)){
-// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
-// .eq("lev1", 2)
-// .orderBy("bay1",false));
-// for (LocMast locMast2 : locMasts) {
-// if (locMast2.getLocSts().equals("O") ) {
-// if (locMast == null){
-// locMast = locMast2;
-// }
-// }else if (locMast2.getLocSts().equals("F")){
-// locMast = null;
-// }
-// }
-// }
-// }else {
- for (int i = 1; i <= 2; i++) {
- if (locMast != null) {
- break;
- }
-// List<LocMast> locMastsF = locMastService.selectList(new EntityWrapper<LocMast>()
-// .eq("lev1", i)
-// .eq("loc_sts", "F"));
-// if (!Cools.isEmpty(locMastsF)) {
-// continue;
-// }
- List<LocMast> locMastsR = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("lev1", i)
- .eq("loc_sts", "R"));
- if (!Cools.isEmpty(locMastsR)) {
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("loc_no", locMastsR.get(0).getLocNo()));
- if (Cools.isEmpty(wrkMast)) {
- continue;
- }
- List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- if (!wrkDetls.get(0).getMatnr().equals(matnr)) {
- continue;
- }
- }
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("lev1", i)
- .orderBy("bay1", false));
- if (Cools.isEmpty(locMasts)) {
- throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===銆嬪簱浣嶆湭鐭�");
- }
- for (LocMast locmast3 : locMasts) {
- if (locmast3.getLocSts().equals("O")) {
- if (locMast == null) {
- locMast = locmast3;
+ if (Cools.isEmpty(locDetl) || (matnr.equals(locDetl.getMatnr()) && batch.equals(locDetl.getBatch()))) {
+ // 鎵惧埌绗﹀悎鏉′欢鐨勫簱浣嶏紝璺冲嚭寰幆
+ break;
}
- } else if (locmast3.getLocSts().equals("F")) {
- locMast = null;
+ }
+
+ // 褰撳墠鍒楁棤绌轰綅锛屾鏌ヤ笅涓�鍒�
+ currentBay++;
+ }
+ // 鈶� 濡傛灉绗竴鎺掑叏婊★紝妫�绱㈢8鎺�
+ if (Cools.isEmpty(locMast)) {
+ for (int bay = 1; bay <= MaxBay; bay++) {
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", 8) // 绗�8鎺�
+ .eq("loc_sts", "O") // 绌哄簱浣嶇姸鎬�
+ .eq("bay1", bay) // 褰撳墠鍒�
+ .orderBy("lev1 ASC")); // 鎸夊眰鎺掑簭
+
+ if (!Cools.isEmpty(locMast)) {
+ break; // 鎵惧埌绗﹀悎鏉′欢鐨勫簱浣嶏紝閫�鍑哄惊鐜�
+ }
}
}
- }
-// }
- } else {
- //绌烘澘鍏ュ簱
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("lev1", 3)
- .orderBy("bay1", true));
- if (Cools.isEmpty(locMasts)) {
- throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�===銆嬪簱浣嶆湭鐭�");
- }
- for (LocMast locmast : locMasts) {
- if (locmast.getLocSts().equals("O")) {
- if (locMast == null) {
- locMast = locmast;
- }
- } else if (locmast.getLocSts().equals("D")) {
- locMast = null;
+
+ // 濡傛灉娌℃湁鎵惧埌绗﹀悎鏉′欢鐨勫簱浣�
+ if (Cools.isEmpty(locMast)) {
+ log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛�", JSON.toJSONString(locTypeDto));
+ throw new CoolException("娌℃湁绌哄簱浣�");
}
- }
+ break;
+ // 绌烘澘瑙勫垯
+ case 10:
+ // 鈶� 浼樺厛妫�绱㈢1鎺掓墍鏈夊垪鐘舵�佷负 "D" 鐨勫簱浣�
+ // 鏍囩锛岀敤浜庤烦鍑哄灞傚惊鐜�
+ outerLoop:
+ for (int bay = 1; bay <= MaxBay; bay++) {
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", sRow) // 绗竴鎺�
+ .eq("loc_sts", "D") // 绌烘澘鐘舵��
+ .eq("bay1", bay) // 褰撳墠鍒�
+ .ne("row1", 8) // 鎺掗櫎绗�8鎺�
+ .orderBy("lev1 ASC")); // 鎸夊眰鎺掑簭
+
+ if (!Cools.isEmpty(locMast)) {
+ // 浠庡綋鍓嶅垪鎵惧埌鐘舵�佷负 "D" 鐨勫簱浣嶅悗锛屽悜澶栦緷娆℃绱㈡帓
+ for (int row = sRow + 1; row <= eRow; row++) { // 浠庣浜屾帓寮�濮�
+ LocMast potentialLoc = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", row) // 褰撳墠鎺�
+ .eq("loc_sts", "O") // 绌哄簱浣嶇姸鎬�
+ .eq("bay1", bay) // 褰撳墠鍒�
+ .ne("row1", 8) // 鎺掗櫎绗�8鎺�
+ .eq("lev1",locMast.getLev1())); //褰撳墠灞�
+
+ if (!Cools.isEmpty(potentialLoc)) {
+ locMast = potentialLoc; // 鏇存柊涓烘壘鍒扮殑绌哄簱浣�
+ break outerLoop; // 鎵惧埌绗﹀悎鏉′欢鐨勫簱浣嶏紝璺冲嚭澶栧眰寰幆
+ }
+ }
+ }
+ }
+
+ // 鈶� 濡傛灉绗�1鎺掓病鏈夋壘鍒� "D"锛屾绱㈢姸鎬佷负 "O" 鐨勫簱浣�
+ if (Cools.isEmpty(locMast)) {
+ for (int bay = 1; bay <= MaxBay; bay++) {
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", sRow) // 绗竴鎺�
+ .eq("loc_sts", "O") // 绌哄簱浣嶇姸鎬�
+ .eq("bay1", bay) // 褰撳墠鍒�
+ .orderBy("lev1 ASC")); // 鎸夊眰鎺掑簭
+
+ if (!Cools.isEmpty(locMast)) {
+ break; // 鎵惧埌绗﹀悎鏉′欢鐨勫簱浣嶏紝閫�鍑哄惊鐜�
+ }
+ }
+ }
+
+ // 鈶� 濡傛灉绗竴鎺掑叏婊★紝妫�绱㈢8鎺�
+ if (Cools.isEmpty(locMast)) {
+ for (int bay = 1; bay <= MaxBay; bay++) {
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", 8) // 绗�8鎺�
+ .eq("loc_sts", "O") // 绌哄簱浣嶇姸鎬�
+ .eq("bay1", bay) // 褰撳墠鍒�
+ .orderBy("lev1 ASC")); // 鎸夊眰鎺掑簭
+
+ if (!Cools.isEmpty(locMast)) {
+ break; // 鎵惧埌绗﹀悎鏉′欢鐨勫簱浣嶏紝閫�鍑哄惊鐜�
+ }
+ }
+ }
+
+ // 濡傛灉浠嶇劧娌℃湁鎵惧埌绗﹀悎鏉′欢鐨勫簱浣�
+ if (Cools.isEmpty(locMast)) {
+ log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛�", JSON.toJSONString(locTypeDto));
+ throw new CoolException("娌℃湁绌哄簱浣�");
+ }
+ break;
+
+ default:
+ throw new CoolException("涓嶆敮鎸佺殑搴撲綅瑙勫垯绫诲瀷: " + staDescId);
+
}
-
- // 閫掑綊鏌ヨ
- if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
- // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount * 2) {
- times = times + 1;
- return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade, moveCrnNo, locTypeDto, times);
- }
- log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
- throw new CoolException("娌℃湁绌哄簱浣�");
- }
+ // 杩斿洖鎵惧埌鐨勫簱浣�
String locNo = locMast.getLocNo();
-
- // 鐢熸垚宸ヤ綔鍙�
int workNo = getWorkNo(0);
- // 杩斿洖dto
startupDto.setWorkNo(workNo);
- startupDto.setCrnNo(1);
+ startupDto.setCrnNo(locMast.getCrnNo());
startupDto.setSourceStaNo(sourceStaNo);
startupDto.setLocNo(locNo);
+
return startupDto;
}
--
Gitblit v1.9.1