Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

7 天以前 04dce61c02c10832665cdaf1aabf5b7e9b31da47

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

@@ -16,12 +16,20 @@
        select ppm.*,
               pwo.work_order_no as workOrderNo,
               pwo.status as workOrderStatus,
               pwo.actual_start_time as actualStartTime,
               pwo.actual_end_time as actualEndTime,
               u.nick_name as nickName
               u.nick_name as nickName,
               p.product_name as productName,
               pm.model as productModelName,
               ppo.quantity,
               pm.unit,
               sl.sales_contract_no salesContractNo
        from
            production_product_main ppm
                left join product_work_order pwo on pwo.id = ppm.work_order_id
                left join product_order po on po.id = pwo.product_order_id
                left join production_product_output ppo on ppm.id = ppo.product_main_id
                left join product_model pm on pm.id = ppo.product_model_id
                left join product p on p.id = pm.product_id
                left join sales_ledger sl on sl.id = po.sales_ledger_id
                left join sys_user u on u.user_id = ppm.user_id
        <where>
            <if test="c.nickName != null and c.nickName != ''">
@@ -38,6 +46,14 @@
            </if>
        </where>
        order by ppm.id

    </select>
    <select id="getOrderByMainId" resultType="com.ruoyi.production.pojo.ProductOrder">
        select po.*
        from product_order po
        left join  product_work_order pwo on po.id = pwo.product_order_id
        left join production_product_main pm on work_order_id=pwo.id
        where pm.id=#{productMainId}
    </select>

    <delete id="deleteByWorkOrderIds" parameterType="java.util.List">