Merge remote-tracking branch 'origin/master'

op-modules/op-technology/src/main/java/com/op/technology/controller/ProProcessController.java

@@ -172,11 +172,22 @@ public class ProProcessController extends BaseController {
     /**
      * 查询设工作中心
      */
-    @RequiresPermissions("wms:factory:getWorkCenterList")
+    @RequiresPermissions("mes:pro:process:getWorkCenterList")
     @GetMapping("/getWorkCenterList")
     public TableDataInfo getWorkCenterList(SysFactory sysFactory) {
         startPage();
         List<SysFactory> list = proProcessService.getWorkCenterList(sysFactory);
         return getDataTable(list);
     }
+
+    /**
+     * 查询设工作中心
+     */
+    @RequiresPermissions("mes:pro:process:getEquipmentTypeList")
+    @GetMapping("/getEquipmentTypeList")
+    public TableDataInfo getEquipmentTypeList(Equipment equipment) {
+        startPage();
+        List<Equipment> list = proProcessService.getEquipmentTypeList(equipment);
+        return getDataTable(list);
+    }
 }

op-modules/op-technology/src/main/java/com/op/technology/mapper/ProProcessMapper.java

@@ -76,4 +76,7 @@ public interface ProProcessMapper
 
     //查询下拉式工作中心
     public List<SysFactory> getWorkCenterList(SysFactory sysFactory);
+
+    //查询设备类型
+    List<Equipment> getEquipmentTypeList(Equipment equipment);
 }

op-modules/op-technology/src/main/java/com/op/technology/service/IProProcessService.java

@@ -77,4 +77,7 @@ public interface IProProcessService
 
     //查询下拉式工作中心
     List<SysFactory> getWorkCenterList(SysFactory sysFactory);
+
+    //查询设备类型
+    List<Equipment> getEquipmentTypeList(Equipment equipment);
 }

op-modules/op-technology/src/main/java/com/op/technology/service/impl/ProProcessServiceImpl.java

@@ -245,4 +245,16 @@ public class ProProcessServiceImpl implements IProProcessService {
     public List<SysFactory> getWorkCenterList(SysFactory sysFactory) {
         return proProcessMapper.getWorkCenterList(sysFactory);
     }
+
+    /**
+     * 查询设备类型
+     *
+     * @param equipment 工厂模型
+     * @return 工厂模型
+     */
+    @Override
+    @DS("#header.poolName")
+    public List<Equipment> getEquipmentTypeList(Equipment equipment) {
+        return proProcessMapper.getEquipmentTypeList(equipment);
+    }
 }

op-modules/op-technology/src/main/resources/mapper/technology/ProProcessMapper.xml

@@ -297,9 +297,9 @@
     <select id="selectEquipmentList" parameterType="Equipment" resultMap="EquipmentResult">
         <include refid="selectEquipmentVo"/>
         <where>
-            <if test="equipmentCode != null  and equipmentCode != ''"> and equipment_code = #{equipmentCode}</if>
+            <if test="equipmentCode != null  and equipmentCode != ''"> and equipment_code like concat('%', #{equipmentCode}, '%')</if>
             <if test="equipmentName != null  and equipmentName != ''"> and equipment_name like concat('%', #{equipmentName}, '%')</if>
-            <if test="equipmentTypeCode != null  and equipmentTypeCode != ''"> and equipment_type_code = #{equipmentTypeCode}</if>
+            <if test="equipmentTypeCode != null  and equipmentTypeCode != ''"> and equipment_type_code like concat('%', #{equipmentTypeCode}, '%')</if>
             <if test="equipmentTypeName != null  and equipmentTypeName != ''"> and equipment_type_name like concat('%', #{equipmentTypeName}, '%')</if>
         </where>
     </select>
@@ -323,4 +323,10 @@
 		from sys_factory
 	</select>
 
+    <select id="getEquipmentTypeList" parameterType="Equipment" resultMap="EquipmentResult">
+		select  equipment_type_code,equipment_type_name
+		from base_equipment
+		group by equipment_type_code,equipment_type_name
+	</select>
+
 </mapper>

op-modules/op-wms/src/main/resources/mapper/wms/SysFactoryMapper.xml

@@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</foreach>
 	</delete>
 
-	<select id="getWorkCenterList" parameterType="SysFactory" resultType="SysFactoryResult">
+	<select id="getWorkCenterList" parameterType="SysFactory" resultMap="SysFactoryResult">
 		select  factory_code,factory_name
 		from sys_factory
 	</select>