Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r17085 -r17130
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 17085)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 17130)
@@ -339,24 +339,29 @@
 	var waitDeliveryCount = record.data['count'];// 申请数量
 	var sendAmount = Number(record.data['tempAmount']);// 已扫描数量
 	var notSendAmount = Number(waitDeliveryCount) - Number(sendAmount);// 待发货数量
-	var sendAmount = 0 ;
+//	var sendAmount = 0 ;
 	if(notSendAmount <= 0){
 		return;
 	}
-	if(sendAmount >= storageAmount){
-		return;
+	if(goods.tousseFixedBarcode){
+		if(sendAmount >= storageAmount){
+			return;
+		}
 	}
+	
 	if(notSendAmount < storageAmount){// 待发货数量小于库存
 		count = notSendAmount;
 	}else{
 		count = storageAmount;
 	}
-	var remnantStorage = storageAmount - sendAmount;
+	
 	// 固定条码每次增加的数量不能超过包定义的扫描数量
 	if(goods.tousseFixedBarcode){
+		var remnantStorage = storageAmount - sendAmount;
 		count = Math.min(count,goods.scanAmount);// 单次增加数量不能超过每次扫描数量
+		count = Math.min(count,remnantStorage);// 增加数量不能超过剩余库存
 	}
-	count = Math.min(count,remnantStorage);// 增加数量不能超过剩余库存
+	
 	if(count == 0){
 		return;
 	}
@@ -1673,7 +1678,7 @@
 					}
 				}, {
 					text : '辅助发货',
-					hidden: !sstsConfig.showAuxiliaryInvoiceBtn,
+//					hidden: !sstsConfig.showAuxiliaryInvoiceBtn,
 					handler : function() {
 						
 						selectedInvoicePlanId = "";