Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java =================================================================== diff -u -r14210 -r14211 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 14210) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 14211) @@ -249,6 +249,7 @@ curDisposableGoods.setType(disposableGoods.getType()); curDisposableGoods.setUnit(disposableGoods.getUnit()); curDisposableGoods.setUnitConvertCoefficient(disposableGoods.getUnitConvertCoefficient()); + curDisposableGoods.setMaxApplyAmount(disposableGoods.getMaxApplyAmount()); } /** * 更新一次性物品定义 Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js =================================================================== diff -u -r13892 -r14211 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 13892) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 14211) @@ -388,6 +388,19 @@ layout : 'form', labelWidth : 110, items : [{ + xtype : 'numberfield', + fieldLabel : '最大申请数量', + maxLength : '16', + id : 'maxApplyAmount', + name : 'maxApplyAmount', + allowBlank : true, + anchor : '95%' + }] + },{ + columnWidth : 1, + layout : 'form', + labelWidth : 110, + items : [{ xtype : 'textfield', fieldLabel : '单位', maxLength : '16', @@ -647,12 +660,19 @@ var max = top.Ext.getCmp('maxStorage').getValue(); var min = top.Ext.getCmp('minStorage').getValue(); + var minApply = top.Ext.getCmp('minApplyAmount').getValue(); + var maxApply = top.Ext.getCmp('maxApplyAmount').getValue(); if(typeof max == 'number' && typeof min == 'number'){ if(min>max){ showResult('最小库存不能大于最大库存'); top.Ext.getCmp('minStorage').focus(); return false; } + if(minApply > maxApply){ + showResult('最小申请数不能大于最大申请数'); + top.Ext.getCmp('minApplyAmount').focus(); + return false; + } } this.disable(); validateAndSubmit(); @@ -879,6 +899,7 @@ {header : "参考价",width : 60,dataIndex : 'referencePrice'}, {header : "总数",width : 50,dataIndex : 'amount',hidden:true}, {header : "最小申请数量",width : 80,dataIndex : 'minApplyAmount'}, + {header : "最大申请数量",width : 80,dataIndex : 'maxApplyAmount'}, {header : "单位",width : 50,dataIndex : 'unit'}, {header : "拼音码",width : 90,dataIndex : 'spelling'}, {header : "五笔码",width : 90,dataIndex : 'wbCode'}, @@ -900,7 +921,8 @@ {name : 'packageSpec'}, {name : 'amount'}, {name : 'minApplyAmount'}, - {name : 'unit'}, + {name : 'maxApplyAmount'}, + {name : 'unit'}, {name : 'minStorage'}, {name : 'maxStorage'}, {name : 'spelling'}, @@ -917,6 +939,7 @@ {type: 'string', dataIndex: 'externalCode'}, {type: 'numeric', dataIndex: 'amount'}, {type: 'numeric', dataIndex: 'minApplyAmount'}, + {type: 'numeric', dataIndex: 'maxApplyAmount'}, {type: 'string', dataIndex: 'unit'}, {type: 'numeric', dataIndex: 'minStorage'}, {type: 'numeric', dataIndex: 'maxStorage'},