Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
===================================================================
diff -u -r26816 -r26820
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java	(.../TousseDefinition.java)	(revision 26816)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java	(.../TousseDefinition.java)	(revision 26820)
@@ -583,7 +583,7 @@
 	 * 可存放的库位
 	 */
 	@JsonIgnore
-	private List<StorageLocation> storageLocationList = new ArrayList<StorageLocation>();
+	private List<StorageLocation> storageLocationList;
 	
 	@Override
 	@Id
@@ -1852,7 +1852,7 @@
 		this.maxIDCardNum = maxIDCardNum;
 	}
 	
-	@ManyToMany(cascade = { CascadeType.PERSIST, CascadeType.MERGE }, fetch = FetchType.LAZY)
+	@ManyToMany(fetch = FetchType.LAZY)
 	@JoinTable(name = "storageLocation_tousseDefinition", joinColumns = { @JoinColumn(name = "tousseDefinition_id") }, inverseJoinColumns = { @JoinColumn(name = "storageLocation_id") })
 	public List<StorageLocation> getStorageLocationList() {
 		return storageLocationList;
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java
===================================================================
diff -u -r26308 -r26820
--- ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java	(.../UseRecordManagerTests.java)	(revision 26308)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/useRecord/UseRecordManagerTests.java	(.../UseRecordManagerTests.java)	(revision 26820)
@@ -2426,7 +2426,7 @@
 		objectDao.save(foreignTousseApplication);
 		
 		TousseDefinition foreignTousseDefinition = tousseDefinitionManager.getTousseDefinitionByNameForDisplay("Test骨钩");
-		
+		foreignTousseDefinition.setStorageLocationList(null);
 		TousseDefinition newForeignTousseDefinition = new TousseDefinition();
 
 		BeanUtils.copyProperties(newForeignTousseDefinition, foreignTousseDefinition);
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r26816 -r26820
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 26816)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 26820)
@@ -4216,6 +4216,9 @@
 			return toussesArray;
 		}
 		List<StorageLocation> unLimitedStorageLocation = storageLocationManager.getUnLimitedStorageLocation();	// 不限制存放物品的库位
+		if (CollectionUtils.isEmpty(unLimitedStorageLocation)) {
+			unLimitedStorageLocation = new ArrayList<StorageLocation>();
+		}
 		List<Long> packingRecordIds = new ArrayList<Long>();	// 装配记录ID
 		Map<Long, List<StorageLocation>> storageLocationMap = new HashMap<Long, List<StorageLocation>>();	// 库位Map(库位简称、库位编码)
 		Map<Long, TousseInstance> tousseInstanceMap = new HashMap<Long, TousseInstance>();					// 器械包实例Map(装配时间)
@@ -4327,7 +4330,7 @@
 			Set<String> simpleNameSet = new HashSet<String>();
 			String codes = "";
 			String names = "";
-			String orgUnitName = tousseObj.getString("depart");
+			String orgUnitName = tousseObj.optString("depart", "");
 			if (CollectionUtils.isNotEmpty(slList)) {
 				for (StorageLocation sl : slList) {
 					// 不是当前器械包实例所在科室下的库位不可用
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/warehouse/StorageLocation.java
===================================================================
diff -u -r26816 -r26820
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/warehouse/StorageLocation.java	(.../StorageLocation.java)	(revision 26816)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/warehouse/StorageLocation.java	(.../StorageLocation.java)	(revision 26820)
@@ -95,7 +95,7 @@
 	 * 可存放器械包
 	 */
 	@JsonIgnore
-	private List<TousseDefinition> tousseDefinitionList = new ArrayList<TousseDefinition>();
+	private List<TousseDefinition> tousseDefinitionList;
 	
 	/**
 	 * 所有祖先库位ID
@@ -184,7 +184,7 @@
 		this.tousseDefinitionNames = tousseDefinitionNames;
 	}
 
-	@ManyToMany(cascade = { javax.persistence.CascadeType.MERGE,javax.persistence.CascadeType.PERSIST }, fetch = FetchType.LAZY)
+	@ManyToMany(fetch = FetchType.LAZY)
 	@JoinTable(name = "storageLocation_tousseDefinition", joinColumns = { @JoinColumn(name = "storageLocation_id") }, inverseJoinColumns = { @JoinColumn(name = "tousseDefinition_id") })
 	public List<TousseDefinition> getTousseDefinitionList() {
 		return tousseDefinitionList;