art: 下料接口，上下料查询接口修改

zhangherong

20 小时以前 9e97ded95f71e4c736bf11464ea2c25860d2aab8

 src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialLoadingMapper.xml

@@ -4,21 +4,41 @@
    <select id="queryUnloadingByLoadingId" resultType="org.jeecg.modules.mes.entity.MesMaterialUnloading">
        select * from mes_material_unloading where loading_id = #{loadingId} and del_flag = 0 order by create_time desc
    </select>
    <select id="queryLoadingByWorkOrderId" resultType="org.jeecg.modules.mes.entity.MesMaterialLoading">
        select mml.* ,mpwo.work_order_code as workOrderCode
        from mes_material_loading mml
                 left join mes_production_work_order mpwo on mml.work_order_id = mpwo.id
        where mml.work_order_id = #{workOrderId}
          and mml.del_flag = 0
    </select>

    <select id="queryPageList" resultType="org.jeecg.modules.mes.entity.MesMaterialLoading">
        SELECT
            t1.*,
            t2.work_order_code workOrderCode,
            t3.equipment_name equipmentName
        FROM mes_material_loading t1
        LEFT JOIN mes_production_work_order t2 ON t1.work_order_id = t2.id
        LEFT JOIN eam_equipment t3 ON t1.equipment_id = t3.id
        ${ew.customSqlSegment}
        select *
        from (SELECT m.id,
                     m.create_by,
                     m.create_time,
                     m.material_number,
                     m.material_name,
                     m.factory_id,
                     m.warehouse_id,
                     m.batch_number,
                     m.steel_ball_size,
                     m.quantity,
                     m.remaining_quantity,
                     m.unloading_flag,
                     'LOADING' AS category
              FROM mes_material_loading m
              WHERE m.del_flag = 0
              UNION ALL
              SELECT t1.id,
                     t1.create_by,
                     t1.create_time,
                     t1.material_number,
                     t1.material_name,
                     t2.factory_id,
                     t2.warehouse_id,
                     t2.batch_number,
                     t2.steel_ball_size,
                     t1.quantity,
                     t2.remaining_quantity,
                     t2.unloading_flag,
                     'UNLOADING' AS category
              FROM mes_material_unloading t1
              INNER JOIN mes_material_loading t2 ON t1.loading_id = t2.id
              WHERE t1.del_flag = 0) mml
            ${ew.customSqlSegment}
    </select>
</mapper>