feat: 扫码时做限制，若采购台账已全部质检入库，APP扫码 入库时提示已入库。并且联动质检

gongchunyi

14 小时以前 6d3a76f894052209cad136ec9bff6ddcd43fc4e7

feat: 扫码时做限制，若采购台账已全部质检入库，APP扫码 入库时提示已入库。并且联动质检

 doc/ºÓÄϺױÚÌìãå¸Ö»¯²£Á§³§.sql

@@ -139,3 +139,19 @@
ALTER TABLE `sales_ledger_product`
    ADD COLUMN `unqualified_stocked_quantity` decimal(18, 2) DEFAULT '0.00' COMMENT '不合格入库数量' AFTER `stocked_quantity`,
    ADD COLUMN `unqualified_shipped_quantity` decimal(18, 2) DEFAULT '0.00' COMMENT '不合格出库数量' AFTER `shipped_quantity`;

ALTER TABLE `product-inventory-management-hbtmblc`.`purchase_ledger`
    ADD COLUMN `stock_status` tinyint(1) NULL DEFAULT 0 COMMENT '入库状态：0-未入库，1-部分入库，2-已入库' AFTER `approve_user_ids`;

ALTER TABLE `product-inventory-management-hbtmblc`.`sales_ledger_product`
    MODIFY COLUMN `actual_piece_area` decimal(20, 4) NULL DEFAULT NULL COMMENT '实际单片面积(㎡)' AFTER `is_checked`,
    MODIFY COLUMN `actual_total_area` decimal(20, 4) NULL DEFAULT NULL COMMENT '实际总面积(㎡)' AFTER `actual_piece_area`,
    MODIFY COLUMN `settle_piece_area` decimal(20, 4) NULL DEFAULT NULL COMMENT '结算单片面积(㎡)' AFTER `actual_total_area`,
    MODIFY COLUMN `settle_total_area` decimal(20, 4) NULL DEFAULT NULL COMMENT '结算总面积(㎡)' AFTER `settle_piece_area`,
    MODIFY COLUMN `width` decimal(20, 4) NULL DEFAULT NULL COMMENT '宽' AFTER `settle_total_area`,
    MODIFY COLUMN `height` decimal(20, 4) NULL DEFAULT NULL COMMENT '高' AFTER `width`,
    MODIFY COLUMN `perimeter` decimal(20, 4) NULL DEFAULT NULL COMMENT '周长' AFTER `remark`,
    MODIFY COLUMN `heavy_box` decimal(20, 4) NULL DEFAULT NULL COMMENT '重箱' AFTER `perimeter`;

ALTER TABLE `product-inventory-management-hbtmblc`.`quality_unqualified`
    ADD COLUMN `product_model_id` bigint NULL COMMENT '产品规格ID' AFTER `inspect_id`;

 src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java

@@ -13,7 +13,6 @@
import com.ruoyi.approve.service.IApproveNodeService;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.device.mapper.DeviceRepairMapper;
import com.ruoyi.device.pojo.DeviceRepair;
@@ -39,6 +38,7 @@
import org.springframework.util.CollectionUtils;

import java.io.IOException;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.Comparator;
@@ -208,16 +208,26 @@
                    purchaseLedger.setApprovalStatus(3);
                    List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(new QueryWrapper<SalesLedgerProduct>()
                            .lambda().eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedger.getId()).eq(SalesLedgerProduct::getType, 2));
                    boolean hasCheckedProduct = false;
                    for (SalesLedgerProduct salesLedgerProduct : salesLedgerProducts) {
                        // è´¨æ£€
                        if (salesLedgerProduct.getIsChecked()) {
                            hasCheckedProduct = true;
                            purchaseLedgerServiceImpl.addQualityInspect(purchaseLedger, salesLedgerProduct);
                        }else {
                            //直接入库
                            stockUtils.addStock(null, salesLedgerProduct.getId(), salesLedgerProduct.getProductModelId(),
                                    salesLedgerProduct.getQuantity(), StockInQualifiedRecordTypeEnum.PURCHASE_STOCK_IN.getCode(), salesLedgerProduct.getId());
                            BigDecimal oldStocked = salesLedgerProduct.getStockedQuantity() == null ? BigDecimal.ZERO : salesLedgerProduct.getStockedQuantity();
                            BigDecimal orderQty = salesLedgerProduct.getQuantity() == null ? BigDecimal.ZERO : salesLedgerProduct.getQuantity();
                            BigDecimal newStocked = oldStocked.add(orderQty);
                            salesLedgerProduct.setStockedQuantity(newStocked);
                            salesLedgerProduct.setProductStockStatus(2);
                            salesLedgerProduct.fillRemainingQuantity();
                            salesLedgerProductMapper.updateById(salesLedgerProduct);
                        }
                    }
                    purchaseLedger.setStockStatus(hasCheckedProduct ? 0 : 2);
                } else if (status.equals(3)) {
                    // æ‹’绝
                    purchaseLedger.setApprovalStatus(4);

 src/main/java/com/ruoyi/common/enums/StockInQualifiedRecordTypeEnum.java

@@ -7,14 +7,13 @@
public enum StockInQualifiedRecordTypeEnum implements BaseEnum<String> {

    CUSTOMIZATION_STOCK_IN("0", "合格自定义入库"),
    PRODUCTION_REPORT_STOCK_IN("2", "生产报工-入库"),
    PURCHASE_STOCK_IN("7", "采购-入库"),
    QUALITYINSPECT_STOCK_IN("6", "质检-合格入库"),
    DEFECTIVE_PASS("11", "不合格-让步放行"),
    RETURN_HE_IN("14", "销售退货-合格入库"),
    SALE_STOCK_IN("15", "销售订单-合格入库"),
    SALE_SCAN_STOCK_IN("17", "销售订单扫码-合格入库"),
    PURCHASE_SCAN_STOCK_IN("18", "采购订单扫码-合格入库");
    PURCHASE_SCAN_STOCK_IN("18", "采购订单扫码-合格入库"),
    PURCHASE_SCAN_QUALITY_STOCK_IN("19", "扫码入库质检-合格入库");


    private final String code;

 src/main/java/com/ruoyi/common/enums/StockInUnQualifiedRecordTypeEnum.java

@@ -11,9 +11,9 @@
    PRODUCTION_SCRAP("5", "生产报工-报废"),
    CUSTOMIZATION_UNSTOCK_IN("9", "不合格自定义入库"),
    QUALITYINSPECT_UNSTOCK_IN("12", "质检-不合格入库"),
    RETURN_UNSTOCK_IN("15", "销售退货-不合格入库"),
    SALES_SCAN_UNSTOCK_IN("16", "销售订单扫码-不合格入库"),
    PURCHASE_SCAN_UNSTOCK_IN("19", "采购订单扫码-不合格入库");
    PURCHASE_SCAN_UNSTOCK_IN("19", "采购订单扫码-不合格入库"),
    PURCHASE_SCAN_QUALITY_UNSTOCK_IN("20", "扫码入库质检-不合格入库");


    private final String code;

 src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java

@@ -193,6 +193,13 @@
    private String paymentMethod;
    @ApiModelProperty("审批状态")
    private Integer approvalStatus;

    @ApiModelProperty("采购订单入库状态：0-未入库，1-部分入库，2-已入库")
    private Integer stockStatus;

    @ApiModelProperty("采购订单产品入库状态：0-未入库，1-部分入库，2-已入库")
    private Integer productStockStatus;

    @ApiModelProperty(value = "模板名称")
    private String templateName;
    @ApiModelProperty(value = "审批人id")

 src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java

@@ -159,4 +159,9 @@
    @ApiModelProperty(value = "审批人id")
    private String approveUserIds;

    /**
     * å…¥åº“状态：0-未入库，1-部分入库，2-已入库
     */
    private Integer stockStatus;

}

 src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java

@@ -141,6 +141,8 @@
    @Autowired
    private QualityInspectMapper qualityInspectMapper;
    @Autowired
    private QualityUnqualifiedMapper qualityUnqualifiedMapper;
    @Autowired
    private CommonFileServiceImpl commonFileService;
    @Autowired
    private QualityTestStandardBindingMapper qualityTestStandardBindingMapper;
@@ -212,6 +214,7 @@
        purchaseLedger.setRecorderName(sysUser.getNickName());
        purchaseLedger.setPhoneNumber(sysUser.getPhonenumber());
        purchaseLedger.setApprovalStatus(1);
        purchaseLedger.setStockStatus(0);
        // 3. æ–°å¢žæˆ–更新主表
        if (purchaseLedger.getId() == null) {
            purchaseLedgerMapper.insert(purchaseLedger);
@@ -336,6 +339,7 @@
        if (!updateList.isEmpty()) {
            for (SalesLedgerProduct product : updateList) {
                product.setType(type);
                product.setProductStockStatus(calculateProductStockStatus(product));
                product.fillRemainingQuantity();
                salesLedgerProductMapper.updateById(product);
            }
@@ -351,6 +355,7 @@
                salesLedgerProduct.setFutureTickets(salesLedgerProduct.getQuantity());
                salesLedgerProduct.setFutureTicketsAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
                salesLedgerProduct.setPendingTicketsTotal(salesLedgerProduct.getTaxInclusiveTotalPrice());
                salesLedgerProduct.setProductStockStatus(calculateProductStockStatus(salesLedgerProduct));
                salesLedgerProduct.fillRemainingQuantity();
                salesLedgerProductMapper.insert(salesLedgerProduct);
            }
@@ -481,7 +486,8 @@
                                        .in(StockInRecord::getSalesLedgerProductId, productIds)
                                        .or(q -> q.in(StockInRecord::getRecordId, productIds)
                                                .in(StockInRecord::getRecordType, Arrays.asList(
                                                        StockInUnQualifiedRecordTypeEnum.PURCHASE_SCAN_UNSTOCK_IN.getCode()
                                                        StockInUnQualifiedRecordTypeEnum.PURCHASE_SCAN_UNSTOCK_IN.getCode(),
                                                        StockInUnQualifiedRecordTypeEnum.PURCHASE_SCAN_QUALITY_UNSTOCK_IN.getCode()
                                                ))))
                                .select(StockInRecord::getId))
                        .stream().map(StockInRecord::getId).collect(Collectors.toList());
