blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
廖井涛
2024-08-01 fa32e887b8fdcd4a2bc3326306cbc558e119a9bb 
 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


@@ -79,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}


@@ -142,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}


@@ -195,7 +196,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>




@@ -286,4 +289,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>