a411319227de1415c25c4ff1cfe1fee741bad753..61e45a2a7c94d845de5b9ace90bfee4bc9af4fd2
4 天以前 huminmin
显示料号
61e45a 对比 | 目录
4 天以前 huminmin
显示料号
80a04f 对比 | 目录
已修改4个文件
38 ■■■■■ 文件已修改
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/stock/StockInRecordMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -785,6 +785,10 @@
        productWrapper.eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedger.getId())
                .eq(SalesLedgerProduct::getType, 2);
        List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(productWrapper);
        for (SalesLedgerProduct product : products) {
            ProductModel productModel = productModelMapper.selectById(product.getProductModelId());
            product.setMaterialCode(productModel != null ? productModel.getMaterialCode() : "");
        }
        // 4. 转换 DTO
        PurchaseLedgerDto resultDto = new PurchaseLedgerDto();
src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
@@ -75,6 +75,13 @@
    private String model;
    /**
     * 物料编号
     */
    @Excel(name = "料号")
    @TableField(exist = false)
    private String materialCode;
    /**
     * 单位
     */
    @Excel(name = "单位")
src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml
@@ -17,16 +17,14 @@
        qu.deal_name,
        qu.deal_time,
        qu.quarantine_lifted,
        qu.model,
        pm.material_code as materialCode,
        CASE
        WHEN qu.model = pm.id THEN pm.model
        ELSE qu.model
        END AS model,
        CASE
        WHEN qu.model = pm.id THEN true
        WHEN qu.inspect_id is null THEN true
        ELSE false
        END AS method
        FROM quality_unqualified qu
        LEFT JOIN product_model pm ON qu.model = pm.id
        LEFT JOIN product_model pm ON qu.model = pm.model
        where
        1=1
        <if test="qualityUnqualified.inspectType != null ">
@@ -47,8 +45,10 @@
    </select>
    <select id="qualityUnqualifiedExport" resultType="com.ruoyi.quality.pojo.QualityUnqualified">
        SELECT
        *
        FROM quality_unqualified
        qu.*,
        pm.material_code as materialCode
        FROM quality_unqualified qu
        LEFT JOIN product_model pm ON qu.model = pm.model
        where
        1=1
        <if test="qualityUnqualified.inspectType != null">
@@ -77,16 +77,14 @@
            qu.deal_name,
            qu.deal_time,
            qi.process,
            qu.model,
            pm.material_code as materialCode,
            CASE
                WHEN qu.model = pm.id THEN pm.model
                ELSE qu.model
                END AS model,
            CASE
                WHEN qu.model = pm.id THEN true
                WHEN qu.inspect_id is null THEN true
                ELSE false
                END AS method
        FROM quality_unqualified qu
                 LEFT JOIN product_model pm ON qu.model = pm.id
                 LEFT JOIN product_model pm ON qu.model = pm.model
                 LEFT JOIN quality_inspect qi ON qu.inspect_id = qi.id
        where
            1=1
src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -70,6 +70,7 @@
            p.product_name AS product_name,
            pm.model,
            pm.unit,
            pm.material_code AS materialCode,
            u.nick_name AS createBy
        FROM
            stock_in_record AS sir