Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r40705 -r40706 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 40705) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 40706) @@ -6765,35 +6765,41 @@ return json.toString(); } @Override - public Map handleComTousseInstanceAutobasketInsertionData(List comboTousseInstances, Map comboToStContainer){ + public Map handleComTousseInstanceAutobasketInsertionData(List comboTousseInstances, Map comboToStContainer, JSONArray notIntoBasketMessage){ Iterator it = comboTousseInstances.iterator(); Set allBasketIds = new HashSet(); Map> childInstancesMap = new HashMap>(); while(it.hasNext()){ TousseInstance comboTousseInstance = it.next(); List childInstances = tousseInstanceManager.getChildTousseInstance(comboTousseInstance.getId()); if (CollectionUtils.isEmpty(childInstances)) { + String msg = comboTousseInstance.getTousseName() + "装配后自动审核入筐查询不到聚合包内的包 不审核入筐"; appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_PACKING, Log.TYPE_UPDATE - , comboTousseInstance.getTousseName() + "装配后自动审核入筐查询不到聚合包内的包 不审核入筐"); + , msg); + notIntoBasketMessage.add(msg); it.remove(); continue; } // 找出子包实例的所有篮筐ID Set basketIds = findCommonClassifyBasketIds(childInstances); if (CollectionUtils.isEmpty(basketIds)) { it.remove(); + String msg = comboTousseInstance.getTousseName() + "装配后自动审核入筐有子包没有清洗篮筐 不审核入筐"; appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_PACKING, Log.TYPE_UPDATE , comboTousseInstance.getTousseName() + "装配后自动审核入筐有子包没有清洗篮筐 不审核入筐"); + notIntoBasketMessage.add(msg); continue; } allBasketIds.addAll(basketIds); childInstancesMap.put(comboTousseInstance.getId(), childInstances); } if(CollectionUtils.isEmpty(allBasketIds)){ + notIntoBasketMessage.add("未入清洗筐 不审核入筐"); return null; } Map containerBindingInfo = getContainerBindingInfo(allBasketIds); if(MapUtils.isEmpty(containerBindingInfo)){ + notIntoBasketMessage.add("未绑定灭菌容器 不审核入筐"); return null; } Iterator it2 = comboTousseInstances.iterator(); @@ -6806,17 +6812,21 @@ Long stCcontainerId = containerBindingInfo.get(basketId); if(!DatabaseUtil.isPoIdValid(stCcontainerId)){ it2.remove(); + String msg = comboTousseInstance.getTousseName() + "装配后自动审核入筐找不到绑定的灭菌篮筐 不审核入筐"; appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_PACKING, Log.TYPE_UPDATE - , comboTousseInstance.getTousseName() + "装配后自动审核入筐找不到绑定的灭菌篮筐 不审核入筐"); + , msg); stCcontainerIds.clear(); + notIntoBasketMessage.add(msg); break; } stCcontainerIds.add(stCcontainerId); } if(stCcontainerIds.size() > 1){ it2.remove(); + String msg = comboTousseInstance.getTousseName() + "装配后自动审核入筐子包绑定了不同的灭菌篮筐 不审核入筐"; appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_PACKING, Log.TYPE_UPDATE - , comboTousseInstance.getTousseName() + "装配后自动审核入筐子包绑定了不同的灭菌篮筐 不审核入筐"); + , msg); + notIntoBasketMessage.add(msg); continue; }else if(stCcontainerIds.size() == 1){ for (Long stCcontainerId : stCcontainerIds) { @@ -10498,12 +10508,15 @@ if(CssdUtils.getSystemSetConfigByNameBool("enbaleLoadAutomaticallyIntoBasketsAfterAssembly", false)){ try { Map comboToStContainer = new HashMap(); - Map containerBindingInfo = handleComTousseInstanceAutobasketInsertionData(comboTousseInstances, comboToStContainer); + JSONArray notIntoBasketMessage = new JSONArray(); + Map containerBindingInfo = handleComTousseInstanceAutobasketInsertionData(comboTousseInstances, comboToStContainer, notIntoBasketMessage); JSONObject autoResult = autobasketInsertion(comboTousseInstances, containerBindingInfo, comboToStContainer, true); if(autoResult != null){ printJson.put("containerStatusMsgs", autoResult.optString("containerStatusMsgs")); printJson.put("successIntoBasket", autoResult.optString("successIntoBasket")); } + //未自动审核入筐的提示数组 + printJson.put("notIntoBasketMessage", autoResult.optString("notIntoBasketMessage")); } catch (Exception e) { logger.error(e); appLogManager.saveLog(AcegiHelper.getLoginUser() Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java =================================================================== diff -u -r40702 -r40706 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java (.../PackingManager.java) (revision 40702) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java (.../PackingManager.java) (revision 40706) @@ -508,9 +508,10 @@ * 查询聚合包的容器绑定关系 移除一些不能自动入筐审核的聚合包 * @param comboTousseInstances 聚合包 * @param comboToStContainer key 聚合包实例id 要入筐到的灭菌容器id + * @param notIntoBasketMessage 一些不审核入筐的提示 * @return containerBindingInfo 容器绑定关系 key ClassifyBasket_id value 灭菌容器id ContainerId */ - public Map handleComTousseInstanceAutobasketInsertionData(List comboTousseInstances, Map comboToStContainer); + public Map handleComTousseInstanceAutobasketInsertionData(List comboTousseInstances, Map comboToStContainer, JSONArray notIntoBasketMessage); /** * 获取装配任务的申请单 * @param packingTask