修改不合格管理

huminmin

2026-07-15 422a5676c2d96dd37c1be62935a314d70fef79b5

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

@@ -51,7 +51,8 @@
               date(ppm.create_time) as schedulingDate,
               su.nick_name as schedulingUserName,
               po_sales.customerName,
               poro.operation_name as process
               poro.operation_name as process,
               ppm.repair_work_hour as repairWorkHour
        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
@@ -138,14 +139,27 @@
               date(pa.scheduling_date) as schedulingDate,
               pa.scheduling_user_id as schedulingUserId,
               pa.scheduling_user_name as schedulingUserName,
               ppm.repair_work_hour as repairWorkHour,
               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(ifnull(pa.adjust_amount, 0) as decimal(18,4)) as adjustAmount,
               pa.adjust_remark as adjustRemark,
               cast(
                   case
                       when poro.type = 0 then ifnull(pa.work_hours, 0) * (ifnull(ppm.work_hour, 0) + ifnull(ppm.repair_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 originalWages,
               cast(
                   case
                       when pa.adjust_amount is not null then ifnull(pa.adjust_amount, 0)
                       when poro.type = 0 then ifnull(pa.work_hours, 0) * ifnull(ppm.work_hour, 0)
                       when poro.type = 0 then ifnull(pa.work_hours, 0) * (ifnull(ppm.work_hour, 0) + ifnull(ppm.repair_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]+)?$'
@@ -172,6 +186,9 @@
                <if test="c.reportType != null">
                    and ppm.report_type = #{c.reportType}
                </if>
                <if test="c.reportType == null">
                    and ppm.report_type in (0, 1)
                </if>
                <if test="c.productCategory != null and c.productCategory != ''">
                    and p_parent.product_name like concat('%', #{c.productCategory}, '%')
                </if>