Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r29886 -r29956
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 29886)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 29956)
@@ -3755,6 +3755,8 @@
 		String remark = JSONUtil.optString(paramsObj, "remark", null);
 		String errorDamageRemarkInfo = JSONUtil.optString(paramsObj, "errorDamageRemarkInfo", null);
 		String errorDamageRemarkId = JSONUtil.optString(paramsObj, "errorDamageRemarkId", null);
+		//noUserFormSterilizationInfo=true是才使用包定义的灭菌程序和包装类型
+		String noUserFormSterilizationInfo = JSONUtil.optString(paramsObj, "noUserFormSterilizationInfo", null);
 		ErrorDamageRemark errorDamageRemark = null;
 		if(DatabaseUtil.isPoIdValid(errorDamageRemarkId)){
 			errorDamageRemark = (ErrorDamageRemark)objectDao.getById(ErrorDamageRemark.class.getSimpleName(), errorDamageRemarkId);
@@ -3866,8 +3868,11 @@
 			if(CollectionUtils.isEmpty(packingTasks)){
 				throw new RuntimeException("装配任务不能为空! ");
 			}
-			//如果装配多个装配任务,灭菌程序和包装类型取值为包定义的默认类型
-			boolean isMultiplePackingTask = packingTasks.size() > 1?true:false;
+			//noUserFormSterilizationInfo=true是才使用包定义的灭菌程序和包装类型
+			boolean noUserFormSterilizationInfoFlag = false;
+			if(StringUtils.isNotBlank(noUserFormSterilizationInfo) || "true".equals(noUserFormSterilizationInfo)){
+				noUserFormSterilizationInfoFlag = true;
+			}
 			Set<Long> recyclingRecordIds = new HashSet<Long>();
 			for (PackingTask packingTask : packingTasks) {
 				logger.debug("装配任务packingTask[id=" + packingTask.getId() + "],tousseName=" + packingTask.getTousseDefinition().getName()+ "], [待装配数量=" + packingTask.getUnPackAmount() + "]");
@@ -4228,7 +4233,7 @@
 	
 					// 汇总装配记录对应的一次性物品扣减信息
 //					summaryOutDisposableGoodsStockInfo(packingRecordToDisposableGoodsOutAmount, packingRecord, disposableGoodsIdToAmount);
-					if(isMultiplePackingTask){
+					if(noUserFormSterilizationInfoFlag){
 						sterilingType = tdOfPackingTask.getSterilingMethod();
 						packageType = tdOfPackingTask.getPackageType();
 					}
@@ -4346,7 +4351,7 @@
 						logger.debug("tousseInstances.size()=" + tousseInstances.size());
 						logger.debug("virtualSeqNumArray.size()=" + virtualSeqNumArray.size() + ",virtualSeqNumArray=" + virtualSeqNumArray);
 						logger.debug("departmentArray.size()=" + departmentArray.size() + ",departmentArray=" + departmentArray);
-						if(isMultiplePackingTask){
+						if(noUserFormSterilizationInfoFlag){
 							sterilingType = tdOfPackingTask.getSterilingMethod();
 							packageType = tdOfPackingTask.getPackageType();
 							packageTypeAbbreviation = TousseInstanceUtils.getPackageTypeAbbreviation(objectDao, packageType);