Index: ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindHandler.js =================================================================== diff -u -r27583 -r27586 --- ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindHandler.js (.../goodsBindHandler.js) (revision 27583) +++ ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindHandler.js (.../goodsBindHandler.js) (revision 27586) @@ -105,7 +105,8 @@ goodType: curSelectedGoods.type, urgentAmount:top.Ext4.getCmp('urgentAmount').getValue(), urgentLevel:top.Ext4.getCmp('urgentLevel').getRawValue(), - urgentLevelId:top.Ext4.getCmp('urgentLevel').getValue() + urgentLevelId:top.Ext4.getCmp('urgentLevel').getValue(), + returnGoodsWithCountZero:true }; } if (params.bindCount && params.goodId) { @@ -119,9 +120,10 @@ var result = Ext.decode(response.responseText); if (!isUndefinedOrNullOrEmpty(result)) { if (result.success) { - var records = result.data; + var records = result.data; if (records.length > 0) { var lcmArr = []; + var isTrue = 0; for(var i=0,j=0;i 0){ + var msgBox = new top.Ext4.create('Ext.window.MessageBox', { + width : 500, + height : 200 + }); + msgBox.alert('提示信息', records[i].name+'的数量必须为最小申请数量('+minApplyAmount+')的倍数'); + return; + } + + if(records[i].count > maxApplyAmount && minApplyAmount > 0){ + var msgBox = new top.Ext4.create('Ext.window.MessageBox', { + width : 500, + height : 200 + }); + msgBox.alert('提示信息', records[i].name+'的数量必须小于最大申请数量'); + return; + } } - if((params.bindCount%lcm(lcmArr)) !== 0){ + + if(lcmArr.length > 0 && lcm(lcmArr) > 0 && (params.bindCount%lcm(lcmArr)) !== 0){ var msgBox = new top.Ext4.create('Ext.window.MessageBox', { width : 500, height : 200 }); msgBox.alert('提示信息', params.goodName+'的数量必须为'+lcm(lcmArr)+'的倍数'); return; } - me.addBindGood(records); } } else {