@@ -567,7 +573,7 @@
        productWrapper.eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedger.getId())
                .eq(SalesLedgerProduct::getType, purchaseLedgerDto.getType());
        List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(productWrapper);
        products.forEach(SalesLedgerProduct::fillRemainingQuantity);
        applyQualityInboundToProducts(purchaseLedger.getId(), products);

        // 3.查询上传文件
        LambdaQueryWrapper<CommonFile> salesLedgerFileWrapper = new LambdaQueryWrapper<>();
@@ -837,7 +843,7 @@
        productWrapper.eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedger.getId())
                .eq(SalesLedgerProduct::getType, 2);
        List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(productWrapper);
        products.forEach(SalesLedgerProduct::fillRemainingQuantity);
        applyQualityInboundToProducts(purchaseLedger.getId(), products);

        // 4. è½¬æ¢ DTO
        PurchaseLedgerDto resultDto = new PurchaseLedgerDto();
@@ -908,7 +914,57 @@
            if (dbProduct.getProductModelId() == null) {
                throw new ServiceException("入库失败,产品规格未维护,无法入库");
            }
            BigDecimal orderQty = dbProduct.getQuantity() == null ? BigDecimal.ZERO : dbProduct.getQuantity();
            if (orderQty.compareTo(BigDecimal.ZERO) <= 0) {
                throw new ServiceException("入库失败,采购产品数量异常");
            }
            //  éœ€è¦è´¨æ£€ï¼šæ‰«ç å…¥åº“进入原材料检验，不直接入合格库存
            if (Boolean.TRUE.equals(dbProduct.getIsChecked())) {
                //  å­˜åœ¨æœªé€šè¿‡/未处理的原材料检验单，则禁止继续扫码入库
                Long pendingInspectCount = qualityInspectMapper.selectCount(new LambdaQueryWrapper<QualityInspect>()
                        .eq(QualityInspect::getInspectType, 0)
                        .eq(QualityInspect::getPurchaseLedgerId, purchaseId)
                        .eq(QualityInspect::getProductModelId, dbProduct.getProductModelId())
                        .and(w -> w
                                .isNull(QualityInspect::getInspectState)
                                .or(q0 -> q0.eq(QualityInspect::getInspectState, 0))
                                // inspect_state=1 ä¹Ÿè§†ä¸ºâ€œæœªå¤„理”
                                .or(q1 -> q1.eq(QualityInspect::getInspectState, 1)
                                        .isNull(QualityInspect::getCheckResult))));
                if (pendingInspectCount != null && pendingInspectCount > 0) {
                    throw new ServiceException("入库失败,存在未通过或未处理的质检记录,请先处理后再扫码入库");
                }
                //  éœ€è¦è´¨æ£€æ—¶ï¼ŒæŒ‰â€œå¾…检/已合格”的检验数量控制扫码上限
                BigDecimal inspectQty = qualityInspectMapper.selectList(new LambdaQueryWrapper<QualityInspect>()
                                .eq(QualityInspect::getInspectType, 0)
                                .eq(QualityInspect::getPurchaseLedgerId, purchaseId)
                                .eq(QualityInspect::getProductModelId, dbProduct.getProductModelId())
                                .and(w -> w
                                        .isNull(QualityInspect::getInspectState)
                                        .or(q0 -> q0.eq(QualityInspect::getInspectState, 0))
                                        .or(q1 -> q1.eq(QualityInspect::getInspectState, 1)
                                                .and(r -> r.isNull(QualityInspect::getCheckResult)
                                                        .or()
                                                        .eq(QualityInspect::getCheckResult, "合格")))))
                        .stream()
                        .map(QualityInspect::getQuantity)
                        .filter(Objects::nonNull)
                        .reduce(BigDecimal.ZERO, BigDecimal::add);
                if (inspectQty.add(inboundThisLine).compareTo(orderQty) > 0) {
                    throw new ServiceException("入库失败,扫码合格入库数量不能超过采购产品数量");
                }
                SalesLedgerProduct scanInspectProduct = new SalesLedgerProduct();
                BeanUtils.copyProperties(dbProduct, scanInspectProduct);
                scanInspectProduct.setQuantity(inboundThisLine);
                addQualityInspect(purchaseLedger, scanInspectProduct);
                continue;
            }

            // ä¸éœ€è¦è´¨æ£€ï¼šæ‰«ç ç›´æŽ¥å…¥åº“（允许多入库，不做上限限制）
            BigDecimal oldStocked = dbProduct.getStockedQuantity() == null ? BigDecimal.ZERO : dbProduct.getStockedQuantity();
            if (oldStocked.add(inboundThisLine).compareTo(orderQty) > 0) {
                throw new ServiceException("入库失败,扫码合格入库数量不能超过采购产品数量");
            }
            BigDecimal newStocked = oldStocked.add(inboundThisLine);

            StockInventoryDto stockInventoryDto = new StockInventoryDto();
