feat(basic): 添加产品条码功能并完善生产统计报表

云

2026-09-10 1e123568c2f561013f5636e45dc0db30b17a3517

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

@@ -30,19 +30,27 @@
               p.product_name as productName,
               pm.model as productModelName,
               pm.unit,
               sl.sales_contract_no as salesContractNo,
               po_sales.salesContractNo,
               date(ppm.create_time) as schedulingDate,
               su.nick_name as schedulingUserName,
               sl.customer_name as customerName,
               top2.name as process
               po_sales.customerName,
               poro.operation_name as process
        from production_product_main ppm
                 left join production_operation_task pot on ppm.production_operation_task_id = pot.id
                 left join production_order po on pot.production_order_id = po.id
                 left join sales_ledger sl on po.sales_ledger_id = sl.id
                 left join product_model pm on po.product_model_id = pm.id
                 left join production_order_routing_operation poro on pot.production_order_routing_operation_id = poro.id
                 left join (
            select po2.id as orderId,
                   group_concat(distinct sl2.sales_contract_no order by sl2.sales_contract_no separator ',') as salesContractNo,
                   group_concat(distinct sl2.customer_name order by sl2.customer_name separator ',') as customerName
            from production_order po2
                     left join production_plan pp2
                               on find_in_set(pp2.id, replace(replace(replace(po2.production_plan_ids, '[', ''), ']', ''), ' ', '')) > 0
                     left join sales_ledger sl2 on sl2.id = pp2.sales_ledger_id
            group by po2.id
        ) po_sales on po_sales.orderId = po.id
                 left join product_model pm on pm.id = ifnull(poro.product_model_id, po.product_model_id)
                 left join product p on pm.product_id = p.id
                 left join technology_routing_operation tro on pot.technology_routing_operation_id = tro.id
                 left join technology_operation top2 on tro.technology_operation_id = top2.id
                 left join sys_user su on ppm.create_user = su.user_id
                 left join production_product_output ppo on ppo.production_product_main_id = ppm.id
        <where>
