Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

2026-05-22 2d03ec79e1892248b520cf097e8a58dd82a4892f

 src/main/resources/mapper/production/ProductionProductMainMapper.xml

@@ -22,6 +22,7 @@
        pm.model as productModelName,
        ppo.quantity,
        ppo.scrap_qty,
        ppo.add_qty,
        pm.unit,
        sl.sales_contract_no salesContractNo
        from
@@ -48,8 +49,14 @@
            <if test="c.status != null and c.status != ''">
                and ppm.status = #{c.status}
            </if>
            <if test="c.auditStatus != null">
                and ppm.audit_status = #{c.auditStatus}
            </if>
            <if test="c.workOrderId != null">
                and ppm.work_order_id = #{c.workOrderId}
            </if>
        </where>
        order by ppm.id
        order by  ppm.id desc

    </select>
    <select id="getOrderByMainId" resultType="com.ruoyi.production.pojo.ProductOrder">
@@ -71,7 +78,16 @@
        slpa.process,
        ppo.quantity,
        slpa.work_hours,
        slpa.work_hours * slpa.finished_num AS wages
        slpa.work_hours * slpa.finished_num AS wages,
        dl.device_name,
        slpa.work_hour as work_minutes,
        IFNULL(
        TIMESTAMPDIFF(MINUTE, ppm.start_time, ppm.end_time),
        0
        ) AS work_minutes,
        ppo.add_qty,
        ppo.scrap_qty,
        ppo.replenish_qty
        FROM
        production_product_main ppm
        LEFT JOIN sales_ledger_production_accounting slpa ON slpa.product_main_id = ppm.id
@@ -82,7 +98,8 @@
        LEFT JOIN product_model pm ON po.product_model_id = pm.id
        LEFT JOIN product p ON p.id = pm.product_id
        LEFT JOIN sales_ledger sl ON po.sales_ledger_id = sl.id
        <where>
        left join device_ledger dl ON dl.id = slpa.device_id
        where ppm.audit_status = 1
            <if test="ew.schedulingUserName != null and ew.schedulingUserName !=''">
                and slpa.scheduling_user_name = #{ew.schedulingUserName}
            </if>
@@ -94,7 +111,6 @@
                and slpa.scheduling_date >= #{ew.entryDateStart}
                and slpa.scheduling_date &lt; date_add(#{ew.entryDateEnd}, INTERVAL 1 DAY)
            </if>
        </where>
    </select>
    <select id="listMain" resultType="java.lang.Long">
        SELECT ppm.id FROM production_product_main ppm