Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r37519 -r37520 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 37519) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 37520) @@ -14009,7 +14009,7 @@ String sql = String.format("select bd.barcode, ti.tousseName, ti.status " + ", ope.nextOperationLimitTime, ope.nextOperationTime " + ", ope.destLocation, ope.operator, ope.operatorCode " - + ", ope.operationTime " + + ", ope.operationTime, ope.storageRecordId " + "from %s ti " + "join %s bd on bd.id = ti.id " + "join %s ope on ope.tousseInstanceId = ti.id " @@ -14044,8 +14044,13 @@ String tiOperator = rs.getString("operator"); String tiOperatorCode = rs.getString("operatorCode"); Date tiOperationTime = rs.getTimestamp("operationTime"); + Long storageRecordId = rs.getLong("storageRecordId"); + String finalStatus = tiStatus; + if(DatabaseUtil.isPoIdValid(storageRecordId)){ + finalStatus = "出入库"; + } - String tiTousseOperationInfo = returnTousseOperationStatus(tiStatus, nextOperationLimitTime, nextOperationTime, today); + String tiTousseOperationInfo = returnTousseOperationStatus(finalStatus, nextOperationLimitTime, nextOperationTime, today); json.put("barcode", tiBarcode); json.put("tousseName", tiTousseName);