工序判断逻辑修改

guoyujie

2025-11-24 1b804da07a72f4c93016975dac9c7183ff066509

 north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml

@@ -6,7 +6,7 @@

    <insert id="insertOrderProcessDetail" >
        insert into
            order_process_detail(
            sd.order_process_detail(
                order_id,
                order_number,
                technology_number,
@@ -78,11 +78,13 @@
                            when 'stepA' then 3
                            when 'stepD' then 4
                            when 'stepB' then 4
                     end as sort
                            else 1
                     end as sort,
                    b.sort as 'sort2'


        from order_process_detail
        left join (select DISTINCT basic_name,nickname from basic_data where basic_category = 'process') as b
        left join (select DISTINCT basic_name,nickname,sort from basic_data where basic_category = 'process') as b
        on b.basic_name = process
        where order_id = #{orderId}
        group by process) as a
@@ -99,7 +101,7 @@
                                                    group by opd.id) as a
                    GROUP BY process)   as sort1
        on sort1.process = a.process
        order by sort,sort1.count,id
        order by sort,sort2,sort1.count,id

    </select>

@@ -119,7 +121,8 @@
        select
             max(a.technology_number) as rowCount,
             RowNum,
             a.order_number
             a.order_number,
             a.process_id
        from pp.flow_card as a
        left join
            (select min((@i:=@i+1)) AS RowNum,c.*
@@ -264,4 +267,44 @@
                  and b.process = #{thisProcess}
                )
    </select>

    <select id="selectProcessCardProgressSv">
        select a.*,(b.quantity-b.termination_quantity) as 'quantity'
        from order_process_detail as a
        inner join pp.flow_card as b
            on a.order_id = b.order_id
            and a.process_id = b.process_id
            and a.order_number = b.order_number
            and a.technology_number = b.technology_number
        where termination_status = 0
          <if test="orderId != null and orderId != ''">
            and a.order_id=#{orderId}
          </if>
          <if test="processId != null and processId != ''">
            and a.process_id=#{processId}
          </if>
          <if test="orderNumber != null and orderNumber != ''">
            and a.order_number=#{orderNumber}
          </if>
          <if test="technologyNumber != null and technologyNumber != ''">
            and a.technology_number=#{technologyNumber}
          </if>
          <if test="process != null and process != ''">
            and a.process=#{process}
          </if>

    </select>
    
    <select id="selectProcessSort">
        select a.process,
               ROW_NUMBER() OVER (ORDER BY (SELECT NULL)) AS sort,
               ifnull(b.nickname,"") as recombination
        from sd.order_process_detail as a
        inner join sd.basic_data as b
                on a.process = b.basic_name and b.basic_category = 'process'
                where a.order_id = #{orderId}
                and a.process_id = #{processId}
                and a.order_number =#{orderNumber}
                and a.technology_number =#{technologyNumber}
    </select>
</mapper>