liding
4 小时以前 5db8d3fe1d7f754283b094fb691b58ccd5e76510
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -274,10 +274,10 @@
        // 查询订单Id
        InsOrder order = insOrderMapper.selectFirstSubmit(dto.getId());
        if (order == null) {
            return BeanUtil.isEmpty(insProducts) ? Collections.emptyList() : insProducts;
            return CollectionUtils.isEmpty(insProducts) ? Collections.emptyList() : insProducts;
        }
        insProducts = mergeDirectTemplateSnapshots(order, dto.getId(), dto.getLaboratory(), insProducts);
        if (BeanUtil.isEmpty(insProducts)) {
        if (CollectionUtils.isEmpty(insProducts)) {
            return Collections.emptyList();
        }
        getTemplateThing(order, insProducts, dto.getLaboratory());
@@ -1803,11 +1803,11 @@
                    message += "\n批次号: " + ifsInventoryQuantity.getUpdateBatchNo();
                }
                //发送企业微信消息通知  提交复核
                try {
                    WxCpUtils.inform(sendUserAccount, message, null);
                } catch (Exception e) {
                    throw new RuntimeException(e);
                }
//                try {
//                    WxCpUtils.inform(sendUserAccount, message, null);
//                } catch (Exception e) {
//                    throw new RuntimeException(e);
//                }
            });
@@ -2138,7 +2138,7 @@
                insProducts = insUnqualifiedRetestProductMapper.getInsProductUnqualifiedRetest6(dto.getId(), dto.getLaboratory(), dto.getRawMaterialTag(), dto.getRetestTag());
                break;
        }
        if (BeanUtil.isEmpty(insProducts)) {
        if (CollectionUtils.isEmpty(insProducts)) {
            return null;
        }
        InsOrder order = insOrderMapper.selectFirstSubmit(dto.getId());