Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java =================================================================== diff -u -r30959 -r31015 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 30959) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java (.../TousseInstanceAction.java) (revision 31015) @@ -342,6 +342,7 @@ String status = ""; String tousseType = ""; String registUseRecordAfterSigned = ""; + Long tiId = 0l; if (tousseInstance != null){ td = tousseInstance.getTousseDefinition(); @@ -350,6 +351,7 @@ tousseType = td.getTousseType(); registUseRecordAfterSigned = td.getRegistUseRecordAfterSigned(); status = tousseInstance.getStatus(); + tiId = tousseInstance.getId(); } else{ // 查询是否标识牌条码 @@ -379,6 +381,7 @@ name = td.getName(); tousseType = td.getTousseType(); registUseRecordAfterSigned = td.getRegistUseRecordAfterSigned(); + tiId = tousseInstance.getId(); } } } @@ -389,6 +392,7 @@ JSONObject obj = new JSONObject(); obj.put("tousseDefinitionId", tdId); + obj.put("tousseInstanceId", tiId); obj.put("name", name); obj.put("tousseType", tousseType); obj.put("status", status); Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js =================================================================== diff -u -r31014 -r31015 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 31014) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js (.../useRecordForm.js) (revision 31015) @@ -281,7 +281,7 @@ success : function(response, options) { var result = Ext.decode(response.responseText); if((result.data.tousseType == "外来器械包" || result.data.tousseType == "外来器械拆分小包") && result.data.status == "已发货"){ - loadingVideoAndImg(result.data.tousseDefinitionId); + loadingVideoAndImg(result.data.tousseInstanceId); }else { loadScanGoods(isVisible); } @@ -295,7 +295,7 @@ url : WWWROOT +'/disinfectSystem/baseData/uploadImageAndVideoAction!getImageAndVideoInfo.do', params : { objectId:objectId, - imageType:"装配采集图片", + imageType:"包实例装配采集图片", videoType:"装配采集视频" }, async : false,