Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r14652 -r14657 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 14652) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 14657) @@ -5553,6 +5553,11 @@ tousseType.put("tousseGroupID", 0L); tousseType.put("type", TousseDefinition.PACKAGE_TYPE_INSIDE); types.add(tousseType); + + JSONObject disinfectType= new JSONObject(); + disinfectType.put("tousseGroupID", 0L); + disinfectType.put("type", TousseDefinition.PACKAGE_TYPE_DISINFECTION); + types.add(disinfectType); } JSONObject json = new JSONObject(); JSONArray array = new JSONArray(); Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.3.1_4.3.2_oracle.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.3.1_4.3.2_oracle.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.3.1_4.3.2_oracle.sql (revision 14657) @@ -0,0 +1,2 @@ +execute immediate 'alter table printInvoiceConfig modify toussegroupconfig varchar(4000)'; +update InvoiceItem set isPrint = '是' where invoice_id in ( select id from Invoice where isPrint = '是' ) and ( isPrint = '否' or isPrint is null ); \ No newline at end of file Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.3.1_4.3.2.sql =================================================================== diff -u -r14652 -r14657 --- ssts-web/src/main/webapp/dataUpdater/sqls/4.3.1_4.3.2.sql (.../4.3.1_4.3.2.sql) (revision 14652) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.3.1_4.3.2.sql (.../4.3.1_4.3.2_sqlserver.sql) (revision 14657) @@ -1 +1,2 @@ +alter table printInvoiceConfig alter column toussegroupconfig varchar(4000); update InvoiceItem set isPrint = '是' where invoice_id in ( select id from Invoice where isPrint = '是' ) and ( isPrint = '否' or isPrint is null ); \ No newline at end of file Fisheye: Tag 14657 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/dataUpdater/sqls/4.3.1_4.3.2.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js =================================================================== diff -u -r14652 -r14657 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 14652) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 14657) @@ -1287,6 +1287,23 @@ }); } +function getSelectedIds(){ + var records = grid.getSelectionModel().getSelections(); + if (records.length == 0) { + showResult("请选择发货单!"); + return false; + } + var ids = null; + for ( var i = 0, len = records.length; i < len; i++) { + if (ids == null) { + ids = records[i].data['id']; + } else { + ids = ids + ',' + records[i].data['id']; + } + } + return ids; +} + function mergePrintInvoices(){ var records = grid.getSelectionModel().getSelections(); if (records.length == 0) { @@ -2158,22 +2175,6 @@ } } } - function getSelectedIds(){ - var records = grid.getSelectionModel().getSelections(); - if (records.length == 0) { - showResult("请选择发货单!"); - return false; - } - var ids = null; - for ( var i = 0, len = records.length; i < len; i++) { - if (ids == null) { - ids = records[i].data['id']; - } else { - ids = ids + ',' + records[i].data['id']; - } - } - return ids; - } var viewport = new Ext.Viewport({ layout : 'border', Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/printinvoiceconfig/PrintInvoiceConfig.java =================================================================== diff -u -r14652 -r14657 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/printinvoiceconfig/PrintInvoiceConfig.java (.../PrintInvoiceConfig.java) (revision 14652) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/printinvoiceconfig/PrintInvoiceConfig.java (.../PrintInvoiceConfig.java) (revision 14657) @@ -161,6 +161,7 @@ this.orderNum = orderNum; } + @Column(length=4000) public String getTousseGroupConfig() { return tousseGroupConfig; }