Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/PrepareRecycleTousseManagerImpl.java =================================================================== diff -u -r35664 -r35674 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/PrepareRecycleTousseManagerImpl.java (.../PrepareRecycleTousseManagerImpl.java) (revision 35664) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/PrepareRecycleTousseManagerImpl.java (.../PrepareRecycleTousseManagerImpl.java) (revision 35674) @@ -52,8 +52,8 @@ public JSONObject savePrepareRecyleTousse(JSONObject params,String scanBarcodeInfo,JSONArray deletedTdIdList){ //如果保存成功,返回{succesee:true},否则返回{succesee:false,message:"具体的消息"} //以下代码为原serviceManager实现方法的代码,现已移值到此manager实现类中,在此基础上做新增的需求内容 - boolean success = false; - String error = ""; + boolean success = true; + String error = "保存成功"; if(params != null){ JSONArray array = params.optJSONArray("tousseItems"); if(CollectionUtils.isNotEmpty(array)){ @@ -238,9 +238,9 @@ tousseItemIdList.add(item.getId()); tdIdToTousseItemIdMap.put(item.getTousseDefinitionId(), item.getId()); } - error = handlePrepareRecyleScanBarcode(scanBarcodeInfo, tousseItemIdList, tdIdToTousseItemIdMap); - if(StringUtils.isNotBlank(error)){ - return JSONUtil.buildJsonObject(false, error); + String handlePrepareRecyleScanBarcodeMsg = handlePrepareRecyleScanBarcode(scanBarcodeInfo, tousseItemIdList, tdIdToTousseItemIdMap); + if(StringUtils.isNotBlank(handlePrepareRecyleScanBarcodeMsg)){ + return JSONUtil.buildJsonObject(false, handlePrepareRecyleScanBarcodeMsg); } if (plan != null) { plan.setIsPrepareRecycled(InvoicePlan.SIGNED_TRUE); @@ -254,7 +254,6 @@ returnTousse(tousseDefIdPrepareRecycleAmountMap, restApplyTousses, plan, plan.getDepartCoding()); } success = true; - error = "保存成功"; } else { success = false; error = "申请单不存在";