feat(production): 更新生产核算逻辑以支持设备和工时计算

liyong

2026-04-28 2c51e2bac7e271f6bd1a7da060e4ffd327d5a8d2

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

@@ -197,8 +197,9 @@
                T1.supplier_name LIKE CONCAT ('%',#{req.supplierName},'%')
            </if>
        </where>
        GROUP BY T1.supplier_name
        GROUP BY T1.supplier_name,T1.supplier_id
    </select>

    <select id="supplierNameListPageDetails" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
        SELECT
        T1.supplier_id,
@@ -209,14 +210,14 @@
        T1.purchase_contract_number,
        T2.payment_date
        FROM purchase_ledger T1
        LEFT JOIN payment_registration T2 ON T1.id = T2.purchase_ledger_id
        INNER JOIN payment_registration T2 ON T1.id = T2.purchase_ledger_id
        <where>
            T1.supplier_id = #{req.supplierId}
            <if test="req.supplierName != null and req.supplierName != '' ">
                T1.supplier_name LIKE CONCAT ('%',#{req.supplierName},'%')
            </if>
        </where>
        GROUP BY  T1.purchase_contract_number,T2.payment_date
        GROUP BY  T1.purchase_contract_number,T2.payment_date,T1.supplier_id,T1.supplier_name
    </select>

</mapper>