1.二维码巡检记录以及文件上传记录 2.部分优化

liding

昨天 d75958896efd4c8a6daee9c56d048641b99cacf6

 main-business/src/main/java/com/ruoyi/business/service/impl/PurchaseRegistrationServiceImpl.java

@@ -52,7 +52,7 @@
        LambdaQueryWrapper<PurchaseRegistration> queryWrapper = new LambdaQueryWrapper<>();
        if (StringUtils.isNotBlank(purchaseRegistrationDto.getSearchAll())){
            queryWrapper.and(wrapper -> wrapper
                    .like(PurchaseRegistration::getCoal, purchaseRegistrationDto.getSearchAll())
                    .like(PurchaseRegistration::getCoalId, purchaseRegistrationDto.getSearchAll())
                    .or()
                    .like(PurchaseRegistration::getSupplierName, purchaseRegistrationDto.getSearchAll())
            );
@@ -74,7 +74,7 @@
        if (coalInfo == null) {
            throw new BaseException("煤种信息不存在");
        }
        purchaseRegistration.setCoal(coalInfo.getCoal());
//        purchaseRegistration.setCoal(coalInfo.getCoal());
        Supply supply = supplyMapper.selectById(purchaseRegistrationDto.getSupplierId());
        if (supply == null) {
            throw new BaseException("供应商信息不存在");
@@ -109,6 +109,7 @@
        BeanUtils.copyProperties(purchaseRegistration, pendingInventory);

        // 设置待入库记录特有的属性（如果有）
        pendingInventory.setCoalId(purchaseRegistration.getCoalId());
        pendingInventory.setInventoryQuantity(purchaseRegistration.getPurchaseQuantity());
        return pendingInventory;
    }