zouyu
6 天以前 992deae2bf67803b5158673aec993bd60ad5c2d1
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -180,14 +180,8 @@
        Integer isCheck = insOrderPlanDTO.getIsCheck();
        insOrderPlanDTO.setIsCheck(null);
        String sonLaboratory = insOrderPlanDTO.getSonLaboratory();//试验室
        QueryWrapper<InsOrderPlanDTO> queryWrapper = QueryWrappers.queryWrappers(insOrderPlanDTO);
        if(ObjectUtils.isEmpty(insOrderPlanDTO.getTypeSource())){
            queryWrapper.isNull("ifs_inventory_id");//委托试验查询非ifs报检订单
        }else{
            queryWrapper.isNotNull("ifs_inventory_id");
        }
        IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page,
                queryWrapper,
                QueryWrappers.queryWrappers(insOrderPlanDTO),
                userName,
                userId,
                sonLaboratory,