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

yuan

5 天以前 84b131de4a1deb526066fc0f7e7514ac43838bf8

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

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

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