Index: forgon-core/src/main/java/com/forgon/Constants.java
===================================================================
diff -u -r13461 -r13507
--- forgon-core/src/main/java/com/forgon/Constants.java	(.../Constants.java)	(revision 13461)
+++ forgon-core/src/main/java/com/forgon/Constants.java	(.../Constants.java)	(revision 13507)
@@ -17,7 +17,7 @@
 
 	public final static String[] SOFTWARE_VERSION_ARRAY = new String[] {
 			"3.3.0","3.3.8", "3.3.9", "3.3.10","3.3.12","3.3.13","3.8.0","3.9.0","3.9.1","3.9.2","4.0.2","4.0.3","4.0.4",
-			"4.0.5","4.0.6","4.0.44","4.0.45","4.1.0","4.1.1","4.1.2","4.1.3","4.1.4","4.1.5","4.1.6"};// 版本列表
+			"4.0.5","4.0.6","4.0.44","4.0.45","4.1.0","4.1.1","4.1.2","4.1.3","4.1.4","4.1.5","4.1.6","4.1.7"};// 版本列表
 	public final static List<String> SOFTWARE_VERSION_LIST = Arrays
 			.asList(SOFTWARE_VERSION_ARRAY);
 	public final static String SOFTWARE_VERSION = SOFTWARE_VERSION_ARRAY[SOFTWARE_VERSION_ARRAY.length - 1];// 软件最新版本
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r13497 -r13507
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 13497)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 13507)
@@ -1255,7 +1255,7 @@
 		String sql = "select po.id as taskId,recyclingBasketName,basketBarcode,department,status,washTime,startTime,unPackAmount,taskType,"
 				+ "td.id as tousseDefinitionId,td.name,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,"
 				+ "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName from PackingTask po , CssdHandleTousses ct , TousseDefinition td "
-				+ "where po.tousseDefinition_id = ct.tousseDefinitionId and ct.tousseDefinitionId=td.id and po.orgUnitCoding = ct.orgUnitCode "
+				+ "where po.tousseDefinition_id = td.id and ct.tousseDefinitionId=td.ancestorID and po.orgUnitCoding = ct.orgUnitCode "
 				+ "and ct.taskGroup = '"+taskGroup+"' and po.orgUnitCoding = '" + orgCode + "'";
 		if(StringUtils.isNotBlank(basketBarcode)){
 			//验证篮筐是否清洗
Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.1.6_4.1.7_sqlserver.sql
===================================================================
diff -u
--- ssts-web/src/main/webapp/dataUpdater/sqls/4.1.6_4.1.7_sqlserver.sql	(revision 0)
+++ ssts-web/src/main/webapp/dataUpdater/sqls/4.1.6_4.1.7_sqlserver.sql	(revision 13507)
@@ -0,0 +1,12 @@
+update GoodPurchaseItem set disposableGoodsId = (select id from DisposableGoods where GoodPurchaseItem.name= case when specification is null then name else name + '['+ specification +']' end)
+where disposableGoodsId is null;
+
+update GoodPurchaseItem set materialDefinitionId = (select id from MaterialDefinition where GoodPurchaseItem.name= case when specification is null then name else name + '['+ specification +']' end)
+where materialDefinitionId is null;
+
+update TousseDefinition set ancestorID=id where tousseType in ('器械包','敷料包') and ancestorID is null;
+update TousseDefinition set ancestorID=id where tousseType in ('消毒物品') and forDisplay='1' and ancestorID is null;
+
+select id , name into temp  from TousseDefinition where tousseType in ('消毒物品') and forDisplay='1';
+update TousseDefinition set ancestorID=(select id from temp where name=TousseDefinition.name) where tousseType in ('消毒物品') and forDisplay='0' and ancestorID is null;
+drop table temp;
\ No newline at end of file
Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.1.6_4.1.7_oracle.sql
===================================================================
diff -u
--- ssts-web/src/main/webapp/dataUpdater/sqls/4.1.6_4.1.7_oracle.sql	(revision 0)
+++ ssts-web/src/main/webapp/dataUpdater/sqls/4.1.6_4.1.7_oracle.sql	(revision 13507)
@@ -0,0 +1,12 @@
+update GoodPurchaseItem set disposableGoodsId = (select id from DisposableGoods where GoodPurchaseItem.name= case when specification is null then name else name || '['|| specification ||']' end)
+where disposableGoodsId is null;
+
+update GoodPurchaseItem set materialDefinitionId = (select id from MaterialDefinition where GoodPurchaseItem.name= case when specification is null then name else name || '['|| specification ||']' end)
+where materialDefinitionId is null;
+
+update TousseDefinition set ancestorID=id where tousseType in ('器械包','敷料包') and ancestorID is null;
+update TousseDefinition set ancestorID=id where tousseType in ('消毒物品') and forDisplay='1' and ancestorID is null;
+
+create table temp as select id , name from TousseDefinition where tousseType in ('消毒物品') and forDisplay='1';
+update TousseDefinition set ancestorID=(select id from temp where name=TousseDefinition.name) where tousseType in ('消毒物品') and forDisplay='0' and ancestorID is null;
+drop table temp;
\ No newline at end of file