@@ -920,7 +976,6 @@
            stockInventoryDto.setSalesLedgerProductId(dbProduct.getId());
            stockInventoryService.addstockInventory(stockInventoryDto);

            BigDecimal orderQty = dbProduct.getQuantity() == null ? BigDecimal.ZERO : dbProduct.getQuantity();
            int lineStockStatus;
            if (newStocked.compareTo(BigDecimal.ZERO) <= 0) {
                lineStockStatus = 0;
@@ -934,6 +989,7 @@
            dbProduct.fillRemainingQuantity();
            salesLedgerProductMapper.updateById(dbProduct);
        }
        refreshPurchaseLedgerStockStatus(purchaseLedger.getId());
    }

    @Override
@@ -1051,7 +1107,28 @@
                throw new ServiceException("不合格入库失败,产品规格未维护,无法入库");
            }
            stockUtils.addUnStock(null, null, dbProduct.getProductModelId(), inboundThisLine,
                    StockInUnQualifiedRecordTypeEnum.PURCHASE_SCAN_UNSTOCK_IN.getCode(), dbProduct.getId());
                    Boolean.TRUE.equals(dbProduct.getIsChecked())
                            ? StockInUnQualifiedRecordTypeEnum.PURCHASE_SCAN_QUALITY_UNSTOCK_IN.getCode()
                            : StockInUnQualifiedRecordTypeEnum.PURCHASE_SCAN_UNSTOCK_IN.getCode(),
                    dbProduct.getId());

            // é‡‡è´­ä¸åˆæ ¼å…¥åº“后，自动进入不合格管理，等待用户处理
            QualityUnqualified qualityUnqualified = new QualityUnqualified();
            qualityUnqualified.setInspectType(0); // åŽŸææ–™ä¸åˆæ ¼
            qualityUnqualified.setInspectState(0); // å¾…处理
            qualityUnqualified.setCheckTime(new Date());
            LoginUser loginUser = SecurityUtils.getLoginUser();
            if (loginUser != null && loginUser.getUser() != null) {
                qualityUnqualified.setCheckName(loginUser.getUser().getNickName());
            }
            qualityUnqualified.setProductId(dbProduct.getProductId());
            qualityUnqualified.setProductModelId(dbProduct.getProductModelId());
            qualityUnqualified.setProductName(dbProduct.getProductCategory());
            qualityUnqualified.setModel(dbProduct.getSpecificationModel());
            qualityUnqualified.setUnit(dbProduct.getUnit());
            qualityUnqualified.setQuantity(inboundThisLine);
            qualityUnqualified.setDefectivePhenomena("采购订单扫码不合格入库，待处理");
            qualityUnqualifiedMapper.insert(qualityUnqualified);

            BigDecimal oldUnStocked = dbProduct.getUnqualifiedStockedQuantity() == null ? BigDecimal.ZERO : dbProduct.getUnqualifiedStockedQuantity();
            dbProduct.setUnqualifiedStockedQuantity(oldUnStocked.add(inboundThisLine));
