Index: ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js
===================================================================
diff -u -r23652 -r25124
--- ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js	(.../materialInvoiceView.js)	(revision 23652)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/materialInvoiceView.js	(.../materialInvoiceView.js)	(revision 25124)
@@ -440,6 +440,7 @@
         				}
         			})*/
         		},
+						{header : "单价",width : 40,menuDisabled : true,dataIndex : 'price', id:'price'},
 	        	{header : " 数量",dataIndex : 'amount',width : 40,menuDisabled : true,
         			editor : new Ext.form.TextField({
         				regex: /^\d+$/,
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r25049 -r25124
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 25049)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 25124)
@@ -877,7 +877,9 @@
 		url : WWWROOT + '/disinfectSystem/invoiceAction!loadGoodsByBarcode.do',
 		params : {barcode : barcode,orgUnitCoding : orgUnitCoding,sourceWarehouseId: sourceWarehouseId},
 		success : function(response, options) {
+			//console.log("信息："+JSON.stringify(response));
 			top.Ext.getCmp("sendOutGoods").getEl().unmask();
+			
 			var result = Ext.decode(response.responseText);
 			// 首先处理错误信息
 			if(!isUndefinedOrNullOrEmpty(result.errMsg)){
@@ -929,15 +931,18 @@
 			for(var x=0;x<result.data.length;x++){
 				var goods = result.data[x];
 				
+				//yu
+				//console.log("all:"+response.responseText+";goods.tousseFixedBarcode:"+goods.tousseFixedBarcode+";goods.diposable:"+goods.diposable+";goods.tousseType:"+goods.tousseType+";errMsg:"+goods.errMsg);
+				
 				// 聚合包的处理
 				if(goods.tousseType == '聚合包'){
 					processComboTousse(goods,speakBasket);
 					continue;
 				}
 				// 扫描多个包时，固定条码包直接忽略
-				if((result.data.length > 1) && goods.tousseFixedBarcode){// 扫单个包才提示
-					continue;
-				}
+// 				if((result.data.length > 1) && goods.tousseFixedBarcode){// 扫单个包才提示
+// 					continue;
+// 				}
 				
 				var b = isBarcodeRepeat(goods.barcode);
 				if(b && (goods.diposable == '是' || !goods.tousseFixedBarcode || goods.tousseType==EXPENSIVEGOODS_TYPE_NAME)){// 扫描多个时，如果存在已扫描的，直接忽略，跳过
@@ -1001,12 +1006,27 @@
 					continue;
 				}
 				var validatePass = goods.validatePass;// 没见其他地方有这个属性，暂时保留?
-			    if(!validatePass){
-			    	continue;
+				if(!validatePass){
+					continue;
 				}
-			    if(!isUndefinedOrNullOrEmpty(goods.showResult)){
-			    	showResult(goods.showResult , null , sstsConfig.messagePauseTimeOnInvoiceplanPage);
-			    }
+				if(!isUndefinedOrNullOrEmpty(goods.showResult)){
+					showResult(goods.showResult , null , sstsConfig.messagePauseTimeOnInvoiceplanPage);
+				}
+				// yu 固定条码
+				
+				// 	if(已扫描物品（左边列表）不包含此物品定义条码)     	前面已做判断
+				//  if(在发货计划内（参考扫描一次性物品批次的处理）) 	  前面record已做判断
+				// 	待发数量amount
+				// 	if(amount == 0){       		验证发货数量是否大于申请数量   改 注释块已做判断
+				
+				
+				if(goods.diposable == '是' && goods.tousseType=="一次性物品定义"){
+					//根据返回的物品库存storage，判断库存是否足以发货
+					if(storage == 0){
+						continue;
+					}
+				}
+				// 固定条码 end
 				var goodsName = goods.name;
 				// 验证是否为申请的物品
 //				var b = isInvoiceGoods(goodsName);
@@ -1042,7 +1062,7 @@
 				}
 				
 				addGoods(goods,speakBasket);
-			  }
+			}
 			
 //			for(var x=0;x<result.data.length;x++){
 //				var msg = result.data[x].showResult;