Q管理、扭矩管理点检明细报表增加作业单号查询条件

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/FirstOrderDetailDao.java

@@ -48,6 +48,10 @@ public class FirstOrderDetailDao implements IFirstOrderDetailDao {
             hql += " and forder.workOrderNo like :workOrderNo";
         }
 
+        if(!StringUtils.isEmpty(mesFirstOrderDetail.getOrderNo())){
+            hql += " and forder.orderNo like :orderNo";
+        }
+
         if(!StringUtils.isEmpty(mesFirstOrderDetail.getProcessCode())){
             hql += " and fdetail.processCode = :processCode ";
         }
@@ -116,6 +120,10 @@ public class FirstOrderDetailDao implements IFirstOrderDetailDao {
             queryObject.setParameter(MesExtConstWords.WORK_ORDER_NO, "%"+ mesFirstOrderDetail.getWorkOrderNo() +"%");
         }
 
+        if(!StringUtils.isEmpty(mesFirstOrderDetail.getOrderNo())){
+            queryObject.setParameter(MesExtConstWords.ORDER_NO, "%"+ mesFirstOrderDetail.getOrderNo() +"%");
+        }
+
         if(!StringUtils.isEmpty(mesFirstOrderDetail.getProcessCode())){
             queryObject.setParameter(MesExtConstWords.PROCESS_CODE, mesFirstOrderDetail.getProcessCode());
         }

modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/sqlpack/MesExtHqlPack.java

@@ -808,6 +808,7 @@ public class MesExtHqlPack {
 
     public static DdlPackBean getMesProcessTorqueManageTaskDetail(MesProcessTorqueManageTaskDetail torqueManageTaskDetail) {
         DdlPackBean packBean = getAllBaseData(torqueManageTaskDetail.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(torqueManageTaskDetail.getOrderJobNo(), MesExtConstWords.ORDER_JOB_NO, packBean);
         DdlPreparedPack.getStringLikerPack(torqueManageTaskDetail.getWorkOrderNo(), MesExtConstWords.WORK_ORDER_NO, packBean);
         DdlPreparedPack.getStringLikerPack(torqueManageTaskDetail.getProcessCode(), MesExtConstWords.PROCESS_CODE, packBean);
         DdlPreparedPack.getStringLikerPack(torqueManageTaskDetail.getWorkCenterCode(), MesExtConstWords.WORK_CENTER_CODE, packBean);