blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyujie
2025-06-21 2e2356dd4fec268f6be6ed923b14bfa667de0c0d 
 north-glass-erp/src/main/resources/mapper/pp/Report.xml


@@ -126,6 +126,7 @@


        <result column="reviewed" property="reviewed"/>


        <result column="examine_time" property="examineTime"/>


        <result column="workProcessName" property="workProcessName"/>


        <result column="device_name" property="deviceName"/>


    </resultMap>




    <resultMap id="scheduleProductionScheduleMap" type="com.example.erp.dto.pp.ScheduleProductionScheduleDTO">


@@ -1124,12 +1125,14 @@


               ogd.child_width,


               ogd.child_height,


               odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -


               odpd.broken_num                                        as stockNum,


               odpd.broken_num as stockNum,


               ROUND(ogd.child_width * ogd.child_height *


                     (odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -


                      odpd.broken_num) / 1000000, 2)                  as stockArea,


                      odpd.broken_num) / 1000000, 2) as stockArea,


               od.product_name,


               od.bend_radius


               od.bend_radius,


               ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber,


               rws.teams_groups_name




        from sd.order_detail AS od


                 LEFT JOIN sd.order_glass_detail AS ogd


@@ -1149,7 +1152,7 @@


                           ON odpds.id = odpd.id - 1


                 left join


             (SELECT sum(rw.rework_num) as 'patchNumSum',


                     rw.process_id,


                      rw.process_id,


                     rw.order_sort,


                     rw.technology_number,


                     rwk.this_process


@@ -1165,6 +1168,14 @@


                 and c.technology_number = fc.technology_number


                 left join sd.`order` as o


                           on o.order_id = od.order_id


                 left join


             (


                 select a.process_id,a.teams_groups_name,a.next_process,b.technology_number,b.order_number


                 from reporting_work  as a


                          left join reporting_work_detail as b on a.reporting_work_id=b.reporting_work_id


                 GROUP BY a.process_id,a.teams_groups_name,a.next_process,b.order_number,b.technology_number


             ) as rws on rws.process_id=fc.process_id and rws.order_number=fc.order_number


                 and  rws.technology_number=fc.technology_number and rws.next_process=#{process}


        where  o.create_order>0


          and odpds.reporting_work_num_count + ifnull(c.patchNumSum, 0) - odpd.reporting_work_num_count -


              odpd.broken_num != 0


@@ -1337,9 +1348,10 @@


        JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,


        rw.reviewed,


        rw.examine_time,


        rw.device_name,


--         GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName


        CASE


        WHEN #{laminating} = 'laminating' THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')


        WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')


        ELSE MAX( ogd.glass_child )


        END AS workProcessName


        FROM


@@ -1367,9 +1379,12 @@


        <if test="teamOutputDTO.edgingType != null and teamOutputDTO.edgingType != ''">


            and od.edging_type regexp #{teamOutputDTO.edgingType}


        </if>


        <if test="teamOutputDTO.deviceName != null and teamOutputDTO.deviceName != ''">


            and rw.device_name regexp #{teamOutputDTO.deviceName}


        </if>




        <choose>


            <when test="laminating != 'laminating'">


            <when test="laminating == ''">


                GROUP BY


                rw.reporting_work_id,


                rw.process_id,


@@ -1380,11 +1395,15 @@


            </when>


            <otherwise>


                GROUP BY


                <if test="laminating == 'stepA' || laminating == 'stepC'" >


                    ogd.`group`,


                </if>


                rw.reporting_work_id,


                rw.process_id,


                rw.this_process,


                rw.teams_groups_name,


                rwd.order_number




            </otherwise>


        </choose>


        ORDER BY


@@ -1410,7 +1429,14 @@


        rwd.completed_quantity as completed_quantity,


        ROUND(MAX( ogd.child_width )*MAX( ogd.child_height )*rwd.completed_quantity/1000000,2) as area,


        od.product_name,


        JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code


        JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,


        rw.reviewed,


        rw.examine_time,


        rw.device_name,


        CASE


        WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')


        ELSE MAX( ogd.glass_child )


        END AS workProcessName


        FROM


        reporting_work as rw left join reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id


        left join flow_card as fc on fc.order_id=rw.order_id and fc.process_id=rw.process_id  and fc.order_number=rwd.order_number and fc.technology_number=rwd.technology_number


@@ -1418,15 +1444,31 @@


        left join sd.order_detail as od  on od.order_id=ogd.order_id and od.order_number=ogd.order_number


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


        where o.create_order>0 and rw.reviewed_state>=0 and rwd.completed_quantity>0


          and date(rw.reporting_work_time) >= #{date[0]}


          and date(rw.reporting_work_time) &lt;= #{date[1]}


        and date(rw.reporting_work_time) >= #{date[0]}


        and date(rw.reporting_work_time) &lt;= #{date[1]}


        and position(#{process} in rw.this_process)


        GROUP BY


        rw.reporting_work_id,


        rw.process_id,


        rw.this_process,


        rw.teams_groups_name,


        rwd.order_number


        <choose>


            <when test="laminating == ''">


                GROUP BY


                rw.reporting_work_id,


                rw.process_id,


                rw.this_process,


                rw.teams_groups_name,


                rwd.order_number,


                rwd.technology_number


            </when>


            <otherwise>


                GROUP BY


                <if test="laminating == 'stepA' || laminating == 'stepC'" >


                    ogd.`group`,


                </if>


                rw.reporting_work_id,


                rw.process_id,


                rw.this_process,


                rw.teams_groups_name,


                rwd.order_number


            </otherwise>


        </choose>


        ORDER BY


        rw.this_process,


        rw.process_id,


@@ -1482,7 +1524,7 @@


        </if>




        <choose>


            <when test="laminating != 'laminating'">


            <when test="laminating == ''">


                GROUP BY


                rw.reporting_work_id,


                rw.process_id,


@@ -1893,7 +1935,9 @@


        SUM(od.quantity) AS quantity,


        SUM(odpds.reporting_work_num_count + IFNULL(c.patchNumSum, 0) - odpd.reporting_work_num_count - odpd.broken_num) AS stockNum,


        SUM(ROUND(ogd.child_width * ogd.child_height *


        (odpds.reporting_work_num_count + IFNULL(c.patchNumSum, 0) - odpd.reporting_work_num_count - odpd.broken_num) / 1000000, 2)) AS stockArea


        (odpds.reporting_work_num_count + IFNULL(c.patchNumSum, 0) - odpd.reporting_work_num_count - odpd.broken_num) / 1000000, 2)) AS stockArea,


        CEILING(count(fc.id)/#{pageSize}) as 'pageTotal',


        count(distinct fc.id) as 'total'


        FROM sd.order_detail AS od


        LEFT JOIN sd.order_glass_detail AS ogd


        ON od.order_id = ogd.order_id


@@ -1965,7 +2009,6 @@


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


            and fc.process_id regexp #{workInProgressDTO.processId}


        </if>


        order by o.order_id, fc.process_id


    </select>




    <select id="processToBeCompletedFootSum">


@@ -2097,7 +2140,7 @@


            and od.edging_type regexp #{teamOutputDTO.edgingType}


        </if>


        <choose>


            <when test="laminating != 'laminating'">


            <when test="laminating == ''">


                GROUP BY


                rw.reporting_work_id,


                rw.process_id,