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

云

2026-04-21 2683793796366a4b6361baf4a16e5c65c8dce068

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

@@ -3,7 +3,7 @@
<mapper namespace="com.ruoyi.production.mapper.ProductOrderMapper">


    <resultMap id="basicMap" type="com.ruoyi.production.pojo.ProductOrder">
    <resultMap id="basicMap" type="com.ruoyi.production2.pojo.ProductOrder">
        <id property="id" column="id"/>
        <result property="productModelId" column="product_model_id"/>
        <result property="tenantId" column="tenant_id"/>
@@ -13,7 +13,7 @@
        <result property="createTime" column="create_time"/>
        <result property="updateTime" column="update_time"/>
    </resultMap>
    <select id="pageProductOrder" resultType="com.ruoyi.production.dto.ProductOrderDto">
    <select id="pageProductOrder" resultType="com.ruoyi.production2.dto.ProductOrderDto">
        select po.*,
        sl.sales_contract_no,
        sl.customer_name,
@@ -41,7 +41,7 @@
        ) shipping_status_counts ON sl.id = shipping_status_counts.sales_ledger_id
            left join product_model pm on po.product_model_id = pm.id
            left join product p on pm.product_id = p.id
        left join sales_ledger_product slp on po.sale_ledger_product_id = slp.id
        left join sales_ledger_product slp on po.sale_ledger_product_id = slp.id and slp.type = 1
        left join product_process_route ppr on po.id = ppr.product_order_id
        left join product_bom pb on pb.id = ppr.bom_id
        <where>
@@ -65,13 +65,13 @@
            </if>
        </where>
    </select>
    <select id="listProcessRoute" resultType="com.ruoyi.production.pojo.ProcessRoute">
    <select id="listProcessRoute" resultType="com.ruoyi.production2.pojo.ProcessRoute">
        select pr.*
        from process_route pr
                 left join product_model pm on pr.product_model_id = pm.id
        where pm.id = #{productModelId}
    </select>
    <select id="listProcessBom" resultType="com.ruoyi.production.dto.ProductStructureDto">
    <select id="listProcessBom" resultType="com.ruoyi.production2.dto.ProductStructureDto">
        select ps.id,
               ps.product_model_id,
               ps.process_id,