blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyuji
2024-07-18 09897d2adec822b398c652bc3b8e6b6cfd6a6b2b 
 north-glass-erp/src/main/resources/mapper/pp/Report.xml


@@ -118,6 +118,7 @@


        <result column="completed_quantity" property="completedQuantity"/>


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


        <result column="product_name" property="productName"/>


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


    </resultMap>




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


@@ -287,7 +288,7 @@


                   reporting_work as rwk


                   on rw.reporting_work_id = rwk.reporting_work_id


              where rwk.this_process = #{selectProcesses}


                and rw.review_status = 1


                and rw.review_status >= 0


              GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c


             on c.process_id = fc.process_id


                 and c.order_sort = fc.order_number


@@ -298,7 +299,6 @@


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


              odpd.broken_num != 0


          and odpd.process = #{selectProcesses}


          and o.create_time between #{selectTime1} and #{selectTime2}


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


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




@@ -989,7 +989,7 @@


                   reporting_work as rwk


                   on rw.reporting_work_id = rwk.reporting_work_id


              where rwk.this_process = #{process}


                and rw.review_status = 1


                and rw.review_status >= 0


              GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c


             on c.process_id = fc.process_id


                 and c.order_sort = fc.order_number


@@ -1165,7 +1165,8 @@


        od.edging_type,


        rwd.completed_quantity,


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


        od.product_name


        od.product_name,


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


        FROM


        reporting_work AS rw


        LEFT JOIN reporting_work_detail AS rwd ON rw.reporting_work_id = rwd.reporting_work_id


@@ -1313,7 +1314,7 @@


                   reporting_work as rwk


                   on rw.reporting_work_id = rwk.reporting_work_id


              where rwk.this_process = #{selectProcesses}


                and rw.review_status = 1


                and rw.review_status >= 0


              GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c


             on c.process_id = fc.process_id


                 and c.order_sort = fc.order_number


@@ -1324,7 +1325,6 @@


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


              odpd.broken_num != 0


          and odpd.process = #{selectProcesses}


          and o.create_time between #{selectTime1} and #{selectTime2}


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


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




@@ -1375,7 +1375,7 @@


                   reporting_work as rwk


                   on rw.reporting_work_id = rwk.reporting_work_id


              where rwk.this_process = #{selectProcesses}


                and rw.review_status = 1


                and rw.review_status >= 0


              GROUP BY rw.process_id, rw.order_sort, rw.technology_number) as c


             on c.process_id = fc.process_id


                 and c.order_sort = fc.order_number


@@ -1386,7 +1386,6 @@


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


              odpd.broken_num != 0


          and odpd.process = #{selectProcesses}


          and o.create_time between #{selectTime1} and #{selectTime2}


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


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