fix:生产核算-对应工序

liding

2026-04-15 a97eb69a7233fc36a794832210fb1b0de037f2bb

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

@@ -14,7 +14,9 @@
        <result property="updateTime" column="update_time"/>
        <result property="expectedSchedule" column="expected_schedule"/>
        <result property="manufacturingTeam" column="manufacturing_team"/>
        <result property="isEnd" column="is_end"/>
    </resultMap>

    <select id="pageProductOrder" resultType="com.ruoyi.production.dto.ProductOrderDto">
        select po.*,
        sl.sales_contract_no,
@@ -22,7 +24,9 @@
        p.product_name as product_category,
        pm.model as specification_model,
        pm.unit,
        pm.uid_no,
        ppr.process_route_code,
        pb.id as bomId,
        pb.bom_no,
        ROUND(po.complete_quantity / po.quantity * 100, 2) AS completionStatus,
        DATEDIFF(sl.delivery_date, CURDATE()) AS delivery_days_diff,
@@ -57,10 +61,10 @@
                and sl.customer_name like concat('%',#{c.customerName},'%')
            </if>
            <if test="c.productCategory != null and c.productCategory != ''">
                and slp.product_category like concat('%',#{c.productCategory},'%')
                and p.product_name like concat('%',#{c.productCategory},'%')
            </if>
            <if test="c.specificationModel != null and c.specificationModel != ''">
                and slp.specification_model like concat('%',#{c.specificationModel},'%')
                and pm.model like concat('%',#{c.specificationModel},'%')
            </if>
            <if test="c.startTime != null and c.endTime != null">
                and po.create_time between #{c.startTime} and #{c.endTime}
@@ -83,6 +87,7 @@
               p.product_name,
               pp.name as  process_name,
               pm.product_id,
               pm.uid_no,
               pm.model
        from
            product_structure ps