Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManagerImpl.java
===================================================================
diff -u -r13023 -r13025
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManagerImpl.java	(.../DiposableGoodBatchStockManagerImpl.java)	(revision 13023)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManagerImpl.java	(.../DiposableGoodBatchStockManagerImpl.java)	(revision 13025)
@@ -282,10 +282,10 @@
 	 * @param disposableGoodsStock
 	 * @return
 	 */
-	// Terry Kwan，获取库存不为0，并且最早入库的批次的价格（及id为最小的）
+	// Terry Kwan，获取库存不为0，并且最早入库的批次的价格（即id为最小的）
 	// 2015-07-25
 	@Override
-	public Double getRecentPrice(DisposableGoodsStock disposableGoodsStock) {
+	public Double getEarliestPrice(DisposableGoodsStock disposableGoodsStock) {
 		
 		String sql = "";
 		String database = dbConnection.getDatabase();
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManager.java
===================================================================
diff -u -r13023 -r13025
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManager.java	(.../DiposableGoodBatchStockManager.java)	(revision 13023)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodBatchStockManager.java	(.../DiposableGoodBatchStockManager.java)	(revision 13025)
@@ -68,7 +68,7 @@
 	public String getIdentificationNumberByDiposableGoods(
 			DisposableGoodsStock disposableGoodsStock);
 
-	public Double getRecentPrice(DisposableGoodsStock disposableGoodsStock);
+	public Double getEarliestPrice(DisposableGoodsStock disposableGoodsStock);
 
 	public List<IdentificationOfDisposableGoods> getIdentificationsWithNoZeroStroge(
 			Long batchId);
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
===================================================================
diff -u -r13019 -r13025
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 13019)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 13025)
@@ -838,7 +838,7 @@
 				temp.put("referencePrice", disposableGoodsStock.getReferencePrice());
 
 				// 价格修改为浮动价格
-				Double price = diposableGoodBatchStockManager.getRecentPrice(disposableGoodsStock);
+				Double price = diposableGoodBatchStockManager.getEarliestPrice(disposableGoodsStock);
 				price = MathTools.mul(price, floatPercent, 2);
 				temp.put("price", price);
 
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManagerImpl.java
===================================================================
diff -u -r13009 -r13025
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManagerImpl.java	(.../DisposableGoodsStockManagerImpl.java)	(revision 13009)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DisposableGoodsStockManagerImpl.java	(.../DisposableGoodsStockManagerImpl.java)	(revision 13025)
@@ -195,7 +195,7 @@
 			temp.put("referencePrice", disposableGoodsStock.getReferencePrice());
 
 			// 价格修改为浮动价格
-			Double price = diposableGoodBatchStockManager.getRecentPrice(disposableGoodsStock);
+			Double price = diposableGoodBatchStockManager.getEarliestPrice(disposableGoodsStock);
 			price = MathTools.mul(price, floatPercent, 2);
 			temp.put("price", price);
 			displayName = getDisposableGoodsStockDisplayName(disposableGoodsStock,price);
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r12987 -r13025
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 12987)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 13025)
@@ -3245,12 +3245,8 @@
 			DisposableGoodsBatch disposableGoodsBatch = (DisposableGoodsBatch) barcodeDevice;
 			DisposableGoods diposableGoods = disposableGoodsBatch
 					.getDiposableGoods();
-			String name = diposableGoods.getName();
-			String specification = diposableGoods.getSpecification();
-			if (StringUtils.isNotBlank(specification)) {
-				name = String.format("%s[%s]", diposableGoods.getName(),
-						specification);
-			}
+			String name = diposableGoods.getShowName();
+			
 			DisposableGoodsBatchStock disposableGoodsBatchStock = diposableGoodsManager.getDisposableGoodsStockByBatchNumber(sourceWarehouseId, diposableGoods.getId(), disposableGoodsBatch.getBatchNumber());
 			if(disposableGoodsBatchStock == null){
 				return buildErrorMsgJsonResult("批次库存为空！");