新版430
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
Lius
2023-12-07 4337640b7ab86136baed2fd6aa959e4828a75cea 
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml


@@ -168,7 +168,7 @@


                #{id}


            </foreach>


        </where>


        ORDER BY me.equipment_id


        ORDER BY sd.depart_order


    </select>




    <!--根据设备编号查询设备信息和产线信息-->


@@ -191,7 +191,7 @@


                #{id}


            </foreach>


        </where>


        ORDER BY me.equipment_id


        ORDER BY mp.production_order


    </select>




    <!--根据大屏车间id查询设备列表-->


@@ -204,7 +204,7 @@


        <where>


            AND mwe.workshop_id = #{ workshopEquipmentVo.workshopId }


            <if test="workshopEquipmentVo.equipmentId != null and workshopEquipmentVo.equipmentId != ''">


                AND mwe.equipment_id = #{equipmentId}


                AND mwe.equipment_id = #{ workshopEquipmentVo.equipmentId }


            </if>


        </where>


        ORDER BY me.equipment_id