生产核算增加折算工时

huminmin

18 小时以前 4467032448645476177dd2751cdf43b7678a2b43

生产核算增加折算工时

 src/main/java/com/ruoyi/production/bean/dto/ProductionProductMainDto.java

@@ -87,6 +87,9 @@
    @Schema(description = "工资定额")
    private BigDecimal workHours;

    @Schema(description = "折算工时")
    private BigDecimal convertedWorkHours;

    @Schema(description = "工资")
    private BigDecimal wages;


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

@@ -49,16 +49,20 @@
        group_concat(distinct pot.work_order_no order by pot.work_order_no separator ',') as workOrderNo,
        cast(sum(
            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) + ifnull(ppm.repair_work_hour, 0))
                else case
                         when ifnull(p.standard_quantity, 0) = 0 then 0
                         else ifnull(pa.finished_num, 0) / ifnull(p.standard_quantity, 0) * 8
                     end
                when ifnull(too.standard_quantity, 0) = 0 then 0
                else ifnull(pa.finished_num, 0) / ifnull(too.standard_quantity, 0) * 8 + ifnull(ppm.repair_work_hour, 0)
            end
        ) as decimal(18,4)) as wages,
        cast(sum(ifnull(pa.finished_num, 0)) as decimal(18,4)) as finishedNum,
        cast(sum(ifnull(pa.work_hours, 0)) as decimal(18,4)) as workHours,
        cast(sum(
            case
                when poro.type = 0 then ifnull(pa.work_hours, 0) + ifnull(ppm.repair_work_hour, 0)
                else case
                         when ifnull(too.standard_quantity, 0) = 0 then 0
                         else ifnull(pa.finished_num, 0) / ifnull(too.standard_quantity, 0) * 8 + ifnull(ppm.repair_work_hour, 0)
                     end
            end
        ) as decimal(18,4)) as workHours,
        cast(sum(ifnull(pa.adjust_amount, 0)) as decimal(18,4)) as adjustAmount,
        cast(sum(ifnull(ppm.work_hour, 0)) as decimal(18,4)) as workHour,
        case
@@ -138,19 +142,14 @@
    <select id="selectUserAccount" resultType="com.ruoyi.production.bean.dto.UserAccountDto">
        select cast(ifnull(sum(
            case
                when pa.adjust_amount is not null then 0
                when poro.type = 0 then 0
                else case
                         when ifnull(p.standard_quantity, 0) = 0 then 0
                         else ifnull(pa.finished_num, 0) / ifnull(p.standard_quantity, 0) * 8
                     end
                when ifnull(too.standard_quantity, 0) = 0 then 0
                else ifnull(pa.finished_num, 0) / ifnull(too.standard_quantity, 0) * 8 + ifnull(ppm.repair_work_hour, 0)
            end
       ), 0) as decimal(18,2)) as accountBalance,
               cast(ifnull(sum(
                   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) + ifnull(ppm.repair_work_hour, 0))
                       else 0
                       when ifnull(too.standard_quantity, 0) = 0 then 0
                       else ifnull(pa.finished_num, 0) / ifnull(too.standard_quantity, 0) * 8 + ifnull(ppm.repair_work_hour, 0)
                   end
               ), 0) as decimal(18,2)) as account
        from production_account pa
@@ -158,6 +157,7 @@
                 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 technology_operation too on poro.technology_operation_id = too.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
        where pa.scheduling_user_id = #{userId}

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

@@ -145,6 +145,17 @@
               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(
                   case
                       when poro.type = 0 then ifnull(pa.work_hours, 0)
                       else case
                                when ifnull(too.standard_quantity, 0) = 0 then 0
                                else ifnull(pa.finished_num, 0) / ifnull(too.standard_quantity, 0) * 8
                            end
                   end
                   + ifnull(ppm.repair_work_hour, 0)
                   as decimal(18,4)
               ) as convertedWorkHours,
               cast(ifnull(pa.adjust_amount, 0) as decimal(18,4)) as adjustAmount,
               pa.adjust_remark as adjustRemark,
               cast(