修改生产核算

huminmin

2026-07-13 53c0da6e44a01acf9d97bdc7abaf25e5984b92dc

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

@@ -7,6 +7,9 @@
        <id column="id" property="id" />
        <result column="product_no" property="productNo" />
        <result column="production_operation_task_id" property="productionOperationTaskId" />
        <result column="report_type" property="reportType" />
        <result column="audit_status" property="auditStatus" />
        <result column="audit_remark" property="auditRemark" />
        <result column="dept_id" property="deptId" />
        <result column="update_time" property="updateTime" />
        <result column="create_user" property="createUser" />
@@ -16,6 +19,20 @@

    <select id="listPageProductionProductMainDto" resultType="com.ruoyi.production.bean.dto.ProductionProductMainDto">
        select ppm.*,
               ppm.product_no as reportNo,
               case ppm.report_type
                   when 0 then '合格'
                   when 1 then '轻微返工'
                   when 2 then '严重返工'
                   when 3 then '报废'
                   else '未知'
                   end as reportTypeName,
               case ppm.audit_status
                   when 0 then '待审核'
                   when 1 then '审核通过'
                   when 2 then '审核不通过'
                   else '未知'
                   end as auditStatusName,
               pot.work_order_no as workOrderNo,
               case pot.status
                   when 1 then '待确认'
@@ -57,6 +74,12 @@
            <if test="c.productNo != null and c.productNo != ''">
                and ppm.product_no like concat('%', #{c.productNo}, '%')
            </if>
            <if test="c.auditStatus != null">
                and ppm.audit_status = #{c.auditStatus}
            </if>
            <if test="c.reportType != null">
                and ppm.report_type = #{c.reportType}
            </if>
            <if test="c.workOrderNo != null and c.workOrderNo != ''">
                and pot.work_order_no like concat('%', #{c.workOrderNo}, '%')
            </if>
@@ -91,21 +114,91 @@

    <select id="listProductionDetails" resultType="com.ruoyi.production.bean.dto.ProductionProductMainDto">
        select ppm.*,
               ppm.product_no as reportNo,
               case ppm.report_type
                   when 0 then '合格'
                   when 1 then '轻微返工'
                   when 2 then '严重返工'
                   when 3 then '报废'
                   else '未知'
                   end as reportTypeName,
               case ppm.audit_status
                   when 0 then '待审核'
                   when 1 then '审核通过'
                   when 2 then '审核不通过'
                   else '未知'
                   end as auditStatusName,
               pot.work_order_no as workOrderNo,
               p.product_name as productName,
               pm.model as productModelName,
               pm.unit,
               poro.operation_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_id as schedulingUserId,
               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(ifnull(pa.adjust_amount, 0) as decimal(18,4)) as adjustAmount,
               pa.adjust_remark as adjustRemark,
               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)
                       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
        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 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 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
        <where>
            <if test="c != null">
                <if test="c.auditStatus != null">
                    and ppm.audit_status = #{c.auditStatus}
                </if>
                <if test="c.reportType != null">
                    and ppm.report_type = #{c.reportType}
                </if>
                <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">