Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r13857 -r13872 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 13857) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 13872) @@ -675,6 +675,7 @@ List recyclingApplications = null; boolean isOneLevelSupply = false; String errorMessage = null; + Long idCardUseAmount = null; if (StringUtils.isNotBlank(barcode)) { orgUnit = orgUnitManager.getOrgUnitByBarcode(barcode); if (orgUnit != null) { @@ -784,6 +785,7 @@ errorMessage = "器械包必须是已发货、已使用或已签收的状态 !"; } } + idCardUseAmount = idCardInstance.getUseAmount(); } else { // 代码逻辑有问题 // IDCardInstance idCardInstance = ((IDCardInstance) @@ -830,6 +832,7 @@ map.put("isOneLevelSupply", isOneLevelSupply);// 是否为一级供应室 map.put("application", recyclingApplications); map.put("errorMessage", errorMessage); + map.put("idCardUseAmount", idCardUseAmount); try { JSONObject jsonObject = JSONObject.fromObject(map, config); response.setCharacterEncoding("UTF-8"); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r13814 -r13872 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 13814) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 13872) @@ -93,7 +93,7 @@ function closeDiv(){ ab.close(); } - + var applicationType = null; var userNameByBarcode = "";//条形码对应的用户名 @@ -703,7 +703,19 @@ $("#basketsUl li:first").find('input').val(json); toggleItems(obj.find('span')[0]); } - +function noticeIdCardUseAmount(useAmount){ + if(sstsConfig && sstsConfig.idCardUseAmountNoticeType){ + var msg = '此标识牌已经使用' + useAmount + '次'; + if(1 == sstsConfig.idCardUseAmountNoticeType){ + jShowResult(msg); + }else if(2 == sstsConfig.idCardUseAmountNoticeType){ + speaker.speak(msg); + }else if(3 == sstsConfig.idCardUseAmountNoticeType){ + speaker.speak(msg); + jShowResult(msg); + } + } +} function loadBarcodeDevice(barcodeTemp){ if(barcodeTemp.length >= 9){ var barcode = barcodeTemp.substring(barcodeTemp.length-9,barcodeTemp.length); @@ -933,6 +945,7 @@ }; addToussItem(toussItem); } + noticeIdCardUseAmount(msg.idCardUseAmount); } //记住扫描的标志牌 $('#tousseItemTable').children().first().children().each(function(i,element){ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/jShowResult.css =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/jShowResult.css (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/jShowResult.css (revision 13872) @@ -0,0 +1,41 @@ +#overlay{ + /*background:transparent url(images/overlay.png) repeat top left;*/ + position:fixed; + top:0px; + bottom:0px; + left:0px; + right:0px; + z-index:100; + } + +#box{ + position:fixed; + top:-500px; + left:40%; + width:20%; + /*right:30%;*/ + background-color:#fff; + color:#7F7F7F; + padding:20px; + border:2px solid #ccc; + -moz-border-radius: 20px; + -webkit-border-radius:20px; + -khtml-border-radius:20px; + -moz-box-shadow: 0 1px 5px #333; + -webkit-box-shadow: 0 1px 5px #333; + z-index:101; + } +#box span.boxclose{ + float:right; + width:26px; + height:26px; + /*background:transparent url(images/cancel.png) repeat top left;*/ + margin-top:-30px; + margin-right:-30px; + cursor:pointer; +} +#mess{ + font-size:16px; + color:red; +} +/*.img{float:right;}*/ \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js =================================================================== diff -u -r13280 -r13872 --- ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js (.../config.js) (revision 13280) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js (.../config.js) (revision 13872) @@ -53,5 +53,7 @@ //入库单是否显示生物检测信息 godownEntryShowBiologicalTestReport:true, //金额的小数位数 - moneyDigitCount:4 + moneyDigitCount:4, + //回收界面，标识牌通知方式:1弹出提示框,2语音播报,3提示框和语音,其他值无操作 + idCardUseAmountNoticeType:1 } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/jquery-message.js =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/jquery-message.js (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/jquery-message.js (revision 13872) @@ -0,0 +1,31 @@ +var jmessage_box_timer = null; +function jShowResult(message,title,pauseTime){ + tishiclose(); + var str = '' + + '
' + + 'X' + + '
'; + + $(document.body).append(str); + + var tempPauseTime = 5000; + if(pauseTime){ + tempPauseTime = pauseTime; + } + + $('#overlay').fadeIn('fast', function () { + $('#box').animate({ 'top': '150px' }, 500); + $("#mess").html(message); + jmessage_box_timer = setTimeout("tishiclose()",tempPauseTime); + }); +} + +function tishiclose(){ + $('#box').animate({ 'top': '-500px' }, 100, function () { + $('#overlay').fadeOut('fast'); + }); + if(jmessage_box_timer){ + clearTimeout(jmessage_box_timer); + jmessage_box_timer = null; + } +} \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r13615 -r13872 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 13615) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 13872) @@ -30,7 +30,10 @@ + + + @@ -58,6 +61,7 @@ %>