首检、巡检报表新增工单号、产线和产品条码查询条件

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

@@ -940,15 +940,6 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesQcOrder(MesQcOrder qcOrder, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(qcOrder, organizeCode);
-        if (!StringUtils.isEmpty(qcOrder.getRelationOrderNo())) {
-            DdlPreparedPack.getStringEqualPack(qcOrder.getRelationOrderNo(), "relationOrderNo", packBean);
-        }
-        if (!StringUtils.isEmpty(qcOrder.getWorkCenterCode())) {
-            DdlPreparedPack.getStringEqualPack(qcOrder.getWorkCenterCode(), "workCenterCode", packBean);
-        }
-        if (!StringUtils.isEmpty(qcOrder.getProductSn())) {
-            DdlPreparedPack.getStringEqualPack(qcOrder.getProductSn(), "productSn", packBean);
-        }
         if (!StringUtils.isEmpty(qcOrder.getOrderNo())) {
             DdlPreparedPack.getStringEqualPack(qcOrder.getOrderNo(), "orderNo", packBean);
         }
@@ -964,6 +955,12 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(qcOrder.getCheckType())) {
             DdlPreparedPack.getNumEqualPack(qcOrder.getCheckType(), "checkType", packBean);
         }
+        if (!StringUtils.isEmpty(qcOrder.getWorkCenterCode())) {
+            DdlPreparedPack.getNumEqualPack(qcOrder.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(qcOrder.getRelationOrderNo())) {
+            DdlPreparedPack.getNumEqualPack(qcOrder.getRelationOrderNo(), "relationOrderNo", packBean);
+        }
         // 时间段查询
         if (!StringUtils.isEmpty(qcOrder.getCreateDateTimeStart()) || !StringUtils.isEmpty(qcOrder.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(