From 8e39c9bbf8a8bb4707f2a766295b40497ae96706 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 01 九月 2023 13:46:54 +0800
Subject: [PATCH] MOM系统-9-01 生产订单 生产计划完成

---
 standard-server/src/main/resources/mapper/DeviceMapper.xml |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/standard-server/src/main/resources/mapper/DeviceMapper.xml b/standard-server/src/main/resources/mapper/DeviceMapper.xml
index 38e63fd..f6cc9da 100644
--- a/standard-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/standard-server/src/main/resources/mapper/DeviceMapper.xml
@@ -56,10 +56,18 @@
             AND d.`father` = #{fatherName}
         </if>
     </select>
+
     <select id="getDeviceNameByGroup" resultType="java.util.Map">
-        select id, name
+        select id as deviceid, name deviceName
         from mom_ocean.device
-        where state=1
-        and father=#{deviceGroup}
+        where state = 1
+          and father = #{deviceGroup}
+          and device_status in (1, 5)
+    </select>
+    <!--閫夋嫨璁惧缁�-->
+    <select id="chooseDevGroup" resultType="java.util.Map">
+        select distinct father
+        from mom_ocean.device
+        where state=1 and device_status in(1,5)
     </select>
 </mapper>

--
Gitblit v1.9.3