From e7c658b1fab6878e5f986f945a63053badfe8a48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9A=B4=E7=82=B3=E6=9E=97?= <15237758276@163.com>
Date: Mon, 23 Dec 2024 17:47:42 +0800
Subject: [PATCH] no message

---
 src/main/java/com/dev/swms/server/model/base/location.hbm.xml   | 2 +-
 .../server/service/picking/allocate/DefaultAutoAllocator.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dev/swms/server/model/base/location.hbm.xml b/src/main/java/com/dev/swms/server/model/base/location.hbm.xml
index 3665bce..8bc884d 100644
--- a/src/main/java/com/dev/swms/server/model/base/location.hbm.xml
+++ b/src/main/java/com/dev/swms/server/model/base/location.hbm.xml
@@ -135,6 +135,6 @@
 			<column name="stock" />
 		</many-to-one>
 		
-		
+			
 	</class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultAutoAllocator.java b/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultAutoAllocator.java
index ce007f7..13c098a 100644
--- a/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultAutoAllocator.java
+++ b/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultAutoAllocator.java
@@ -2379,7 +2379,7 @@ public class DefaultAutoAllocator extends DefaultBaseManager implements AutoAllo
 								
 							}else {
 								String bsql=" from BillTypeConfig b where b.billType.id="+pt.getBillType().getId();
-								if(ptd.getNewLotInfo().getPropC9()!=null&&!ptd.getNewLotInfo().getPropC9().equals("")) {
+								if(ptd.getNewLotInfo()!=null&&ptd.getNewLotInfo().getPropC9()!=null&&!ptd.getNewLotInfo().getPropC9().equals("")) {
 									bsql+=" and b.plantCode='"+ptd.getNewLotInfo().getPropC9()+"'";
 								}
 							List<BillTypeConfig> bts=commonDao.findByQuery(bsql);