Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r17404 -r17443
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 17404)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 17443)
@@ -828,6 +828,7 @@
 			temp.put("isThereIdentificationCard", isThereIdCard);
 			temp.put("suppler", tousseDefinition.getSupplierName());
 			temp.put("includeImplant", tousseDefinition.getIncludeImplant());
+			temp.put("allowModifyPackageType", tousseDefinition.getAllowModifyPackageType());
 			mapList.add(temp);
 		}
 		Map<String, Object> map = new HashMap<String, Object>();
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskVo.java
===================================================================
diff -u -r17324 -r17443
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskVo.java	(.../WaitPackingTaskVo.java)	(revision 17324)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskVo.java	(.../WaitPackingTaskVo.java)	(revision 17443)
@@ -6,6 +6,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
+
 /**
  * @author WangYi
  *
@@ -14,6 +16,8 @@
 	
 	private String tousseName;
 	
+	private String allowModifyPackageType = TousseDefinition.STR_YES;
+	
 	private Long tousseID;
 	
 	private Integer unPackingAmount;//未装配数量
@@ -69,6 +73,14 @@
 		this.tousseName = tousseName;
 	}
 	
+	public String getAllowModifyPackageType() {
+		return allowModifyPackageType;
+	}
+
+	public void setAllowModifyPackageType(String allowModifyPackageType) {
+		this.allowModifyPackageType = allowModifyPackageType;
+	}
+
 	public Long getTousseID() {
 		return tousseID;
 	}
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java
===================================================================
diff -u -r17324 -r17443
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java	(.../WaitPackingTaskItemVo.java)	(revision 17324)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java	(.../WaitPackingTaskItemVo.java)	(revision 17443)
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.recyclingdamagerecord.RecyclingDamageItem;
 import com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError;
 
@@ -12,6 +13,8 @@
 	
 	private String tousseName;
 	
+	private String allowModifyPackageType = TousseDefinition.STR_YES;
+	
 	private Long tousseID;
 	
 	private String text;
@@ -92,6 +95,14 @@
 		this.tousseName = tousseName;
 	}
 
+	public String getAllowModifyPackageType() {
+		return allowModifyPackageType;
+	}
+
+	public void setAllowModifyPackageType(String allowModifyPackageType) {
+		this.allowModifyPackageType = allowModifyPackageType;
+	}
+
 	public Long getTousseID() {
 		return tousseID;
 	}
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r17426 -r17443
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 17426)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 17443)
@@ -1658,6 +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);
@@ -1686,6 +1687,7 @@
 				itemVo.setAmount(task.getUnPackAmount());
 				itemVo.setSupplierName(td.getSupplierName());
 				itemVo.setTaskType(task.getTaskType());
+				itemVo.setAllowModifyPackageType(td.getAllowModifyPackageType());
 				List<RecyclingError> errorList = errorsMap.get(task.getId());
 				if(errorList != null && errorList.size() > 0){
 					itemVo.setReplenishMaterils(true);
@@ -1844,7 +1846,7 @@
 	private List<Object[]> findPackingTaskFromCssdHandleToussesConfig(String taskGroup,String basketBarcode,SupplyRoomConfig config) {
 		String orgCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
 		String sql = "select po.id as taskId,recyclingBasketName,basketBarcode,department,status,washTime,startTime,unPackAmount,taskType,idCardBarcode,"
-				+ "td.id as tousseDefinitionId,td.name,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,"
+				+ "td.id as tousseDefinitionId,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,"
 				+ "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount from PackingTask po , CssdHandleTousses ct , TousseDefinition td "
 				+ "where po.tousseDefinition_id = td.id and ct.tousseDefinitionId=td.ancestorID and po.orgUnitCoding = ct.orgUnitCode "
 				+ "and ct.taskGroup = '"+taskGroup+"' and po.orgUnitCoding = '" + orgCode + "' and po.unPackAmount > 0 ";
@@ -1888,7 +1890,7 @@
 	private List<Object[]> findForeignToussePackingTask(String basketBarcode) {
 		String orgCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
 		String sql = "select po.id as taskId,recyclingBasketName,basketBarcode,department,status,washTime,startTime,unPackAmount,taskType,idCardBarcode,"
-				+ "td.id as tousseDefinitionId,td.name,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,"
+				+ "td.id as tousseDefinitionId,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,"
 				+ "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount from PackingTask po , TousseDefinition td "
 				+ "where po.tousseDefinition_id = td.id and td.tousseType='"+TousseDefinition.PACKAGE_TYPE_FOREIGN+"' and po.orgUnitCoding = '" + orgCode + "'";
 		if(StringUtils.isNotBlank(basketBarcode)){
@@ -1918,7 +1920,7 @@
 		List<Object[]> queryResult = new ArrayList<Object[]>();
 		String orgCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
 		String sql = "select po.id as taskId,recyclingBasketName,basketBarcode,department,status,washTime,startTime,unPackAmount,taskType,idCardBarcode,"
-				+ "td.id as tousseDefinitionId,td.name,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,"
+				+ "td.id as tousseDefinitionId,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,"
 				+ "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount from PackingTask po , TousseDefinition td "
 				+ "where po.tousseDefinition_id = td.id and td.tousseType='"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"' and po.orgUnitCoding = '" + orgCode + "'";
 		if(StringUtils.isNotBlank(basketBarcode)){
@@ -1970,6 +1972,7 @@
 				BigDecimal tousseDefinitionIdBigDecimal = (BigDecimal)rs.getObject("tousseDefinitionId");
 				td.setId(tousseDefinitionIdBigDecimal == null ? null : tousseDefinitionIdBigDecimal.longValue());
 				td.setName(rs.getString("name"));
+				td.setAllowModifyPackageType(rs.getString("allowModifyPackageType"));
 				td.setIsDisableIDCard(rs.getString("isDisableIDCard"));
 				td.setTousseType(rs.getString("tousseType"));
 				td.setPackageType(rs.getString("packagetype"));