@@ -1124,6 +1201,105 @@
        }
    }

    private void applyQualityInboundToProducts(Long purchaseLedgerId, List<SalesLedgerProduct> products) {
        if (CollectionUtils.isEmpty(products)) {
            return;
        }
        Map<Long, BigDecimal> qualityInboundQtyByLine = getQualifiedInspectInboundQtyByLine(purchaseLedgerId);
        for (SalesLedgerProduct product : products) {
            product.fillRemainingQuantity();
            if (!Boolean.TRUE.equals(product.getIsChecked())) {
                continue;
            }
            BigDecimal orderQty = product.getQuantity() == null ? BigDecimal.ZERO : product.getQuantity();
            BigDecimal scanInboundQty = product.getStockedQuantity() == null ? BigDecimal.ZERO : product.getStockedQuantity();
            BigDecimal qualityInboundQty = qualityInboundQtyByLine.getOrDefault(product.getId(), BigDecimal.ZERO);
            BigDecimal totalQualifiedInbound = qualityInboundQty.add(scanInboundQty);
            BigDecimal remainingInbound = orderQty.subtract(totalQualifiedInbound);
            product.setRemainingQuantity(remainingInbound.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : remainingInbound);
            BigDecimal shippedQty = product.getShippedQuantity() == null ? BigDecimal.ZERO : product.getShippedQuantity();
            BigDecimal remainingShipped = totalQualifiedInbound.subtract(shippedQty);
            product.setRemainingShippedQuantity(remainingShipped.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : remainingShipped);
        }
    }

    private Map<Long, BigDecimal> getQualifiedInspectInboundQtyByLine(Long purchaseLedgerId) {
        Map<Long, BigDecimal> qualityInboundByModel = qualityInspectMapper.selectList(new LambdaQueryWrapper<QualityInspect>()
                        .eq(QualityInspect::getInspectType, 0)
                        .eq(QualityInspect::getPurchaseLedgerId, purchaseLedgerId)
                        .eq(QualityInspect::getInspectState, 1)
                        .eq(QualityInspect::getCheckResult, "合格"))
                .stream()
                .filter(qualityInspect -> qualityInspect.getProductModelId() != null && qualityInspect.getQuantity() != null)
                .collect(Collectors.groupingBy(QualityInspect::getProductModelId,
                        Collectors.reducing(BigDecimal.ZERO, QualityInspect::getQuantity, BigDecimal::add)));
        if (qualityInboundByModel.isEmpty()) {
            return Collections.emptyMap();
        }
        List<SalesLedgerProduct> purchaseProducts = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
                .eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedgerId)
                .eq(SalesLedgerProduct::getType, PURCHASE.getCode()));
        Map<Long, BigDecimal> qualityInboundByLine = new HashMap<>();
        for (SalesLedgerProduct product : purchaseProducts) {
            if (product.getId() == null || product.getProductModelId() == null) {
                continue;
            }
            qualityInboundByLine.put(product.getId(), qualityInboundByModel.getOrDefault(product.getProductModelId(), BigDecimal.ZERO));
        }
        return qualityInboundByLine;
    }

    private void refreshPurchaseLedgerStockStatus(Long purchaseLedgerId) {
        if (purchaseLedgerId == null) {
            return;
        }
        List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
                .eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedgerId)
                .eq(SalesLedgerProduct::getType, PURCHASE.getCode()));
        if (CollectionUtils.isEmpty(products)) {
            return;
        }
        Map<Long, BigDecimal> qualityInboundQtyByLine = getQualifiedInspectInboundQtyByLine(purchaseLedgerId);
        boolean allInbound = true;
        boolean anyInbound = false;
        for (SalesLedgerProduct product : products) {
            BigDecimal orderQty = product.getQuantity() == null ? BigDecimal.ZERO : product.getQuantity();
            BigDecimal scanInboundQty = product.getStockedQuantity() == null ? BigDecimal.ZERO : product.getStockedQuantity();
            BigDecimal qualityInboundQty = qualityInboundQtyByLine.getOrDefault(product.getId(), BigDecimal.ZERO);
            BigDecimal totalInboundQty = scanInboundQty.add(qualityInboundQty);
            if (totalInboundQty.compareTo(BigDecimal.ZERO) > 0) {
                anyInbound = true;
            }
            if (totalInboundQty.compareTo(orderQty) < 0) {
                allInbound = false;
            }
        }
        PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(purchaseLedgerId);
        if (purchaseLedger == null) {
            return;
        }
        int targetStockStatus = allInbound ? 2 : (anyInbound ? 1 : 0);
        if (!Objects.equals(purchaseLedger.getStockStatus(), targetStockStatus)) {
            purchaseLedger.setStockStatus(targetStockStatus);
            purchaseLedgerMapper.updateById(purchaseLedger);
        }
    }

    private Integer calculateProductStockStatus(SalesLedgerProduct product) {
        if (product == null) {
            return 0;
        }
        BigDecimal orderQty = product.getQuantity() == null ? BigDecimal.ZERO : product.getQuantity();
        BigDecimal stockedQty = product.getStockedQuantity() == null ? BigDecimal.ZERO : product.getStockedQuantity();
        if (stockedQty.compareTo(BigDecimal.ZERO) <= 0) {
            return 0;
        }
        if (orderQty.compareTo(BigDecimal.ZERO) > 0 && stockedQty.compareTo(orderQty) < 0) {
            return 1;
        }
        return 2;
    }

    /**
     * ä¸‹åˆ’线命名转驼峰命名
     */

 src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java

@@ -63,6 +63,11 @@
    private Long productId;

    /**
     * äº§å“è§„æ ¼ID
     */
    private Long productModelId;

    /**
     * äº§å“åç§°
     */
    @Excel(name = "产品名称")

 src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java

@@ -2,6 +2,7 @@


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -9,7 +10,6 @@
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
@@ -23,7 +23,10 @@
import com.ruoyi.quality.pojo.QualityUnqualified;
import com.ruoyi.quality.service.IQualityInspectParamService;
import com.ruoyi.quality.service.IQualityInspectService;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -32,9 +35,11 @@
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.io.OutputStream;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

@AllArgsConstructor
@@ -52,6 +57,8 @@
    private QualityUnqualifiedMapper qualityUnqualifiedMapper;

    private SalesLedgerProductMapper salesLedgerProductMapper;

    private PurchaseLedgerMapper purchaseLedgerMapper;

    private ProcurementRecordService procurementRecordService;

@@ -99,9 +106,13 @@
        } else {
            //合格直接入库
            stockUtils.addStock(qualityInspect.getProductModelId(), qualityInspect.getQuantity(), StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(), qualityInspect.getId());
            // é‡‡è´­åŽŸææ–™æ£€éªŒï¼šåˆæ ¼å…¥åº“后同步到采购产品“已入库数量”，与扫码入库共用一份数据口径
            syncQualifiedInboundToPurchaseProducts(qualityInspect);
        }
        qualityInspect.setInspectState(1);//已提交
        return qualityInspectMapper.updateById(qualityInspect);
        int updated = qualityInspectMapper.updateById(qualityInspect);
        refreshPurchaseLedgerStockStatusByInspect(qualityInspect.getPurchaseLedgerId());
        return updated;
    }

    /*生成检验报告*/
