From 9865c5bb168f1a77d5dec364ae87a4830457cd1b Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 24 十一月 2022 12:48:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 145 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 115 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 11f066a..35d495d 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -50,7 +50,7 @@
/**
* 鐢熸垚宸ヤ綔鍙�
- * @param wrkMk 0:鍏ュ簱 1 - 3000 ; 1:鎷ｆ枡/骞舵澘/鐩樼偣 3001 - 6000 ; 2: 鍑哄簱 6001 -9000 ; 3:鍏朵粬 9001 -9999
+ * @param wrkMk
* @return workNo(宸ヤ綔鍙�)
*/
public int getWorkNo(Integer wrkMk) {
@@ -98,17 +98,36 @@
@Transactional
public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
// whsType = getWhsType(sourceStaNo, times);
+ switch (sourceStaNo){
+ case 101:
+ case 109:
+ case 117:
+ whsType=1; //1-8璐ф灦
+ slaveProperties.setDoubleDeep(false);
+ slaveProperties.setGroupCount(2);
+ break;
+ case 201:
+ slaveProperties.setDoubleDeep(true);
+ slaveProperties.setGroupCount(4);
+ whsType=2; //9-12璐ф灦
+ break;
+ case 207:
+ whsType=3; //13-14璐ф灦
+ slaveProperties.setDoubleDeep(false);
+ slaveProperties.setGroupCount(2);
+ break;
+ case 213:
+ slaveProperties.setDoubleDeep(true);
+ slaveProperties.setGroupCount(4);
+ whsType=4; //15-18璐ф灦
+ break;
+ default:
+ throw new CoolException("鏍规嵁鍏ュ簱绔欒幏鍙栧簱浣嶆帓鍙峰垎閰嶅け璐ワ紝鍏ュ簱绔欙細" + sourceStaNo);
+ }
+
StartupDto startupDto = new StartupDto();
- 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)) {
@@ -169,30 +188,96 @@
}
}
}
-
- // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
- if (null == locMast) {
- Shelves shelves = new Shelves(rowCount, crn_qty);
- 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;
+ if (null == locMast){
+ switch (curRow){
+ case 1:
+ case 3:
+ case 5:
+ curRow=curRow+2;
+ crnNo=(curRow+1)/2;
break;
- }
+ case 7:
+ crnNo=1;
+ curRow=2;
+ break;
+ case 13:
+ crnNo=6;
+ curRow=14;
+ break;
+ case 2:
+ case 4:
+ case 6:
+ curRow=curRow+2;
+ crnNo=curRow/2;
+ break;
+ case 8:
+ crnNo=1;
+ curRow=1;
+ break;
+ case 14:
+ crnNo=6;
+ curRow=13;
+ break;
+ case 9:
+ crnNo=5;
+ curRow=12;
+ break;
+ case 10:
+ crnNo=5;
+ curRow=11;
+ break;
+ case 11:
+ crnNo=5;
+ curRow=9;
+ break;
+ case 12:
+ crnNo=5;
+ curRow=10;
+ break;
+ case 15:
+ crnNo=7;
+ curRow=18;
+ break;
+ case 16:
+ crnNo=7;
+ curRow=17;
+ break;
+ case 17:
+ crnNo=7;
+ curRow=15;
+ break;
+ case 18:
+ crnNo=7;
+ curRow=16;
+ break;
+ default:
+ throw new CoolException("鏍规嵁鍏ュ簱绔欒幏鍙栧簱浣嶆帓鍙峰垎閰嶅け璐ワ紝鍏ュ簱绔欙細" + sourceStaNo);
}
}
+// // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
+// if (null == locMast) {
+// Shelves shelves = new Shelves(rowCount, crn_qty);
+// 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;
+// }
+// }
+// }
+
if (crnNo == 0) {
throw new CoolException("娌℃湁鍙敤鐨勫爢鍨涙満");
}
--
Gitblit v1.9.1