手持查询

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>

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));
     }
 
-
     /**
      * 获取字典下拉列表
      */

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);
     }
-
-
 }