Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js =================================================================== diff -u -r28348 -r28400 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 28348) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 28400) @@ -659,12 +659,18 @@ var materialInstanceId = $('#materialInstanceId'+row).val(); var isImplant = $('#isImplant'+row).val(); var tousseType = $('#tousseType'+row).val(); - 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; + } var success = addBasketItemElement(tousseName,materialName,insertBasketAmount,tousseAmount,tousseDefinitionID,idCardBarcode, putBasketMaxAmount,batchToBasket,materialInstanceId,isImplant,tousseType); @@ -925,27 +931,27 @@ id = basketJson.classifyBasketId; containerName = basketJson.containerName; washClassifyType = basketJson.washClassifyType; - sequence = basketJson.sequence; + sequence = basketJson.sequence; }else if($(this).is('dl')){ $(this).children().each(function(i,element){ if($(this).attr('type') == 'hidden'){ - var itemJson = $(this).val(); + var itemJson = $(this).val(); var json = JSON.parse(itemJson); var obj = {}; obj.basketBarcode = basketBarcode; obj.containerName = containerName; - obj.washClassifyType = washClassifyType; - obj.sequence = sequence; - obj.basketId = id; + obj.sequence = sequence; + obj.washClassifyType = washClassifyType; + obj.basketId = id; obj.materialName = json.materialName; obj.materialAmount = json.amount; obj.tousseName = json.tousseName; obj.tousseAmountForMaterial = json.tousseAmount; obj.tousseDefinitionID = json.tousseDefinitionID; obj.idCardBarcode = json.idCardBarcode; - obj.putBasketMaxAmount = json.putBasketMaxAmount; + obj.putBasketMaxAmount = json.putBasketMaxAmount; var isExist = false; - var len = array.length; + var len = array.length; for(var j = 0;j < len;j++){ if(array[j].tousseDefinitionID == json.tousseDefinitionID){ isExist = true; @@ -968,8 +974,8 @@ } if(!isExist){ array[len] = {}; - array[len].tousseDefinitionID = json.tousseDefinitionID; - array[len].tousseName = json.tousseName; + array[len].tousseDefinitionID = json.tousseDefinitionID; + array[len].tousseName = json.tousseName; array[len].tousseType = json.tousseType; array[len].recycleAmount = json.tousseAmount; array[len].idCardBarcode = json.idCardBarcode; @@ -980,7 +986,7 @@ }); } }); - }); + }); window.opener.customIntoBasketFun(array); window.close(); } Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r28397 -r28400 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28397) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28400) @@ -1005,6 +1005,7 @@ var amount = basketItem.amount; var tousseAmount = basketItem.tousseAmount; var basketBarcode = basketItem.basketBarcode; + var basketId = basketItem.basketId; var idCardBarcode = basketItem.idCardBarcode; var tousseDefinitionID = basketItem.tousseDefinitionID; var tousseType = basketItem.tousseType; @@ -1107,8 +1108,8 @@ } var basketJson = JSON.parse(basketHidenValue); - var basketBarcode = basketJson.barcode; - var basketId = basketJson.classifyBasketId; + basketBarcode = (basketBarcode)?basketBarcode:basketJson.barcode; + basketId = (basketId)?basketId:basketJson.classifyBasketId; var goodsName = tousseName; var tousseNameForMaterial = ""; @@ -1642,7 +1643,7 @@ $('#tousseItemTable').children().first().children().each(function(i,element){ if($('#tousseName'+i).val() == td.name && $('#deleted'+i).val() == '0'){ tousseIsExist = true; - $('#loadedAmount'+i).val(parseInt($('#loadedAmount'+i).val(),10)); + $('#loadedAmount'+i).val(1 + parseInt($('#loadedAmount'+i).val(),10)); $('#tousseOrIDCardInstanceBarcodes'+i).val(appendBarcodes($('#tousseOrIDCardInstanceBarcodes'+i).val(), ti.barcode)); if(parseInt($('#loadedAmount'+i).val()) > parseInt($('#recycleAmount'+i).val())){ $('#recycleAmount'+i).val(parseInt($('#loadedAmount'+i).val())); @@ -2693,7 +2694,7 @@ } } } - if(isCleanedEntirely == "否"){ + if(isCleanedEntirely == "否"){ var materials = data.materials; if(materials == null){ alertDiv("异常数据，请联系管理员！"); @@ -2714,7 +2715,7 @@ showName: item.materialName, amount: item.materialAmount, tousseAmount: loadedAmount, - basketBarcode: item.barcode, + basketBarcode: item.basketBarcode, idCardBarcode: idCardBarcode, basketGroupBarcodes:item.basketGroupBarcodes, putBasketMaxAmount : item.putBasketMaxAmount, @@ -2743,8 +2744,7 @@ }; addBasketItemElement(basketItem); } - setTousseItemLoadedAmountCss(row); - refreshAllBasketTotalNum(); + refreshAllBasketTotalNum() } }); DWREngine.setAsync(true); @@ -2762,8 +2762,7 @@ var tousseType = $('#tousseType'+row).val(); var isCleanedEntirely = $('#isCleanedEntirely'+row).val(); var recycleAmount = parseInt($('#recycleAmount'+row).val(),10); - var applicationAmount = parseInt($('#applicationAmount'+row).val(),10); - var loadedAmount = parseInt($('#loadedAmount'+row).val(),10); + var applicationAmount = parseInt($('#applicationAmount'+row).val(),10); //是否开启限制使用记录转换的申请单不能添加别的物品 if(sstsConfig.restrictAddOtherGoodsToApplicationFromUseRecord && $('#useRecordId').val() !='' && recycleAmount > applicationAmount){ alertDiv("回收数量不能超过申请数量"); @@ -2803,7 +2802,7 @@ showMsg = $('#tousseName'+row).val()+"扫描的标识牌数量不等于回收数量，如果标识牌丢失，请在回收误差中登记丢失记录!"; }else{ if(errorAmount - intoBasketAmount >0){ - amount = errorAmount - intoBasketAmount; + //amount = errorAmount - intoBasketAmount; } } break; @@ -4378,8 +4377,8 @@ var data = getUnCleanedEntirelyTousseInfo(); var tousseIntoBasketInfo = JSON.stringify(getTousseIntoBasketInfo()); if(data != "[]"){ - var url = encodeURI(WWWROOT+'/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp?data='+data+'&resolution=1980' - + '&tousseIntoBasketInfo=' + tousseIntoBasketInfo + '&recyclingApplicationId=' + $('#recyclingApplicationId').val()); + var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp?data='+data+'&resolution=1980' + + '&tousseIntoBasketInfo=' + tousseIntoBasketInfo + '&recyclingApplicationId=' + $('#recyclingApplicationId').val() var style='menubar=no,location=no,directories=no,toolbar=no,statusbar=no,resizable=yes,top=100,left=100,width=1400,height=800,scrollbars=null'; var popwin=openFullSizeWindowWithName(url,true,'自定义入框'); }else{ @@ -4597,8 +4596,10 @@ showName: item.materialName, amount: item.materialAmount, tousseAmount: item.tousseAmountForMaterial, - basketBarcode: item.basketBarcode, - idCardBarcode: item.idCardBarcode, + basketBarcode: item.basketBarcode, + basketId:item.basketId, + idCardBarcode: item.idCardBarcode, + washClassifyType:item.washClassifyType, putBasketMaxAmount:item.putBasketMaxAmount, basketGroupBarcodes:basketGroupBarcodeArray.join(";") };