Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r28001 -r28074 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 28001) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 28074) @@ -110,6 +110,7 @@ import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseMaterialErrorDamageManager; import com.forgon.disinfectsystem.tousseitem.service.TousseItemManager; import com.forgon.disinfectsystem.version.VersionNotMatchException; +import com.forgon.disinfectsystem.vo.RecyclingApplicationVo; import com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.service.WashAndDisinfectRecordManager; import com.forgon.exception.SystemException; import com.forgon.exception.UnfinishedPackingTaskException; @@ -587,6 +588,14 @@ JSONObject jsonObj = JSONUtil.buildJsonObject(success, message); jsonObj.put("versionNotMatch", versionNotMatch); + if(versionNotMatch){ + try { + RecyclingApplicationVo recyclingApplicationVo = invoicePlanManager.invoicePlan2RecyclingApplicationVo(invoicePlanManager.get(recyclingContext.getRecyclingApplicationId()), true); + jsonObj.put("recyclingApplicationVo", recyclingApplicationVo); + } catch (Exception e) { + e.printStackTrace(); + } + } if(success){ //输出回收记录id,用于接下来的回收记录与视频录制记录关联数据的保存 jsonObj.put("recyclingRecordId", recyclingContext.getId());