blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyujie
2025-05-06 43bd3c136f3c2fd7fc54975d763bd2b24a4d0a92 
 north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml


@@ -77,7 +77,8 @@


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


        ogd.technology_number=ps.technology_number


        where ps.scheduling_id IS NOT NULL


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


          and o.create_order>0


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


        and position(#{processes} in ps.processes)


        and position(#{orderIds} in ps.order_id)


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


@@ -138,9 +139,9 @@


        ps.technology_number = ogd.technology_number




        where (od.quantity - IFNULL((ps.schedulingQuantity), 0)) > 0


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


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


        and opd.reporting_work_num_count = 0




        and o.create_order>0


        and position(#{orderIds} in ogd.order_id)


        -- and position("切割" in ps.processes)


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


@@ -234,9 +235,9 @@


        ps.technology_number = ogd.technology_number




        where (od.quantity - IFNULL((ps.schedulingQuantity), 0)) > 0


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


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


        and opd.reporting_work_num_count = 0




        and o.create_order>0


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


        -- and position("切割" in ps.processes)


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


@@ -268,7 +269,8 @@


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


        ogd.technology_number=ps.technology_number


        where ps.scheduling_id IS NOT NULL


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


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


        and o.create_order>0


        and position(#{processes} in ps.processes)


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


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