Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js =================================================================== diff -u -r15728 -r15828 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 15728) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 15828) @@ -449,6 +449,20 @@ allowBlank : true, anchor : '95%' }] + },{ + columnWidth : 1, + layout : 'form', + labelWidth : 110, + items : [{ + xtype : 'numberfield', + fieldLabel : '顺序号', + maxLength : '16', + id : 'sequence', + name : 'sequence', + allowDecimals : false, + allowBlank : true, + anchor : '95%' + }] } ] },{ @@ -942,8 +956,9 @@ {header : "最小申请数量",width : 80,dataIndex : 'minApplyAmount'}, {header : "最大申请数量",width : 80,dataIndex : 'maxApplyAmount'}, {header : "单位",width : 50,dataIndex : 'unit'}, - {header : "中包装单位",width : 50,dataIndex : 'middlePackageUnit'}, - {header : "中包装单位装换单位系数",width : 50,dataIndex : 'transferScale'}, + {header : "中包装单位",width : 90,dataIndex : 'middlePackageUnit'}, + {header : "中包装单位装换单位系数",width : 90,dataIndex : 'transferScale'}, + {header : "顺序号",width : 50,dataIndex : 'sequence'}, {header : "拼音码",width : 90,dataIndex : 'spelling'}, {header : "五笔码",width : 90,dataIndex : 'wbCode'}, {header : "能否作为器械包材料",width : 120,dataIndex : 'isPartOfTousseMaterial'}, @@ -968,6 +983,7 @@ {name : 'unit'}, {name : 'middlePackageUnit'}, {name : 'transferScale'}, + {name : 'sequence'}, {name : 'minStorage'}, {name : 'maxStorage'}, {name : 'spelling'}, @@ -988,6 +1004,7 @@ {type: 'string', dataIndex: 'unit'}, {type: 'string', dataIndex: 'middlePackageUnit'}, {type: 'numeric', dataIndex: 'transferScale'}, + {type: 'numeric', dataIndex: 'sequence'}, {type: 'numeric', dataIndex: 'minStorage'}, {type: 'numeric', dataIndex: 'maxStorage'}, {type: 'string', dataIndex: 'spelling'}, Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java =================================================================== diff -u -r15734 -r15828 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 15734) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 15828) @@ -260,6 +260,7 @@ curDisposableGoods.setMaxApplyAmount(disposableGoods.getMaxApplyAmount()); curDisposableGoods.setMiddlePackageUnit(disposableGoods.getMiddlePackageUnit()); curDisposableGoods.setTransferScale(disposableGoods.getTransferScale()); + curDisposableGoods.setSequence(disposableGoods.getSequence()); } /** * 更新一次性物品定义