Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r40664 -r40674 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 40664) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 40674) @@ -6359,6 +6359,8 @@ if(CollectionUtils.isEmpty(tousseInstances) || MapUtils.isEmpty(cntainerBindingInfo)){ return null; } + List containerStatusMsgs = new ArrayList(); + JSONObject obj = new JSONObject(); try{ //先按篮筐分组 Map> groups = new HashMap<>(); @@ -6384,7 +6386,6 @@ } } List statusLogMsgs = new ArrayList(); - List containerStatusMsgs = new ArrayList(); boolean haveSuccessMsgs = false; if(MapUtils.isNotEmpty(groups)){ String databaseNowTime = DatabaseUtil.getSqlNowDateTimeExpress(dbConnection); @@ -6410,7 +6411,7 @@ if(!Container.CONTAINER_STATUS_FREE.equals(container.getStatus()) && !Container.CONTAINER_STATUS_STERILIZELOADING.equals(container.getStatus())){ statusLogMsgs.add("装配后自动审核入筐异常:" + container.getContainerName() + "状态不为空闲或灭菌装载"); - containerStatusMsgs.add(container.getContainerName() + "的篮筐状态不为空闲,无法自动放入物品,请手动装载相关物品。"); + containerStatusMsgs.add(container.getContainerName() + "的篮筐状态不为空闲或灭菌装载,无法自动放入物品,请手动装载相关物品。"); continue; } ReviewedBasket reviewedBasket = reviewedBasketManager.getReviewedBasketButNew(container); @@ -6688,20 +6689,23 @@ } } } - JSONObject obj = new JSONObject(); - if(CollectionUtils.isNotEmpty(containerStatusMsgs)){ - obj.put("containerStatusMsgs", containerStatusMsgs); - } if(haveSuccessMsgs){ obj.put("successIntoBasket", "装配成功,已自动装载到灭菌篮筐中。"); } appLogManager.batchSaveLog(AcegiHelper.getLoginUser(), Log.MODEL_PACKING, Log.TYPE_UPDATE, statusLogMsgs); - return obj; } catch (Exception e) { logger.error(e); + containerStatusMsgs.clear(); + containerStatusMsgs.add("装配后自动审核入筐异常"+ e.getMessage()); + if(CollectionUtils.isNotEmpty(containerStatusMsgs)){ + obj.put("containerStatusMsgs", containerStatusMsgs); + } appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_PACKING, Log.TYPE_UPDATE, "装配后自动审核入筐异常" + e.getMessage()); } - return null; + if(CollectionUtils.isNotEmpty(containerStatusMsgs)){ + obj.put("containerStatusMsgs", containerStatusMsgs); + } + return obj; } @Override