Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

廖井涛

2024-03-07 f60327c377097f67ed42c349bda2a54c3147b7be

 north-glass-erp/target/classes/mapper/pp/FolwCard.xml

@@ -81,7 +81,38 @@
                    </if>


        group by a.process_Id;
        group by a.process_Id
        ORDER BY a.id desc
        limit #{offset},#{pageSize};
    </select>


    <select id="getPageTotal">
        select
        CEILING(count(a.process_Id)/#{pageSize}) as 'pageTotal',
        count(distinct a.process_Id) as 'total'
        from flow_card as a left join sd.`order` as b on a.order_Id=b.order_id
        left join sd.order_detail as c on a.order_Id=c.order_id and a.order_Number=c.order_number
        where a.create_time between #{selectTime1} and #{selectTime2}
        <if test="flowCard.orderId != null and flowCard.orderId != ''">
            and a.order_id regexp #{flowCard.orderId}
        </if>
        <if test="flowCard.productionId != null and flowCard.productionId != ''">
            and a.process_Id regexp #{flowCard.productionId}
        </if>
        <if test="flowCard.orderDetail.productId != null and flowCard.orderDetail.productId != ''">
            and c.product_id regexp #{flowCard.orderDetail.productId}
        </if>
        <if test="flowCard.orderDetail.productName != null and flowCard.orderDetail.productName!= ''">
            and c.product_name regexp #{flowCard.orderDetail.productName}
        </if>

        <if test="flowCard.order.project != null and flowCard.order.project!= ''">
            and b.project regexp #{flowCard.order.project}
        </if>


        limit #{offset},#{pageSize};
    </select>

    <!--分架查询-->
@@ -132,7 +163,7 @@
    </select>

<!--    分架明细查询-->
    <select id="DetailsSelectMp" resultMap="flowCardMap">
    <select id="detailsSelectMp" resultMap="flowCardMap">
        select od.order_id,
        ogd.production_id,
        od.product_id,
@@ -159,7 +190,7 @@
    </select>

    <!--    更新分架状态-->
    <update id="UpdateDeleteState">
    <update id="updateDeleteState">
        update
            sd.order_glass_detail as ogd left join flow_card as fc
                on ogd.order_id=fc.order_id and ogd.order_number=fc.order_number
@@ -169,14 +200,14 @@
    </update>

    <!--    删除流程卡-->
    <update id="DeleteFlowCardMp">
    <update id="deleteFlowCardMp">
        delete from flow_card as fc where fc.process_id=#{processId}
    </update>

    <!--    分架新增明细查询-->

    <!--resultMap="flowCardMap"-->
    <select id="SelectNoCardMp" >
    <select id="selectNoCardMp" >

        select
        od.order_number,
@@ -203,14 +234,14 @@
    </select>

    <!--修改排版状态-->
    <update id="UpdateLayoutStatusMp">
    <update id="updateLayoutStatusMp">
        update flow_card as fc
        set fc.layout_status=2
        where fc.process_id = #{processId}
    </update>

<!--    查询对应流程卡号排版状态-->
    <select id="SelectLayoutStatus">
    <select id="selectLayoutStatus">
        select fc.layout_status
        from flow_card as fc
        where fc.process_id = #{processId}
@@ -218,13 +249,13 @@
    </select>

<!--    查询报工表内是否有对应流程卡-->
    <select id="ReportingWorkCount">
    <select id="reportingWorkCount">
        select COUNT(rw.process_id)
        from reporting_work as rw
        where rw.process_id = #{processId}
    </select>
<!--    插入Flow_card表-->
    <insert id="AddFlowCardMp">
    <insert id="addFlowCardMp">
        insert into
            flow_card (
            order_id,
@@ -260,27 +291,27 @@
    </insert>

<!--    更新分架状态-->
    <update id="UpdateFlowState">
    <update id="updateFlowState">
        update sd.order_glass_detail as ogd
        set ogd.splitting_status=1
        where ogd.production_id=#{productionId} and ogd.order_number=#{orderNumber}
    </update>
<!--    查询未分架的条数-->
    <select id="SelectFlowCount">
    <select id="selectFlowCount">
        select COUNT(*)
        from sd.order_glass_detail as ogd
        where ogd.order_id = left(#{productionId},10)
          and ogd.splitting_status = 0
    </select>
<!--   修改订单表分架状态-->
    <update id="UpdateProcessingCard">
    <update id="updateProcessingCard">
        update sd.`order` as o
        set o.processing_card=#{state}
        where o.order_id=left(#{productionId},10)
    </update>

<!--    查询已排版数据-->
    <select id="SelectOkSchedulingMp">
    <select id="selectOkSchedulingMp">
        select od.order_id,o.customer_name,o.project,od.order_number,od.width,od.height,od.quantity,
               round(od.width*od.height*od.quantity/1000000,2),
               (od.quantity-IFNULL(ps.scheduling_quantity,0)),
@@ -294,7 +325,7 @@

    </select>
<!--    查询未排版数据-->
    <select id="SelectNoSchedulingMp">
    <select id="selectNoSchedulingMp">

    </select>
<!--    首次查询排版数据-->
@@ -312,7 +343,7 @@
    </select>

<!--   查询对应序号的层数-->
    <select id="SelectLayer">
    <select id="selectLayer">
        select COUNT(ogd.order_number)
        from sd.order_glass_detail as ogd
        where ogd.production_id = #{productionId}