yys 生产管控（完成基本功能）

maven

11 小时以前 5eec9b5a9d8bf9e49663d5a51cab7490fef5b204

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

@@ -62,7 +62,7 @@
                    .map(CoalInfo::getId)
                    .collect(Collectors.toList());

            // 组装查询条件：煤种ID在匹配的列表中 或 供应商名称匹配
            // 组装查询条件：煤种ID在匹配的列表中
            queryWrapper.and(w -> {
                if (!matchedCoalIds.isEmpty()) {
                    w.in(PurchaseRegistration::getCoalId, matchedCoalIds).or();
@@ -127,6 +127,7 @@
        pendingInventory.setPurchaseId(purchaseRegistration.getId());
        pendingInventory.setCoalId(purchaseRegistration.getCoalId());
        pendingInventory.setInventoryQuantity(purchaseRegistration.getPurchaseQuantity());
        pendingInventory.setType(purchaseRegistration.getType());
        return pendingInventory;
    }