From ccaf80f21ea0a8375324df6bb2250b9ad11c5cdd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 27 九月 2022 15:01:34 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/CommonService.java |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 89e086e..d1705b5 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -148,13 +148,14 @@
             List<String> locNos = locDetlService.getSameDetl(matNos.get(0), start, end);
             for (String locNo : locNos) {
                 List<String> groupLoc = Utils.getGroupLoc(locNo);
-                locMast = locMastService.findOutMost(groupLoc);
-                if (null != locMast) {
+                LocMast locMast0 = locMastService.findOutMost(groupLoc);
+                if (null != locMast0) {
                     // 娴呭簱浣嶇鍚堝昂瀵告娴�
-                    if (VersionUtils.locMoveCheckLocType(locMast, locTypeDto)) {
+                    if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                         // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
-                        if (basCrnpService.checkSiteError(locMast.getCrnNo(), true)) {
-                            crnNo = locMast.getCrnNo();
+                        if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
+                            crnNo = locMast0.getCrnNo();
+                            locMast = locMast0;
                             break;
                         }
                     }
@@ -169,13 +170,14 @@
             if (locMasts.size() > 0) {
                 for (LocMast loc : locMasts) {
                     List<String> groupLoc = Utils.getGroupLoc(loc.getLocNo());
-                    locMast = locMastService.findOutMost(groupLoc);
-                    if (null != locMast) {
+                    LocMast locMast0 = locMastService.findOutMost(groupLoc);
+                    if (null != locMast0) {
                         // 娴呭簱浣嶇鍚堝昂瀵告娴�
-                        if (VersionUtils.locMoveCheckLocType(locMast, locTypeDto)) {
+                        if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                             // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
-                            if (basCrnpService.checkSiteError(locMast.getCrnNo(), true)) {
-                                crnNo = locMast.getCrnNo();
+                            if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
+                                crnNo = locMast0.getCrnNo();
+                                locMast = locMast0;
                                 break;
                             }
                         }
@@ -190,6 +192,9 @@
         if (null == locMast) {
             Shelves shelves = new Shelves(rowCount, crn_qty);
             for (int i = 0; i < shelves.group; i ++) {
+                if (i > 0) {
+                    curRow = currentRow;
+                }
                 curRow = shelves.start(curRow);
                 if (curRow < 0) {
                     throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");

--
Gitblit v1.9.1