Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
===================================================================
diff -u -r28938 -r28997
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java	(.../InvoicePlanOptimizeManagerImpl.java)	(revision 28938)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java	(.../InvoicePlanOptimizeManagerImpl.java)	(revision 28997)
@@ -1129,7 +1129,7 @@
 								tousseItemTableAlias , invoicePlanTableAlias,invoiceOrigin,
 								afterRecyclingTousseDeliver);
 				
-				String queryNotDisinfectTousseItemSql = String.format("select tousseName,tousseType,diposable,"
+				String queryNotDisinfectTousseItemSql = String.format("select disposableGoodsId,tousseName,tousseType,diposable,"
 						+ "max(ul.grade) grade,min("+ invoicePlanTableAlias +".applicationTime) applicationTime,"
 						+ "dg.ttsName ,sum"+ tousseItemWaitSendAmountSumSql +" amount,"
 						//+ "sum(case when ("+ tousseItemTableAlias +".urgentAmount is null or "+ tousseItemTableAlias +".urgentAmount <= "+ tousseItemTableAlias +".sendoutAmount) then 0 else ("+ tousseItemTableAlias +".urgentAmount - "+ tousseItemTableAlias +".sendoutAmount) end) urgentAmount "
@@ -1139,7 +1139,7 @@
 						+ "left join %s ul on "+ tousseItemTableAlias +".urgentLevel_id=ul.id "
 						+ "left join %s dg on dg.id="+ tousseItemTableAlias +".disposableGoodsId "
 						+ "where %s and %s and " + tousseItemWaitSendAmountSumSql +" > 0 "
-						+ "group by tousseName,tousseType,diposable,dg.ttsName "
+						+ "group by disposableGoodsId,tousseName,tousseType,diposable,dg.ttsName "
 						+ "order by max(ul.grade) desc ,"
 						+ "(case when tousseType='%s' then 1 else 2 end),"
 						+ "min("+ invoicePlanTableAlias +".applicationTime)", 
@@ -1547,6 +1547,10 @@
 			supplyRoomConfigManager.getTodayTimeQuantum(out_beginTime, out_endTime);
 			for (Map<String , Object> map : list) {
 				ApplicationGoodsVo vo = new ApplicationGoodsVo();
+				Object disposableGoodsId = map.get("disposableGoodsId");
+				if(disposableGoodsId != null){
+					vo.setDisposableGoodsId(((Number)disposableGoodsId).longValue());
+				}
 				String showName = (String)map.get("tousseName");
 				String tousseType = (String)map.get("tousseType");
 				vo.setName(showName);
@@ -1555,6 +1559,7 @@
 				vo.setDiposable((String)map.get("diposable"));
 				//待发货数量
 				vo.setCount(((Number)map.get("amount")).intValue());
+				vo.setApplicationAmount(vo.getCount());
 				//加急级别
 				Number grade = (Number)map.get("grade");
 				if(grade != null){
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
===================================================================
diff -u -r28979 -r28997
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 28979)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 28997)
@@ -3312,9 +3312,13 @@
 				String applicationSpecification = rs.getString("applicationSpecification");
 				String ttsName = rs.getString("ttsName");
 				String specification = rs.getString("specification");
-				String barcode = rs.getString("barcode");
 				Double referencePrice = rs.getDouble("referencePrice");
 				String showTousseName = rs.getString("showTousseName");
+				String barcode = rs.getString("barcode");
+				//未设置固定条码的不处理
+				if(StringUtils.isBlank(barcode)){
+					continue;
+				}
 				
 				Long stockAmount = rs.getLong("amount");//库存数量
 				JSONObject typeInfoOnScannedObj = new JSONObject();