Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/invoice/expensiveGoodsInvoiceForm.js
===================================================================
diff -u -r21843 -r21877
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/invoice/expensiveGoodsInvoiceForm.js	(.../expensiveGoodsInvoiceForm.js)	(revision 21843)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/invoice/expensiveGoodsInvoiceForm.js	(.../expensiveGoodsInvoiceForm.js)	(revision 21877)
@@ -9,7 +9,6 @@
 var recyclingapplicationStoreLoaded = false;
 var postInitDataTimer = null;
 var confirmSaveWin = null;
-var isScanAmountEqualsAppAmountConfirmed = false;
 var EXPENSIVEGOODS_TYPE_NAME = '高值耗材';
 var wareHouseStore = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
@@ -129,7 +128,7 @@
 				updateAmount1(name,amount);
 			}
 				
-			sendDeleteScannedGoodsLog(rows[i].data);
+//			sendDeleteScannedGoodsLog(rows[i].data);
 		}
 	}
 }
@@ -313,12 +312,6 @@
 			 b = false;
 			 break;
 		 }
-		 var errorAmount = record.get('errorAmount');
-		 if(parseInt(errorAmount) < 0){
-			 showResult('['+getTtsNameByAppRecord(record)+'] 误差数量不能小于0，保存失败！');
-			 b = false;
-			 break;
-		 }
 	}
 	for ( var i = 0; i < sendOutGoodsStore.getCount(); i++) {
 		 var record = sendOutGoodsStore.getAt(i);
@@ -459,7 +452,7 @@
 		diposable : goods.diposable,
 		price : price,
 		fluctuationPrice : goods.fluctuationPrice,
-		storage : storageAmount,
+		storage : 1,
 		batchNumber : goods.batchNumber,
 		tousseType : goods.tousseType,
 		typeInfoOnScanned : goods.typeInfoOnScanned,
@@ -1118,7 +1111,7 @@
 		},
 		{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:formatScannedAmount},
-		{header : '误差',id : 'errorAmount',dataIndex : 'errorAmount',width : 50,value : 0, menuDisabled: true,renderer:getDefaultAmount},
+		{header : '误差',id : 'errorAmount',hidden :true,dataIndex : 'errorAmount',width : 50,value : 0, menuDisabled: true,renderer:getDefaultAmount},
 		{header : '库存',id : 'storage',dataIndex : 'storage',width : 50,value : 0, menuDisabled: true,renderer:formatStorage},
 		{id : 'diposable',header : "是否一次性材料",dataIndex : 'diposable',hidden :true},
 		{id :'applicationAmount',header : "最大发货数量",dataIndex : 'applicationAmount',hidden : true,width :150}
@@ -1184,26 +1177,6 @@
 		if(!bool){
 			return false;
 		}
