feat(production): 新增生产工单管理功能 - 创建 ProductionOperationTask 实体类定义工单数据结构 - 实现 ...

liding

10 天以前 fe1b02a121c173e9b2d56bbe5a1982e0e69e0548

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

@@ -14,62 +14,59 @@
        <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"/>
    </resultMap>

    <select id="listPage" resultType="com.ruoyi.production.bean.dto.ProductionPlanDto">
    <select id="listPage" resultType="com.ruoyi.production.bean.vo.ProductionPlanVo">
        SELECT
        pp.*,
        pms.material_code AS materialCode,
        pms.model,
        pms.product_id AS productMaterialId,
        pm.product_name AS productName,
        pm.unit
        pm.model,
        p.id as productId,
        p.product_name AS productName,
        pm.unit,
        sl.sales_contract_no,
        sl.customer_name,
        sl.project_name
        FROM production_plan pp
        left join product_material_sku pms on pp.product_material_sku_id = pms.id
        left join product_material pm on pms.product_id = pm.id
        WHERE 1 = 1
        <if test="c.customerName != null and c.customerName != '' ">
            AND pp.customer_name LIKE CONCAT('%',#{c.customerName},'%')
        </if>
        <if test="c.productName != null and c.productName != '' ">
            AND pm.product_name LIKE CONCAT('%',#{c.productName},'%')
        </if>
        <if test="c.materialCode != null and c.materialCode != '' ">
            AND pms.material_code LIKE CONCAT('%',#{c.materialCode},'%')
        </if>
        <if test="c.model != null and c.model != '' ">
            AND pms.model LIKE CONCAT('%',#{c.model},'%')
        </if>
        <if test="c.status != null">
            AND pp.status =#{c.status}
        </if>
        <if test="c.applyNo != null and c.applyNo != '' ">
            AND pp.apply_no LIKE CONCAT('%',#{c.applyNo},'%')
        </if>
        <if test="c.startDate != null">
            AND pp.start_date &gt;= DATE_FORMAT(#{c.startDate},'%Y-%m-%d')
        </if>
        <if test="c.endDate != null">
            AND pp.end_date &lt;= DATE_FORMAT(#{c.endDate},'%Y-%m-%d')
        </if>
        ORDER BY COALESCE(pp.form_modified_time, pp.id) DESC
        left join product_model pm on pp.product_model_id = pm.id
        left join product p on pm.product_id = p.id
        left join sales_ledger sl on pp.sales_ledger_id = sl.id
        <where>
            <if test="c != null">
                <if test="c.id != null">
                    and pp.id = #{c.id}
                </if>
                <if test="c.productName != null and c.productName != ''">
                    and p.product_name like concat('%', #{c.productName}, '%')
                </if>
                <if test="c.model != null and c.model != ''">
                    and pm.model like concat('%', #{c.model}, '%')
                </if>
                <if test="c.status != null">
                    and pp.status = #{c.status}
                </if>
                <if test="c.mpsNo != null and c.mpsNo != ''">
                    and pp.mps_no like concat('%', #{c.mpsNo}, '%')
                </if>
                <if test="c.requiredDateStart != null and c.requiredDateEnd != null">
                    and pp.required_date between #{c.requiredDateStart} and #{c.requiredDateEnd}
                </if>
            </if>
        </where>
        ORDER BY COALESCE(pp.id) DESC
    </select>

    <select id="selectWithMaterialByIds" resultType="com.ruoyi.production.bean.dto.ProductionPlanDto">
        SELECT
        pp.*,
        pms.material_code AS materialCode,
        pms.model,
        pm.product_name AS productName,
        pm.model,
        p.product_name AS productName,
        pm.unit
        FROM production_plan pp
        LEFT JOIN product_material_sku pms ON pp.product_material_sku_id = pms.id
        LEFT JOIN product_material pm ON pms.product_id = pm.id
        LEFT JOIN product_model pm ON pp.product_model_id = pm.id
        LEFT JOIN product p ON pm.product_id = p.id
        WHERE pp.id IN
        <foreach collection="ids" item="id" open="(" separator="," close=")">
            #{id}
@@ -79,14 +76,31 @@
    <select id="selectProductionPlanDtoById" resultType="com.ruoyi.production.bean.dto.ProductionPlanDto">
        SELECT
        pp.*,
        pms.material_code AS materialCode,
        pms.model,
        pms.product_id AS productMaterialId,
        pm.product_name AS productName,
        pm.model,
        p.product_name AS productName,
        pm.unit
        FROM production_plan pp
        left join product_material_sku pms on pp.product_material_sku_id = pms.id
        left join product_material pm on pms.product_id = pm.id
        left join product_model pm on pp.product_model_id = pm.id
        left join product p on pm.product_id = p.id
        WHERE pp.id = #{productionPlanId}
    </select>
    <select id="getSource" resultType="com.ruoyi.production.bean.vo.ProductionPlanVo">
         SELECT
        pp.*,
        pm.model,
        p.product_name AS productName,
        pm.unit,
        sl.sales_contract_no,
        sl.customer_name,
        sl.project_name
        FROM production_plan pp
        LEFT JOIN product_model pm ON pp.product_model_id = pm.id
        LEFT JOIN product p ON pm.product_id = p.id
        left join sales_ledger sl on pp.sales_ledger_id = sl.id
        WHERE pp.id IN
        <foreach collection="ids" item="id" open="(" separator="," close=")">
            #{id}
        </foreach>
        ORDER BY pp.id ASC
    </select>
</mapper>