Index: ssts-stockmanage/src/main/java/com/forgon/disinfectsystem/stockmanage/departmentstock/vo/TousseInstanceVo.java =================================================================== diff -u -r26366 -r34495 --- ssts-stockmanage/src/main/java/com/forgon/disinfectsystem/stockmanage/departmentstock/vo/TousseInstanceVo.java (.../TousseInstanceVo.java) (revision 26366) +++ ssts-stockmanage/src/main/java/com/forgon/disinfectsystem/stockmanage/departmentstock/vo/TousseInstanceVo.java (.../TousseInstanceVo.java) (revision 34495) @@ -49,7 +49,10 @@ * 加急信息 */ private UrgentLevelVo urgentLevelInfo; - + /** + * 是否追溯 + */ + private String isTraceable; public String getIsUrgentTousse() { return isUrgentTousse; } @@ -161,4 +164,13 @@ public void setUrgentLevelInfo(UrgentLevelVo urgentLevelInfo) { this.urgentLevelInfo = urgentLevelInfo; } + + public String getIsTraceable() { + return isTraceable; + } + + public void setIsTraceable(String isTraceable) { + this.isTraceable = isTraceable; + } + } Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r34468 -r34495 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 34468) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 34495) @@ -900,7 +900,7 @@ sterilingModeAncestorSql = " and s.sterilizationMode='" + sterilingMode + "' "; } - return "select v1.* from (select rownum rn, v.* from ((select tdancestor.id tdAncestorId,ti.id,depart,ti.tousseName," + return "select v1.* from (select rownum rn, v.* from ((select '是' isTraceable,tdancestor.id tdAncestorId,ti.id,depart,ti.tousseName," + "b.barcode,ti.reviewTime, ti.sterilingMode,1 amount " + urgentLevel_SelectSql + " from TousseInstance ti join barcodeDevice b on b.id=ti.id " @@ -914,7 +914,7 @@ + " union " - + "(select tdancestor.id tdAncestorId,null id,null depart,tdancestor.name tousseName" + + "(select '否' isTraceable, tdancestor.id tdAncestorId,null id,null depart,tdancestor.name tousseName" + ",(select barcode from TousseInstance ti1 join barcodeDevice b1 on b1.id=ti1.id where ti1.tousseFixedBarcode=1 and ti1.tousseDefinition_id=tdancestor.id and rownum <= 1) barcode" + " ,null reviewTime, s.sterilizationMode sterilingMode,count(0) amount " + " ,null isUrgentTousse, null ulId,null ulGrade ,null ulName,null ulColorCode " @@ -957,7 +957,7 @@ } return "select * from (select top "+amount+" * from " - + "((select tdancestor.id tdAncestorId,ti.id,depart,ti.tousseName,b.barcode,ti.reviewTime,ti.sterilingMode,1 amount " + + "((select '是' isTraceable,tdancestor.id tdAncestorId,ti.id,depart,ti.tousseName,b.barcode,ti.reviewTime,ti.sterilingMode,1 amount " + urgentLevel_SelectSql//加急信息 + "from TousseInstance ti " + " join barcodeDevice b on b.id=ti.id join toussedefinition td on ti.tousseDefinition_id=td.id " @@ -971,7 +971,7 @@ + " union " - + "(select tdancestor.id tdAncestorId,null id,null depart,tdancestor.name tousseName" + + "(select '否' isTraceable, tdancestor.id tdAncestorId,null id,null depart,tdancestor.name tousseName" + ",(select top 1 barcode from TousseInstance ti1 join barcodeDevice b1 on b1.id=ti1.id where ti1.tousseFixedBarcode=1 and " + "ti1.tousseDefinition_id=tdancestor.id) barcode,null reviewTime , s.sterilizationMode sterilingMode,count(0) amount " + " , null isUrgentTousse,null ulId,null ulGrade ,null ulName,null ulColorCode " @@ -1066,6 +1066,7 @@ vo.setSterilingMode(rs.getString("sterilingMode")); vo.setAmount(rs.getInt("amount")); vo.setIsUrgentTousse(rs.getString("isUrgentTousse")); + vo.setIsTraceable(rs.getString("isTraceable")); if(DatabaseUtil.isPoIdValid(rs.getLong("ulId"))){ UrgentLevelVo urgentLevelVo = new UrgentLevelVo(); urgentLevelVo.setId(rs.getLong("ulId")); @@ -8837,7 +8838,7 @@ String dateStr = null; switch (ti.getStatus()) { case TousseInstance.STATUS_PACKED: - dateStr = ti.getUseTimeStr(); + dateStr = ti.getOperationTimeStr(); break; case TousseInstance.STATUS_REVIEWED: case TousseInstance.STATUS_DISINFECTED: