blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
14 小时以前 6db03250bcbf51193b8dd71a698ea2b202c6d6ad 
 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"/>


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


        ps.reviewer,


        od.product_name,


        if(od.shape=1,'普形',if(od.shape=2,'异形','')) as shape,


        ps.scheduling_id


        ps.scheduling_id,


        ps.notes


        from sd.order_detail as od


        left join sd.order as o on od.order_id = o.order_id


        left join production_scheduling as ps


@@ -76,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 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.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}


@@ -137,13 +139,13 @@


        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.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}


@@ -195,7 +197,9 @@


    <update id="examineSchedulingMp">


        update production_scheduling


        set review_status=1,


            reviewer=#{userName}


            reviewer=#{userName},


            scheduling_quantity=#{schedulingQuantity},


            notes=#{notes}


        where scheduling_id = #{schedulingId}


    </update>




@@ -231,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 != ''">


@@ -265,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 != ''">


@@ -286,4 +291,8 @@


        order by ps.id desc


        limit #{offset},#{pageSize};


    </select>




    <update id="cancelReviewSchedulingMp">


        update production_scheduling set   review_status=0    where scheduling_id = #{schedulingId}


    </update>


</mapper>