From 5677ab158fb78d1267c16bbbf29eb690e0b4039f Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 十二月 2023 16:53:39 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
index cef5f36..945127c 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml
+++ b/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
--
Gitblit v1.9.3