Merge remote-tracking branch 'origin/dev_长治_祥雨远见' into dev_长治_祥雨远见

gongchunyi

5 天以前 9f5813763a54f7fde8b472b0da305d635a624e8f

Merge remote-tracking branch 'origin/dev_长治_祥雨远见' into dev_长治_祥雨远见

# Conflicts:
#	src/main/resources/mapper/production/ProductWorkOrderMapper.xml

 src/main/resources/mapper/production/ProductWorkOrderMapper.xml

@@ -61,7 +61,7 @@
        <if test="c.productOrderId != null and c.productOrderId != ''">
            and pwo.product_order_id = #{c.productOrderId}
        </if>
        order by pwo.work_order_no desc
        order by po.nps_no desc, pwo.work_order_no desc
    </select>

    <select id="getProductWorkOrderFlowCard" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">

 src/main/resources/mapper/production/ProductionProductMainMapper.xml

@@ -49,7 +49,7 @@
                and ppm.status = #{c.status}
            </if>
        </where>
        order by ppm.id
        order by ppm.id desc 

    </select>
    <select id="getOrderByMainId" resultType="com.ruoyi.production.pojo.ProductOrder">