From 56a6e23e02f33d851a4882a20a0739081f308a23 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 02 十二月 2022 08:10:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 66 ++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index cd7aafa..11f066a 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
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.*;
@@ -96,10 +97,19 @@
*/
@Transactional
public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
- whsType = getWhsType(staDescId, times);
+// whsType = getWhsType(sourceStaNo, times);
StartupDto startupDto = new StartupDto();
- // 鐢熸垚宸ヤ綔鍙�
- int workNo = getWorkNo(0);
+
+ if (sourceStaNo < 200){
+ whsType = 1;
+ } else if (sourceStaNo > 199 && sourceStaNo < 300){
+ whsType = 2;
+ } else if (sourceStaNo > 299 && sourceStaNo < 400){
+ whsType = 3;
+ } else if (sourceStaNo > 399){
+ whsType = 4;
+ }
+
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
@@ -163,17 +173,22 @@
// 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
if (null == locMast) {
Shelves shelves = new Shelves(rowCount, crn_qty);
- if (whsType == 1) {
- for (int i = 0; i < shelves.group; i ++) {
- curRow = shelves.start(curRow);
- if (curRow < 0) {
- throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
- }
- Integer crnNo1 = shelves.get(curRow);
- if (basCrnpService.checkSiteError(crnNo1, true)) {
- crnNo = crnNo1;
- break;
- }
+ int divides = (int) Arith.divides(1, curRow - 1, 4);
+ curRow = (int) Arith.remainder(curRow, 4);
+ if (curRow == 0) {
+ curRow = 4;
+ }
+ for (int i = 0; i < shelves.group; i ++) {
+ curRow = shelves.start(curRow);
+ if (curRow < 0) {
+ throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
+ }
+ Integer crnNo1 = shelves.get(curRow);
+ crnNo1 = crnNo1 + divides*1;
+ if (basCrnpService.checkSiteError(crnNo1, true)) {
+ crnNo = crnNo1;
+ curRow = curRow + divides*4;
+ break;
}
}
}
@@ -195,6 +210,7 @@
if (!staNo.getAutoing().equals("Y")) {
throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
}
+
// 鏇存柊搴撲綅鎺掑彿
rowLastno.setCurrentRow(curRow);
rowLastnoService.updateById(rowLastno);
@@ -253,6 +269,8 @@
}
String locNo = locMast.getLocNo();
+ // 鐢熸垚宸ヤ綔鍙�
+ int workNo = getWorkNo(0);
// 杩斿洖dto
startupDto.setWorkNo(workNo);
startupDto.setCrnNo(crnNo);
@@ -280,11 +298,11 @@
/**
* 鏍规嵁鍏ュ簱绔欒幏鍙栧簱浣嶆帓鍙峰垎閰�
*/
- private Integer getWhsType(Integer staDescId, int times) {
+ private Integer getWhsType(Integer sourceStaNo, int times) {
if (times >= 16) {
return 4;
}
- switch (staDescId) {
+ switch (sourceStaNo) {
case 173:
case 176:
case 180:
@@ -296,14 +314,18 @@
case 202:
return 2;
case 206:
- case 211:
- case 215:
- case 219:
- case 223:
- case 226:
+// case 211:
+// case 215:
+// case 219:
+// case 223:
+ case 227:
return 3;
+ case 305:
+ case 303:
+ case 301:
+ return 4;
default:
- throw new CoolException("鏍规嵁鍏ュ簱绔欒幏鍙栧簱浣嶆帓鍙峰垎閰嶅け璐ワ紝鍏ュ簱绔欙細" + staDescId);
+ throw new CoolException("鏍规嵁鍏ュ簱绔欒幏鍙栧簱浣嶆帓鍙峰垎閰嶅け璐ワ紝鍏ュ簱绔欙細" + sourceStaNo);
}
}
--
Gitblit v1.9.1