插队操作+用户列表

zss

2024-09-02 a42e0989485009e7196a8e8a7d25473b3d827cff

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java

@@ -195,10 +195,16 @@
            return false;
        }
        /*认领需要判断该样品是否在库*/
        //查询样品id
        //查询样品id(过滤没有检验项目的样品)
        List<Integer> sampleIds = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery()
                .eq(InsSample::getInsOrderId, entity.getInsSampleId())).stream().map(InsSample::getId).collect(Collectors.toList());
        for (Integer samId : sampleIds) {
            //过滤没有检验项目的样品id
            if (ObjectUtils.isEmpty(insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
                    .eq(InsProduct::getInsSampleId,samId)
                    .eq(InsProduct::getState,1)))){
                continue;
            }
            //入库次数
            Long inCount = warehouseHistoryMapper.selectCount(Wrappers.<WarehouseHistory>lambdaQuery()
                    .eq(WarehouseHistory::getState, 1)
@@ -208,7 +214,7 @@
                    .eq(WarehouseHistory::getState, 2)
                    .eq(WarehouseHistory::getInsSampleId, samId));
            if (inCount > 0 && inCount > outCount) {
                //入库
                continue;
            } else {
                throw new ErrorException("所选的样品库存不足,请检查入库和出库记录!");
            }
@@ -636,51 +642,6 @@
                    result.setUpdateTime(LocalDateTime.now());
                    insProductResultMapper.updateById(result);
                }
                /*如果是第一次选择设备信息,且还有其余样品也有同一个经验项目,那么所有样品的该项目都用这个设备信息*/
                /*//先查询是否还有其余样品
                Integer insSampleId = product.getInsSampleId();
                List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, insSampleMapper.selectById(insSampleId).getInsOrderId()));
                //如果有多个样品或者不是采集类型就同一个设备
                if (insSamples.size() > 1 && !product.getInspectionItemType().equals("1")) {
                    //存在其余样品,查询是否有同一种检验项目
                    for (InsSample sample : insSamples.stream().filter(insSample -> !insSample.getId().equals(insSampleId)).collect(Collectors.toList())) {
                        InsProduct product1 = insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
                                .eq(InsProduct::getState, 1)
                                .eq(InsProduct::getInsSampleId, sample.getId())
                                .eq(InsProduct::getInspectionItem, product.getInspectionItem())
                                .eq(InsProduct::getInspectionItemEn, product.getInspectionItemEn())
                                .eq(InsProduct::getInspectionItemSubclass, product.getInspectionItemSubclass())
                                .eq(InsProduct::getInspectionItemSubclassEn, product.getInspectionItemSubclassEn())
                                .eq(InsProduct::getTemplateId, product.getTemplateId())
                                .eq(InsProduct::getStandardMethodListId, product.getStandardMethodListId())
                                .eq(InsProduct::getInsBushId, product.getInsBushId())
                                .eq(InsProduct::getInsFibersId, product.getInsFibersId())
                                .eq(InsProduct::getInsFiberId, product.getInsFiberId()));
                        if (ObjectUtils.isNotEmpty(product1)) {
                            //如果存在项目,查询是否有表
                            InsProductResult productResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery()
                                    .eq(InsProductResult::getInsProductId, product1.getId()));
                            if (ObjectUtils.isEmpty(productResult)) {
                                //没有表新建表
                                productResult = new InsProductResult();
                                productResult.setInsProductId(product1.getId());
                                productResult.setEquipValue(result.getEquipValue());
                                productResult.setEquipName(result.getEquipValue());
                                productResult.setCreateUser(userId);
                                productResult.setUpdateUser(userId);
                                insProductResultMapper.insert(productResult);
                            } else if (ObjectUtils.isEmpty(productResult.getEquipValue())) {
                                //有表判断是否有设备
                                productResult.setEquipValue(result.getEquipValue());
                                productResult.setEquipName(result.getEquipValue());
                                productResult.setUpdateUser(userId);
                                productResult.setUpdateTime(LocalDateTime.now());
                                insProductResultMapper.updateById(productResult);
                            }
                        }
                    }

                }*/
                insProduct.setUpdateUser(userId);
                insProductMapper.updateById(insProduct);
                insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
@@ -980,7 +941,8 @@
                    insOrderState.setLaboratory(minElement);
                    insOrderState.setInsState(0);
                    insOrderStateMapper.insert(insOrderState);
                } else {
                }
                else {
                    //如果继续试验没有其他站点的检验任务那就结束试验
                    verifyPlan(orderId, laboratory, 2, tell);
                }