From 9c699c554f021930ee3598261f43e6dfd9cccb9c Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 07 一月 2025 08:35:50 +0800
Subject: [PATCH] #拣料盘点优化(仍有回库顺序不同堵塞问题)
---
src/main/java/com/zy/common/service/CommonService.java | 414 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 285 insertions(+), 129 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..92420c0 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;
/**
* 鐢熸垚宸ヤ綔鍙�
*
@@ -126,11 +128,10 @@
*/
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, 2);
}
-
- } catch (Exception e) {
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
+ } catch (CoolException ex) {
+ log.error("鍏ュ簱澶辫触锛岄敊璇俊鎭�: {}", ex.getMessage(), ex);
}
return null;
}
@@ -445,150 +446,305 @@
}
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();
-
-
- 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;
+ int curRow = rowLastno.getCurrentRow();
+ int sRow = rowLastno.getsRow();
+ int eRow = rowLastno.geteRow();
+ 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;
}
-// 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)) {
+ //鐩爣鎺掍负杞ㄩ亾澶栨帓
+ if (Utils.getRow(wrkMast.getLocNo()) == orbit || Utils.getRow(wrkMast.getLocNo()) == nearRow){
+ continue;
+ }
+ //鏌ユ壘姝ゅ簱浣嶇殑娴呭簱浣嶆槸鍚︿负绌�
+ 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;
+ }
+
+ }
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
+ 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;
}
- 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;
+ 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;
}
- } else if (locmast3.getLocSts().equals("F")) {
- locMast = null;
+ if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
+ locMast = shallowLoc;
+ crnNo = locMast.getCrnNo();
+ 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;
}
}
}
+ // 鑾峰彇鐩爣绔�
+ 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 (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);
+ // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
+ if (null == locMast) {
+ LocMast locMast1 = new LocMast();
+ if(times != 0){
+ locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", 1)
+ .eq("loc_sts","O")
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .orderBy("lev1,bay1 ASC"));
+ } else {
+ locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", 8)
+ .eq("loc_sts","O")
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .orderBy("lev1,bay1 ASC"));
}
- log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
+ 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));
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;
+ }
+
+ public StartupDto getLocNoRunPick(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
+ int crnNo = 1;//灏忚溅缂栧彿澶囩敤
+ RowLastno rowLastno = rowLastnoService.selectById(4);
+ LocMast locMast = null; // 鐩爣搴撲綅
+ StartupDto startupDto = new StartupDto();
+ int curRow = rowLastno.getCurrentRow();
+ int sRow = rowLastno.getsRow();
+ int eRow = rowLastno.geteRow();
+ 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;
+ }
+ //鐩爣鎺掍负杞ㄩ亾澶栨帓
+ if (Utils.getRow(wrkMast.getLocNo()) == orbit || Utils.getRow(wrkMast.getLocNo()) == nearRow){
+ continue;
+ }
+ //鏌ユ壘姝ゅ簱浣嶇殑娴呭簱浣嶆槸鍚︿负绌�
+ 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;
+ }
+
+ }
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
+ 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(times != 0){
+ locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", 1)
+ .eq("loc_sts","O")
+ .eq("loc_type1", locTypeDto.getLocType1())
+ .orderBy("lev1,bay1 ASC"));
+ } else {
+ locMast1=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("row1", 8)
+ .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));
+ throw new CoolException("娌℃湁绌哄簱浣�");
+ }
+ String locNo = locMast.getLocNo();
+ // 杩斿洖鎵惧埌鐨勫簱浣�
+ startupDto.setWorkNo(0);
+ startupDto.setCrnNo(locMast.getCrnNo());
+ startupDto.setSourceStaNo(sourceStaNo);
+ startupDto.setLocNo(locNo);
+
return startupDto;
}
--
Gitblit v1.9.1