Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r26721 -r26722 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 26721) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 26722) @@ -5992,7 +5992,7 @@ StringBuffer usedDateSql = new StringBuffer();//已使用未回收的数量的时间查询条件 setDateSql(tiDateSql, recyDateSql, disinfectedDateSql, usedDateSql); if(TousseInstance.STATUS_SIGNED.equals(status)){ - querySql.append(" ti.id,signedDate,signedUser,bd.barcode "); + querySql.append(" ti.id,signedDate,signedUser,bd.barcode,validUntil "); }else if(TousseInstance.STATUS_PACKED.equals(status)){ querySql.append(" ti.id,operationTime,operator,packageType,bd.barcode "); }else if(TousseInstance.STATUS_REVIEWED.equals(status)){ @@ -6071,6 +6071,10 @@ if(signedDate != null){ obj.put("signedDate", sdf.format(signedDate)); } + Date validUntil = rs.getTimestamp("validUntil"); + if(validUntil != null){ + obj.put("validUntil", sdf.format(validUntil)); + } obj.put("signedUser", signedUser); obj.put("barcode", barcode); }else if(TousseInstance.STATUS_USED.equals(status)){ Index: ssts-web/src/main/webapp/disinfectsystem/departmentStock/departmentStockNumberDetails.js =================================================================== diff -u -r26717 -r26722 --- ssts-web/src/main/webapp/disinfectsystem/departmentStock/departmentStockNumberDetails.js (.../departmentStockNumberDetails.js) (revision 26717) +++ ssts-web/src/main/webapp/disinfectsystem/departmentStock/departmentStockNumberDetails.js (.../departmentStockNumberDetails.js) (revision 26722) @@ -14,12 +14,14 @@ {name : 'id'}, {name : 'signedDate'}, {name : 'signedUser'}, + {name : 'validUntil'}, {name : 'barcode'} ) cms.push( {header : "id",dataIndex : 'id',menuDisabled:true,hidden:true}, {header : "签收时间",width : 100,dataIndex : 'signedDate',menuDisabled:true}, {header : "签收人",width : 60,dataIndex : 'signedUser',menuDisabled:true}, + {header : "失效期",width : 90,dataIndex : 'validUntil',menuDisabled:true}, {header : "包条码 ",width :100,dataIndex : 'barcode',menuDisabled:true} ); }else if(type == STATUS_USED){//已使用数量