Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

huang

2024-11-26 45f64d8b130c57ff2b8e8442d65ab7a490e915e3

 north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml

@@ -32,6 +32,31 @@
        <!--        </association>-->

    </resultMap>
    
    <resultMap id="optimizeProjectMangeMap" type="com.example.erp.entity.pp.OptimizeProjectMange">
        <result property="id" column="id"/>
        <result property="projectNumber" column="project Number"/>
        <result property="projectName" column="project Name"/>
        <result property="glassType" column="glass Type"/>
        <result property="thickness" column="thickness"/>
        <result property="type" column="type"/>
        <result property="state" column="state"/>
        <result property="quantity" column="quantity"/>
        <result property="area" column="area"/>
        <result property="processCardQuantity" column="process Card Quantity"/>
        <result property="usingQuantity" column="using Quantity"/>
        <result property="temperedLoadingRate" column="tempered loading rate"/>
        <result property="numberOfTemperingFurnaces" column="number of tempering furnaces"/>
        <result property="averageCuttingRate" column="average cutting rate"/>
        <result property="effectiveCuttingRate" column="effective cutting rate"/>
        <result property="residueGlassCuttingRate" column="residue glass cutting rate"/>
        <result property="processCardCollection" column="process card collection"/>
        <result property="averageCuttingRate1" column="average cutting rate1"/>
        <result property="notes" column="notes"/>
        <result property="creator" column="creator"/>
        <result property="createTime" column="create time"/>
        <result property="modifyTime" column="modify time"/>
    </resultMap>

    <select id="selectWordOrder" resultMap="wordOrderMap">
        select
@@ -105,7 +130,86 @@
                           on fcss.process_id = fc.process_id and fcss.order_number = fc.order_number
        where position(#{optionVal} in ogd.glass_child)
        GROUP BY fc.process_id, fc.technology_number
        ORDER BY fc.process_id,fc.technology_number
        ORDER BY fc.process_id, fc.technology_number
    </select>

    <select id="optimizeProjectMangeMp"  resultMap="optimizeProjectMangeMap">
        select p.`id`                                AS `id`,
               p.`project_no`                        AS `Project Number`,
               p.`project_name`                      AS `Project Name`,
               p.`glass_type`                        AS `Glass Type`,
               p.`glass_thickness`                   AS `Thickness`,
               p.`type`                              AS `Type`,
               p.`state`                             AS `State`,
               p.`glass_total`                       AS `Quantity`,
               p.`glass_total_area`                  AS `Area`,
               p.`process_qty`                       AS `Process Card Quantity`,
               p.`raw_stock_qty`                     AS `Using Quantity`,
               concat((`p`.`load_rate` * 100), ' %') AS `Tempered loading rate`,
               `p`.`furnaces_qty`                    AS `Number of tempering furnaces`,
               concat(`p`.`avg_cut_pct`, ' %')       AS `Average cutting rate`,
               concat(`p`.`valid_cut_pct`, ' %')     AS `Effective cutting rate`,
               concat(`p`.`last_cut_pct`, ' %')      AS `Residue glass cutting rate`,
               `p`.`process_cards`                   AS `Process card collection`,
               `p`.`frist_stock_qty`                 AS `Amount of original glass usage 1`,
               concat(`p`.`frist_cut_pct`, ' %')     AS `Average cutting rate 1`,
               `p`.`remark`                          AS `Notes`,
               `a`.`name`                            AS `Creator`,
               `p`.`create_time`                     AS `Create time`,
               `p`.`update_time`                     AS `Modify time`
        from pp.optimize_project as p
                 left join pp.optimize_admin as a on p.creater = a.Id
        where (`p`.`state` > -(1))
            and DATE (`p`.`create_time`) BETWEEN #{startSelectTime} AND #{endSelectTime}
        <if test="optimizeProjectMange.projectNumber != null and optimizeProjectMange.projectNumber != ''">
            and p.project_no regexp #{optimizeProjectMange.projectNumber}
        </if>
        <if test="optimizeProjectMange.state!= null">
            and p.state = #{optimizeProjectMange.state}
        </if>
        order by `p`.`create_time` desc, `p`.`project_no`
    </select>
    <!--修改工程状态-->
    <update id="updateProjectStateMp">
        update pp.optimize_project as p
        set p.state = #{state}
        where p.project_no = #{projectNumber}
    </update>

    <!--删除工程-->
    <delete id="deleteProjectMp">
        delete from pp.optimize_project
        where project_no = #{projectNumber}
    </delete>

    <select id="getProjectListMp">
        SELECT
            p.id,
            p.project_no,
            p.project_name,
            p.glass_type,
            p.glass_thickness,
            p.type,
            p.state,
            p.glass_total,
            p.glass_total_area,
            p.process_qty,
            p.process_cards,
            p.remark,
            a.name,
            p.create_time,
            p.update_time
        FROM
            (
                pp.optimize_project p
                    LEFT JOIN pp.optimize_admin a ON ((
                    p.creater = a.Id
                    )))
        WHERE
            ( p.state = 1 )
        ORDER BY
            p.create_time DESC,
            p.project_no
    </select>

</mapper>