Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js =================================================================== diff -u -r15728 -r15745 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 15728) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 15745) @@ -698,14 +698,16 @@ if (isUndefinedOrNullOrEmpty(para.transferScale) || isUndefinedOrNullOrEmpty(para.middlePackageUnit)){ targetNode.set('transferScale',''); targetNode.set('unitCount',''); - var minUnit = targetNode.get('minUnit'); + // var minUnit = targetNode.get('minUnit'); + var unit = targetNode.get('unit'); targetNode.set('minUnit',''); - targetNode.set('unit',minUnit); + targetNode.set('unit',unit); } else { targetNode.set('transferScale',para.transferScale); targetNode.set('unitCount', para.count * para.transferScale); - targetNode.set('minUnit',targetNode.get('unit')); + // targetNode.set('minUnit',targetNode.get('unit')); + targetNode.set('minUnit',targetNode.get('minUnit')); targetNode.set('unit',para.middlePackageUnit); targetNode.set('totalPrice', roundValue(para.price * para.count * para.transferScale)); } @@ -951,7 +953,7 @@ if(isDiposableGoods == '是'){ if(!isValidDiposableAmount(minApplyAmount,count)){ showResult("该一次性物品最小申请数量为"+minApplyAmount+",所填数量必须是"+minApplyAmount+"的倍数。"); - clearCount(); + // clearCount(); return false; }else if(parseInt(count,10) > storageAmount ){ if(!allowApplyDisposableGoodsWhenUnderstock){ @@ -960,7 +962,7 @@ } top.Ext4.Msg.confirm("请确认", "申请数量大于库存数量,发货可能会延迟,是否继续申请该物品?",function(btn) { if (btn != 'yes') { - clearCount(); + // clearCount(); return false; }else{ addItems(id,name,count,isDiposableGoods,isApplyEntireTousse,price,externalCode,storageAmount,tousseType,materials,unit,packageSpec,minApplyAmount,maxApplyAmount,urgentAmount,para); @@ -970,7 +972,7 @@ } else if(!isUndefinedOrNullOrEmpty(maxApplyAmount) && count > maxApplyAmount){ top.Ext4.Msg.alert("提示消息","申请数量大于最大可申请数量"); - clearCount(); + // clearCount(); addItems(id,name,count,isDiposableGoods,isApplyEntireTousse,price,externalCode,storageAmount,tousseType,materials,unit,packageSpec,minApplyAmount,maxApplyAmount,urgentAmount,para); afterAddItem(); }