@@ -193,5 +204,114 @@

    }

    private void refreshPurchaseLedgerStockStatusByInspect(Long purchaseLedgerId) {
        if (purchaseLedgerId == null) {
            return;
        }
        List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
                .eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedgerId)
                .eq(SalesLedgerProduct::getType, 2));
        if (products == null || products.isEmpty()) {
            return;
        }
        boolean allInbound = true;
        boolean anyInbound = false;
        for (SalesLedgerProduct product : products) {
            BigDecimal orderQty = product.getQuantity() == null ? BigDecimal.ZERO : product.getQuantity();
            BigDecimal totalInboundQty = product.getStockedQuantity() == null ? BigDecimal.ZERO : product.getStockedQuantity();
            if (totalInboundQty.compareTo(BigDecimal.ZERO) > 0) {
                anyInbound = true;
            }
            if (totalInboundQty.compareTo(orderQty) < 0) {
                allInbound = false;
            }
        }
        PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(purchaseLedgerId);
        if (purchaseLedger == null) {
            return;
        }
        int targetStockStatus = allInbound ? 2 : (anyInbound ? 1 : 0);
        if (!Objects.equals(purchaseLedger.getStockStatus(), targetStockStatus)) {
            purchaseLedger.setStockStatus(targetStockStatus);
            purchaseLedgerMapper.updateById(purchaseLedger);
        }
    }

    private void syncQualifiedInboundToPurchaseProducts(QualityInspect qualityInspect) {
        if (qualityInspect == null) {
            return;
        }
        if (!Objects.equals(qualityInspect.getInspectType(), 0) || qualityInspect.getPurchaseLedgerId() == null) {
            return;
        }
        if (qualityInspect.getProductModelId() == null || qualityInspect.getQuantity() == null) {
            return;
        }
        BigDecimal inboundQty = qualityInspect.getQuantity();
        if (inboundQty.compareTo(BigDecimal.ZERO) <= 0) {
            return;
        }

        List<SalesLedgerProduct> lines = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
                .eq(SalesLedgerProduct::getSalesLedgerId, qualityInspect.getPurchaseLedgerId())
                .eq(SalesLedgerProduct::getType, 2)
                .eq(SalesLedgerProduct::getProductModelId, qualityInspect.getProductModelId())
                .eq(SalesLedgerProduct::getIsChecked, true)
                .orderByAsc(SalesLedgerProduct::getId));
        if (lines == null || lines.isEmpty()) {
            return;
        }

        BigDecimal remaining = inboundQty;
        SalesLedgerProduct fallbackLine = null;
        for (SalesLedgerProduct line : lines) {
            if (remaining.compareTo(BigDecimal.ZERO) <= 0) {
                break;
            }
            BigDecimal orderQty = line.getQuantity() == null ? BigDecimal.ZERO : line.getQuantity();
            BigDecimal stocked = line.getStockedQuantity() == null ? BigDecimal.ZERO : line.getStockedQuantity();
            BigDecimal canFill = orderQty.subtract(stocked);
            if (canFill.compareTo(BigDecimal.ZERO) <= 0) {
                fallbackLine = line;
                continue;
            }
            BigDecimal add = canFill.min(remaining);
            BigDecimal newStocked = stocked.add(add);
            int status;
            if (newStocked.compareTo(BigDecimal.ZERO) <= 0) {
                status = 0;
            } else if (orderQty.compareTo(BigDecimal.ZERO) > 0 && newStocked.compareTo(orderQty) < 0) {
                status = 1;
            } else {
                status = 2;
            }
            line.setStockedQuantity(newStocked);
            line.setProductStockStatus(status);
            line.fillRemainingQuantity();
            salesLedgerProductMapper.updateById(line);
            remaining = remaining.subtract(add);
            fallbackLine = line;
        }

        // å…è®¸å¤šå…¥åº“：若仍有剩余，累计到最后一行，确保 remaining_shipped_quantity èƒ½åŒæ­¥å¢žé•¿
        if (remaining.compareTo(BigDecimal.ZERO) > 0 && fallbackLine != null) {
            BigDecimal orderQty = fallbackLine.getQuantity() == null ? BigDecimal.ZERO : fallbackLine.getQuantity();
            BigDecimal stocked = fallbackLine.getStockedQuantity() == null ? BigDecimal.ZERO : fallbackLine.getStockedQuantity();
            BigDecimal newStocked = stocked.add(remaining);
            int status;
            if (newStocked.compareTo(BigDecimal.ZERO) <= 0) {
                status = 0;
            } else if (orderQty.compareTo(BigDecimal.ZERO) > 0 && newStocked.compareTo(orderQty) < 0) {
                status = 1;
            } else {
                status = 2;
            }
            fallbackLine.setStockedQuantity(newStocked);
            fallbackLine.setProductStockStatus(status);
            fallbackLine.fillRemainingQuantity();
            salesLedgerProductMapper.updateById(fallbackLine);
        }
    }


}

 src/main/java/com/ruoyi/quality/service/impl/QualityUnqualifiedServiceImpl.java

