blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyuji
2024-09-20 cbfb94ee3bbda9cf341d326f55bec2b2f294e321 
 north-glass-erp/src/main/resources/mapper/pp/ProductionScheduling.xml


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


        <result column="scheduling_quantity" property="schedulingQuantity"/>


        <result column="order_number" property="orderNumber"/>


        <result column="scheduling_id" property="schedulingId"/>


        <result column="order_id" property="orderGlassDetail.orderId"/>


        <result column="order_id" property="order.orderId"/>


        <result column="technology_number" property="technologyNumber"/>


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


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


@@ -77,11 +77,12 @@


        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 o.create_order>0


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


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


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


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


            and ogd.order_id regexp #{productionScheduling.orderId}


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


            and ogd.order_id regexp #{productionScheduling.order.orderId}


        </if>


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


            and o.customer_name regexp #{productionScheduling.order.customerName}


@@ -140,11 +141,11 @@


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


        and od.create_time 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.orderId != null and productionScheduling.orderId != ''">


            and ogd.order_id regexp #{productionScheduling.orderId}


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


            and ogd.order_id regexp #{productionScheduling.order.orderId}


        </if>


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


            and o.customer_name regexp #{productionScheduling.order.customerName}


@@ -236,7 +237,7 @@


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


        and od.create_time 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 != ''">


@@ -269,6 +270,7 @@


        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 position(#{processes} in ps.processes)


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


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