blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
2025-07-29 1bc669f980c7cdb13d96eec27053ead30f2f6aec 
 north-glass-erp/src/main/resources/mapper/pp/Report.xml


@@ -178,6 +178,7 @@


#                c.quantity,


               c.quantity as thisQuantity,/*用于判断是否改变颜色*/


               e.reportWorkQuantity,


               e.reportWorkQuantityShow,


               e.reportWorkQuantityCount,


               e.reportWorkTime,


               e.broken_num,


@@ -219,6 +220,10 @@


                                          GROUP_CONCAT(concat("\"", process, "\":\"", if(technology_number!=1 and (bd.nickname='stepD' || bd.nickname='stepB' ) ,0,reporting_work_num), "\"")),


                                          '}'


                                       )             as reportWorkQuantity,


                                   concat('{',


                                          GROUP_CONCAT(concat("\"", process, "\":\"", if(technology_number!=1 and (bd.nickname='stepD' || bd.nickname='stepB' ) ,0,reporting_work_num), "\"")),


                                          '}'


                                       )             as reportWorkQuantityShow,


                                   concat('{',


                                          GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num_count, "\"")),


                                          '}'


@@ -2113,7 +2118,7 @@


        WHERE


            rw.reporting_work_time >= #{selectTime1}


          AND rw.reporting_work_time <  #{selectTime2}


          AND dd.available = 0


          AND dd.available = 0 and rw.reviewed_state>=0


        <if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">


            and o.order_id regexp #{damageReportDTO.orderId}


        </if>


@@ -2223,7 +2228,7 @@


    </select>




    <select id="workInProgressMpdataList1" resultMap="workInProgressMap">


        select if(#{selectProcesses}='',d.process,#{selectProcesses}) as thisProcess,


        select d.process as thisProcess,


        fc.process_id,


        o.customer_name,


        o.project,


@@ -2296,14 +2301,16 @@




        ) as d


        on d.process_id=fc.process_id and d.order_number=fc.order_number and d.technology_number=fc.technology_number


        and position(#{selectProcesses} in d.process)


        left join sd.`order` as o on o.order_id=od.order_id


        LEFT JOIN sd.basic_data AS bd ON bd.basic_name = d.process


        where  o.create_order>0


        and d.numCounts +d.patchNumSum - d.numCount - d.broken_num != 0


        and d.process!=SUBSTRING_INDEX(ogd.process, '->', 1)


        and position(#{selectProcesses} in d.process)


        and position(#{orderId} in od.order_id)


        and position(#{inputProject} in o.project)


        <if test="workInProgressDTO.thisProcess != null and workInProgressDTO.thisProcess != ''">


            and d.process regexp #{workInProgressDTO.thisProcess}


        </if>


        <if test="workInProgressDTO.customerName != null and workInProgressDTO.customerName != ''">


            and o.customer_name regexp #{workInProgressDTO.customerName}


        </if>


@@ -2328,8 +2335,21 @@


        <if test="workInProgressDTO.glassNumber != null and workInProgressDTO.glassNumber != ''">


            and ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') regexp #{workInProgressDTO.glassNumber}


        </if>


        group by fc.process_id, fc.order_number, fc.technology_number,d.process


        order by fc.process_id, fc.order_number, fc.technology_number


        <choose>


            <when test="laminating != null and laminating == 'stepC'">


                GROUP BY fc.process_id, fc.order_number, ogd.`group`, d.process


            </when>


            <when test="laminating != null and laminating == 'stepD'">


                GROUP BY fc.process_id, fc.order_number, d.process


            </when>


            <when test="laminating != null and laminating == 'stepB'">


                GROUP BY fc.process_id, fc.order_number, d.process


            </when>


            <otherwise>


                GROUP BY fc.process_id, fc.order_number, fc.technology_number, d.process


            </otherwise>


        </choose>


        order by d.process,fc.process_id, fc.order_number, fc.technology_number


        limit #{offset},#{pageSize};


    </select>




@@ -2736,7 +2756,8 @@


                                          on e.id=(f.id-1) and e.process_id = f.process_id and e.order_number = f.order_number and e.technology_number =f.technology_number


                       where


                           e.id is not null


                         and (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)>0 ) as g


                         and (e.reporting_work_num_count+f.patchNumSum-f.reporting_work_num_count-f.broken_num)>0 group by f.process_id, f.order_number,


        f.technology_number) as g


                            <choose>


                                <when test="laminating == 'stepC' and process == '预压'">


                                    GROUP BY g.process_id, g.order_number, g.technology_number


@@ -2825,7 +2846,8 @@


        on e.id=(f.id-1) and e.process_id = f.process_id and e.order_number = f.order_number and e.technology_number =f.technology_number


        where


        e.id is not null


        and e.reporting_work_num_count-f.reporting_work_num_count>0 ) as g


        and e.reporting_work_num_count-f.reporting_work_num_count>0 group by f.process_id, f.order_number,


        f.technology_number) as g


        <choose>


            <when test="laminating == 'stepC' and process == '预压'">


                GROUP BY g.process_id, g.order_number, g.technology_number