Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

zss

6 天以前 a0400e48a2e8f50c457e1c4d4ba19bab2a0d1301

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

@@ -19,16 +19,16 @@
        select ppm.*,
        ppm.post_name as postName,
        po.nps_no as npsNo,
        po.strength as strength,
        pms.material_code as materialCode,
        pm.product_name as productName,
        pms.model as productModelName,
        IFNULL(ppi.quantity, 0) as totalQuantity,
        IFNULL(ppo.total_quantity, 0) as totalQuantity,
        IFNULL(ppo.scrap_qty, 0) as scrapQty,
        IFNULL(ppo.quantity, 0) as quantity
        from
        production_product_main ppm
        left join production_product_output ppo on ppo.product_main_id = ppm.id
        left join production_product_input ppi on ppi.product_main_id = ppm.id
        left join product_order po on po.id = ppm.product_order_id
        left join product_order_plan pop on po.id = pop.product_order_id
        left join production_plan pp on pop.production_plan_id = pp.id
@@ -106,6 +106,21 @@
            </if>
        </where>
    </select>
    <select id="selectProductionProductMainDto"
            resultType="com.ruoyi.production.dto.ProductionProductMainDto">
        SELECT ppm.id,
        ppm.product_no,
        ppm.post_name,
        ppm.schedule,
        ppm.reporting_time,
        ppo.quantity,
        ppo.scrap_qty,
        ppo.total_quantity
        FROM production_product_main ppm
        left join production_product_output ppo on ppm.id = ppo.product_main_id
        WHERE product_order_id=#{productOrderId}
        order by reporting_time
    </select>

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