38506 23032—PCN端【Q管理作业】，项目排序增加：若改点检项已存在结果，则排序放置最后

38507 23032—PCN端【扭矩管理作业】项目排序增加：若改点检项已存在结果，则排序放置最后。

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/bu/BuFirstOrderService.java

@@ -161,7 +161,7 @@ public class BuFirstOrderService implements IBuFirstOrderService {
         }
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getStringEqualPack(orderNo, "orderNo", packBean);
-        packBean.setOrderByStr(" order by processCode ");
+        packBean.setOrderByStr(" order by checkResult,processCode ");
         return mesFirstOrderDetailRDao.findByHqlWhere(packBean);
     }
 

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckDetailService.java

@@ -52,7 +52,7 @@ public class TorqueManageCheckDetailService implements ITorqueManageCheckService
         DdlPreparedPack.getStringEqualPack(personCheckDetail.getWorkCenterCode(), MesPcnExtConstWords.WORK_CENTER_CODE, packBean);
         DdlPreparedPack.getStringEqualPack(personCheckDetail.getWorkCellCode(), MesPcnExtConstWords.WORK_CELL_CODE, packBean);
         pager = PagerHelper.getPager(pager, torqueManageTaskDetailRepository.findByHqlWhereCount(packBean));
-        packBean.setOrderByStr(" order by processCode ");
+        packBean.setOrderByStr(" order by checkResult, processCode ");
         List<MesProcessTorqueManageTaskDetail> torqueManageTaskDetailList = torqueManageTaskDetailRepository.findByHqlWherePage(packBean, pager);
         for (MesProcessTorqueManageTaskDetail mesProcessTorqueManageTaskDetail : torqueManageTaskDetailList) {
             if (!StringUtils.isEmpty(mesProcessTorqueManageTaskDetail.getTorqueSpecValue())) {