From e67cb04af87e32a19c2b1e0756e6e8c6d0c7d1f8 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 12 一月 2025 14:50:18 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 8036cd6..885c12e 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -230,10 +230,20 @@
                         if (locMast2.getCrnNo()==1 || locMast2.getCrnNo()==6){
                             continue;
                         }
+                        if (sourceStaNo == 118 || sourceStaNo == 122){
+                            if (locMast2.getCrnNo()>3){
+                                continue;
+                            }
+                        } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){
+                            if (locMast2.getCrnNo()<4){
+                                continue;
+                            }
+                        }
                     }
                     LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast2.getLocNo()));
                     if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr())) {
                         locMast = locMast1;
+                        crnNo = locMast.getCrnNo();
                         break;
                     }
                 }
@@ -252,6 +262,15 @@
                         if (shallowLoc.getCrnNo()==1 || shallowLoc.getCrnNo()==6){
                             continue;
                         }
+                        if (sourceStaNo == 118 || sourceStaNo == 122){
+                            if (shallowLoc.getCrnNo()>3){
+                                continue;
+                            }
+                        } else if (sourceStaNo == 120 || sourceStaNo == 121 || sourceStaNo == 123 || sourceStaNo == 171){
+                            if (shallowLoc.getCrnNo()<4){
+                                continue;
+                            }
+                        }
                     }
                     if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
                         if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {

--
Gitblit v1.9.1