From 9f83a9d589aaf22cb790515272a425216ea618b2 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 27 九月 2025 16:57:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 387 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 257 insertions(+), 130 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 628c95f..faefd3f 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -1,23 +1,29 @@
package com.zy.common.service;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.core.common.Arith;
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.common.model.Shelves;
+import com.zy.asrs.utils.Utils;
+import com.zy.asrs.utils.VersionUtils;
+import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
+import com.zy.common.properties.SlaveProperties;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.util.Collections;
import java.util.List;
/**
* 璐ф灦鏍稿績鍔熻兘
* Created by vincent on 2020/6/11
*/
+@Slf4j
@Service
public class CommonService {
@@ -37,10 +43,13 @@
private LocMastService locMastService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private SlaveProperties slaveProperties;
/**
* 鐢熸垚宸ヤ綔鍙�
- * @param wrkMk 0:鍏ュ嚭搴� ; 1:鍏朵粬
+ *
+ * @param wrkMk 0:鍏ュ簱 1 - 3000 ; 1:鎷ｆ枡/骞舵澘/鐩樼偣 3001 - 6000 ; 2: 鍑哄簱 6001 -9000 ; 3:鍏朵粬 9001 -9999
* @return workNo(宸ヤ綔鍙�)
*/
public int getWorkNo(Integer wrkMk) {
@@ -48,164 +57,282 @@
if (Cools.isEmpty(wrkLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
- int workNo = 0;
- // 鍏ュ嚭搴撶被鍨�
- if (wrkLastno.getWrkMk() == 0) {
- workNo = wrkLastno.getWrkNo();
- int sNo = wrkLastno.getSNo();
- int eNo = wrkLastno.getENo();
- workNo = workNo>=eNo ? sNo : workNo+1;
-
- while (true) {
- WrkMast wrkMast = wrkMastService.selectById(workNo);
- if (null != wrkMast) {
- workNo = workNo>=eNo ? sNo : workNo+1;
- } else {
- break;
- }
- }
- if (workNo > 0){
- wrkLastno.setWrkNo(workNo);
- wrkLastnoService.updateById(wrkLastno);
+ int workNo = wrkLastno.getWrkNo();
+ int sNo = wrkLastno.getSNo();
+ int eNo = wrkLastno.getENo();
+ workNo = workNo >= eNo ? sNo : workNo + 1;
+ while (true) {
+ WrkMast wrkMast = wrkMastService.selectById(workNo);
+ if (null != wrkMast) {
+ workNo = workNo >= eNo ? sNo : workNo + 1;
+ } else {
+ break;
}
}
+ // 淇敼搴忓彿璁板綍
+ if (workNo > 0) {
+ wrkLastno.setWrkNo(workNo);
+ wrkLastnoService.updateById(wrkLastno);
+ }
+ // 妫�楠�
if (workNo == 0) {
throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
} else {
- if (wrkMastService.selectById(workNo)!=null) {
+ if (wrkMastService.selectById(workNo) != null) {
throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
}
}
return workNo;
}
+
/**
* 妫�绱㈠簱浣嶅彿
- * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
- * @param staDescId 璺緞ID
- * @param sourceStaNo 婧愮珯
+ *
+ * @param staDescId 璺緞ID
+ * @param sourceStaNo 婧愮珯
+ * @param findLocNoAttributeVo 灞炴��
+ * @param locTypeDto 绫诲瀷
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo) {
- StartupDto startupDto = new StartupDto();
- RowLastno rowLastno = rowLastnoService.selectById(whsType);
- if (Cools.isEmpty(rowLastno)) {
- throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ @Transactional
+ public StartupDto getLocNo(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 (rowLastno.getWhsType() == 1){
- int curRow = rowLastno.getCurrentRow();
- int sRow = rowLastno.getsRow();
- int eRow = rowLastno.geteRow();
- int crn_qty = rowLastno.getCrnQty();
- int rowCount = eRow - sRow + 1;
- // 鐩爣鍫嗗灈鏈哄彿
- int crnNo = 0;
- // 鐩爣搴撲綅
- LocMast locMast = null;
- // 鍚屼竴澶╁悓瑙勬牸璐х墿闈犺繎鎽嗘硶瑙勫垯
- List<String> locNos = locDetlService.getSameDetlToday("X004073XX");
- for (String locNo : locNos) {
- // 鑾峰彇鎺�
- int row = Integer.parseInt(locNo.substring(0, 2));
- // 鍒ゆ柇鏄惁涓烘繁搴撲綅
- double remainder = Arith.remainder(row, rowCount / crn_qty);
- int targetRow;
- if (remainder == 1) {
- // 寰楀埌褰撳墠搴撲綅鐨勫鍥村簱浣�
- targetRow = row + 1;
- } else if (remainder == 0) {
- // 寰楀埌褰撳墠搴撲綅鐨勫唴鍥村簱浣�
- targetRow = row - 1;
- } else {
+ if(startupDto == null) {
+ builder.append("鎵句笉鍒扮┖搴撲綅");
+ throw new CoolException(builder.toString());
+ }
+
+ return startupDto;
+ }
+
+ /**
+ * 妫�绱㈠簱浣嶅彿
+ *
+ * @param staDescId 璺緞ID
+ * @param sourceStaNo 婧愮珯
+ * @param findLocNoAttributeVo 灞炴��
+ * @param locTypeDto 绫诲瀷
+ * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
+ */
+ @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();
+
+// // 鑾峰彇鐩爣绔�
+// Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>().eq("type_no", staDescId).eq("stn_no", sourceStaNo).eq("crn_no", locMast.getCrnNo());
+// StaDesc staDesc = staDescService.selectOne(wrapper);
+// if (Cools.isEmpty(staDesc)) {
+// log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+// } else {
+// BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
+// if (!staNo.getAutoing().equals("Y")) {
+// log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
+// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+// }
+// startupDto.setStaNo(staNo.getDevNo());
+// }
+ 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.getLocRowGroupDesc(slaveProperties, Utils.getRow(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;
}
- String targetLocNo = zerofill(String.valueOf(targetRow), 2)+locNo.substring(2);
- // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
- LocMast targetLocMast = locMastService.selectById(targetLocNo);
- if (targetLocMast != null && !targetLocMast.getLocSts().equals("O")) {
- locMast = targetLocMast;
- crnNo = locMast.getCrnNo();
+
+ if (deepLoc.getLocSts().equals("F")) {
+ continue;
+ } else if (deepLoc.getLocSts().equals("O")) {
+ targetLocMast = deepLoc;
+ break;
+ }else {
break;
}
}
- // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
- if (null == locMast) {
- // 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙�
- Shelves shelves = new Shelves(rowCount, crn_qty);
- curRow = shelves.start(curRow);
- if (curRow < 0) {
- throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
- }
- for (List<Integer> node : shelves.nodes){
- if (node.contains(curRow)) {
- crnNo = shelves.nodes.indexOf(node) + 1;
+ }
+
+ if(targetLocMast == null) {
+ //鐩歌繎鐗╂枡鍖归厤澶辫触锛屾悳绱㈠彲鐢ㄧ┖搴撲綅缁�
+
+ //鑾峰彇璁惧妤煎眰
+ List<Integer> levList = basCrnpService.getLevList();
+ Collections.shuffle(levList);
+
+ List<Integer> locLevList = locMastService.getLevList();
+ levList.addAll(locLevList);
+
+ for (Integer lev : levList) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "O")
+ .eq("lev1", lev)
+ .orderBy("bay1", true));
+ for (LocMast locMast : locMasts) {
+ String locNo = locMast.getLocNo();
+ //鑾峰彇閫氶亾缁�
+ List<Integer> locRowGroupDesc = Utils.getLocRowGroupDesc(slaveProperties, Utils.getRow(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;
}
}
- }
-
- basCrnpService.checkSiteStatus(crnNo);
- // 鑾峰彇鐩爣绔�
- Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", staDescId)
- .eq("stn_no", sourceStaNo)
- .eq("crn_no", crnNo);
- StaDesc staDesc = staDescService.selectOne(wrapper);
- if (Cools.isEmpty(staDesc)) {
- throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
- }
- BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
- int inQty = staNo.getInQty()==null?0:staNo.getInQty();
- if (staNo.getInEnable().equals("Y") && staNo.getAutoing().equals("Y") && inQty<2) {
- // 鏌ユ壘搴撲綅
- if (locMast == null) {
- locMast = locMastService.queryFreeLocMast(curRow);
+ if (targetLocMast != null) {
+ break;
}
- if (Cools.isEmpty(locMast)) {
- throw new CoolException("娌℃湁绌哄簱浣�");
- }
- String locNo = locMast.getLocNo();
-
- // 鏇存柊搴撲綅鎺掑彿
- rowLastno.setCurrentRow(curRow);
- rowLastnoService.updateById(rowLastno);
-
- // 杩斿洖dto
- startupDto.setCrnNo(crnNo);
- startupDto.setSourceStaNo(sourceStaNo);
- startupDto.setStaNo(staNo.getDevNo());
- startupDto.setLocNo(locNo);
- } else {
- throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
}
- } else {
- throw new CoolException(rowLastno.getWhsType()+"鍙峰簱浣嶆帓鍙峰垎閰嶈鍒欎笉鍙敤");
+
}
- return startupDto;
+ return targetLocMast;
}
- public static void main(String[] args) {
- System.out.println(Arith.remainder(1, 4));
- System.out.println("0200201".substring(0, 2));
- String locNo = "0800201";
- int row = Integer.parseInt(locNo.substring(0, 2));
- double remainder = Arith.remainder(row, 4);
- int targetRow;
- if (remainder == 1) {
- // 寰楀埌褰撳墠搴撲綅鐨勫鍥村簱浣�
- targetRow = row + 1;
- } else if (remainder == 0) {
- // 寰楀埌褰撳墠搴撲綅鐨勫唴鍥村簱浣�
- targetRow = row - 1;
- } else {
- return;
+ //鎼滅储绌烘墭鐩樺簱浣�
+ 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> locRowGroupDesc = Utils.getLocRowGroupDesc(slaveProperties, Utils.getRow(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;
+ }
+ }
+
}
- String zerofill = zerofill(String.valueOf(targetRow), 2)+locNo.substring(2);
- System.out.println(zerofill);
+
+ if(targetLocMast == null) {
+
+ //鑾峰彇璁惧妤煎眰
+ List<Integer> levList = basCrnpService.getLevList();
+ Collections.shuffle(levList);
+
+ List<Integer> locLevList = locMastService.getLevList();
+ levList.addAll(locLevList);
+
+ for (Integer lev : levList) {
+ //鐩歌繎鐗╂枡鍖归厤澶辫触锛屾悳绱㈠彲鐢ㄧ┖搴撲綅缁�
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "O")
+ .eq("lev1", lev)
+ .orderBy("bay1", true));
+ for (LocMast locMast : locMasts) {
+ String locNo = locMast.getLocNo();
+ //鑾峰彇閫氶亾缁�
+ List<Integer> locRowGroupDesc = Utils.getLocRowGroupDesc(slaveProperties, Utils.getRow(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 static String zerofill(String msg, Integer count) {
@@ -215,11 +342,11 @@
return msg.substring(0, 16);
} else {
StringBuilder msgBuilder = new StringBuilder(msg);
- for(int i = 0; i < count - msg.length(); ++i) {
+ for (int i = 0; i < count - msg.length(); ++i) {
msgBuilder.insert(0, "0");
}
return msgBuilder.toString();
}
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1