@@ -63,8 +63,16 @@
    @Override
    public int deal(QualityUnqualified qualityUnqualified) {
        QualityUnqualified unqualified = qualityUnqualifiedMapper.selectById(qualityUnqualified.getId());
        QualityInspect qualityInspect = qualityInspectService.getById(unqualified.getInspectId());
        if (ObjectUtils.isNotNull(qualityInspect) && qualityInspect.getInspectType() != 0) {
        if (ObjectUtils.isNull(unqualified)) {
            throw new RuntimeException("不合格记录不存在");
        }
        QualityInspect qualityInspect = null;
        if (ObjectUtils.isNotNull(unqualified.getInspectId())) {
            qualityInspect = qualityInspectService.getById(unqualified.getInspectId());
        }
        if (ObjectUtils.isNotNull(unqualified.getInspectId())
                && ObjectUtils.isNotNull(qualityInspect)
                && qualityInspect.getInspectType() != 0) {
            switch (qualityUnqualified.getDealResult()) {
                case "返修":
                case "返工":
@@ -137,8 +145,14 @@
                    break;
            }
        } else {
            //查询对应的规格型号id
            Long modelId = qualityUnqualifiedMapper.getModelId(qualityUnqualified.getProductName(), qualityUnqualified.getModel());
            // æ‰«ç ä¸åˆæ ¼ä¼˜å…ˆä½¿ç”¨ productModelId
            Long modelId = unqualified.getProductModelId();
            if (ObjectUtils.isNull(modelId)) {
                modelId = qualityUnqualifiedMapper.getModelId(qualityUnqualified.getProductName(), qualityUnqualified.getModel());
            }
            if (ObjectUtils.isNull(modelId)) {
                throw new RuntimeException("处理失败,未找到对应产品规格,请检查产品名称和规格型号");
            }
            switch (qualityUnqualified.getDealResult()) {
                case "报废":
                    //调用不合格库存接口 å…¥ä¸åˆæ ¼åº“

 src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java

@@ -28,7 +28,6 @@
import com.ruoyi.sales.pojo.SalesLedgerProduct;
// import com.ruoyi.sales.pojo.ShipmentApproval;
import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ISalesLedgerService;
import com.ruoyi.sales.service.ShippingInfoService;
// import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
@@ -67,9 +66,6 @@
    // private StockUtils stockUtils;

    @Autowired
    private ISalesLedgerProductService salesLedgerProductService;

    @Autowired
    private ISalesLedgerService salesLedgerService;

    @Autowired
@@ -99,6 +95,15 @@
            return AjaxResult.error("关联订单不存在");
        }

        // å‘货前必须保证该订单所有产品已入库
        List<SalesLedgerProduct> notStocked = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
                .eq(SalesLedgerProduct::getSalesLedgerId, salesLedger.getId())
                .eq(SalesLedgerProduct::getType, 1)
                .ne(SalesLedgerProduct::getProductStockStatus, 2));
        if (CollectionUtils.isNotEmpty(notStocked)) {
            return AjaxResult.error("发货失败,该销售订单存在未入库产品,请先完成全部入库后再发货");
        }

        // æ£€æŸ¥æ˜¯å¦å·²ç»åœ¨å®¡æ‰¹ä¸­æˆ–已发货
        if (salesLedger.getDeliveryStatus() != null && salesLedger.getDeliveryStatus() >= 2 && !salesLedger.getDeliveryStatus().equals(3)) {
             return AjaxResult.error("该订单已在审批中或已发货，无法重复发起");

 src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java

@@ -340,6 +340,10 @@
    @TableField(exist = false)
    private Integer hasSufficientStock;

    @TableField(exist = false)
    @ApiModelProperty("采购订单入库状态：0-未入库，1-部分入库，2-已入库")
    private Integer purchaseStockStatus;

    // é€€è´§æ•°é‡
    @TableField(exist = false)
    private BigDecimal returnQuality;

 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java

@@ -9,6 +9,7 @@
import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.utils.StockUtils;
@@ -32,6 +33,9 @@
import com.ruoyi.sales.service.ISalesLedgerProductProcessBindService;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.stock.mapper.StockInventoryMapper;
import com.ruoyi.stock.mapper.StockInRecordMapper;
import com.ruoyi.stock.dto.StockInventoryDto;
import com.ruoyi.stock.pojo.StockInRecord;
import com.ruoyi.stock.pojo.StockInventory;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -88,6 +92,8 @@
    private ShippingInfoServiceImpl shippingInfoService;

    private StockUtils stockUtils;

    private StockInRecordMapper stockInRecordMapper;

    private final ISalesLedgerProductProcessBindService salesLedgerProductProcessBindService;

@@ -294,9 +300,32 @@
            result = salesLedgerProductMapper.insert(salesLedgerProduct);
            addProductionData(salesLedgerProduct);
        } else {
            SalesLedgerProduct dbBefore = salesLedgerProductMapper.selectById(salesLedgerProduct.getId());
            if (dbBefore == null) {
                throw new RuntimeException("销售产品不存在，无法编辑");
            }
            // ä¸èƒ½æŠŠè®¢å•æ•°é‡æ”¹åˆ°å°äºŽå·²å‘货数量，否则账实不一致
            BigDecimal shipped = dbBefore.getShippedQuantity() == null ? BigDecimal.ZERO : dbBefore.getShippedQuantity();
            BigDecimal newOrderQty = salesLedgerProduct.getQuantity() == null ? BigDecimal.ZERO : salesLedgerProduct.getQuantity();
            if (newOrderQty.compareTo(shipped) < 0) {
                throw new RuntimeException("编辑失败,订单数量不能小于已发货数量");
            }
            //查询原本的产品型号id
            salesLedgerProduct.setFutureTickets(salesLedgerProduct.getQuantity());
            result = salesLedgerProductMapper.updateById(salesLedgerProduct);

            // å…è®¸â€œå¤šå…¥åº“”：当订单数量被下调时，只回退“下调差额”对应的入库数量
            // ä¾‹ï¼šåŽŸè®¢å•100，已入库120；改为50 -> åªå›žé€€50，最终已入库70（不强压到50）
            BigDecimal oldOrderQty = dbBefore.getQuantity() == null ? BigDecimal.ZERO : dbBefore.getQuantity();
            BigDecimal stocked = dbBefore.getStockedQuantity() == null ? BigDecimal.ZERO : dbBefore.getStockedQuantity();
            BigDecimal reduced = oldOrderQty.subtract(newOrderQty);
            if (reduced.compareTo(BigDecimal.ZERO) > 0) {
                BigDecimal rollbackQty = stocked.min(reduced);
                if (rollbackQty.compareTo(BigDecimal.ZERO) > 0) {
                    rollbackExcessStockIn(dbBefore, rollbackQty);
                }
            }

            /*删除对应的生产数据并重新新增*/
            deleteProductionData(Arrays.asList(salesLedgerProduct.getId()));
            // åˆ é™¤ç”Ÿäº§æ ¸ç®—数据
@@ -333,10 +362,108 @@

            //  æ¸…空销售产品绑定的加工
            salesLedgerProductProcessBindService.updateProductProcessBind(salesLedgerProduct.getSalesProductProcessList(), salesLedgerProduct.getId());

            // æ–°å¢ž/编辑产品后，刷新销售主单入库状态（避免因新增未入库行导致状态不准）
            refreshSalesLedgerStockStatus(salesLedgerId);
        }
        return result;
    }

    private void rollbackExcessStockIn(SalesLedgerProduct dbBefore, BigDecimal rollbackQtyTotal) {
        if (dbBefore == null || rollbackQtyTotal == null || rollbackQtyTotal.compareTo(BigDecimal.ZERO) <= 0) {
            return;
        }
        if (dbBefore.getProductModelId() == null) {
            throw new RuntimeException("回退入库失败,产品规格未维护");
        }
        Long productId = dbBefore.getId();
        //  å€’序回退：优先回退“扫码入库”，再回退“手动入库”
        List<String> recordTypes = Arrays.asList(
                StockInQualifiedRecordTypeEnum.SALE_SCAN_STOCK_IN.getCode(),
                StockInQualifiedRecordTypeEnum.SALE_STOCK_IN.getCode()
        );
        List<StockInRecord> records = stockInRecordMapper.selectList(new LambdaQueryWrapper<StockInRecord>()
                .eq(StockInRecord::getSalesLedgerProductId, productId)
                .eq(StockInRecord::getType, "0")
                .in(StockInRecord::getRecordType, recordTypes)
                .orderByDesc(StockInRecord::getCreateTime));
        BigDecimal remaining = rollbackQtyTotal;
        for (StockInRecord r : records) {
            if (remaining.compareTo(BigDecimal.ZERO) <= 0) {
                break;
            }
            BigDecimal inNum = r.getStockInNum() == null ? BigDecimal.ZERO : r.getStockInNum();
            if (inNum.compareTo(BigDecimal.ZERO) <= 0) {
                continue;
            }
            BigDecimal rollbackQty = inNum.min(remaining);

            StockInventoryDto stockInventoryDto = new StockInventoryDto();
            stockInventoryDto.setProductModelId(dbBefore.getProductModelId());
            stockInventoryDto.setQualitity(rollbackQty);
            int affectRows = stockInventoryMapper.updateSubtractStockInventory(stockInventoryDto);
            if (affectRows <= 0) {
                throw new RuntimeException("回退入库失败,当前库存不足,无法扣回超入库数量");
            }

            BigDecimal newInNum = inNum.subtract(rollbackQty);
            if (newInNum.compareTo(BigDecimal.ZERO) <= 0) {
                stockInRecordMapper.deleteById(r.getId());
            } else {
                r.setStockInNum(newInNum);
                stockInRecordMapper.updateById(r);
            }
            remaining = remaining.subtract(rollbackQty);
        }
        if (remaining.compareTo(BigDecimal.ZERO) > 0) {
            throw new RuntimeException("回退入库失败,未找到足够的入库记录用于扣回超入库数量");
        }

        //  å›žå†™äº§å“è¡Œå·²å…¥åº“数量与状态
        SalesLedgerProduct fresh = salesLedgerProductMapper.selectById(dbBefore.getId());
        if (fresh == null) {
            return;
        }
        BigDecimal newStocked = (fresh.getStockedQuantity() == null ? BigDecimal.ZERO : fresh.getStockedQuantity()).subtract(rollbackQtyTotal);
        if (newStocked.compareTo(BigDecimal.ZERO) < 0) {
            newStocked = BigDecimal.ZERO;
        }
        BigDecimal orderQty = fresh.getQuantity() == null ? BigDecimal.ZERO : fresh.getQuantity();
        int stockStatus;
        if (newStocked.compareTo(BigDecimal.ZERO) <= 0) stockStatus = 0;
        else if (orderQty.compareTo(BigDecimal.ZERO) > 0 && newStocked.compareTo(orderQty) < 0) stockStatus = 1;
        else stockStatus = 2;
        fresh.setStockedQuantity(newStocked);
        fresh.setProductStockStatus(stockStatus);
        fresh.fillRemainingQuantity();
        salesLedgerProductMapper.updateById(fresh);
    }

    private void refreshSalesLedgerStockStatus(Long salesLedgerId) {
        if (salesLedgerId == null) {
            return;
        }
        SalesLedger ledger = salesLedgerMapper.selectById(salesLedgerId);
        if (ledger == null) {
            return;
        }
        List<SalesLedgerProduct> allProducts = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
                .eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId)
                .eq(SalesLedgerProduct::getType, 1));
        if (CollectionUtils.isEmpty(allProducts)) {
            ledger.setStockStatus(0);
            salesLedgerMapper.updateById(ledger);
            return;
        }
        boolean anyInbound = allProducts.stream().anyMatch(p -> {
            BigDecimal sq = p.getStockedQuantity();
            return sq != null && sq.compareTo(BigDecimal.ZERO) > 0;
        });
        boolean allFull = allProducts.stream().allMatch(p -> Objects.equals(p.getProductStockStatus(), 2));
        ledger.setStockStatus(allFull ? 2 : (anyInbound ? 1 : 0));
        salesLedgerMapper.updateById(ledger);
    }

    /**
     * æ–°å¢žç”Ÿäº§æ•°æ®
     */

 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java

