From 057e2cd464cc8773672ae6ddac7d32eb8cbc3a1f Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期一, 15 七月 2024 13:27:33 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/CommonService.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index a6d7812..8a506d7 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -179,6 +179,11 @@
             if (basCrnpService.checkSiteError(crnNo, true)) {
                 rowCount =  locNecessaryParameters[0];
                 nearRow = locNecessaryParameters[3];
+                List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+                if (locMasts.size()<=10){
+                    times++;
+                    continue;
+                }
                 break;
             } else {
                 times++;
@@ -214,6 +219,11 @@
                 String shallowLoc = Utils.getDeepLoc(slaveProperties,locMast1.getLocNo());
                 LocMast locMast2 = locMastService.selectById(shallowLoc);
                 if (!Cools.isEmpty(locMast2) && locMast2.getLocSts().equals("F")){
+                    if (sourceStaNo<200){
+                        if (locMast2.getCrnNo()==1 || locMast2.getCrnNo()==6){
+                            continue;
+                        }
+                    }
                     LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast2.getLocNo()));
                     if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr())) {
                         locMast = locMast1;
@@ -231,6 +241,11 @@
                 // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
                 LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                 if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
+                    if (sourceStaNo<200){
+                        if (shallowLoc.getCrnNo()==1 || shallowLoc.getCrnNo()==6){
+                            continue;
+                        }
+                    }
                     if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
                         if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
                             locMast = shallowLoc;
@@ -270,6 +285,11 @@
                     // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
                     LocMast shallowLoc = locMastService.selectById(shallowLocNo);
                     if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
+                        if (sourceStaNo<200){
+                            if (shallowLoc.getCrnNo()==1 || shallowLoc.getCrnNo()==6){
+                                continue;
+                            }
+                        }
                         if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
                             if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
                                 locMast = shallowLoc;
@@ -308,7 +328,7 @@
         }
 
         // 鏇存柊搴撲綅鎺掑彿
-        if (Utils.BooleanWhsTypeSta(whsType, staDescId)) {
+        if (Utils.BooleanWhsTypeSta(whsType, staDescId) && Cools.isEmpty(locMast)) {
             rowLastno.setCurrentRow(curRow);
             rowLastnoService.updateById(rowLastno);
         }
@@ -317,7 +337,7 @@
 
         // 1.鎸夎鍒欐煡鎵惧簱浣�
         if (Cools.isEmpty(locMast) && crnNo != 0) {
-            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O").orderBy("lev1",true));
             for (LocMast locMast1 : locMasts) {
                 if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
                     continue;

--
Gitblit v1.9.1