fix:1.采购/销售导入导出模板调整 2.采购/销售导入导出逻辑更改

liding

3 天以前 3841d6424d6cb9cfeb4221435c137628b9f7442d

fix:1.采购/销售导入导出模板调整
2.采购/销售导入导出逻辑更改

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

@@ -1,7 +1,6 @@
package com.ruoyi.purchase.dto;

import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.dto.SalesLedgerProductImportDto;
import lombok.Data;

import java.math.BigDecimal;
@@ -17,16 +16,6 @@
    private String purchaseContractNumber;

    /**
     * é¢„警数量
     */
    @Excel(name = "库存预警数量")
    private BigDecimal warnNum;

    @Excel(name = "销售单号")
    private String salesContractNo;


    /**
     * äº§å“å¤§ç±»
     */
    @Excel(name = "产品大类")
@@ -39,16 +28,22 @@
    private String specificationModel;

    /**
     * UID码
     */
    @Excel(name = "UID码")
    private String uidNo;

    /**
     * æ‰¹æ¬¡å·
     */
    @Excel(name = "批次号")
    private String batchNo;

    /**
     * å•ä½
     */
    @Excel(name = "单位")
    private String unit;

    /**
     * æ•°é‡
     */
    @Excel(name = "数量")
    private BigDecimal quantity;

    /**
     * ç¨ŽçŽ‡
@@ -63,6 +58,12 @@
    private BigDecimal taxInclusiveUnitPrice;

    /**
     * æ•°é‡
     */
    @Excel(name = "数量")
    private BigDecimal quantity;

    /**
     * å«ç¨Žæ€»ä»·
     */
    @Excel(name = "含税总价")
@@ -75,6 +76,12 @@
    private String invoiceType;

    /**
     * é¢„警数量
     */
    @Excel(name = "库存预警数量")
    private BigDecimal warnNum;

    /**
     * æ˜¯å¦è´¨æ£€
     */
    @Excel(name = "是否质检", readConverterExp = "0=否,1=是")

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

@@ -246,7 +246,7 @@
        qualityInspect.setQuantity(saleProduct.getQuantity());
        qualityInspectMapper.insert(qualityInspect);
        List<QualityTestStandard> qualityTestStandard = qualityTestStandardMapper.getQualityTestStandardByProductId(saleProduct.getProductId(), 0,null);
        if (qualityTestStandard.size()>0){
        if (!qualityTestStandard.isEmpty()) {
            qualityInspect.setTestStandardId(qualityTestStandard.get(0).getId());
            qualityInspectMapper.updateById(qualityInspect);
            qualityTestStandardParamMapper.selectList(Wrappers.<QualityTestStandardParam>lambdaQuery()
@@ -745,6 +745,24 @@

                for (PurchaseLedgerProductImportDto salesLedgerProductImportDto : salesLedgerProductImportDtos) {
                    SalesLedgerProduct salesLedgerProduct = new SalesLedgerProduct();
                    // æŸ¥è¯¢äº§å“
                    Product product = productMapper.selectOne(new LambdaQueryWrapper<Product>()
                            .eq(Product::getProductName, salesLedgerProductImportDto.getProductCategory()));
                    if (product == null) {
                        throw new RuntimeException("请维护产品：" + salesLedgerProductImportDto.getProductCategory());
                    }
                    // æŸ¥è¯¢äº§å“åž‹å·
                    ProductModel productModel = productModelMapper.selectOne(new LambdaQueryWrapper<ProductModel>()
                            .eq(ProductModel::getProductId, product.getId())
                            .eq(ProductModel::getModel, salesLedgerProductImportDto.getSpecificationModel())
                            .eq(ProductModel::getUidNo, salesLedgerProductImportDto.getUidNo()));
                    if (productModel == null) {
                        throw new RuntimeException("请维护产品【" + salesLedgerProductImportDto.getProductCategory() + "】的型号【"
                                + salesLedgerProductImportDto.getSpecificationModel() + "】和UID码【"
                                + salesLedgerProductImportDto.getUidNo() + "】");
                    }
                    salesLedgerProduct.setProductModelId(productModel.getId());
                    salesLedgerProduct.setProductId(product.getId());
                    BeanUtils.copyProperties(salesLedgerProductImportDto, salesLedgerProduct);
                    salesLedgerProduct.setSalesLedgerId(salesLedger.getId());
                    salesLedgerProduct.setType(2);
@@ -764,21 +782,25 @@
                    salesLedgerProduct.setApproveStatus(0);
                    salesLedgerProduct.setPendingTicketsTotal(salesLedgerProductImportDto.getTaxInclusiveTotalPrice());
                    // æ˜¯å¦è´¨æ£€åˆ¤æ–­
                    if (salesLedgerProductImportDto.getIsChecked() == null) {
                        throw new RuntimeException("请填写是否质检！");
                    }
                    salesLedgerProduct.setIsChecked(salesLedgerProductImportDto.getIsChecked() == 1);
                    if(salesLedgerProductImportDto.getIsChecked() == 1){
                        addQualityInspect(salesLedger, salesLedgerProduct);
                    } else {
                        //直接入库
                        stockUtils.addStock(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockInQualifiedRecordTypeEnum.PURCHASE_STOCK_IN.getCode(),
                                salesLedger.getId(), salesLedgerProduct.getBatchNo(), salesLedger.getSupplierName(), LocalDate.now());
                    }
                    salesLedgerProductMapper.insert(salesLedgerProduct);
                }
                // é‡‡è´­å®¡æ ¸
                addApproveByPurchase(loginUser,salesLedger);
            }

            return AjaxResult.success("导入成功");
        } catch (Exception e) {
            e.printStackTrace();
            throw new RuntimeException(e.getMessage());
        }
        return AjaxResult.success("导入失败");
    }

    @Override

 src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java

