Index: ssts-web/src/main/webapp/disinfectsystem/invoice/batchInvoice.js
===================================================================
diff -u -r35365 -r35368
--- ssts-web/src/main/webapp/disinfectsystem/invoice/batchInvoice.js	(.../batchInvoice.js)	(revision 35365)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/batchInvoice.js	(.../batchInvoice.js)	(revision 35368)
@@ -703,6 +703,7 @@
 				}
 				var params = {
 					wareHouseId: wareHouseId,
+					filterBarcode:false,
 					amountAndIdArray: JSON.stringify(invoiceItems)
 				}
 
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
===================================================================
diff -u -r35359 -r35368
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 35359)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 35368)
@@ -3355,6 +3355,12 @@
 	@Override
 	public JSONObject getDisposableGoodsInfoByAmountAndIdsMap(
 			Map<Long, Long> amountAndIdsMap, Long wareHouseId) {
+		return getDisposableGoodsInfoByAmountAndIdsMap(amountAndIdsMap, wareHouseId, true);
+	}
+	@Override
+	public JSONObject getDisposableGoodsInfoByAmountAndIdsMap(
+			Map<Long, Long> amountAndIdsMap, Long wareHouseId,
+			boolean filterBarcode) {
 		JSONObject returnObj = JSONUtil.buildJsonObject(true);
 		String sql = null;
 		//查有效的批次库存数量
@@ -3392,7 +3398,7 @@
 				String showTousseName = rs.getString("showTousseName");
 				String barcode = rs.getString("barcode");
 				//未设置固定条码的不处理
-				if(StringUtils.isBlank(barcode)){
+				if(filterBarcode && StringUtils.isBlank(barcode)){
 					continue;
 				}
 				
@@ -3427,7 +3433,6 @@
 		}
 		return returnObj;
 	}
-	
 	@Override
 	public List<DisposableGoodsBatchStock> getExpdateDisposableGoodsBatchStocksByIdList(
 			List<String> idList, String expdateType, String currentOrgUnitCode) {
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java
===================================================================
diff -u -r34039 -r35368
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java	(.../DiposableGoodsManager.java)	(revision 34039)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java	(.../DiposableGoodsManager.java)	(revision 35368)
@@ -337,8 +337,15 @@
 	 * @return 
      */
 	public JSONObject getDisposableGoodsInfoByAmountAndIdsMap(Map<Long, Long> amountAndIdsMap, Long wareHouseId);
-	
 	/**
+	 * 根据map<一次性物品名称[规格],待发数量>、仓库id获取一次性物品id、物品简称ttsName、满足待发数量、条码、参考价、名称、带规格名称
+	 * @param amountAndIdsMap map<一次性物品名称[规格],待发数量>
+	 * @param wareHouseId 仓库id
+	 * @param filterBarcode 过滤条码
+	 * @return
+	 */
+	public JSONObject getDisposableGoodsInfoByAmountAndIdsMap(Map<Long, Long> amountAndIdsMap, Long wareHouseId, boolean filterBarcode);
+	/**
 	 * 根据一次性物品id获取多个物品的批次库存信息
 	 * @param idList
 	 * @param expdateType
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r35203 -r35368
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 35203)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 35368)
@@ -2369,6 +2369,7 @@
 	public void getDisposableGoodInfoByMapAndWareHouseId() {
 		String amountAndIdArray = StrutsParamUtils.getPraramValue("amountAndIdArray", null);
 		Long wareHouseId = StrutsParamUtils.getPraramLongValue("wareHouseId", null);
+		boolean filterBarcode = StrutsParamUtils.getBoolPraramValue("filterBarcode", false);
 		Map<Long, Long> amountAndIdMap = new HashMap<Long, Long>();
 		JSONArray objArray = JSONArray.fromObject(amountAndIdArray);
 		for (int i = 0; i < objArray.size(); i++) {
@@ -2377,7 +2378,7 @@
 			Long disposableGoodsId = obj.optLong("disposableGoodsId");
 			amountAndIdMap.put(disposableGoodsId, amount);
 		}
-		String result = diposableGoodsManager.getDisposableGoodsInfoByAmountAndIdsMap(amountAndIdMap,wareHouseId).toString();
+		String result = diposableGoodsManager.getDisposableGoodsInfoByAmountAndIdsMap(amountAndIdMap,wareHouseId, filterBarcode).toString();
 		StrutsResponseUtils.output(result);
 	}