@@ -53,10 +61,10 @@
                and pot.work_order_no like concat('%', #{c.workOrderNo}, '%')
            </if>
            <if test="c.salesContractNo != null and c.salesContractNo != ''">
                and sl.sales_contract_no like concat('%', #{c.salesContractNo}, '%')
                and po_sales.salesContractNo like concat('%', #{c.salesContractNo}, '%')
            </if>
            <if test="c.customerName != null and c.customerName != ''">
                and sl.customer_name like concat('%', #{c.customerName}, '%')
                and po_sales.customerName like concat('%', #{c.customerName}, '%')
            </if>
            <if test="c.productName != null and c.productName != ''">
                and p.product_name like concat('%', #{c.productName}, '%')
@@ -65,13 +73,107 @@
                and pm.model like concat('%', #{c.productModelName}, '%')
            </if>
            <if test="c.process != null and c.process != ''">
                and top2.name like concat('%', #{c.process}, '%')
                and poro.operation_name like concat('%', #{c.process}, '%')
            </if>
            <if test="c.schedulingDate != null">
                and date(ppm.create_time) = #{c.schedulingDate}
            </if>
            <if test="c.productMainId != null">
                and ppm.id = #{c.productMainId}
            </if>
            <if test="c.deviceId != null">
                and ppm.device_id = #{c.deviceId}
            </if>
            <if test="c.deviceName != null and c.deviceName != ''">
                and ppm.device_name like concat('%', #{c.deviceName}, '%')
            </if>
        </where>
        order by ppm.create_time desc
        order by pot.work_order_no desc, poro.drag_sort, ppm.product_no desc
    </select>

    <select id="wageSummary" resultType="com.ruoyi.production.bean.vo.PieceWageSummaryVo">
        select pa.scheduling_user_id                                                              as userId,
               pa.scheduling_user_name                                                            as userName,
               count(distinct pa.production_product_main_id)                                      as workCount,
               sum(ifnull(pa.finished_num, 0))                                                    as quantity,
               sum(ifnull(ppm.work_hour, 0))                                                      as workHour,
               sum(cast(ifnull(prc.unit_price, 0) * ifnull(pa.finished_num, 0) as decimal(18, 2))) as pieceWage,
               sum(
                   case
                       when prc.unit_price is not null
                           then cast(ifnull(pa.finished_num, 0) * prc.unit_price as decimal(18, 2))
                       when poro.type = 0
                           then cast(ifnull(pa.work_hours, 0) * ifnull(ppm.work_hour, 0) as decimal(18, 2))
                       else cast(ifnull(pa.work_hours, 0) * ifnull(pa.finished_num, 0) *
                                case
                                    when substring_index(pm.model, '*', -1) regexp '^[0-9]+(\\.[0-9]+)?$'
                                        then cast(substring_index(pm.model, '*', -1) as decimal(18, 4))
                                    else 1
                                end as decimal(18, 2))
                   end
               )                                                                                  as wages
        from production_account pa
                 join production_product_main ppm on ppm.id = pa.production_product_main_id
                 left join production_operation_task pot on ppm.production_operation_task_id = pot.id
                 left join production_order po on pot.production_order_id = po.id
                 left join production_order_routing_operation poro on pot.production_order_routing_operation_id = poro.id
                 left join product_model pm on pm.id = ifnull(poro.product_model_id, po.product_model_id)
                 left join piece_rate_config prc on prc.product_model_id = pm.id
                     and prc.operation_name = pa.technology_operation_name
                     and prc.status = 1
        <where>
            <if test="startDate != null">and date(pa.scheduling_date) &gt;= #{startDate}</if>
            <if test="endDate != null">and date(pa.scheduling_date) &lt;= #{endDate}</if>
            <if test="userName != null and userName != ''">and pa.scheduling_user_name like concat('%', #{userName}, '%')</if>
        </where>
        group by pa.scheduling_user_id, pa.scheduling_user_name
        order by wages desc
    </select>

    <!-- 工时/报废是报工单级标量，一单多工序时直接 sum 会被行数放大，故用 rn=1 只在其首道工序行计入 -->
    <select id="outputStat" resultType="com.ruoyi.production.bean.vo.DeviceOutputStatVo">
        select
        t.groupName,
        <if test="dimension == 'device'">t.groupId,</if>
        count(distinct t.ppmId) as workCount,
        sum(ifnull(t.finishedNum, 0)) as quantity,
        sum(case when t.rn = 1 then ifnull(t.scrapQty, 0) else 0 end) as scrapQty,
        sum(case when t.rn = 1 then ifnull(t.workHour, 0) else 0 end) as workHour
        from (
            select
            <choose>
                <when test="dimension == 'operation'">pa.technology_operation_name</when>
                <when test="dimension == 'product'">concat(ifnull(p.product_name, ''), '/', ifnull(pm.model, ''))</when>
                <otherwise>ifnull(ppm.device_name, '未指定设备')</otherwise>
            </choose>
            as groupName,
            ppm.device_id as groupId,
            ppm.id as ppmId,
            pa.finished_num as finishedNum,
            ppm.work_hour as workHour,
            ppo.scrap_qty as scrapQty,
            row_number() over (partition by ppm.id order by pa.id) as rn
            from production_account pa
            join production_product_main ppm on ppm.id = pa.production_product_main_id
            left join production_operation_task pot on ppm.production_operation_task_id = pot.id
            left join production_order po on pot.production_order_id = po.id
            left join production_order_routing_operation poro on pot.production_order_routing_operation_id = poro.id
            left join product_model pm on pm.id = ifnull(poro.product_model_id, po.product_model_id)
            left join product p on pm.product_id = p.id
            left join (
                select production_product_main_id, sum(ifnull(scrap_qty, 0)) as scrap_qty
                from production_product_output
                group by production_product_main_id
            ) ppo on ppo.production_product_main_id = ppm.id
            <where>
                <if test="startDate != null">and date(pa.scheduling_date) &gt;= #{startDate}</if>
                <if test="endDate != null">and date(pa.scheduling_date) &lt;= #{endDate}</if>
                <if test="deviceId != null">and ppm.device_id = #{deviceId}</if>
            </where>
        ) t
        group by t.groupName
        <if test="dimension == 'device'">, t.groupId</if>
        order by quantity desc
    </select>

    <select id="getOrderByMainId" resultType="com.ruoyi.production.pojo.ProductionOrder">
@@ -84,18 +186,70 @@
               p.product_name as productName,
               pm.model as productModelName,
               pm.unit,
               top2.name as process,
               pa.technology_operation_name as process,
               ifnull(ppo.quantity, 0) as quantity,
               ifnull(ppo.scrap_qty, 0) as scrapQty
        from production_product_main ppm
               ifnull(ppo.scrap_qty, 0) as scrapQty,
               date(pa.scheduling_date) as schedulingDate,
               pa.scheduling_user_name as schedulingUserName,
               cast(ifnull(ppm.work_hour, 0) as decimal(18,4)) as workHour,
               cast(ifnull(pa.work_hours, 0) as decimal(18,4)) as workHours,
               cast(
                   case
                       when prc.unit_price is not null then ifnull(pa.finished_num, 0) * prc.unit_price
                       when poro.type = 0 then ifnull(pa.work_hours, 0) * ifnull(ppm.work_hour, 0)
                       else ifnull(pa.work_hours, 0) * ifnull(pa.finished_num, 0) *
                            case
                                when substring_index(pm.model, '*', -1) regexp '^[0-9]+(\\.[0-9]+)?$'
                                then cast(substring_index(pm.model, '*', -1) as decimal(18,4))
                                else 1
                            end
                   end
                   as decimal(18,4)
               ) as wages,
               case when prc.unit_price is not null then '计件' else '计时' end as wageMode,
               ppm.device_id as deviceId,
               ppm.device_name as deviceName
        from production_account pa
                 left join production_product_main ppm on ppm.id = pa.production_product_main_id
                 left join production_operation_task pot on ppm.production_operation_task_id = pot.id
                 left join production_order po on pot.production_order_id = po.id
                 left join product_model pm on po.product_model_id = pm.id
                 left join production_order_routing_operation poro on pot.production_order_routing_operation_id = poro.id
                 left join product_model pm on pm.id = ifnull(poro.product_model_id, po.product_model_id)
                 left join product p on pm.product_id = p.id
                 left join technology_routing_operation tro on pot.technology_routing_operation_id = tro.id
                 left join technology_operation top2 on tro.technology_operation_id = top2.id
                 left join product p_parent on p_parent.id = p.parent_id
                 left join production_product_output ppo on ppo.production_product_main_id = ppm.id
        order by ppm.create_time desc
                 left join piece_rate_config prc on prc.product_model_id = pm.id
                     and prc.operation_name = pa.technology_operation_name
                     and prc.status = 1
        <where>
            <if test="c != null">
                <if test="c.productCategory != null and c.productCategory != ''">
                    and p_parent.product_name like concat('%', #{c.productCategory}, '%')
                </if>
                <if test="c.specificationModel != null and c.specificationModel != ''">
                    and pm.model like concat('%', #{c.specificationModel}, '%')
                </if>
                <if test="c.schedulingUserId != null">
                    and pa.scheduling_user_id = #{c.schedulingUserId}
                </if>
                <if test="c.schedulingUserName != null and c.schedulingUserName != ''">
                    and pa.scheduling_user_name like concat('%', #{c.schedulingUserName}, '%')
                </if>
                <if test="c.process != null and c.process != ''">
                    and pa.technology_operation_name like concat('%', #{c.process}, '%')
                </if>
                <if test="c.entryDate != null">
                    and date(pa.scheduling_date) = #{c.entryDate}
                </if>
                <if test="c.entryDateStart != null">
                    and date(pa.scheduling_date) &gt;= #{c.entryDateStart}
                </if>
                <if test="c.entryDateEnd != null">
                    and date(pa.scheduling_date) &lt;= #{c.entryDateEnd}
                </if>
            </if>
        </where>
        order by pa.scheduling_date desc, pa.id desc
    </select>

    <select id="listMain" resultType="java.lang.Long">