修改订单报表

廖井涛

2024-07-24 2a891d0391bc9f2dfaaaee8f63fcb20ff0932202

 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml

@@ -194,7 +194,8 @@
            odpd.broken_num as onceBroken,
            ogd.`group`,
            if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 判断是否已经完成，已经完成不序号和同序号数量相同才能提交
            od.other_columns
            od.other_columns,
            ogd.id as 'glassId'

        FROM
            sd.order_detail AS od
@@ -209,6 +210,7 @@
                               and technology_number =#{technologyStr}
                               limit 1)
        </if>


        LEFT JOIN flow_card AS fc
                ON fc.order_id = ogd.order_id
@@ -469,7 +471,7 @@
            and f.order_number = a.order_number
            and f.technology_number = a.technology_number
        <if test="nextProcess != null and nextProcess != ''">
            left join (select ifnull(sum(completed_quantity),0) as completed_quantity ,
            left join (select sum(ifnull(completed_quantity,0)+ifnull(breakage_quantity,0)) as completed_quantity ,
                            rw.process_id,
                            rwd.order_number,
                            rwd.technology_number,
@@ -591,7 +593,12 @@
    </select>
<!--    查询下工序是否报工-->
    <select id="selectCountByProcessId">
        select count(reporting_work_id) from reporting_work where this_process=#{nextProcess} and process_id=#{processId}
        select count(reporting_work_id)
        from reporting_work
        where
            this_process=#{nextProcess}
            and process_id=#{processId}
            and reviewed_state>-1
    </select>

<!--    查询完工次破数量-->
@@ -600,12 +607,10 @@
               rwd.order_number,
               rwd.technology_number,
               rwd.completed_quantity,
               IFNULL(SUM(dd.breakage_quantity), 0) as breakage_quantity
               rwd.breakage_quantity as breakage_quantity
        from reporting_work as rw
                 left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id
                 left join damage_details as dd
                           on dd.reporting_work_id = rwd.reporting_work_id and dd.order_number = rwd.order_number and
                              dd.technology_number = rwd.technology_number
        left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id

        where rw.reporting_work_id = #{reportingWorkId}
        GROUP BY rwd.order_number, rwd.technology_number
    </select>