@@ -1,12 +1,9 @@
package com.ruoyi.sales.dto;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

/**
 * @author :yys
@@ -32,6 +29,18 @@
    private String specificationModel;

    /**
     * æ‰¹å·
     */
    @Excel(name = "批号")
    private String batchNo;

    /**
     * UID码
     */
    @Excel(name = "UID码")
    private String uniNo;

    /**
     * å•ä½
     */
    @Excel(name = "单位")

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

@@ -285,7 +285,7 @@
        List<ProcessRoute> processRoutes = processRouteMapper.selectList(new QueryWrapper<ProcessRoute>().lambda()
                .eq(ProcessRoute::getProductModelId, salesLedgerProduct.getProductModelId())
                .orderByDesc(ProcessRoute::getCreateTime));
        if (processRoutes.size()>0){
        if (!processRoutes.isEmpty()){
            ProcessRoute processRoute = processRoutes.get(0);
            //新增生产订单工艺路线主表
            ProductProcessRoute productProcessRoute = new ProductProcessRoute();

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

@@ -429,6 +429,10 @@

                for (SalesLedgerProductImportDto salesLedgerProductImportDto : salesLedgerProductImportDtos) {
                    SalesLedgerProduct salesLedgerProduct = new SalesLedgerProduct();
                    List<StockInventory> stockInventories = stockInventoryMapper.selectList(new LambdaQueryWrapper<StockInventory>().in(StockInventory::getBatchNo, salesLedgerProductImportDto.getBatchNo()));
                    if (CollectionUtils.isEmpty(stockInventories)) {
                        throw new RuntimeException("产品批号:" + salesLedgerProductImportDto.getBatchNo() + ",库存无对应产品数据！");
                    }
                    BeanUtils.copyProperties(salesLedgerProductImportDto, salesLedgerProduct);
                    salesLedgerProduct.setSalesLedgerId(salesLedger.getId());
                    salesLedgerProduct.setType(1);
@@ -458,16 +462,13 @@
                    salesLedgerProduct.setApproveStatus(0);
                    salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProductImportDto.getTaxInclusiveTotalPrice());
                    salesLedgerProductMapper.insert(salesLedgerProduct);
                    // æ·»åŠ ç”Ÿäº§æ•°æ®
                    salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
                }
            }

            return AjaxResult.success("导入成功");
        } catch (Exception e) {
            e.printStackTrace();
            throw new RuntimeException(e.getMessage());
        }
        return AjaxResult.success("导入失败");
    }

    @Override

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

@@ -5,15 +5,22 @@
<mapper namespace="com.ruoyi.sales.mapper.SalesLedgerProductMapper">

    <select id="selectSalesLedgerProductList" resultType="com.ruoyi.sales.pojo.SalesLedgerProduct">
        WITH stock_summary AS (
        SELECT
        product_model_id,
        SUM(qualitity) AS total_quantity,
        SUM(locked_quantity) AS total_locked
        FROM stock_inventory
        GROUP BY product_model_id
        )
        SELECT
        T1.*,
        CASE
        WHEN (IFNULL(t2.qualitity, 0) - IFNULL(t2.locked_quantity, 0)) >= IFNULL(T1.quantity, 0) THEN 1
        WHEN (IFNULL(s.total_quantity, 0) - IFNULL(s.total_locked, 0)) >= IFNULL(T1.quantity, 0) THEN 1
        ELSE 0
        END as has_sufficient_stock
        FROM
        sales_ledger_product T1
        LEFT JOIN stock_inventory t2 ON T1.product_model_id = t2.product_model_id
        FROM sales_ledger_product T1
        LEFT JOIN stock_summary s ON T1.product_model_id = s.product_model_id
        <where>
            <if test="salesLedgerProduct.salesLedgerId != null">
                AND T1.sales_ledger_id = #{salesLedgerProduct.salesLedgerId}

 src/main/resources/static/²É¹ºÌ¨Õ˵¼ÈëÄ£°å.xlsx

Binary files differ

 src/main/resources/static/ÏúÊŲ̂Õ˵¼ÈëÄ£°å.xlsx

Binary files differ