Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js =================================================================== diff -u -r36235 -r36281 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 36235) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 36281) @@ -1307,6 +1307,9 @@ if (result.isNeedRoutineMonitoringWarning != undefined && result.isNeedRoutineMonitoringWarning == true) { showResult("该物品灭菌炉没有进行监测,请登记!", null, sstsConfig.messagePauseTimeOnInvoiceplanPage); } + if(result.type && result.type == 'tousseInstanceSetCode'){ + showResult('已添加符合条件的器械包。'); + } // 验证灭菌筐内的物品是否符合发货条件,扫描的器械包数量是否大于申请数量 var tousseNameToAmountMap = getTousseNameToAmountMap(result); var exceedAmountNames = {};// 超过待发数量的包 Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js =================================================================== diff -u -r36247 -r36281 --- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 36247) +++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 36281) @@ -1958,7 +1958,7 @@ //如果启用材料清单,则将扫描的条码的信息导入材料清单 loadTousseInfo(obj.tousseDefinitionId,obj.tousseName); } - } else if(returnType == "multiTousseInstancesSuccess"){//扫描的是虚拟篮框(单个或首尾)或首尾器械包(返回结果为单个器械包,暂保留) + } else if(returnType == "multiTousseInstancesSuccess" || returnType == 'tousseInstanceSetCode'){//扫描的是虚拟篮框(单个或首尾)或首尾器械包(返回结果为单个器械包,暂保留) var tousseInstanceArray = obj.tousseInstances; if(tousseInstanceArray && tousseInstanceArray.length > 0){ if(taskGroup != tousseInstanceArray[0].taskGroup && sstsConfig.reviewModuleVersion !== 2){ @@ -1997,6 +1997,9 @@ }else{ Ext.getCmp('barcodeEnd').focus();//否则不清除,条码/篮筐(尾)获得焦点 } + if(returnType == 'tousseInstanceSetCode'){ + showResult('已添加符合条件的器械包。'); + } speakBasket.speakContent(); }else{ showResult("未找到相应的器械包或器械包已扫描" , null , sstsConfig.messagePauseTimeOnReviewPage); Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js =================================================================== diff -u -r36247 -r36281 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 36247) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js (.../sterilizationRecordForm.js) (revision 36281) @@ -1737,7 +1737,7 @@ * @param {条码} barcodeStr (器械包、灭菌篮筐、虚拟篮筐) * @param {灭菌记录id} sterilizationRecordId */ -function loadTousseInstance(barcodeStr, sterilizationRecordId, isTimeout, setCode) { +function loadTousseInstance(barcodeStr, sterilizationRecordId, isTimeout, setCode, barcodeType) { if(!setCode){ if (barcodeStr == '' || barcodeStr.length <= 0) { showMultipleResult("请输入条码!", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage); @@ -2389,6 +2389,10 @@ } newAddAudioTips("sterilizationRecordAudio", "", speakBasket); + + if(barcodeType == TOUSSEINSTANCESETCODE){ + showMultipleResult("已添加符合条件的器械包。", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage); + } } else { sterilizationRecordWin.getEl().unmask(); showMultipleResult("您扫描的物品非已审核的器械包或篮筐!", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage); @@ -4255,7 +4259,7 @@ top.Ext.getCmp('inputBarcodeEnd').focus();//否则不清除,条码/篮筐(尾)获得焦点 } } else if(TOUSSEINSTANCESETCODE == result){ //器械包集合码 - loadTousseInstance('', recordID,null,barcode); + loadTousseInstance('', recordID,null,barcode,TOUSSEINSTANCESETCODE); } else if ("notFixedBarcode" == result) { showMultipleResult("该器械包为可追溯的包,不能扫描固定条码!", null, sstsConfig.messagePauseTimeOnSterilizationRecordPage); Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r36247 -r36281 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 36247) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 36281) @@ -36,7 +36,7 @@ inspectorName = sstsConfig.aliasNameOfInspectorField; } var packingForCode = false; -var noCreateSetCode = ''; +var hasNoTraceable = ''; var oldTousseInstanceIds = ''; var reviewViewText; if (sstsConfig.nameSchemeOfReviewModule == 2) { @@ -5000,7 +5000,7 @@ var createSetCode = false; var lastTime = false; var tousseInstanceIds = ''; - if(noCreateSetCode !== ''){ + if(hasNoTraceable !== ''){ createSetCode = false; tousseInstanceIds = ''; }else { @@ -5026,7 +5026,7 @@ getPackingMaterialsForCheck.remove(par.tousseID); materialStore.reload(); } - noCreateSetCode = result.noCreateSetCode || ''; + hasNoTraceable = result.hasNoTraceable || ''; oldTousseInstanceIds = result.tousseInstanceIds || ''; var errorOfCreateSetCode = result.errorOfCreateSetCode || ''; if(errorOfCreateSetCode !== ''){ Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js =================================================================== diff -u -r35307 -r36281 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js (.../invoiceSignFormVersion2.js) (revision 35307) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js (.../invoiceSignFormVersion2.js) (revision 36281) @@ -231,6 +231,9 @@ top.Ext.getCmp('scanText').setValue(""); top.Ext.getCmp('scanText').focus(); } + if(result.signType && result.signType == '器械包集合码'){ + showResult('已添加符合条件的器械包。'); + } }else{ showResult(result.msg , null , sstsConfig.messagePauseTimeOnInvoiceplanPage); top.Ext.getCmp('scanText').setValue(""); Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp =================================================================== diff -u -r31906 -r36281 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp (.../invoiceSign.jsp) (revision 31906) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp (.../invoiceSign.jsp) (revision 36281) @@ -539,6 +539,9 @@ } } loadTodaySignedTousse(); + if(data.signType && data.signType == '器械包集合码'){ + alertDiv('已签收符合条件的器械包。'); + } }else{ if(typeof(data.message)=="undefined"){ speaker.speak(data.msg);