fix:1.生产计划 2.生产订单

liding

2026-04-23 8e4456bfa6dc84a1c37c13ee515fa9d6347cc480

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

@@ -4,21 +4,68 @@

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.production.pojo.ProductionPlan">
        <id column="id" property="id" />
        <result column="mps_no" property="mpsNo" />
        <result column="required_date" property="requiredDate" />
        <result column="remark" property="remark" />
        <result column="create_time" property="createTime" />
        <result column="update_time" property="updateTime" />
        <result column="create_user" property="createUser" />
        <result column="update_user" property="updateUser" />
        <result column="product_model_id" property="productModelId" />
        <result column="qty_required" property="qtyRequired" />
        <result column="state" property="state" />
        <result column="issued" property="issued" />
        <result column="source" property="source" />
        <result column="is_audit" property="isAudit" />
        <result column="promised_delivery_date" property="promisedDeliveryDate" />
        <id column="id" property="id"/>
        <result column="mps_no" property="mpsNo"/>
        <result column="required_date" property="requiredDate"/>
        <result column="remark" property="remark"/>
        <result column="create_time" property="createTime"/>
        <result column="update_time" property="updateTime"/>
        <result column="create_user" property="createUser"/>
        <result column="update_user" property="updateUser"/>
        <result column="product_model_id" property="productModelId"/>
        <result column="qty_required" property="qtyRequired"/>
        <result column="issued" property="issued"/>
        <result column="source" property="source"/>
        <result column="is_audit" property="isAudit"/>
        <result column="promised_delivery_date" property="promisedDeliveryDate"/>
    </resultMap>

    <select id="listPage" resultType="com.ruoyi.production.bean.vo.ProductionPlanVo">
        SELECT
        pp.*,
        pms.material_code AS materialCode,
        pmdl.model,
        pms.product_id AS productMaterialId,
        p.product_name AS productName,
        pmdl.unit
        FROM production_plan pp
        left join product_material_sku pms on pp.product_material_sku_id = pms.id
        left join product_model pmdl on pp.product_model_id = pmdl.id
        left join product p on pmdl.product_id = p.id

        ORDER BY COALESCE(pp.form_modified_time, pp.id) DESC
    </select>

    <select id="selectWithMaterialByIds" resultType="com.ruoyi.production.bean.dto.ProductionPlanDto">
        SELECT
        pp.*,
        pms.material_code AS materialCode,
        pmdl.model,
        p.product_name AS productName,
        pmdl.unit,
        pms.product_id AS productMaterialId
        FROM production_plan pp
        LEFT JOIN product_material_sku pms ON pp.product_material_sku_id = pms.id
        LEFT JOIN product_model pmdl ON pp.product_model_id = pmdl.id
        LEFT JOIN product p ON pmdl.product_id = p.id
        WHERE pp.id IN
        <foreach collection="ids" item="id" open="(" separator="," close=")">
            #{id}
        </foreach>
        ORDER BY pp.id ASC
    </select>
    <select id="selectProductionPlanDtoById" resultType="com.ruoyi.production.bean.dto.ProductionPlanDto">
        SELECT
        pp.*,
        pms.material_code AS materialCode,
        pmdl.model,
        pms.product_id AS productMaterialId,
        p.product_name AS productName,
        pmdl.unit
        FROM production_plan pp
        left join product_material_sku pms on pp.product_material_sku_id = pms.id
        left join product_model pmdl on pp.product_model_id = pmdl.id
        left join product p on pmdl.product_id = p.id
        WHERE pp.id = #{productionPlanId}
    </select>
</mapper>