From 00d7b6d9df2e9a1de897b9cac1468f3b64905677 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 03 一月 2025 11:15:02 +0800
Subject: [PATCH] #满，空入库完成
---
src/main/java/com/zy/common/service/CommonService.java | 248 +++++++++++++++++++++++++------------------------
1 files changed, 125 insertions(+), 123 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index a841d2b..5f4285a 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -128,7 +128,7 @@
*/
switch (rowLastnoType.getType()) {
case 4:
- return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade, 4, locTypeDto, 0);
+ return getLocNoRun4(whsType, staDescId, sourceStaNo, matnr, batch, grade, 4, locTypeDto, 3);
}
} catch (CoolException ex) {
log.error("鍏ュ簱澶辫触锛岄敊璇俊鎭�: {}", ex.getMessage(), ex);
@@ -450,138 +450,140 @@
RowLastno rowLastno = rowLastnoService.selectById(4);
LocMast locMast = null; // 鐩爣搴撲綅
StartupDto startupDto = new StartupDto();
- int MaxBay = rowLastno.getCurrentRow();
+ int curRow = 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(locDetl) || (matnr.equals(locDetl.getMatnr()) && batch.equals(locDetl.getBatch()))) {
- // 鎵惧埌绗﹀悎鏉′欢鐨勫簱浣嶏紝璺冲嚭寰幆
- break;
- }
- }
-
- // 褰撳墠鍒楁棤绌轰綅锛屾鏌ヤ笅涓�鍒�
- currentBay++;
+ int nearRow = 8;//鐗规畩鍗曟帓
+ int orbit = 7;//杞ㄩ亾
+ // 鐩镐技宸ヤ綔妗ｆ --- 鍚屽ぉ鍚岃鏍肩墿鏂�
+ if (!Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111) ) {
+ //鏌ヨ鐩镐技宸ヤ綔妗ｆ
+ List<WrkMast> wrkMasts = wrkMastService.selectWrkMastWrkDetlMatnrBatch(1, matnr, batch,null, crnNo);
+ for (WrkMast wrkMast:wrkMasts){
+ if (Cools.isEmpty(wrkMast.getLocNo())){
+ continue;
}
- // 鈶� 濡傛灉绗竴鎺掑叏婊★紝妫�绱㈢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 (Utils.getRow(wrkMast.getLocNo()) == orbit || Utils.getRow(wrkMast.getLocNo()) == nearRow){
+ continue;
}
-
- // 濡傛灉娌℃湁鎵惧埌绗﹀悎鏉′欢鐨勫簱浣�
- if (Cools.isEmpty(locMast)) {
- log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛�", JSON.toJSONString(locTypeDto));
- throw new CoolException("娌℃湁绌哄簱浣�");
+ //鏌ユ壘姝ゅ簱浣嶇殑娴呭簱浣嶆槸鍚︿负绌�
+ int value = Integer.valueOf(wrkMast.getLocNo().substring(0, 2)) + 1;
+ String loc="0"+value+wrkMast.getLocNo().substring(2);
+ LocMast locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no",loc)
+ .eq("loc_sts","O")
+ .eq("loc_type1", locTypeDto.getLocType1())
+ );
+ if(Cools.isEmpty(locMast1)){
+ continue;
}
+ locMast=locMast1;
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)) {
+ List<LocDetl> locNos = locDetlService.getSameDetlToday(matnr, batch,sRow, eRow);
+ for (LocDetl locNo : locNos) {
+ //鐩爣鎺掍负鏈�澶栧眰鎺�
+ if (Utils.getRow(locNo.getLocNo()) == nearRow || Utils.getRow(locNo.getLocNo()) == orbit){
+ continue;
+ }
+ LocMast locMast2=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no",locNo.getLocNo())
+ .eq("loc_sts","F"));
+ if(Cools.isEmpty(locMast2)){
+ continue;
+ }
+ int value = Integer.valueOf(locNo.getLocNo().substring(0, 2)) + 1;
+ String loc="0"+value+locNo.getLocNo().substring(2);
+ LocMast locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no",loc)
+ .eq("loc_sts","O")
+ .eq("loc_type1", locTypeDto.getLocType1())
+ );
+ if(Cools.isEmpty(locMast1)){
+ continue;
+ }
+ locMast=locMast1;
+ break;
+ }
+ }
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+ if (staDescId == 10) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
+ if (locMasts.size() > 0) {
+ for (LocMast loc : locMasts) {
+ if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
+ continue;
+ }
+ String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo());
+ // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
+ LocMast shallowLoc = locMastService.selectById(shallowLocNo);
+ if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
+ if (shallowLoc.getLocType1()<locTypeDto.getLocType1()){
+ continue;
+ }
+ if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
+ locMast = shallowLoc;
+ crnNo = locMast.getCrnNo();
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ // 鑾峰彇鐩爣绔�
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no", 1);
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+ throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ }
+ BasDevp staNo = basDevpService.selectById(staDesc.getStnNo());
+ if (!staNo.getAutoing().equals("Y")) {
+ throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ }
+
+ // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
+ if (null == locMast) {
+ LocMast locMast1 = new LocMast();
+ if(sourceStaNo == 101){
+ locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", 1)
+ .eq("loc_sts","O")
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .orderBy("lev1,bay1 ASC"));
+ }
+ if(!Cools.isEmpty(locMast1)){
+ locMast=locMast1;
+ }
+ }
+ // 鏇存柊搴撲綅鎺掑彿
+ rowLastno.setCurrentRow(curRow);
+ rowLastnoService.updateById(rowLastno);
+
+ // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
+ if (Cools.isEmpty(locMast)) {
+ // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
+ times = times - 1;
+ if (times >0) {
+ 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);
startupDto.setWorkNo(workNo);
startupDto.setCrnNo(locMast.getCrnNo());
--
Gitblit v1.9.1