From 6204fbf1a8c32aa19a775e0226c600bade5eea79 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Tue, 27 Aug 2024 12:34:46 +0800
Subject: [PATCH] no message

---
 .../receiving/pojo/DefaultASNManager.java     | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java b/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java
index 1fa35bb..2c0a8bf 100644
--- a/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java
+++ b/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java
@@ -1591,7 +1591,7 @@ public class DefaultASNManager extends DefaultBaseManager implements
 						 }else{
 							 name=l;
 					 }
-					 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code ",
+					 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+"  ",
 					 new String[] { "code"},new Object[] {name});
 					if(Locations.size()<=0){
 						 sb2.append((i+1)+"行"+name+";");
@@ -1703,7 +1703,7 @@ public class DefaultASNManager extends DefaultBaseManager implements
 								 name=l;
 								 qty= expectedQuantity;
 							 }
-							 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code ",
+							 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ",
 							 new String[] { "code"},new Object[] {name});
 							if(Locations.size()>0){
 								loc=Locations.get(0);
@@ -1871,7 +1871,7 @@ public class DefaultASNManager extends DefaultBaseManager implements
 						 }else{
 							 name=l;
 						 }
-						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code ",
+						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ",
 						 new String[] { "code"},new Object[] {name});
 						if(Locations.size()<=0){
 							 sb2.append((i+1)+"行"+name+";");
@@ -1954,7 +1954,7 @@ public class DefaultASNManager extends DefaultBaseManager implements
 							 qty= quantity;
 						 }
 						
-						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code ",
+						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ",
 						 new String[] { "code"},new Object[] {name});
 						 if(Locations.size()>0){
 							loc=Locations.get(0);
@@ -2089,7 +2089,7 @@ public class DefaultASNManager extends DefaultBaseManager implements
 						 }else{
 							 name=l;
 						 }
-						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code ",
+						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+"  ",
 						 new String[] { "code"},new Object[] {name});
 						if(Locations.size()<=0){
 							 sb2.append((i+1)+"行"+name+";");
@@ -2186,7 +2186,7 @@ public class DefaultASNManager extends DefaultBaseManager implements
 							 qty= quantity;
 						 }
 						
-						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code ",
+						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ",
 						 new String[] { "code"},new Object[] {name});
 						if(Locations.size()>0){
 							loc=Locations.get(0);
@@ -2355,7 +2355,7 @@ public class DefaultASNManager extends DefaultBaseManager implements
 						 }else{
 							 name=l;
 						 }
-						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code ",
+						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ",
 						 new String[] { "code"},new Object[] {name});
 						if(Locations.size()<=0){
 							 sb2.append((i+1)+"行"+name+";");
@@ -2451,7 +2451,7 @@ public class DefaultASNManager extends DefaultBaseManager implements
 							 qty= quantity;
 						 }
 						
-						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code ",
+						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ",
 						 new String[] { "code"},new Object[] {name});
 						if(Locations.size()>0){
 							loc=Locations.get(0);
@@ -2620,7 +2620,7 @@ public class DefaultASNManager extends DefaultBaseManager implements
 						 }else{
 							 name=l;
 						 }
-						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code ",
+						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ",
 						 new String[] { "code"},new Object[] {name});
 						if(Locations.size()<=0){
 							 sb2.append((i+1)+"行"+name+";");
@@ -2716,7 +2716,7 @@ public class DefaultASNManager extends DefaultBaseManager implements
 							 qty= quantity;
 						 }
 						
-						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code ",
+						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ",
 						 new String[] { "code"},new Object[] {name});
 						if(Locations.size()>0){
 							loc=Locations.get(0);
@@ -2892,7 +2892,7 @@ public class DefaultASNManager extends DefaultBaseManager implements
 						 }else{
 							 name=l;
 						 }
-						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code ",
+						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ",
 						 new String[] { "code"},new Object[] {name});
 						if(Locations.size()<=0){
 							 sb2.append((i+1)+"行"+name+";");
@@ -2989,7 +2989,7 @@ public class DefaultASNManager extends DefaultBaseManager implements
 							 qty= quantity;
 						 }
 						
-						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code ",
+						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ",
 						 new String[] { "code"},new Object[] {name});
 						if(Locations.size()>0){
 							loc=Locations.get(0);
@@ -3183,7 +3183,7 @@ public class DefaultASNManager extends DefaultBaseManager implements
 						 }else{
 							 name=l;
 						 }
-						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code ",
+						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ",
 						 new String[] { "code"},new Object[] {name});
 						if(Locations.size()<=0){
 							 sb2.append((i+1)+"行"+name+";");
@@ -3267,7 +3267,7 @@ public class DefaultASNManager extends DefaultBaseManager implements
 							 qty= quantity;
 						 }
 						
-						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code ",
+						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ",
 						 new String[] { "code"},new Object[] {name});
 						if(Locations.size()>0){
 							loc=Locations.get(0);
@@ -3407,7 +3407,7 @@ public class DefaultASNManager extends DefaultBaseManager implements
 						 }else{
 							 name=l;
 						 }
-						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code ",
+						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ",
 						 new String[] { "code"},new Object[] {name});
 						if(Locations.size()<=0){
 							 sb2.append((i+1)+"行"+name+";");
@@ -3491,7 +3491,7 @@ public class DefaultASNManager extends DefaultBaseManager implements
 							 qty= quantity;
 						 }
 						
-						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code ",
+						 List<Location> Locations =  commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ",
 						 new String[] { "code"},new Object[] {name});
 						if(Locations.size()>0){
 							loc=Locations.get(0);