Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js =================================================================== diff -u -r27068 -r27182 --- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 27068) +++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 27182) @@ -1,6 +1,55 @@ var tempforeignTousseName=""; var splitForeignTousse_confirmIndicatorCardWin = null; var rowNum = 0; + +/** + * 拍照 + * @param tousseName 包定义名称 + * @param tousseDefinitionId 包定义id + * @param isLook 是查看还是拍摄 true查看 false需要拍摄和上传 + */ +function takeImgAndVideoSplit(imageIdsArry,videoIdsArry,isLook){ + var imageType = '包实例装配采集图片'; + if(Ext4.chromeVersion < 62){ + showResult("请使用62以上版本的chrome浏览器!" , null , sstsConfig.messagePauseTimeOnPackingPage); + return ; + } + if(imageIdsArry != undefined){ + var imageIds = imageIdsArry.join(","); + } + + if(videoIdsArry != undefined){ + var videoIds = videoIdsArry.join(","); + } + + if(imageIds == ""){ + imageIds = null; + } + + if(videoIds == ""){ + videoIds = null; + } + tousseDefinitionId = ""; + tousseName = ""; + + var urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName='+ tousseName +'&imageType='+imageType+'&videoType='+videoTypePacking+'&objectId='+tousseDefinitionId+'&videoIds='+videoIds+'&imageIds='+imageIds+'&isLook='+isLook; + var winW = 1020; + var winH = 600; + var tops = (window.screen.availHeight -winH)/2; + var lefts = (window.screen.availWidth -winW)/2; + if(window.screen.height == 768){ + lefts = 0; + tops = 0; + } + + var style = "resizable=yes,top="+tops+",left="+lefts+",width="+winW+",height="+winH+",status=no,menubar=no,toolbar=no,Scrollbars=no,Location=no,Direction=no,resizable=no"; + var videoImgWin = window.open(urls,'图片视频拍摄',style); + if(videoImgWin != null ){ + videoImgWin.focus(); + } +} + + function validateValidUntil(foreignTousseName,supplierName){ var showResult = ""; var splitedTousseStore = top.Ext4.getCmp("splitedTousseGrid").getStore(); @@ -311,9 +360,11 @@ } } -var cameraPhotos = []; +var imageIdsArry = []; +var videoIdsArry = []; function splitForeignTousse(packTaskId,foreignTousseName,showName,invoicePlanId,thizAmount,supplierName,basketBarcode,packageType,sterilingType){ - cameraPhotos = []; + imageIdsArry = []; + videoIdsArry = []; top.Ext4.define('cellEditingGrid',{ extend: 'top.Ext4.grid.Panel', xtype: 'cell-editing', @@ -1046,11 +1097,11 @@ } // 拍照 function openCameraWindow() { - if (Ext4.chromeVersion < 62) { + /* if (Ext4.chromeVersion < 62) { showResult("请使用62以上版本的chrome浏览器!", null, sstsConfig.messagePauseTimeOnPackingPage); return false; - } + } */ if (!isSplitComplete()) { return false; } @@ -1065,20 +1116,28 @@ showResult("只能选择一个包！" , null , sstsConfig.messagePauseTimeOnPackingPage); return false; } + var data = records[0].data; - cameraPhotos = data.cameraPhotos; - if(!cameraPhotos){ - data.cameraPhotos = []; - cameraPhotos = data.cameraPhotos; + imageIdsArry = data.imageIdsArry; + if(!imageIdsArry){ + data.imageIdsArry = []; + imageIdsArry = data.imageIdsArry; } + videoIdsArry = data.videoIdsArry; + if(!videoIdsArry){ + data.videoIdsArry = []; + videoIdsArry = data.videoIdsArry; + } + takeImgAndVideoSplit(imageIdsArry,videoIdsArry,false); + // 弹出窗口 - var pageUrl = WWWROOT + '/disinfectsystem/test/video_split.jsp'; + /* var pageUrl = WWWROOT + '/disinfectsystem/test/video_split.jsp'; var style = "menubar=no,location=no,directories=no,toolbar=no,statusbar=no,resizable=no," + getCenterWindowPos(1920, 1080) + ",scrollbars=no"; var popwin = window.open(pageUrl, '图片采集', style); if (popwin != null) { popwin.focus(); - } + } */ } function isSplitComplete(){ var waitSplitMaterialStore = top.Ext4.getCmp("waitSplitMaterialGrid").getStore(); @@ -1107,18 +1166,54 @@ var count = splitedTousseStore.getCount(); for ( var i = 0; i < count; i++) { var record = splitedTousseStore.getAt(i); - var cameraPhotos = record.data.cameraPhotos; - if(cameraPhotos && cameraPhotos.length>0){ - for(var cpi = 0; cpi < cameraPhotos.length; cpi++){ - uploadTousseCameraPhoto(tousses[i].id,cameraPhotos[cpi]); - } - } + var imageIdsArry = record.data.imageIdsArry; + var videoIdsArry = record.data.videoIdsArry; + if(imageIdsArry == undefined && videoIdsArry == undefined){ + continue; + } + + if(imageIdsArry == undefined){ + imageIdsArry = ""; + }else{ + imageIdsArry = imageIdsArry.join(","); + } + + if(videoIdsArry == undefined){ + videoIdsArry = ""; + + }else{ + videoIdsArry = videoIdsArry.join(","); + } + uploadTousseCameraPhoto(tousses[i].id,imageIdsArry,videoIdsArry); + } hideMessageBox4(true); } - function uploadTousseCameraPhoto(objectId,base64Data){ - var imageType = '包实例装配采集图片'; + function uploadTousseCameraPhoto(objectId,imageIds,videoIds){ + var url = WWWROOT + '/disinfectSystem/baseData/uploadImageAndVideoAction!bindingImageVideoFile.do'; + $.ajax({ + type: "POST", + url: url, + async:false, + dataType: "json", + data: { + imageIds :imageIds, + videoIds:videoIds, + objectId :objectId + } + }).done(function(o) { + if(o.success){ + message = o.message; + showResult(message, null , sstsConfig.messagePauseTimeOnPackingPage); + }else{ + message = o.message; + showResult(message, null , sstsConfig.messagePauseTimeOnPackingPage); + } + }) + + + /* var imageType = '包实例装配采集图片'; var url = WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!uploadBase64Image.do?imageType='+imageType; //这里我用struts2做后台处理 if(objectId){ url += '&objectId='+objectId; @@ -1139,7 +1234,7 @@ message = o.message; showResult(message, null , sstsConfig.messagePauseTimeOnPackingPage); } - }); + }); */ } // 装配按钮处理 function splitForeignTousse_packingTousseBtnClick(btn){ Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r27068 -r27182 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 27068) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 27182) @@ -253,6 +253,44 @@ Ext4.getCmp('lostBtn').hide(); Ext4.getCmp('damageBtn').hide(); } + +/** + * 拍照 + * @param tousseName 包定义名称 imageType + * @param tousseDefinitionId 包定义id + * @param isLook 是查看还是拍摄 true查看 false需要拍摄和上传 + * @param imageType 图片类型 + * @param videoType 视频类型 + */ +function takeImgAndVideo(tousseName,tousseDefinitionId,isLook,imageType,videoType){ + if(Ext4.chromeVersion < 62){ + showResult("请使用62以上版本的chrome浏览器!" , null , sstsConfig.messagePauseTimeOnPackingPage); + return ; + } + var imageIds = null; + var videoIds = null; + + if(tousseDefinitionId == "null"){ + tousseDefinitionId = ""; + } + + var urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName='+ tousseName +'&imageType='+imageType+'&videoType='+videoType+'&objectId='+tousseDefinitionId+'&videoIds='+videoIds+'&imageIds='+imageIds+'&isLook='+isLook; + var winW = 1020; + var winH = 600; + var tops = (window.screen.availHeight -winH)/2; + var lefts = (window.screen.availWidth -winW)/2; + if(window.screen.height == 768){ + lefts = 0; + tops = 0; + } + + var style = "resizable=yes,top="+tops+",left="+lefts+",width="+winW+",height="+winH+",status=no,menubar=no,toolbar=no,Scrollbars=no,Location=no,Direction=no,resizable=no"; + var videoImgWin = window.open(urls,'图片视频拍摄',style); + if(videoImgWin != null ){ + videoImgWin.focus(); + } +} + Ext4.onReady(function() { taskGroupObj = getTaskGroupObjByName(taskGroup); packingPageAutoSetSterilizationProgramAfterSelectTousse = getBoolValueFromJs('sstsConfig.packingPageAutoSetSterilizationProgramAfterSelectTousse',true); @@ -1037,24 +1075,25 @@ text : '拍摄', hidden : !sstsConfig.showCameraPhoto, handler : function(){ - if(Ext4.chromeVersion < 62){ + /* if(Ext4.chromeVersion < 62){ showResult("请使用62以上版本的chrome浏览器!" , null , sstsConfig.messagePauseTimeOnPackingPage); return ; - } - var td_id = Ext4.getCmp('td_id').getValue(); - if(isUndefinedOrNullOrEmpty(td_id)){ + } */ + var imageName = Ext4.getCmp('imageName').getText(); + var td_id = Ext4.getCmp('td_id').getValue(); + if(isUndefinedOrNullOrEmpty(td_id)){ showResult("请选择装配任务" , null , sstsConfig.messagePauseTimeOnPackingPage); return ; - }else{ -// showToussePackingNote(td_id); } + + takeImgAndVideo(imageName,td_id,false,imageTypeCameraPacking,videoTypePacking); // 弹出窗口 - var pageUrl = WWWROOT + '/disinfectsystem/test/video.jsp?objectId='+td_id+'&imageType=' + imageTypeCameraPacking; + /* var pageUrl = WWWROOT + '/disinfectsystem/test/video.jsp?objectId='+td_id+'&imageType=' + imageTypeCameraPacking; var style="menubar=no,location=no,directories=no,toolbar=no,statusbar=no,resizable=no,"+getCenterWindowPos(1920,1080)+",scrollbars=no"; var popwin=window.open(pageUrl,'图片采集',style); if(popwin != null ){ popwin.focus(); - } + } */ } }, { @@ -1065,10 +1104,11 @@ hidden : !sstsConfig.showCameraPhoto, handler : function(){ var imageName = Ext4.getCmp('imageName').getText(); - var materialId = Ext4.getCmp('materialId').getValue(); + var materialId = Ext4.getCmp('materialId').getValue(); if(imageName != "" && materialId == ""){ var td_id = Ext4.getCmp('td_id').getValue(); - showTousseImages(imageName,td_id,imageTypeCameraApplication); + takeImgAndVideo(imageName,td_id,true,imageTypeCameraApplication,videoType); + // showTousseImages(imageName,td_id,imageTypeCameraApplication); } } }, Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp =================================================================== diff -u -r27068 -r27182 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 27068) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 27182) @@ -5,6 +5,7 @@ <%@page import="com.forgon.disinfectsystem.entity.packing.PackingTask"%> <%@page import="java.util.Map"%> <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%> +<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.videomanager.VideoFile" %> <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.container.Container"%> <%@page import="com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError"%> <%@page import="com.forgon.disinfectsystem.common.Constants"%> @@ -363,7 +364,12 @@ var imageType_specification = '<%=ImageFile.IMAGE_TYPE_SPECIFICATION%>'; var imageTypeCameraPacking = '<%=ImageFile.IMAGE_TYPE_CAMERA_PACKING%>'; var imageTypeCameraApplication = '<%=ImageFile.IMAGE_TYPE_CAMERA_APPLICATION%>'; - +//包实例装配采集图片 +var tousseDefinitionImageTypeCameraPacking = '<%=ImageFile.IMAGE_TYPE_TOUSSEINSTANCE_CAMERA_PACKING%>'; +//视频类型(申请采集视频) +var videoType = '<%=VideoFile.VIDEO_TYPE_CAMERA_APPLICATION%>'; +//视频类型(装配采集视频) +var videoTypePacking = '<%=VideoFile.VIDEO_TYPE_CAMERA_PACKING%>'; var IMAGE_TYPE_MATERIAL_DETACHABLE = '<%=ImageFile.IMAGE_TYPE_MATERIAL_DETACHABLE%>'; var IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKMETHOD = '<%=ImageFile.IMAGE_TYPE_MATERIAL_WASHQUALITYCHECKMETHOD%>'; var IMAGE_TYPE_MATERIAL_FUNCTIONCHECK = '<%=ImageFile.IMAGE_TYPE_MATERIAL_FUNCTIONCHECK%>'; @@ -463,7 +469,7 @@ .script("${ctx}/disinfectsystem/toussemanager/toussemaintain/tousseMaintainForm.js") .script("${ctx}/dwr/interface/BarcodeTableManager.js") - .script("${ctx}/imageShow/imageShow.js") + .script("${ctx}/imageShow/imageShow.js") .script("${ctx}/disinfectsystem/basedatamanager/tousse/modifyTousseInstances.js") Index: ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js =================================================================== diff -u -r27178 -r27182 --- ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js (.../videoAndImg.js) (revision 27178) +++ ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js (.../videoAndImg.js) (revision 27182) @@ -59,7 +59,11 @@ var imgList = "
"; imgList += ""; imgList += ""; - imgList += "
"; + if(isLook == 'true'){ + imgList += "
"; + }else{ + imgList += "
"; + } imgList += ""; //imgList += ""; imgList += "
"; @@ -76,7 +80,12 @@ var videoList = "
"; videoList += ""; videoList += ""; - videoList += "
"; + if(isLook == 'true'){ + videoList += "
"; + }else{ + videoList += "
"; + } + videoList += "
"; //videoList += "
"; videoList += "已上传"; @@ -253,17 +262,17 @@ } function imgAndVideoBtn(){ - var winW = 1024; - var winH = 666; - var winTop = (window.screen.availHeight -winH)/2; - var winLeft = (window.screen.availWidth -winW)/2; + var winowW = 1024; + var winowH = 666; + var winTop = (window.screen.availHeight -winowW)/2; + var winLeft = (window.screen.availWidth -winowH)/2; if(window.screen.height == 768){ lefts = 0; tops = 0; } // 弹出窗口 var pageUrl = WWWROOT + '/disinfectsystem/test/takeVideoAndImg.jsp'; - var style = "resizable=yes,top="+winTop+",left="+winLeft+",width="+winW+",height="+winH+",status=no,menubar=no,toolbar=no,Scrollbars=no,Location=no,Direction=no,resizable=no"; + var style = "resizable=yes,top="+winTop+",left="+winLeft+",width="+winowW+",height="+winowH+",status=no,menubar=no,toolbar=no,Scrollbars=no,Location=no,Direction=no,resizable=no"; popwin=window.open(pageUrl,"_blank",'图片视频拍摄',style); if(popwin != null ){ popwin.focus(); @@ -332,6 +341,11 @@ imageIds = imageIdsVal; } } + //拆包 + if(window.opener.imageIdsArry){ + window.opener.imageIdsArry.push(imageIds); + } + var videoIdsVal= getVideoIds(); if(videoIdsVal != ''){ if(videoIds !=""){ @@ -340,7 +354,12 @@ videoIds = videoIdsVal; } } + //拆包 + if(window.opener.videoIdsArry){ + window.opener.videoIdsArry.push(videoIds); + } + $("#imgVideoBtn").prevAll().remove(); loadingVideoAndImg(imageIds,videoIds); if(imageIds != ""){ @@ -395,7 +414,6 @@ }else{ $(".uploading").show(); } - //加载图片和视频 loadingVideoAndImg(imageIdsData,videoIdsData); })