@@ -1006,7 +1006,15 @@
        if (!updateList.isEmpty()) {
            for (SalesLedgerProduct product : updateList) {
                product.setType(type.getCode());
                SalesLedgerProduct db = salesLedgerProductMapper.selectById(product.getId());
                if (db != null) {
                    BigDecimal stockedQty = product.getStockedQuantity() != null ? product.getStockedQuantity() : db.getStockedQuantity();
                    BigDecimal orderQty = product.getQuantity() != null ? product.getQuantity() : db.getQuantity();
                    product.setStockedQuantity(stockedQty);
                    product.setProductStockStatus(calculateProductStockStatus(stockedQty, orderQty));
                } else {
                product.setProductStockStatus(0);
                }
                product.fillRemainingQuantity();
                salesLedgerProductMapper.updateById(product);
                //  æ¸…空销售产品绑定的加工
@@ -1020,7 +1028,9 @@
                salesLedgerProduct.setNoInvoiceNum(salesLedgerProduct.getQuantity());
                salesLedgerProduct.setNoInvoiceAmount(salesLedgerProduct.getTaxInclusiveTotalPrice());
                salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProduct.getTaxInclusiveTotalPrice());
                salesLedgerProduct.setProductStockStatus(0);
                BigDecimal stockedQty = salesLedgerProduct.getStockedQuantity();
                BigDecimal orderQty = salesLedgerProduct.getQuantity();
                salesLedgerProduct.setProductStockStatus(calculateProductStockStatus(stockedQty, orderQty));
                salesLedgerProduct.fillRemainingQuantity();
                salesLedgerProductMapper.insert(salesLedgerProduct);
                //  ç»‘定产品额外加工
@@ -1030,6 +1040,41 @@
//                salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
            }
        }
        refreshSalesLedgerStockStatus(salesLedgerId);
    }

    private int calculateProductStockStatus(BigDecimal stockedQty, BigDecimal orderQty) {
        BigDecimal stocked = stockedQty == null ? BigDecimal.ZERO : stockedQty;
        BigDecimal order = orderQty == null ? BigDecimal.ZERO : orderQty;
        if (stocked.compareTo(BigDecimal.ZERO) <= 0) {
            return 0;
        }
        if (order.compareTo(BigDecimal.ZERO) > 0 && stocked.compareTo(order) < 0) {
            return 1;
        }
        return 2;
    }

    private void refreshSalesLedgerStockStatus(Long salesLedgerId) {
        if (salesLedgerId == null) return;
        SalesLedger ledger = baseMapper.selectById(salesLedgerId);
        if (ledger == null) return;
        List<SalesLedgerProduct> allProducts = salesLedgerProductMapper.selectList(
                Wrappers.<SalesLedgerProduct>lambdaQuery()
                        .eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId)
                        .eq(SalesLedgerProduct::getType, SaleEnum.SALE.getCode()));
        if (CollectionUtils.isEmpty(allProducts)) {
            ledger.setStockStatus(0);
            baseMapper.updateById(ledger);
            return;
        }
        boolean anyInbound = allProducts.stream().anyMatch(p -> {
            BigDecimal sq = p.getStockedQuantity();
            return sq != null && sq.compareTo(BigDecimal.ZERO) > 0;
        });
        boolean allFull = allProducts.stream().allMatch(p -> Objects.equals(p.getProductStockStatus(), 2));
        ledger.setStockStatus(allFull ? 2 : (anyInbound ? 1 : 0));
        baseMapper.updateById(ledger);
    }

    private SalesLedger convertToEntity(SalesLedgerDto dto) {

 src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java

@@ -19,15 +19,9 @@
import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.service.ShippingInfoService;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.stock.mapper.StockInventoryMapper;
import com.ruoyi.stock.pojo.StockInventory;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;

import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@@ -64,9 +58,6 @@
    @Autowired
    private SalesLedgerMapper salesLedgerMapper;

    @Autowired
    private StockInventoryMapper stockInventoryMapper;

    @Override
    public IPage<ShippingInfoDto> listPage(Page page, ShippingInfo req) {
        IPage<ShippingInfoDto> listPage = shippingInfoMapper.listPage(page, req);
@@ -83,6 +74,14 @@
        if (byId == null) {
            throw new RuntimeException("发货信息不存在");
        }
        //  å‘货扣库存前必须保证该订单所有产品已入库
        List<SalesLedgerProduct> notStocked = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
                .eq(SalesLedgerProduct::getSalesLedgerId, byId.getSalesLedgerId())
                .eq(SalesLedgerProduct::getType, 1)
                .ne(SalesLedgerProduct::getProductStockStatus, 2));
        if (CollectionUtils.isNotEmpty(notStocked)) {
            throw new RuntimeException("发货失败,该销售订单存在未入库产品,请先完成全部入库后再发货");
        }
        //扣减库存
        if (!"已发货".equals(byId.getStatus())) {
            SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(byId.getSalesLedgerProductId());

 src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java

@@ -79,7 +79,10 @@
        stockInRecordService.add(stockInRecordDto);
        //再进行新增库存数量库存
        //先查询库存表中的产品是否存在，不存在新增，存在更新
        StockInventory oldStockInventory = stockInventoryMapper.selectOne(new QueryWrapper<StockInventory>().lambda().eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId()));
        List<StockInventory> stockInventories = stockInventoryMapper.selectList(new QueryWrapper<StockInventory>().lambda()
                .eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId())
                .orderByDesc(StockInventory::getId));
        StockInventory oldStockInventory = (stockInventories == null || stockInventories.isEmpty()) ? null : stockInventories.get(0);
        if (ObjectUtils.isEmpty(oldStockInventory)) {
            StockInventory newStockInventory = new StockInventory();
            newStockInventory.setProductModelId(stockInventoryDto.getProductModelId());
@@ -109,7 +112,10 @@
        stockOutRecordDto.setSalesLedgerId(stockInventoryDto.getSalesLedgerId());
        stockOutRecordDto.setSalesLedgerProductId(stockInventoryDto.getSalesLedgerProductId());
        stockOutRecordService.add(stockOutRecordDto);
        StockInventory oldStockInventory = stockInventoryMapper.selectOne(new QueryWrapper<StockInventory>().lambda().eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId()));
        List<StockInventory> stockInventories = stockInventoryMapper.selectList(new QueryWrapper<StockInventory>().lambda()
                .eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId())
                .orderByDesc(StockInventory::getId));
        StockInventory oldStockInventory = (stockInventories == null || stockInventories.isEmpty()) ? null : stockInventories.get(0);
        if (ObjectUtils.isEmpty(oldStockInventory)) {
            throw new RuntimeException("产品库存不存在");
        }

 src/main/java/com/ruoyi/stock/service/impl/StockUninventoryServiceImpl.java

