Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java =================================================================== diff -u -r12331 -r14225 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java (.../ApplicationGoodsVo.java) (revision 12331) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/vo/ApplicationGoodsVo.java (.../ApplicationGoodsVo.java) (revision 14225) @@ -22,6 +22,8 @@ private int count;//待发货数量(部分发货) + private int urgentAmount;// 加急数量 + private String diposable;//是否一次性物品 private int applicationAmount;//最大发货量(即申请数量) @@ -72,6 +74,14 @@ this.count = count; } + public int getUrgentAmount() { + return urgentAmount; + } + + public void setUrgentAmount(int urgentAmount) { + this.urgentAmount = urgentAmount; + } + public String getDiposable() { return diposable; } Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js =================================================================== diff -u -r13935 -r14225 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 13935) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 14225) @@ -480,7 +480,6 @@ var sendAmount1 = record.data['tempAmount']; //验证发货数量是否大于申请数量 if(sendAmount1 == appAmount1 && goods.tousseType != '器械包'){ - alert(goods.tousseType) showResult(goods.name+',已满足发货计划!'); continue; } @@ -576,6 +575,7 @@ {name : 'count'}, {name : 'diposable'}, {name : 'price'}, + {name : 'urgentAmount'}, {name : 'tempAmount'}, {name : 'errorAmount'}, {name : 'amount'}, @@ -617,7 +617,7 @@ var recyclingapplicationCm = new Ext.grid.ColumnModel([ {header : "申请的物品",dataIndex : 'showTousseName',width : 180,menuDisabled: true}, {header : "name",dataIndex : 'name',hidden : true,menuDisabled: true}, - {header : "待发数量",dataIndex : 'count',width : 50, menuDisabled: true/*, + {header : "待发",dataIndex : 'count',width : 50, menuDisabled: true/*, editor : new Ext.form.TextField( { allowBlank : false, listeners : { @@ -627,8 +627,9 @@ } })*/ }, - {header : '实发数量',id : 'tempAmount',dataIndex : 'tempAmount',width : 50,value : 0, menuDisabled: true,renderer:getDefaultAmount}, - {header : '误差数量',id : 'errorAmount',dataIndex : 'errorAmount',width : 50,value : 0, menuDisabled: true,renderer:getDefaultAmount}, + {header : '加急',id : 'urgentAmount',dataIndex : 'urgentAmount',width : 50,value : 0, menuDisabled: true,renderer:getDefaultAmount}, + {header : '实发',id : 'tempAmount',dataIndex : 'tempAmount',width : 50,value : 0, menuDisabled: true,renderer:getDefaultAmount}, + {header : '误差',id : 'errorAmount',dataIndex : 'errorAmount',width : 50,value : 0, menuDisabled: true,renderer:getDefaultAmount}, {id : 'diposable',header : "是否一次性材料",dataIndex : 'diposable',hidden :true}, {id :'applicationAmount',header : "最大发货数量",dataIndex : 'applicationAmount',hidden : true,width :150} // {id : 'deleteItem',header:'删除',hidden :true,width :40,menuDisabled: true, @@ -1095,7 +1096,7 @@ store : recyclingapplicationStore, cm : recyclingapplicationCm, enableHdMenu : false, - width : 423, + width :423, height :425, loadMask : true, tbar:[{