Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.6.1_4.6.2.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.6.1_4.6.2.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.6.1_4.6.2.sql (revision 16818) @@ -0,0 +1 @@ +update TousseDefinition set barcodePaperType = (select max(barcodePaperType) from SupplyRoomConfig where supplyRoomType=0) where tousseType in('外来器械包','外来器械拆分小包'); \ No newline at end of file Index: forgon-core/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r16804 -r16818 --- forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 16804) +++ forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 16818) @@ -20,7 +20,7 @@ "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","4.1.8","4.1.9","4.2.0","4.2.1","4.2.2", "4.2.3","4.2.4","4.2.5","4.2.6","4.2.7","4.2.8","4.2.9","4.3.0","4.3.1","4.3.2","4.3.3","4.3.4","4.3.5","4.3.6","4.3.7","4.3.8","4.3.9", "4.4.0","4.4.1","4.4.2","4.4.3","4.4.4","4.4.5","4.4.6","4.4.7","4.4.8","4.4.9","4.5.0","4.5.1","4.5.2","4.5.3","4.5.4","4.5.5","4.5.6","4.5.7","4.5.8", - "4.5.9","4.6.0","4.6.1"};// 版本列表 + "4.5.9","4.6.0","4.6.1","4.6.2"};// 版本列表 public final static List SOFTWARE_VERSION_LIST = Arrays .asList(SOFTWARE_VERSION_ARRAY); public final static String SOFTWARE_VERSION = SOFTWARE_VERSION_ARRAY[SOFTWARE_VERSION_ARRAY.length - 1];// 软件最新版本 Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js =================================================================== diff -u -r16707 -r16818 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 16707) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 16818) @@ -932,6 +932,7 @@ layout:'form', labelWidth : 180, columnWidth: .25, + hidden: true, items:[{ xtype : 'combo', fieldLabel : '外来器械包打印标签',