Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java =================================================================== diff -u -r17352 -r17442 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 17352) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 17442) @@ -93,6 +93,10 @@ private String packageCode;//物资编码 private String packageType; // 默认包装类型 + /** + * 允许修改包装类型 + */ + private String allowModifyPackageType = STR_YES; private Integer packingAmountPerVirtualBasket;//默认每虚拟篮筐装配该器械包的数量(可配置) @@ -493,6 +497,14 @@ this.packageType = packageType; } + public String getAllowModifyPackageType() { + return allowModifyPackageType; + } + + public void setAllowModifyPackageType(String allowModifyPackageType) { + this.allowModifyPackageType = allowModifyPackageType; + } + public Double getProxyDisinfectionPrice() { return proxyDisinfectionPrice; } Index: forgon-core/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r17423 -r17442 --- forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 17423) +++ forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 17442) @@ -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.6.2","4.6.3","4.6.4","4.6.5","4.6.6","4.6.7","4.6.8","4.6.9","4.7.0","4.7.1","4.7.2","4.7.3","4.7.4"};// 版本列表 + "4.5.9","4.6.0","4.6.1","4.6.2","4.6.3","4.6.4","4.6.5","4.6.6","4.6.7","4.6.8","4.6.9","4.7.0","4.7.1","4.7.2","4.7.3","4.7.4","4.7.5"};// 版本列表 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/dataUpdater/sqls/4.7.4_4.7.5.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.7.4_4.7.5.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.7.4_4.7.5.sql (revision 17442) @@ -0,0 +1 @@ +update TousseDefinition set allowModifyPackageType='是' where allowModifyPackageType is null ; \ No newline at end of file