Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r31380 -r31412 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 31380) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 31412) @@ -714,8 +714,9 @@ //包定义id jsonItem.put("tousseDefineId", item.getTousseDefinitionId()); //array.add(jsonItem); - array.append(String.format("{\"id\":%s,\"tousseName\":\"%s\",\"amount\":%s,\"prepareRecycleAmount\":%s,\"tousseType\":\"%s\",\"type\":\"%s\",\"applyEntireTousse\":\"%s\",\"materialInstancesJsonArray\":\"%s\",\"tousseDefineId\":%s}", - item.getId(),tousseName,item.getAmount(),prepareRecycleAmount,tousseType,tousseType,td.getIsApplyEntireTousse(),td.getMaterialInstancesJsonArrayStringExceptDisposableInstances(),item.getTousseDefinitionId())); + //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\"}", + item.getId(),tousseName,item.getAmount(),prepareRecycleAmount,tousseType,tousseType,td.getIsApplyEntireTousse(),td.getMaterialInstancesJsonArrayStringExceptDisposableInstances())); if(i < itemSize - 1){ array.append(","); }