Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r30837 -r31269
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 30837)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 31269)
@@ -1565,7 +1565,7 @@
 		if(StringUtils.isNotBlank(deptCodes)){
 			sql += String.format(" and po.departCoding in ('%s')", deptCodes);
 		}
-		sql += " order by po.sequence,po.departCoding,po.applicationTime";
+		sql += " order by po.sequence,po.departCoding,po.submitTime";
 		
 		return getWaitingforRecyclingInvoicePlans(sql);
 	}
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.19_20210511_v4_1_6p_release.apk
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.19_20210511_v4_1_release.apk
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.19_20210511_v4_1_nologo_release.apk
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
===================================================================
diff -u -r31103 -r31269
--- ssts-web/src/main/webapp/mobileClient/clientForAndroid.json	(.../clientForAndroid.json)	(revision 31103)
+++ ssts-web/src/main/webapp/mobileClient/clientForAndroid.json	(.../clientForAndroid.json)	(revision 31269)
@@ -1,7 +1,7 @@
 {
 	"success":"true",
-	"version":"4.7.18",
-	"urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.7.18_20210416_v4_1_release.apk",
-	"urlSuffix-nologo":"/mobileClient/SterileSupplySystem_Android_V4.7.18_20210416_v4_1_nologo_release.apk",
-	"urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.7.18_20210416_v4_1_6p_release.apk",
+	"version":"4.7.19",
+	"urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.7.19_20210511_v4_1_release.apk",
+	"urlSuffix-nologo":"/mobileClient/SterileSupplySystem_Android_V4.7.19_20210511_v4_1_nologo_release.apk",
+	"urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.7.19_20210511_v4_1_6p_release.apk",
 }
\ No newline at end of file
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r31266 -r31269
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 31266)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 31269)
@@ -664,12 +664,13 @@
 		String comfirmor = "";
 		String operator = "";
 		String prepareRecycleDateTime = "";
+		String type = "";
 		if(params != null){
 			String id = params.optString("id");
 			if(StringUtils.isNotBlank(id)){
-				InvoicePlan p = invoicePlanManager.get(id);
-				if(p != null){
-					List<TousseItem> applicationItems = p.getApplicationItems();
+				InvoicePlan invoicePlan = invoicePlanManager.get(id);
+				if(invoicePlan != null){
+					List<TousseItem> applicationItems = invoicePlan.getApplicationItems();
 					if(CollectionUtils.isNotEmpty(applicationItems)){
 						//进入待预回收的for循环之前,先将不符合预回收条件的项过滤掉再循环
 						applicationItems = applicationItems.stream().filter(item -> {
@@ -723,23 +724,25 @@
 						
 					}
 					array.append("]");
-					comfirmor = p.getPrepareRecycleComfirmor();
-					operator = p.getPrepareRecycleOperator();
-					if (p.getPrepareRecycleDateTime() != null) {
+					comfirmor = invoicePlan.getPrepareRecycleComfirmor();
+					operator = invoicePlan.getPrepareRecycleOperator();
+					if (invoicePlan.getPrepareRecycleDateTime() != null) {
 						prepareRecycleDateTime = new SimpleDateFormat(
-								"yyyy-MM-dd HH:mm").format(p
+								"yyyy-MM-dd HH:mm").format(invoicePlan
 								.getPrepareRecycleDateTime());
 					}
+					type = invoicePlan.getType();
 				}
 			}
 		}
 		obj.put("comfirmor", comfirmor);
 		obj.put("operator", operator);
 		obj.put("prepareRecycleDateTime", prepareRecycleDateTime);
 		obj.put("items", array.toString());
+		obj.put("type", type);
 		//return obj.toString();
-		return String.format("{\"success\":%s,\"comfirmor\":\"%s\",\"operator\":\"%s\",\"prepareRecycleDateTime\":\"%s\",\"items\":%s}", 
-				true,StringUtils.defaultString(comfirmor),StringUtils.defaultString(operator),StringUtils.defaultString(prepareRecycleDateTime),array.toString());
+		return String.format("{\"success\":%s,\"comfirmor\":\"%s\",\"operator\":\"%s\",\"prepareRecycleDateTime\":\"%s\",\"type\":\"%s\",\"items\":%s}", 
+				true,StringUtils.defaultString(comfirmor),StringUtils.defaultString(operator),StringUtils.defaultString(prepareRecycleDateTime),type,array.toString());
 	}
 	
 	/**
@@ -819,7 +822,9 @@
 					obj.put("isPrepareRecycled", plan.getIsPrepareRecycled());
 					String appTime = "";
 					try {
-						appTime = sdf.format(plan.getApplicationTime());
+						//appTime = sdf.format(plan.getApplicationTime());
+						//BJ307YY-72 回收模块待回收列表的文字修改，以及PDA预回收页面的文字、时间取值等的修改
+						appTime = sdf.format(plan.getSubmitTime());
 					} catch (Exception e) {}
 					obj.put("appTime", appTime);
 					dataArray.add(obj);