Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp =================================================================== diff -u -r28022 -r28978 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp (.../customIntoBasket.jsp) (revision 28022) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp (.../customIntoBasket.jsp) (revision 28978) @@ -91,6 +91,7 @@ position: absolute; left: 0; top: 0; + z-index: -1; } .mbody { width: 100%; Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js =================================================================== diff -u -r28400 -r28978 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 28400) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 28978) @@ -659,17 +659,24 @@ var materialInstanceId = $('#materialInstanceId'+row).val(); var isImplant = $('#isImplant'+row).val(); var tousseType = $('#tousseType'+row).val(); - var insertBasketAmount = thisAmount?thisAmount:(recycleAmount - loadedAmount); + var insertBasketAmount = thisAmount?thisAmount:(recycleAmount - loadedAmount); if(insertBasketAmount <= 0){ alertDiv('放入篮筐的数量必须大于0!'); return false; } var basketItem = $('#basketsUl').find('li').eq(0).find('input[type=hidden]').val(); - if(JSON.parse(basketItem).washClassifyType !== washClassifyType){ - alertDiv('清洗分类类型不一致,请换个装载【'+washClassifyType+'】类型的篮筐'); - return false; + if(sstsConfig.enableMaterialWashclasifyInCustomRecycle){ + if(JSON.parse(basketItem).washClassifyType !== washClassifyType){ + if(washClassifyType == ''){ + alertDiv('【'+materialName+'】的清洗分类类型为空,缺少该类型的篮筐,请扫描加载篮筐后再入筐!'); + return false; + }else { + alertDiv('【'+materialName+'】的清洗分类类型为'+washClassifyType+',缺少该类型的篮筐,请扫描加载篮筐后再入筐!'); + return false; + } + } } var success = addBasketItemElement(tousseName,materialName,insertBasketAmount,tousseAmount,tousseDefinitionID,idCardBarcode,