Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.8.4_4.8.5_sqlserver.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.8.4_4.8.5_sqlserver.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.8.4_4.8.5_sqlserver.sql (revision 18479) @@ -0,0 +1,4 @@ +alter table invoiceplan alter column hospitalnumber varchar(4000); +alter table invoiceplan alter column currentRemark varchar(4000); +alter table invoiceplan alter column remark varchar(4000); +alter table invoiceplan alter column tousseBarcodes varchar(4000); \ No newline at end of file Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java =================================================================== diff -u -r18383 -r18479 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 18383) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java (.../InvoicePlan.java) (revision 18479) @@ -672,7 +672,7 @@ this.lastInvoiceTime = lastInvoiceTime; } - @Column(length = 2000) + @Column(length = 4000) public String getCurrentRemark() { return currentRemark; } @@ -681,7 +681,7 @@ this.currentRemark = currentRemark; } - @Column(length = 2000) + @Column(length = 4000) public String getRemark() { return remark; } @@ -757,6 +757,7 @@ this.urgent = urgent; } + @Column(length=4000) public String getHospitalNumber() { return hospitalNumber; } @@ -896,7 +897,7 @@ this.borrowConfirmStatus = borrowConfirmStatus; } - @Column(length = 3000) + @Column(length = 4000) public String getTousseBarcodes() { return tousseBarcodes; } Index: forgon-core/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r18458 -r18479 --- forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 18458) +++ forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 18479) @@ -21,7 +21,7 @@ "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.7.5","4.7.6","4.7.7", - "4.7.8","4.7.9","4.8.0","4.8.1","4.8.2","4.8.3","4.8.4"};// 版本列表 + "4.7.8","4.7.9","4.8.0","4.8.1","4.8.2","4.8.3","4.8.4","4.8.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-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java =================================================================== diff -u -r18137 -r18479 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java (.../TousseItem.java) (revision 18137) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java (.../TousseItem.java) (revision 18479) @@ -80,7 +80,12 @@ private Integer prepareRecycleAmount;//预回收数量 - private Integer recyclingAmount = null;// 回收数量,回收数量为null值代表未被回收 + /** + * 回收数量,回收数量为null值代表未被回收 + * 1.申请物品类型为一次性物品、及不回收的器械包(敷料包)等,该值为null + * 2.申请物品为需要回收的器械包(消毒物品等)时,未回收前该值为null,回收时如果删除这一行则值为0,否则就为回收数量 + */ + private Integer recyclingAmount = null; private Integer sendOutAmount = 0;// 发货数量 Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.8.4_4.8.5_oracle.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.8.4_4.8.5_oracle.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.8.4_4.8.5_oracle.sql (revision 18479) @@ -0,0 +1,4 @@ +execute immediate 'alter table invoiceplan modify hospitalnumber varchar(4000)'; +execute immediate 'alter table invoiceplan modify currentRemark varchar(4000)'; +execute immediate 'alter table invoiceplan modify remark varchar(4000)'; +execute immediate 'alter table invoiceplan modify tousseBarcodes varchar(4000)'; \ No newline at end of file