From 96c5a749f14c3dea75ff774e5eed2921ba0f2555 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 17 十二月 2025 09:52:02 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/common/service/CommonService.java | 356 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 356 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 55a2f22..f94e117 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -6,6 +6,7 @@
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
@@ -17,7 +18,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.sql.rowset.WebRowSet;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
@@ -134,6 +137,208 @@
log.error("鍏ュ簱澶辫触锛岄敊璇俊鎭�: {}", ex.getMessage(), ex);
}
return null;
+ }
+
+ @Transactional
+ public StartupDto getLocNoNew(Integer staDescId, Integer sourceStaNo,FindLocNoAttributeVo findLocNoAttributeVo,LocTypeDto locTypeDto,String barcode){
+ StartupDto startupDto = null;
+ StringBuilder builder = new StringBuilder();
+ try {
+ startupDto = searchLocNoByCrnNo(staDescId,sourceStaNo,findLocNoAttributeVo,locTypeDto);
+ }catch (Exception e){
+ builder.append(e.getMessage()).append(",");
+ }
+
+ if (startupDto == null){
+ builder.append("鎵句笉鍒扮┖搴撲綅");
+ throw new CoolException(builder.toString());
+ }
+ return startupDto;
+ }
+
+ @Transactional
+ public StartupDto searchLocNoByCrnNo(Integer staDescId,Integer sourceStaNo,FindLocNoAttributeVo findLocNoAttributeVo,LocTypeDto locTypeDto){
+ LocMast locMast = null;
+ if (staDescId == 10){
+ //鎼滅储绌烘墭鐩�
+ locMast = searchEmptyPallet(locTypeDto);
+ }else {
+ //婊℃墭鐩�
+ locMast = searchMaxPallet(findLocNoAttributeVo,locTypeDto);
+ }
+
+ if (locMast == null){
+ throw new CoolException("鎵句笉鍒扮鍚堝昂瀵哥殑绌哄簱浣�");
+ }
+
+ StartupDto startupDto = new StartupDto();
+
+ String locNo = locMast.getLocNo();
+ //鐢熸垚宸ヤ綔鍙�
+ int workNo = getWorkNo(0);
+ //杩斿洖dto
+ startupDto.setWorkNo(workNo);
+ startupDto.setCrnNo(locMast.getCrnNo());
+ startupDto.setSourceStaNo(sourceStaNo);
+ startupDto.setLocNo(locNo);
+
+ return startupDto;
+ }
+
+ //鎼滅储婊℃墭鐩樺簱浣�
+ public LocMast searchMaxPallet(FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto){
+ LocMast targetLocMast = null;
+ List<String> locNos = locDetlService.getSameDetlList(findLocNoAttributeVo.getMatnr());
+ for (String locNo : locNos) {
+ //鑾峰彇閫氶亾缁�
+ List<Integer> locRowGroupDesc = Utils.getLocGroupDesc(slaveProperties,locNo);
+ for (Integer row : locRowGroupDesc) {
+ String deepLocNo = Utils.getLocNo(row,Utils.getBay(locNo),Utils.getLev(locNo));
+ LocMast deepLoc = locMastService.selectById(deepLocNo);
+ if (deepLoc == null){
+ continue;
+ }
+
+ if (deepLoc.getLocSts().equals("F")){
+ continue;
+ }else if (deepLoc.getLocSts().equals("O")){
+ targetLocMast = deepLoc;
+ break;
+ }else {
+ break;
+ }
+ }
+ }
+
+ if (targetLocMast == null){
+ //鐩歌繎鐗╂枡鍖归厤澶辫触锛屾悳绱㈠彲鐢ㄧ┖搴撲綅缁�
+
+ //鑾峰彇璁惧妤煎眰
+// List<Integer> levList = basCrnpService.getLevList();
+// Collections.shuffle(levList);
+
+ List<Integer> locLevList = locMastService.getLevList();
+// levList.addAll(locLevList);
+
+ for (Integer lev : locLevList) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("lev1", lev).orderBy("bay1", true).orderBy("row1",true));
+ for (LocMast locMast : locMasts) {
+ String locNo = locMast.getLocNo();
+ //鑾峰彇閫氶亾缁�
+ List<Integer> locRowGroupDesc = Utils.getLocGroupDesc(slaveProperties,locNo);
+
+ boolean flag = true;
+ for (Integer row : locRowGroupDesc) {
+ String deepLocNo = Utils.getLocNo(row,Utils.getBay(locNo),Utils.getLev(locNo));
+ LocMast deepLoc = locMastService.selectById(deepLocNo);
+ if (deepLoc == null){
+ continue;
+ }
+
+ if (!deepLoc.getLocSts().equals("O")){
+ flag = false;
+ break;
+ }
+ }
+
+ if (flag){
+ for (Integer row : locRowGroupDesc) {
+ String deepLocNo = Utils.getLocNo(row,Utils.getBay(locNo),Utils.getLev(locNo));
+ LocMast deepLoc = locMastService.selectById(deepLocNo);
+ if (deepLoc == null){
+ continue;
+ }
+
+ targetLocMast = deepLoc;
+ break;
+ }
+ break;
+ }
+ }
+ if (targetLocMast != null){
+ break;
+ }
+ }
+ }
+ return targetLocMast;
+ }
+
+ //鎼滅储绌烘墭鐩樺簱浣�
+ public LocMast searchEmptyPallet(LocTypeDto locTypeDto){
+ LocMast targetLocMast = null;
+ List<LocMast> locMastsD = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D"));
+ for (LocMast locMast : locMastsD) {
+ String locNo = locMast.getLocNo();
+ //鑾峰彇閫氶亾缁�
+ List<Integer> locGroupDesc = Utils.getLocGroupDesc(slaveProperties, locNo);
+ for (Integer row : locGroupDesc) {
+ String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
+ LocMast deepLoc = locMastService.selectById(deepLocNo);
+ if (deepLoc == null){
+ continue;
+ }
+
+ if (deepLoc.getLocSts().equals("F")){
+ continue;
+ }else if (deepLoc.getLocSts().equals("O")){
+ targetLocMast = deepLoc;
+ break;
+ }else {
+ break;
+ }
+ }
+ }
+
+ if (targetLocMast == null){
+ //鑾峰彇璁惧妤煎眰
+// List<Integer> levList = basCrnpService.getLevList();
+// Collections.shuffle(levList);
+
+ List<Integer> locLevList = locMastService.getLevList();
+// levList.addAll(locLevList);
+
+ for (Integer lev : locLevList) {
+ //鐩歌繎鐗╂枡鍖归厤澶辫触锛屾悳绱㈠彲鐢ㄧ┖搴撲綅缁�
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "O").eq("lev1", lev).orderBy("bay1", true).orderBy("row1",true));
+ for (LocMast locMast : locMasts) {
+ String locNo = locMast.getLocNo();
+ //鑾峰彇閫氶亾缁�
+ List<Integer> locGroupDesc = Utils.getLocGroupDesc(slaveProperties, locNo);
+
+ boolean flag = true;
+ for (Integer row : locGroupDesc) {
+ String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
+ LocMast deepLoc = locMastService.selectById(deepLocNo);
+ if (deepLoc == null){
+ continue;
+ }
+
+ if (!deepLoc.getLocSts().equals("O")){
+ flag = false;
+ break;
+ }
+ }
+
+ if (flag){
+ for (Integer row : locGroupDesc) {
+ String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
+ LocMast deepLoc = locMastService.selectById(deepLocNo);
+ if (deepLoc == null){
+ continue;
+ }
+
+ targetLocMast = deepLoc;
+ break;
+ }
+ break;
+ }
+ }
+ if (targetLocMast != null){
+ break;
+ }
+ }
+ }
+ return targetLocMast;
}
/**
@@ -597,6 +802,157 @@
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;
+ }
+
public StartupDto getLocNoRun5(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
matnr = "";
--
Gitblit v1.9.1