Index: ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
===================================================================
diff -u -r34361 -r34387
--- ssts-web/src/main/webapp/mobileClient/clientForAndroid.json	(.../clientForAndroid.json)	(revision 34361)
+++ ssts-web/src/main/webapp/mobileClient/clientForAndroid.json	(.../clientForAndroid.json)	(revision 34387)
@@ -3,5 +3,5 @@
 	"version":"4.7.30",
 	"urlSuffix":"/mobileClient/SterileSupplySystem_Android_V4.7.30_20220812_v4_1_release.apk",
 	"urlSuffix-nologo":"/mobileClient/SterileSupplySystem_Android_V4.7.30_20220812_v4_1_nologo_release.apk",
-	"urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.7.30_20220812_v4_1_6p_release.apk",
+	"urlSuffix-6p":"/mobileClient/SterileSupplySystem_Android_V4.7.30_20220817_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 -r34378 -r34387
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 34378)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 34387)
@@ -775,6 +775,8 @@
 									prepareRecycleAmount = item.getAmount();
 								}*/
 								jsonItem.put("prepareRecycleAmount",prepareRecycleAmount);
+								//用于前台的物品行底色区分(因为prepareRecycleAmount在界面上被多个地方重新赋值处理)
+								jsonItem.put("actualPrepareRecycleAmount",prepareRecycleAmount);
 								jsonItem.put("tousseType", tousseType);
 								jsonItem.put("type", tousseType);
 								jsonItem.put("applyEntireTousse", td.getIsApplyEntireTousse());
@@ -789,8 +791,8 @@
 								}
 								//array.add(jsonItem);
 								//BJ307YY-95 更新后，PDA预回收把包数量改成0提交后，电脑端上数量还是显示1的缺陷(已存在的申请项,不再传tousseDefinitionId至前端了)
-								array.append(String.format("{\"id\":%s,\"tousseName\":\"%s\",\"amount\":%s,\"prepareRecycleAmount\":%s,\"tousseType\":\"%s\",\"type\":\"%s\",\"applyEntireTousse\":\"%s\",\"materialInstancesJsonArray\":\"%s\",\"tousseDefineId\":%s %s}", 
-										item.getId(),tousseName,item.getAmount(),prepareRecycleAmount,tousseType,tousseType,td.getIsApplyEntireTousse(),td.getMaterialInstancesJsonArrayStringExceptDisposableInstances(),item.getTousseDefinitionId(),urgentLevelObjJson));
+								array.append(String.format("{\"id\":%s,\"tousseName\":\"%s\",\"amount\":%s,\"prepareRecycleAmount\":%s,\"actualPrepareRecycleAmount\":%s,\"tousseType\":\"%s\",\"type\":\"%s\",\"applyEntireTousse\":\"%s\",\"materialInstancesJsonArray\":\"%s\",\"tousseDefineId\":%s %s}", 
+										item.getId(),tousseName,item.getAmount(),prepareRecycleAmount,prepareRecycleAmount,tousseType,tousseType,td.getIsApplyEntireTousse(),td.getMaterialInstancesJsonArrayStringExceptDisposableInstances(),item.getTousseDefinitionId(),urgentLevelObjJson));
 								if(i < itemSize - 1){
 									array.append(",");
 								}
Index: ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.7.30_20220817_v4_1_6p_release.apk
===================================================================
diff -u
Binary files differ