Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r35937 -r36028
--- ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 35937)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 36028)
@@ -355,6 +355,7 @@
 	   <operation operationId="SSTS_DisposableGoodsProfitAndLoss_Manager" operationName="һ������Ʒ��ӯ�̿�����"></operation>
 	   <operation operationId="SSTS_DisposableGoodsCheck_Manager" operationName="һ������Ʒ�̵����"></operation>
 	   <operation operationId="SSTS_DisposableGoodSsettleAccounts_Manager" operationName="һ������Ʒ�������"></operation>
+	   <operation operationId="SSTS_DisposableGoodPreferredDelivery_Manager" operationName="һ������Ʒ���ȷ�������" mappingConfigPropertyName="enableDisposableGoodsCanBeShippedFirstFunction"></operation>
     </modelName>
     
     <modelName modleName="�ɹ��ƻ�����ģ��">
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.jsp
===================================================================
diff -u -r29513 -r36028
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.jsp	(.../disposableGoodsStockView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.jsp	(.../disposableGoodsStockView.jsp)	(revision 36028)
@@ -23,6 +23,12 @@
 	<operation:authorize ifAnyGranted="SSTS_DiposableGoods_Delete">
 	SSTS_DiposableGoods_Delete = false;
 	</operation:authorize>
+	var SSTS_DisposableGoodPreferredDelivery_Manager = true;
+	<operation:authorize ifAnyGranted="SSTS_DisposableGoodPreferredDelivery_Manager">
+		if(sstsConfig.enableDisposableGoodsCanBeShippedFirstFunction){
+			SSTS_DisposableGoodPreferredDelivery_Manager = false
+		}
+	</operation:authorize>
 
 	var CONSTANT_YES = '<%=DisposableGoods.CONSTANT_YES %>';//能
 	var CONSTANT_NO = '<%=DisposableGoods.CONSTANT_NO %>';//否
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js
===================================================================
diff -u -r35005 -r36028
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js	(.../disposableGoodsStockView.js)	(revision 35005)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.js	(.../disposableGoodsStockView.js)	(revision 36028)
@@ -54,11 +54,13 @@
 			fields : [
 		  	    {name : 'id'},
 		  	    {name : 'disposableGoodsBatchId'},
+				{name : 'disposableGoodsBatchStockId'},
 		  	    {name : 'barcode'},
 		  	    {name : 'storage'},
 		  	    {name : 'batchNumber'},
 		  	    {name : 'cost'},
 		  	    {name : 'produceDate'},
+				{name : 'priorInvoice'},
 		  	    {name : 'expDate'},
 		  	    {name : 'supplierName'}
 		  	]
@@ -387,11 +389,11 @@
 			columnWidth : 0.6,
 			layout : 'form',
 			items : [
-			    new top.Ext.grid.GridPanel({
+			    new top.Ext.grid.EditorGridPanel({
 					id :'batchNumberGrid',
 				    store : godownEntryItemStore ,
 				    height : 390,
-				    width : 485,
+				    width : 585,
 				    bodyStyle : 'border:1px solid #afd7af',
 				    sm : selectModel,
 				    cm : new top.Ext.grid.ColumnModel([selectModel,
@@ -408,8 +410,53 @@
 				         {header : "库存",width : 50,dataIndex : 'storage',menuDisabled:true},
 				         {header : "生产日期",width : 90,dataIndex : 'produceDate',hidden : !sstsConfig.showProduceDateOfDisposableGoods,renderer:myDateFormat,menuDisabled:true},
 				         {header : "失效日期",width : 90,dataIndex : 'expDate',renderer:myDateFormat,menuDisabled:true},
+						 {header : "是否优先发货",width : 130,dataIndex : 'priorInvoice',menuDisabled:true,editor: new top.Ext.form.ComboBox({
+							xtype: 'combo',
+							valueField: 'value',
+							displayField: 'value',
+							store: new Ext.data.SimpleStore( {
+								fields : [ 'value'],
+								data : [['是'],['否']]
+							}),
+							forceSelection: true,
+							editable: true,
+							mode: 'local',
+							triggerAction: 'all',
+							anchor: '95%'
+						})},
 				      	 {id:'supplierName',header : "供应商",width : 130,dataIndex : 'supplierName',menuDisabled:true}
 				    ]),
+					listeners:{
+						afteredit: function (record) {
+							if(record.value == '否'){
+								godownEntryItemStore.getAt(record.row).set('priorInvoice','')
+							}else {
+								var isTrue = false;
+								var id = godownEntryItemStore.getAt(record.row).get('id');
+								for(var i=0;i<godownEntryItemStore.getCount();i++){
+									var priorInvoice = godownEntryItemStore.getAt(i).get('priorInvoice');
+									var newId = godownEntryItemStore.getAt(i).get('id');
+									if(priorInvoice == '是' && newId !== id){
+										isTrue = true;
+									}
+								}
+								if(isTrue){
+									top.Ext.Msg.confirm('请确认', '当前已有批次设置为优先发货，是否进行替换操作？', function (btn) {
+										if (btn == 'yes') {
+											for(var i=0;i<godownEntryItemStore.getCount();i++){
+												var newId = godownEntryItemStore.getAt(i).get('id');
+												if(newId !== id){
+													godownEntryItemStore.getAt(i).set('priorInvoice','')
+												}
+											}
+										}else {
+											godownEntryItemStore.getAt(record.row).set('priorInvoice','');
+										}
+									})
+								}
+							}
+						}
+					},
 				    autoExpandColumn : 'supplierName',
 				    frame : false,
 				    viewConfig: {forceFit:true},
@@ -468,6 +515,39 @@
 					}
 				});
 			}
+		},{
+			text : '保存',
+			hidden:!SSTS_DisposableGoodPreferredDelivery_Manager,
+			handler : function() {
+				var disposableGoodsBatchId; 
+				var disposableGoodsBatchStockId
+				for(var i=0;i<godownEntryItemStore.getCount();i++){
+					var priorInvoice = godownEntryItemStore.getAt(i).get('priorInvoice');
+					if(priorInvoice == '是'){
+						disposableGoodsBatchId = godownEntryItemStore.getAt(i).get('disposableGoodsBatchId');
+						disposableGoodsBatchStockId = godownEntryItemStore.getAt(i).get('disposableGoodsBatchStockId');
+						price = godownEntryItemStore.getAt(i).get('cost');
+					}
+				}
+				if(disposableGoodsBatchId){
+					Ext.Ajax.request({
+						url :  WWWROOT + '/disinfectSystem/disposableGoodsStockAction!saveDisposablePriorInvoicePrice.do',
+						params : {
+							disposableGoodsBatchId : disposableGoodsBatchId,
+							disposableGoodsBatchStockId:disposableGoodsBatchStockId,
+							price:price
+						},
+						success : function(response, options) {
+							var result = Ext.decode(response.responseText);
+							if(result.success){
+								showResult('保存成功');
+							}else {
+								showResult(result.message);
+							}
+						}
+					});
+				}
+			}
 		}]
 	});
 	
@@ -479,7 +559,7 @@
 		id : 'diposableGoodsWin',
 		layout : 'fit',
 		title : '一次性物品信息',
-		width : 850,
+		width : 950,
 		modal : true,
 		autoHeight : true,
 		border : false,
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/config.js
===================================================================
diff -u -r35546 -r36028
--- ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/config.js	(.../config.js)	(revision 35546)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgshlyy/config.js	(.../config.js)	(revision 36028)
@@ -197,6 +197,8 @@
 	enableInventorySerialNumber:true,
     //启用器械包告警的排序功能
     enableTousseGoodsWarningSortingFunction:true,
+    //启用一次性物品可设置指定价格优先发货功能
+    enableDisposableGoodsCanBeShippedFirstFunction:true,
 	// 核算月报的报表类型。该配置项为一个JSON数组，可以定义报表格式下拉框的文本和对应的报表文件名字
 	patternOfAccountingMonthlyReport:[{'optionText':'横沥新格式','reportName':'东莞横沥医院的核算月报'}]
 }
\ No newline at end of file