feature 设备增加排序规则

cx-aps/cx-aps-common/src/main/resources/mybatis/ApsProcessOperationProcessEquDao.xml

@@ -425,16 +425,19 @@
             a1.PROCESSDEVICEID as processdeviceid,
             a1.PROCESSDEVICE as processdevice,
             apl.PRODUCTLINENAME as productlinename,
+            b.CHECKITEMTYPE,
             apl.ID as productlineid
         FROM
             aps_process_operation_process_equ a1
                 LEFT JOIN aps_resources_equipment ape on ape.EQUIPMENTID = a1.PROCESSDEVICEID AND ape.DELETED = '0'
                 LEFT JOIN aps_production_line apl on ape.MAINID =apl.ID AND apl.DELETED = '0'
+            left join asp_check_items b on a1.PROCESSDEVICEID =b.ID
         WHERE
             a1.DELETED = '0'
           and a1.TENANTID=#{factoryId}
         ORDER BY
             a1.PROCESSWORKSHOP,
+            b.CHECKITEMTYPE,
             a1.PROCESSDEVICE
     </select>
 </mapper>