From 5b2a92ba86b8218da40a002f13f724fcff8cbe95 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 01 六月 2022 17:02:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 036b48d..816c08b 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.*;
@@ -163,7 +164,26 @@
// 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
if (null == locMast) {
Shelves shelves = new Shelves(rowCount, crn_qty);
- if (whsType == 1) {
+ if (whsType != 4) {
+ int divides = (int) Arith.divides(1, curRow - 1, 16);
+ curRow = (int) Arith.remainder(curRow, 16);
+ if (curRow == 0) {
+ curRow = 16;
+ }
+ 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*4;
+ if (basCrnpService.checkSiteError(crnNo1, true)) {
+ crnNo = crnNo1;
+ curRow = curRow + divides*16;
+ break;
+ }
+ }
+ } else {
for (int i = 0; i < shelves.group; i ++) {
curRow = shelves.start(curRow);
if (curRow < 0) {
--
Gitblit v1.9.1