Merge remote-tracking branch 'origin/master'

zhoushihao

2024-08-02 ec4752a2780a1336bbdca510e6888423a794c16d

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/StorageTaskMapper.xml

@@ -3,8 +3,21 @@
<mapper namespace="com.mes.storagetask.mapper.StorageTaskMapper">





    <resultMap id="StorageTaskRequest" type="com.mes.storagetask.entity.request.StorageTaskRequest">

        <result property="loadRack" column="load_rack"/>

        <result property="color" column="color"/>

        <result property="taskState" column="task_state"/>

        <result property="shelfRack" column="shelf_rack"/>

        <result property="startTime" column="start_time"/>

        <result property="rawThickness" column="raw_thickness"/>

        <result property="routeGroup" column="route_group"/>

        <result property="id" column="id"  />

        <result property="taskType" column="task_type"/>

    </resultMap>



    <select id="selectTasks" resultType="java.util.Map">





    <select id="selectTasks" resultMap="StorageTaskRequest">

        <![CDATA[

        SELECT d.*, g.raw_thickness, g.color

        FROM (