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);