blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
huang
2024-11-11 93b80ffb7f7ffc02bc414271b8ebeac82be6bcb9 
 north-glass-erp/src/main/resources/mapper/pp/Report.xml


@@ -151,6 +151,7 @@


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


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


        <result column="bend_radius" property="bendRadius"/>


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


    </resultMap>




    <!--    流程卡进度-->


@@ -168,7 +169,7 @@


               ifnull(f.inventory, 0)                         as inventory,


               round(ifnull(f.inventory, 0) * a.area, 2)      as inventoryArea,


               ifnull(dd.quantity, 0)                         as shippedQuantity,


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


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


        from flow_card as c


                 left join


             sd.order_detail as a


@@ -335,7 +336,8 @@


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


        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




        from sd.order_detail AS od


        LEFT JOIN sd.order_glass_detail AS ogd


@@ -397,6 +399,9 @@


        </if>


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


            and ogd.technology_number regexp #{workInProgressDTO.technologyNumber}


        </if>


        <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


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


@@ -513,7 +518,7 @@


                           on o.order_id = od.order_id


        where LENGTH(fc.process_id) = 14


          and odpd.process = #{selectProcesses}


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


          and  DATE_FORMAT((o.create_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}


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


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


          and fc.quantity - odpd.reporting_work_num>0


@@ -539,7 +544,7 @@


        round( ogd.child_width * ogd.child_height * dd.breakage_quantity / 1000000, 2 ) as area,


        IFNULL(dd.responsible_personnel,'') as personnel,


        ogd.glass_child,


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


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


        FROM


        sd.ORDER AS o


        LEFT JOIN sd.order_glass_detail AS ogd ON ogd.order_id = o.order_id


@@ -549,7 +554,7 @@


        AND dd.technology_number = ogd.technology_number


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


        WHERE


        rw.reporting_work_time between #{selectTime1} and #{selectTime2}


         DATE_FORMAT((rw.reporting_work_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}


        AND dd.available = 0


        AND LENGTH( rw.process_id )= 14


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


@@ -602,7 +607,7 @@


        AND dd.order_number = ogd.order_number


        AND dd.technology_number = ogd.technology_number


        WHERE


        rw.reporting_work_time between #{selectTime1} and #{selectTime2}


         DATE_FORMAT((rw.reporting_work_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}


        AND dd.available = 0


        AND LENGTH( rw.process_id )= 14


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


@@ -697,7 +702,7 @@


            AND opd.order_number = fc.order_number


            AND opd.technology_number = fc.technology_number




        WHERE o.create_time BETWEEN #{selectTime1} and #{selectTime2}


        WHERE  DATE_FORMAT((o.create_time), '%Y-%m-%d') BETWEEN #{selectTime1} and #{selectTime2}




        GROUP BY o.order_id,


                 fc.order_number,


@@ -728,7 +733,7 @@


            AND opd.order_number = fc.order_number


            AND opd.technology_number = fc.technology_number


        WHERE opd.reporting_work_num > 0


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


          and  DATE_FORMAT((o.create_time), '%Y-%m-%d') BETWEEN #{selectTime1} and #{selectTime2}


          AND position(#{selectProcesses} IN opd.process)


        GROUP BY opd.process, o.order_id


    </select>


@@ -748,7 +753,7 @@


               round(ifnull(f.inventory, 0) * a.area, 2)            as inventoryArea,


               ifnull(dd.quantity, 0)                               as shippedQuantity,


               ifnull(dd.area, 0)                                   as area,


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


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




        from flow_card as c


                 left join


@@ -824,12 +829,12 @@


                                       )             as reportWorkQuantityCount


                            FROM sd.order_process_detail as a


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


                            where o.create_time BETWEEN #{selectTime1} and #{selectTime2}


                            where  DATE_FORMAT((o.create_time), '%Y-%m-%d') BETWEEN #{selectTime1} and #{selectTime2}


                            GROUP BY process_id, a.technology_number) as e


                           on e.process_id = c.process_id


                               and e.technology_number = c.technology_number


                 left join sd.delivery_detail as dd on dd.order_id = a.order_id and dd.order_number = a.order_number


        where d.create_time BETWEEN #{selectTime1} and #{selectTime2}


        where DATE_FORMAT((d.create_time), '%Y-%m-%d') BETWEEN #{selectTime1} and #{selectTime2}


          and reportWorkQuantity is not null


        GROUP BY a.order_id


        ORDER BY a.order_id


@@ -858,18 +863,18 @@


                            FROM sd.`order` AS a


                                     LEFT JOIN reporting_work AS b ON a.order_id = b.order_id


                            WHERE b.this_process = '切割'


                              AND a.create_time BETWEEN #{selectTime1} and #{selectTime2}


                              AND  DATE_FORMAT((a.create_time), '%Y-%m-%d') BETWEEN #{selectTime1} and #{selectTime2}


                            GROUP BY a.order_id) AS orw ON orw.order_id = o.order_id


                 LEFT JOIN (SELECT a.order_id,


                                   SUM(b.reporting_work_num) AS completionsNum


                            FROM sd.`order` AS a


                                     LEFT JOIN sd.order_process_detail AS b ON a.order_id = b.order_id


                            WHERE b.process = '包装'


                              AND a.create_time BETWEEN #{selectTime1} and #{selectTime2}


                              AND  DATE_FORMAT((a.create_time), '%Y-%m-%d') BETWEEN #{selectTime1} and #{selectTime2}


                            GROUP BY a.order_id) AS oopd ON oopd.order_id = o.order_id


                 LEFT JOIN reporting_work AS rw ON rw.order_id = fc.order_id


            AND rw.process_id = fc.process_id


        WHERE o.create_time BETWEEN #{selectTime1} and #{selectTime2}


        WHERE  DATE_FORMAT((o.create_time), '%Y-%m-%d') BETWEEN #{selectTime1} and #{selectTime2}


          AND fc.create_time IS NOT NULL


        GROUP BY o.order_id


    </select>


@@ -889,7 +894,7 @@


                 LEFT JOIN optimize_use AS ou ON modl.use_id = ou.id and ou.raw_stock_code = modl.inventory_id


                 LEFT JOIN flow_card AS fc ON ou.project_no = fc.project_no


        where modl.use_id IS NOT NULL


          and mo.material_requisition_date BETWEEN #{selectTime1} and #{selectTime2}


          and  DATE_FORMAT((mo.material_requisition_date), '%Y-%m-%d') BETWEEN #{selectTime1} and #{selectTime2}


        GROUP BY ou.width, ou.height, material_code


    </select>




@@ -1277,7 +1282,8 @@


        left join sd.order_glass_detail as ogd on ogd.order_id=fc.order_id and ogd.order_number=fc.order_number and ogd.technology_number=fc.technology_number


        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 rw.reporting_work_time between #{selectTime1} and #{selectTime2}


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


               DATE_FORMAT((rw.reporting_work_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}


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


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


            and rw.this_process regexp #{teamOutputDTO.thisProcess}


@@ -1375,7 +1381,8 @@


        left join sd.order_glass_detail as ogd on ogd.order_id=fc.order_id and ogd.order_number=fc.order_number and ogd.technology_number=fc.technology_number


        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 rw.reporting_work_time between #{selectTime1} and #{selectTime2}


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


               DATE_FORMAT((rw.reporting_work_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}


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


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


            and rw.this_process regexp #{teamOutputDTO.thisProcess}


@@ -1692,7 +1699,7 @@


        GROUP BY order_id, order_number) as ps


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


        where ps.processes = #{processes}


        and ps.scheduled_start_time between #{selectTime1} and #{selectTime2}


        and  DATE_FORMAT((ps.scheduled_start_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}


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


            and ps.order_id regexp #{scheduleProductionScheduleDTO.orderId}


        </if>


@@ -1718,7 +1725,7 @@


        GROUP BY order_id, order_number) as ps


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


        where ps.processes = #{processes}


        and ps.scheduled_start_time between #{selectTime1} and #{selectTime2}


        and  DATE_FORMAT((ps.scheduled_start_time), '%Y-%m-%d') between #{selectTime1} and #{selectTime2}


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


            and ps.order_id regexp #{scheduleProductionScheduleDTO.orderId}


        </if>