Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java
===================================================================
diff -u -r33604 -r33636
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java	(.../InvoicePlanOptimizeManagerImpl.java)	(revision 33604)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanOptimizeManagerImpl.java	(.../InvoicePlanOptimizeManagerImpl.java)	(revision 33636)
@@ -1473,7 +1473,7 @@
 			return buildForeignTousseSplitVoJSONArray(invoicePlanIDList, tousseName);
 		}
 		
-		String querySql = String.format("select id,type,serialNumber, departCoding, applicationTime from %s po where 1=1 and %s order by applicationTime", InvoicePlan.class.getSimpleName() , SqlUtils.getNonStringFieldInLargeCollectionsPredicate("id", invoicePlanIDList));
+		String querySql = String.format("select id,type,serialNumber, departCoding, applicationTime, applicant from %s po where 1=1 and %s order by applicationTime", InvoicePlan.class.getSimpleName() , SqlUtils.getNonStringFieldInLargeCollectionsPredicate("id", invoicePlanIDList));
 		List<Map<String , Object>> list = jdbcTemplate.queryForList(querySql);
 		JSONArray invoicePlanArray = new JSONArray();
 		if(CollectionUtils.isNotEmpty(list)){
@@ -1498,6 +1498,14 @@
 				invoicePlanTemp.put("uiProvider", "col");
 				invoicePlanTemp.put("cls", "master-task");
 				invoicePlanTemp.put("iconCls", "task-folder");
+				String type = (String)map.get("type");
+				invoicePlanTemp.put("invoicePlanType", type);
+				String applicant = (String)map.get("applicant");
+				if(StringUtils.equals(applicant, "退货重发")){
+					//退货重发的申请单(根据申请人判断，申请人为“退货重发”的申请单)，申请单类型显示为“退货重发”
+					invoicePlanTemp.put("invoicePlanType", applicant);
+				}
+				
 				List<ApplicationGoodsVo> goodsVoList = new ArrayList<ApplicationGoodsVo>();
 				
 				if(StringUtils.isNotBlank(tousseName)){
@@ -1566,7 +1574,7 @@
 				+ "and ti.tousseName = '" + tousseName + "' "
 				+ "and (tdancestor.id = ti.tousseDefinitionId or td.id = ti.tousseDefinitionId )"
 				+ "and tis.tousseFixedBarcode = 0 "
-				+ "and tis.invoice_id is null and tis.invoice2_id is null "
+				//+ "and tis.invoice_id is null and tis.invoice2_id is null "
 				+ invoicePlanCommonCondition + " )"
 				+ "union all "
 				+ "(select ip.id invoicePlanID, ip.recyclingStatus, ti.tousseName, tis.status, "
@@ -1584,7 +1592,7 @@
 				+ "and ti.tousseName = '" + tousseName + "' "
 				+ "and (tdancestor.id = ti.tousseDefinitionId or td.id = ti.tousseDefinitionId )"
 				+ "and tis.tousseFixedBarcode = 0 "
-				+ "and tis.invoice_id is null and tis.invoice2_id is null "
+				//+ "and tis.invoice_id is null and tis.invoice2_id is null "
 				+ invoicePlanCommonCondition
 				+ " group by ti.tousseName,tis.status, tdancestor.id, ip.id, ip.recyclingStatus)) r";
 		ResultSet rs = null;
@@ -1788,7 +1796,7 @@
 				+ invoicePlanTableAlias +".applicationTime,"
 				+ invoicePlanTableAlias +".recyclingStatus,"
 				//+ "cw.washAndDisinfectRecord_ID,"
-				+ tousseItemWaitSendAmountSumSql +" amount "
+				+ shouldSendAmountCaseSql +" amount "
 				+ "from %s "+ tousseItemTableAlias +" "
 				+ "join %s "+ invoicePlanTableAlias +" on "+ tousseItemTableAlias +".recyclingApplication_ID="+ invoicePlanTableAlias +".id "
 				//+ "left join %s " + classifiedItemTableAlias + " on " + classifiedItemCondition