-		if(project == 'gdsy'){
-			if(!isScanAmountEqualsAppAmountConfirmed){
-				if(!isScanAmountEqualsAppAmount()){
-					confirmSaveWin = top.Ext.MessageBox.prompt("请确认","部分物品实发数量与待发数量存在差异，是否继续发货？",
-							function(button, text) {
-						
-								if ("cancel" == button || (!isUndefinedOrNullOrEmpty(text) && (text != BARCODE_ACTION_YES))){
-									confirmSaveWin = null;
-									isScanAmountEqualsAppAmountConfirmed = false;
-								}else{
-									isScanAmountEqualsAppAmountConfirmed = true;
-									doSaveAction();
-								}
-					});
-					speaker.speak("部分物品实发数量与待发数量存在差异，是否继续发货","是否继续发货");
-					return false;
-				}
-			}
-		}
-		isScanAmountEqualsAppAmountConfirmed = false;
 		getTousseGridData();
 		form.form.submit( {
 			//url : WWWROOT + '/disinfectSystem/invoiceAction!saveDepartInvoice.do',
@@ -1260,7 +1233,6 @@
 		if(confirmSaveWin){
 			confirmSaveWin.hide();
 			confirmSaveWin = null;
-			isScanAmountEqualsAppAmountConfirmed = false;
 		}else{
 			closeInvoiceFormWindow();
 		}
@@ -1746,38 +1718,6 @@
 								height :425,
 								loadMask : true,
 								tbar:[{
-									text:'申请单:'
-								},{
-									xtype:'combo',
-									id : 'invoicePlanId',
-									name : 'invoicePlanId',
-									valueField : 'id',
-									listWidth : 280,
-									displayField : 'typeAndserialNumber',
-									allowBlank : true,
-									editable : false,
-									store : departApplicationStore,
-									forceSelection : true,
-									triggerAction : 'all',
-									listeners : {
-										select : function(combo, record, index){
-											//1.根据申请单号的条件重新加载发货单明细
-											var id = record.get('id');
-											selectedInvoicePlanId = id;
-											recyclingapplicationStore.baseParams['invoicePlanId'] = id;
-											recyclingapplicationStore.load();
-											//2.清除已扫描的记录
-											sendOutGoodsStore.removeAll();
-											top.Ext.getCmp('sendOutGoodsStoreData').setValue('');
-											//3.hidden赋值
-											top.Ext.getCmp('invoicePlanIdHidden').setValue(id);
-											//4.已扫描的首尾器械包或篮筐条码清空
-											top.Ext.getCmp('scanText').setValue('');
-											top.Ext.getCmp('scanTextEnd').setValue('');
-										}
-									},
-									anchor : '95%'
-								},{
 									text: "",
 									id : 'tousseAmountInfo'
 								}],
@@ -1787,13 +1727,15 @@
 								viewConfig: {
 						            forceFit:true,
 						            getRowClass : function(record,rowIndex,rowParams,store){
+						            	return '';
 						            	if(record.data.errorAmount < 0){
 						            		return 'my_row_red';
 						            	}else if(record.data.errorAmount > 0){
 						            		return 'my_row_yellow';
 						            	}else{
 						            		return 'my_row_green';
-						            	}                  
+						            	}  
+						            	
 									}
 								},
 								clicksToEdit:1,
@@ -1829,14 +1771,6 @@
 							document.location.href = WWWROOT+'/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.jsp';
 						}
 					}
-				}, {
-					text : '辅助发货',
-					hidden: openMode == INVOICE_FORM_OPEN_MODE_CLICKRETURNRECORD || assistDelivery,
-					handler : function() {
-						
-						closeInvoiceFormWindow();
-						openAuxiliaryInvoiceForm(orgUnitCoding,depart,invoicePlanId);
-					}
 				}]
 			});
 
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r21849 -r21877
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 21849)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 21877)
@@ -1717,7 +1717,7 @@
 			
 			vo.setDiposable(Constants.STR_NO);
 			vo.setTousseType(ExpensiveGoods.TYPE_NAME);
-			
+			vo.setInvoicePlanID(JSONUtil.optLong(data,"invoicePlanID",null));
 			vo.setBarcode(data.get("barcode").getAsString());
 			vo.setName(data.get("name").getAsString());
 			if(!data.get("ttsName").isJsonNull()){
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r21854 -r21877
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 21854)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 21877)
@@ -4757,6 +4757,7 @@
 			data.addProperty("barcode", expensiveGoodsInstance.getBarcode());
 			data.addProperty("diposable", Constants.STR_NO);
 			data.addProperty("storage", 1);
+			data.addProperty("invoicePlanID", expensiveGoodsInstance.getInvoicePlanId());
 			data.addProperty("price", price);
 			data.addProperty("fluctuationPrice", fluctuationPrice);
 			data.addProperty("typeInfoOnScanned", typeInfoOnScanned.toString());
@@ -5246,8 +5247,10 @@
 					continue;
 				// 未发数量 = 申请数量-发货数量
 				int notSendAmount = appAmount - sendOutAmount;
-				if (notSendAmount <= 0)
-					continue;
+				if(!invoicePlan.isExpensiveGoodsApplication()){
+					if (notSendAmount <= 0)
+						continue;
+				}
 				
 				String goodsName = applicationItem.getTousseName();
 				Long disposableGoodsId = applicationItem.getDisposableGoodsId();