blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
廖井涛
2024-07-25 15fa56463061f1e94140e23e98987aa3131714bf 
 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"/>


@@ -80,8 +80,8 @@


        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}


@@ -143,8 +143,8 @@




        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}