From 04bd02d1acaa4715fc7d9b3d31d7769c04b3a31f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 24 十月 2022 10:38:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 74 ++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 9e82564..b8748fb 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -10,7 +10,6 @@
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocTypeDto;
-import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
import com.zy.common.properties.SlaveProperties;
import lombok.extern.slf4j.Slf4j;
@@ -115,16 +114,15 @@
int end = 30;
switch (sourceStaNo) {
case 107:
- whsType = 2;
- end = 17;
- break;
- case 118:
- whsType = 3;
- start = 18;
- break;
- default:
whsType = 1;
break;
+ case 118:
+ whsType = 2;
+ start = 31;
+ end = 32;
+ break;
+ default:
+ throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
// 鐢熸垚宸ヤ綔鍙�
int workNo = getWorkNo(0);
@@ -136,7 +134,13 @@
int sRow = rowLastno.getsRow(); // 璧峰鍒�
int eRow = rowLastno.geteRow(); // 缁堟鍒�
int crn_qty = rowLastno.getCrnQty(); // 鍫嗗灈鏈烘暟閲忥紙宸烽亾鏁伴噺锛�
- int rowCount = eRow - sRow + 1; // 搴撴帓鎬绘暟
+ int rowCount;
+ if (whsType == 1) {
+ rowCount = 2;
+ } else {
+ rowCount = 1;
+ }
+// int rowCount = eRow - sRow + 1; // 搴撴帓鎬绘暟
// 鐩爣鍫嗗灈鏈哄彿
int crnNo = 0;
// 鐩爣搴撲綅
@@ -146,14 +150,19 @@
if (!Cools.isEmpty(matNos) && matNos.size() == 1) {
List<String> locNos = locDetlService.getSameDetl(matNos.get(0), start, end);
for (String locNo : locNos) {
- List<String> groupLoc = Utils.getGroupLoc(locNo);
- LocMast locMast0 = locMastService.findOutMost(groupLoc);
+ LocMast locMast0 = locMastService.findOutMost(locNo);
if (null != locMast0) {
// 娴呭簱浣嶇鍚堝昂瀵告娴�
if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
+ int locCrnNo;
+ if (whsType == 1) {
+ locCrnNo = 2;
+ } else {
+ locCrnNo = 3;
+ }
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
- if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
- crnNo = locMast0.getCrnNo();
+ if (basCrnpService.checkSiteError(locCrnNo, true)) {
+ crnNo = locCrnNo;
locMast = locMast0;
break;
}
@@ -168,14 +177,19 @@
.eq("loc_sts", "D").ge("row1", start).le("row1", end));
if (locMasts.size() > 0) {
for (LocMast loc : locMasts) {
- List<String> groupLoc = Utils.getGroupLoc(loc.getLocNo());
- LocMast locMast0 = locMastService.findOutMost(groupLoc);
+ LocMast locMast0 = locMastService.findOutMost(loc.getLocNo());
if (null != locMast0) {
// 娴呭簱浣嶇鍚堝昂瀵告娴�
if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
+ int locCrnNo;
+ if (whsType == 1) {
+ locCrnNo = 2;
+ } else {
+ locCrnNo = 3;
+ }
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
- if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
- crnNo = locMast0.getCrnNo();
+ if (basCrnpService.checkSiteError(locCrnNo, true)) {
+ crnNo = locCrnNo;
locMast = locMast0;
break;
}
@@ -186,21 +200,15 @@
}
// 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
- if (null == locMast) {
- Shelves shelves = new Shelves(rowCount, crn_qty);
- for (int i = 0; i < shelves.group; i ++) {
- curRow = shelves.start(curRow);
- if (curRow < 0) {
- throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
- }
- Integer crnNo1 = shelves.get(curRow) + 1;
- if (whsType != 1) {
- crnNo1 = whsType;
- }
- if (basCrnpService.checkSiteError(crnNo1, true)) {
- crnNo = crnNo1;
- break;
- }
+ if (null == locMast && whsType == 1) {
+ if (curRow == 2) {
+ curRow = 30;
+ } else if (curRow == 30) {
+ curRow = 2;
+ }
+ int crnNo1 = 2;
+ if (basCrnpService.checkSiteError(crnNo1, true)) {
+ crnNo = crnNo1;
}
}
--
Gitblit v1.9.1