Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r33069 -r33074
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 33069)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 33074)
@@ -5472,9 +5472,6 @@
 				&& (amount % fullCaseApplicationAmount == 0)){
 			tousseItem.setFullCaseApplicationAmount(fullCaseApplicationAmount);
 			tousseItem.setEditAmount(amount);
-			tousseItem.setMiddlePackageAmount(newItemVo.getAmount());
-			tousseItem.setUnit(minUnit);
-			tousseItem.setMiddlePackageUnit("箱");
 			return true;
 		}else if (Constants.DIPOSABLE_TYPE_YES.equals(newItemVo.getDiposable()) && StringUtils.isNotEmpty(minUnit) && unitCount != null && transferScale != null){
 			//如果是一次性物品且配置了中包装单位,则将vo的数量赋值到中包装数量,vo的单位赋值到中包装单位,tousseItem的单位取minUnit,数量取unitCount
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
===================================================================
diff -u -r33064 -r33074
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java	(.../InvoicePlanOptimizeManagerImpl.java)	(revision 33064)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java	(.../InvoicePlanOptimizeManagerImpl.java)	(revision 33074)
@@ -1870,13 +1870,13 @@
 						+ "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 "
 						+ "sum(case when ("+ tousseItemTableAlias +".urgentAmount is null) then 0 else ("+ tousseItemTableAlias +".urgentAmount) end) urgentAmount, "
-						+ tousseItemTableAlias + ".fullCaseApplicationAmount "
+						+ "dg.fullCaseApplicationAmount "
 						+ "from %s "+ tousseItemTableAlias +" "
 						+ "join %s "+ invoicePlanTableAlias +" on "+ tousseItemTableAlias +".recyclingApplication_ID="+ invoicePlanTableAlias +".id "
 						+ "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 disposableGoodsId,tousseName,tousseType,diposable,dg.ttsName, " + tousseItemTableAlias + ".fullCaseApplicationAmount "
+						+ "group by disposableGoodsId,tousseName,tousseType,diposable,dg.ttsName, dg.fullCaseApplicationAmount "
 						+ "order by max(ul.grade) desc ,"
 						+ "(case when tousseType='%s' then 1 else 2 end),"
 						+ "min("+ invoicePlanTableAlias +".applicationTime)",