Merge remote-tracking branch 'origin/dev' into test

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java

@@ -142,7 +142,7 @@ public class MesPlanOrder extends BaseBean {
         return this.status == null ? 0 : this.status;
     }
 
-    public int getOrderTypeVal() {
+    public int getPlanTypeVal() {
         return this.planType == null ? 0 : this.planType;
     }
 }

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.mes.sqlpack;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesPart;
 import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder;
@@ -49,13 +50,13 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(mesPlanOrder.getPartNo())) {
             DdlPreparedPack.getStringEqualPack(mesPlanOrder.getPartNo(), "partNo", packBean);
         }
-        if (StringUtils.isNotEmpty(mesPlanOrder.getPlanType() + "")) {
+        if (StringUtils.isNotEmpty(mesPlanOrder.getPlanType() + "") && mesPlanOrder.getPlanTypeVal() != 0) {
             DdlPreparedPack.getNumEqualPack(mesPlanOrder.getPlanType(), "planType", packBean);
         }
-        if (StringUtils.isNotEmpty(mesPlanOrder.getStatusVal() + "")) {
+        if (StringUtils.isNotEmpty(mesPlanOrder.getStatus() + "") && mesPlanOrder.getStatusVal() != 0) {
-            DdlPreparedPack.getNumEqualPack(mesPlanOrder.getStatusVal(), "status", packBean);
+            DdlPreparedPack.getNumEqualPack(mesPlanOrder.getStatus(), "status", packBean);
         }
-        if (StringUtils.isNotEmpty(mesPlanOrder.getStatusVal() + "")) {
+        if (StringUtils.isNotEmpty(mesPlanOrder.getCreateUser())) {
             DdlPreparedPack.getStringEqualPack(mesPlanOrder.getCreateUser(), "createUser", packBean);
         }
 
@@ -71,7 +72,7 @@ public class MesHqlPack {
         DdlPreparedPack.timeBuilder(
                 mesPlanOrder.getCreateDateTimeStart(),
                 mesPlanOrder.getCreateDateTimeEnd(),
-                "createDateTime", packBean, true);
+                "createDatetime", packBean, true);
 
         // 排序
          DdlPreparedPack.getOrderDefault(mesPlanOrder);
@@ -124,7 +125,7 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(mesWorkOrder.getPartNo())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean);
         }
-        if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderStatus() + "")) {
+        if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean);
         }
         if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCenterCode())) {
@@ -133,7 +134,7 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCellCode())) {
             DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCellCode(), "workCellCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderType() + "")) {
+        if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean);
         }
         if (StringUtils.isNotEmpty(mesWorkOrder.getProdCfgCode())) {
@@ -171,6 +172,7 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(mesQueueOrder.getCustFlagNoEnd() + "")) {
             DdlPreparedPack.getStringSmallerPack(mesQueueOrder.getCustFlagNoEnd(), "custFlagNo", packBean);
         }
+        DdlPreparedPack.getNumEqualPack(MesEnumUtil.QUEUE_ORDER_STATUS.NORMAL.getValue(), "status", packBean);
         // 时间段查询
         DdlPreparedPack.timeBuilder(
                 mesQueueOrder.getCreateDateTimeStart(),

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -182,8 +182,8 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getInPack(String.join(",", WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue() + "",
+        DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue(),
-                WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue() + ""), "poStatus", result);
+                WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue()}, "poStatus", result);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getPoType(), "poType", result);
@@ -954,6 +954,7 @@ public class WmsHqlPack {
         DdlPackBean result =new DdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(),"transTypeCode",result);
         DdlPreparedPack.getNumNOEqualPack(wmsMoveMaster.getId(), "id", result);
         DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result);