From d193c0c6769397fde3bc4b5be27951e44f7c34de Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 26 Sep 2023 13:57:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml | 2 ++
 .../main/java/com/op/quality/controller/QuaController.java    | 1 -
 .../op/quality/service/serviceImpl/QcProCheckServiceImpl.java | 4 +---
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml
index 36aa133d..15203ebe 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml
@@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where material_code = #{sku} and CONVERT(varchar(10),plan_time, 120) = CONVERT(varchar(10),#{reqTime}, 120)
         and del_flag = '0'
     </select>
+
     <select id="getAllEquipments" resultType="com.op.mes.domain.dto.BaseEquipmentDto">
         select equipment_id equipmentId,
                equipment_code equipmentCode,
@@ -55,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                equipment_type_name equipmentTypeName
         from base_equipment
         where del_flag = '0'
+        and status = '1'
         <if test="equipmentTypeCode != null  and equipmentTypeCode != ''">
           and equipment_type_code = #{equipmentTypeCode}
         </if>
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java
index e2fb989b..96ca9c7e 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java
@@ -68,7 +68,6 @@ public class QuaController extends BaseController {
         return success(qcProCheckService.getEquipmentList(qcProCheck));
     }
 
-
     /**
      * 获取字典下拉列表
      */
diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java
index a6d969c1..0db2174d 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/serviceImpl/QcProCheckServiceImpl.java
@@ -94,9 +94,7 @@ public class QcProCheckServiceImpl implements QcProCheckService {
     @Override
     public List<QcProCheck> getDictList(QcProCheck qcProCheck) {
         DynamicDataSourceContextHolder.push("master");
-        qcProCheck.setEquipmentTypeCode("cache");
+        qcProCheck.setEquipmentTypeCode("equ_type");
         return qcProCheckMapper.getDictList(qcProCheck);
     }
-
-
 }