From 9e0016b4c43c3f8d84ea3f88e9120c973a5767b6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 06 一月 2021 09:39:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 256 +++++++++++++++++++++++++++++++-------------------
1 files changed, 159 insertions(+), 97 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 1986fe9..2bc8599 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -2,15 +2,18 @@
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.service.*;
+import com.zy.asrs.utils.Utils;
+import com.zy.common.model.LocTypeDto;
+import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
-import com.zy.common.model.enums.WorkNoType;
+import com.zy.common.properties.SlaveProperties;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -37,6 +40,8 @@
private LocMastService locMastService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private SlaveProperties slaveProperties;
/**
* 鐢熸垚宸ヤ綔鍙�
@@ -47,20 +52,6 @@
WrkLastno wrkLastno = wrkLastnoService.selectById(wrkMk);
if (Cools.isEmpty(wrkLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
- }
-
- // 绫诲瀷
- switch (wrkMk) {
- case 0: // 鍏ュ簱 1 - 3000
- break;
- case 1: // 鎷ｆ枡/骞舵澘/鐩樼偣 3001 - 6000
- break;
- case 2: // 鍑哄簱 6001 -9000
- break;
- case 3: // 鍏朵粬 9001 -9999
- break;
- default:
- break;
}
int workNo = wrkLastno.getWrkNo();
@@ -94,112 +85,183 @@
/**
* 妫�绱㈠簱浣嶅彿
* @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
- * @param staDescId 璺緞ID
+ * @param staDescId 璺緞宸ヤ綔绫诲瀷
* @param sourceStaNo 婧愮珯
* @param matNos 鐗╂枡鍙烽泦鍚�
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos) {
+ @Transactional
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto) {
StartupDto startupDto = new StartupDto();
// 鐢熸垚宸ヤ綔鍙�
- int workNo = getWorkNo(WorkNoType.getWorkNoType(staDescId));
+ int workNo = getWorkNo(0);
+
+ switch (sourceStaNo) {
+ case 202:
+ whsType = 2;
+ break;
+ case 205:
+ whsType = 1;
+ break;
+ case 126:
+ whsType = 3;
+ break;
+ default:
+ throw new CoolException("搴撲綅鎺掑彿鍒嗛厤閿欒, 婧愮珯鍙凤細" + sourceStaNo);
+ }
startupDto.setWorkNo(workNo);
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
- if (whsType == 1 || whsType == 2){
- 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;
- // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
- if (null == locMast) {
- // 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙� todo:luxiaotao
- if (curRow == sRow) {
- curRow = eRow;
- } else {
- curRow = sRow;
+ // ===============>>>> 寮�濮嬫墽琛�
+ 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;
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
+ if (!Cools.isEmpty(matNos)) {
+ List<String> locNos = locDetlService.getSameDetlToday(matNos.get(0));
+ for (String locNo : locNos) {
+ if (Utils.isShallowLoc(slaveProperties, locNo)) {
+ continue;
}
- crnNo = whsType;
-// 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;
-// break;
-// }
-// }
+ String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
+ // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
+ LocMast shallowLoc = locMastService.selectById(shallowLocNo);
+ if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
+ locMast = shallowLoc;
+ crnNo = locMast.getCrnNo();
+ 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("鍏ュ簱璺緞涓嶅瓨鍦�");
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+ if (staDescId == 10) {
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D"));
+ 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")) {
+ locMast = shallowLoc;
+ crnNo = locMast.getCrnNo();
+ break;
+ }
+ }
}
- BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
- int inQty = staNo.getInQty()==null?0:staNo.getInQty();
- if (staNo.getAutoing().equals("Y") && inQty<2) {
- // 鏌ユ壘搴撲綅
- if (locMast == null) {
- locMast = locMastService.queryFreeLocMast(curRow);
+ }
+
+ // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
+ if (null == locMast) {
+ // 1-4鎺�
+ if (whsType == 1) {
+ // 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙�
+ 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;
+ break;
+ }
+ }
+ // 5-8鎺�
+ } else if (whsType == 2) {
+ // 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙�
+ Shelves shelves = new Shelves(rowCount, crn_qty);
+ curRow = shelves.start(curRow - 4);
+ if (curRow < 0) {
+ throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
+ }
+ for (List<Integer> node : shelves.nodes){
+ if (node.contains(curRow)) {
+ crnNo = shelves.nodes.indexOf(node) + 1;
+ break;
+ }
+ }
+ // 鍋忕Щ閲忚ˉ鍋�
+ curRow = curRow + 4;
+ crnNo = crnNo + 1;
+ // 126绌烘澘鍏� 1-8鎺�
+ } else {
+ // 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙�
+ 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;
+ 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.getAutoing().equals("Y") && inQty<2) {
+ // 鏌ユ壘搴撲綅
+ if (locMast == null) {
+ if (Utils.isShallowLoc(slaveProperties, curRow)) {
+ Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
+ locMast = locMastService.queryFreeLocMast(deepRow, locTypeDto.getLocType1());
}
if (Cools.isEmpty(locMast)) {
- throw new CoolException("娌℃湁绌哄簱浣�");
+ locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
}
- 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()+"涓嶅彲鐢�");
}
+ if (Cools.isEmpty(locMast)) {
+ // 杞昏揣鐗╂壘杞诲簱浣嶄负绌烘椂锛屽彲浠ュ幓鎵鹃噸搴撲綅浠�
+ if (locTypeDto.getLocType1() == 1) {
+ locTypeDto.setLocType1((short) 2);
+ return getLocNo(null, staDescId, sourceStaNo, matNos, locTypeDto);
+ }
+ 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(rowLastno.getWhsType()+"鍙峰簱浣嶆帓鍙峰垎閰嶈鍒欎笉鍙敤");
+ throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
}
return startupDto;
}
- 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;
- }
- String zerofill = zerofill(String.valueOf(targetRow), 2)+locNo.substring(2);
- System.out.println(zerofill);
- }
public static String zerofill(String msg, Integer count) {
if (msg.length() == count) {
--
Gitblit v1.9.1