Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java =================================================================== diff -u -r16416 -r16460 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 16416) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 16460) @@ -886,13 +886,18 @@ String reOperator = ""; // 清点人 String reUser = ""; // 回收人 String reType = ""; // 回收类型 + String reTime = ""; // 回收时间 Long recycleId = tousseInstance.getRecyclingRecordId(); if(recycleId != null){ RecyclingRecord re =recyclingRecordManager.getRecyclingRecord(recycleId.toString()); if(re != null){ reOperator = re.getOperator(); reUser = re.getRecyclingUser(); reType = re.getRecyclingApplicationType(); + Date recyclingTime = re.getRecyclingTime(); + if (recyclingTime != null) { + reTime = Constants.SIMPLEDATEFORMAT_YYYYMMDDHHMM.format(recyclingTime); + } } } // if(ttRecord != null){ @@ -923,6 +928,7 @@ map.put("reOperator", reOperator); map.put("reUser", reUser); map.put("reType", reType); + map.put("reTime", reTime); if(sr != null){ map.put("sterilizationRecordID", sr.getId()); map.put("sterilizerRecordAmounts", sr.getSterilizerRecordAmount()); Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js =================================================================== diff -u -r16310 -r16460 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js (.../tousseInstanceInfoTab.js) (revision 16310) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js (.../tousseInstanceInfoTab.js) (revision 16460) @@ -130,6 +130,20 @@ allowBlank : true, anchor : '100%' }] + },{ + layout : 'form', + columnWidth : .5, + cls:'edit-part2-labelwidth', + items : [{ + xtype : 'textfield', + id : 'reTime', + name : 'reTime', + fieldLabel : '回收时间', + readOnly : true, + cls : 'fieldReadOnlyNoRemove', + allowBlank : true, + anchor : '100%' + }] }] }], buttons : [{ @@ -911,6 +925,7 @@ top.Ext.getCmp('reOperator').setValue(result.reOperator); top.Ext.getCmp('reUser').setValue(result.reUser); top.Ext.getCmp('reType').setValue(result.reType); + top.Ext.getCmp('reTime').setValue(result.reTime); if(instance.useRecord_id != null){ Ext.Ajax.request({