Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r17443 -r17447
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 17443)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 17447)
@@ -2608,6 +2608,7 @@
 		td.setIsApplyEntireTousse(ancestorTD.getIsApplyEntireTousse());
 		// 消毒物品物包定义的包装以及灭菌程序分别为胶袋和无
 		td.setPackageType(ancestorTD.getPackageType());// 默认的包装类型
+		td.setAllowModifyPackageType(ancestorTD.getAllowModifyPackageType());// 是否允许修改包装类型
 		td.setSterilingMethod(ancestorTD.getSterilingMethod());// 默认的灭菌程序
 		td.setTaskGroup(ancestorTD.getTaskGroup());
 		//是否打印科室属性设置
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r17443 -r17447
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 17443)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 17447)
@@ -1658,7 +1658,7 @@
 					vo.setIsReview(td.getIsReview());
 					vo.setTousseName(tousseName);
 					vo.setTousseID(tousseID);
-					vo.setAllowModifyPackageType(td.getAllowModifyPackageType());
+					
 					vo.setTaskType(task.getTaskType());
 					vo.setUuid_vedioNames(td.getUuid_vedioNames());
 					vo.setHaveIDCard(haveIDCard);
@@ -1676,6 +1676,11 @@
 						vo.setUrgentAmount(urgentAmount + task.getUrgentAmount());
 					}
 				}
+				// 只要有一个消毒物品的包定义是不允许修改，那么就不允许修改此包的所有装配任务
+				if(StringUtils.equals(td.getAllowModifyPackageType(), TousseDefinition.STR_NO)){
+					vo.setAllowModifyPackageType(td.getAllowModifyPackageType());
+				}
+				
 				vo.setUnPackingAmount(vo.getAmount());
 				if(isTimeout){
 					vo.setIsTimeout(isTimeout);