@@ -59,7 +59,10 @@
        stockInRecordService.add(stockInRecordDto);
        //再进行新增库存数量库存
        //先查询库存表中的产品是否存在，不存在新增，存在更新
        StockUninventory oldStockUnInventory = stockUninventoryMapper.selectOne(new QueryWrapper<StockUninventory>().lambda().eq(StockUninventory::getProductModelId, stockUninventoryDto.getProductModelId()));
        List<StockUninventory> stockUninventories = stockUninventoryMapper.selectList(new QueryWrapper<StockUninventory>().lambda()
                .eq(StockUninventory::getProductModelId, stockUninventoryDto.getProductModelId())
                .orderByDesc(StockUninventory::getId));
        StockUninventory oldStockUnInventory = (stockUninventories == null || stockUninventories.isEmpty()) ? null : stockUninventories.get(0);
        if (ObjectUtils.isEmpty(oldStockUnInventory)) {
            StockUninventory newStockUnInventory = new StockUninventory();
            newStockUnInventory.setProductModelId(stockUninventoryDto.getProductModelId());
@@ -87,7 +90,10 @@
        stockOutRecordDto.setSalesLedgerId(stockUninventoryDto.getSalesLedgerId());
        stockOutRecordDto.setSalesLedgerProductId(stockUninventoryDto.getSalesLedgerProductId());
        stockOutRecordService.add(stockOutRecordDto);
        StockUninventory oldStockInventory = stockUninventoryMapper.selectOne(new QueryWrapper<StockUninventory>().lambda().eq(StockUninventory::getProductModelId, stockUninventoryDto.getProductModelId()));
        List<StockUninventory> stockUninventories = stockUninventoryMapper.selectList(new QueryWrapper<StockUninventory>().lambda()
                .eq(StockUninventory::getProductModelId, stockUninventoryDto.getProductModelId())
                .orderByDesc(StockUninventory::getId));
        StockUninventory oldStockInventory = (stockUninventories == null || stockUninventories.isEmpty()) ? null : stockUninventories.get(0);
        if (ObjectUtils.isEmpty(oldStockInventory)) {
            throw new RuntimeException("产品库存不存在");
        }else {

 src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml

@@ -29,6 +29,8 @@
        pl.approve_user_ids,
        sm.is_white,
        pl.approval_status,
        pl.stock_status,
        IFNULL(ps.product_stock_status, 0) AS product_stock_status,
        pl.payment_method,
        pl.remarks
        FROM purchase_ledger pl
@@ -40,6 +42,19 @@
        GROUP BY purchase_ledger_id
        ) tr_sum ON pl.id = tr_sum.purchase_ledger_id
        LEFT JOIN supplier_manage sm ON pl.supplier_id = sm.id
        LEFT JOIN (
        SELECT
        sales_ledger_id,
        CASE
        WHEN COUNT(1) = 0 THEN 0
        WHEN SUM(CASE WHEN IFNULL(product_stock_status, 0) = 2 THEN 1 ELSE 0 END) = COUNT(1) THEN 2
        WHEN SUM(CASE WHEN IFNULL(product_stock_status, 0) > 0 THEN 1 ELSE 0 END) > 0 THEN 1
        ELSE 0
        END AS product_stock_status
        FROM sales_ledger_product
        WHERE type = 2
        GROUP BY sales_ledger_id
        ) ps ON pl.id = ps.sales_ledger_id
        <where>
            <if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''">
                AND pl.purchase_contract_number LIKE CONCAT('%', #{c.purchaseContractNumber}, '%')

 src/main/resources/mapper/quality/QualityInspectMapper.xml

@@ -47,7 +47,7 @@
        <if test="qualityInspect.entryDateEnd != null and qualityInspect.entryDateEnd != '' ">
            AND qi.check_time &lt;= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d')
        </if>
        ORDER BY qi.check_time DESC
        ORDER BY qi.id DESC
    </select>

    <select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">

 src/main/resources/mapper/sales/SalesLedgerProductMapper.xml

@@ -7,6 +7,7 @@
    <select id="selectSalesLedgerProductList" resultType="com.ruoyi.sales.pojo.SalesLedgerProduct">
        SELECT
        T1.*,
        pl.stock_status AS purchase_stock_status,
        CASE
        WHEN (IFNULL(t2.qualitity, 0) - IFNULL(t2.locked_quantity, 0)) >= IFNULL(T1.quantity, 0) THEN 1
        ELSE 0
@@ -14,6 +15,7 @@
        FROM
        sales_ledger_product T1
        LEFT JOIN stock_inventory t2 ON T1.product_model_id = t2.product_model_id
        LEFT JOIN purchase_ledger pl ON T1.sales_ledger_id = pl.id AND T1.type = 2
        <where>
            <if test="salesLedgerProduct.salesLedgerId != null">
                AND T1.sales_ledger_id = #{salesLedgerProduct.salesLedgerId}