Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r31074 -r31081 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 31074) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 31081) @@ -1538,6 +1538,25 @@ washTimeOfVerifiedMap.put(task.getWashTime(), isTimeout); } WaitPackingTaskItemVo itemVo = new WaitPackingTaskItemVo(); + if(td.isForeignTousse()){ + Map packedMaterialInstanceCountMap = tousseInstanceManager.queryPackedMaterialInstanceCount(task.getId(), td.getId()); + if(MapUtils.isNotEmpty(packedMaterialInstanceCountMap)){ + List materialInstances = materialInstanceManager.getByHql(" tousse_id=" + td.getId()); + if(CollectionUtils.isNotEmpty(materialInstances)){ + for(MaterialInstance mi : materialInstances){ + if(!packedMaterialInstanceCountMap.containsKey(mi.getMaterialDefinitionId())){ + itemVo.setPartPacking(true); + break; + } + int count = packedMaterialInstanceCountMap.get(mi.getMaterialDefinitionId()); + if(count != mi.getCount()){ + itemVo.setPartPacking(true); + break; + } + } + } + } + } itemVo.setTaskId(task.getId()); itemVo.setWashRecordId(task.getWashRecord_id()); itemVo.setSerialNumber(serialNumManager.variablePart(serialNum, task.getSerialNumber())); Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java =================================================================== diff -u -r30322 -r31081 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java (.../WaitPackingTaskItemVo.java) (revision 30322) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java (.../WaitPackingTaskItemVo.java) (revision 31081) @@ -140,6 +140,10 @@ * 篮筐材料数量信息(可能多个材料 篮筐) */ private String classifiedItemAmountInfo; + /** + * 外来器械包部分拆包装配中(未完全拆完) + */ + private boolean partPacking; public Long getTaskId() { return taskId; } @@ -560,5 +564,14 @@ public void setClassifiedItemAmountInfo(String classifiedItemAmountInfo) { this.classifiedItemAmountInfo = classifiedItemAmountInfo; } + + public boolean getPartPacking() { + return partPacking; + } + + public void setPartPacking(boolean partPacking) { + this.partPacking = partPacking; + } + }