Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/ExpressRecyclingVo.java =================================================================== diff -u -r12590 -r12876 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/ExpressRecyclingVo.java (.../ExpressRecyclingVo.java) (revision 12590) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/ExpressRecyclingVo.java (.../ExpressRecyclingVo.java) (revision 12876) @@ -27,6 +27,8 @@ private String isApplyEntireTousse; private Integer prepareRecycleAmount;//预回收数量 + + private Long tousseDefinitionID; public String getDepart() { return depart; @@ -105,5 +107,13 @@ public void setIsApplyEntireTousse(String isApplyEntireTousse) { this.isApplyEntireTousse = isApplyEntireTousse; } + + public Long getTousseDefinitionID() { + return tousseDefinitionID; + } + + public void setTousseDefinitionID(Long tousseDefinitionID) { + this.tousseDefinitionID = tousseDefinitionID; + } } Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r12835 -r12876 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 12835) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 12876) @@ -1093,6 +1093,7 @@ vo.setTousseName(ti.getTousseName()); vo.setAmount(ti.getAmount()); vo.setPrepareRecycleAmount(ti.getPrepareRecycleAmount()); + vo.setTousseDefinitionID(ti.getTousseDefinitionId()); if(td != null){ vo.setIsCleanedEntirely(td.getIsCleanedEntirely()); vo.setIsApplyEntireTousse(td.getIsApplyEntireTousse());