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

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/RequestModel.java

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesPart;
+import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-29-11:58
+ * @Modify:
+ **/
+public class RequestModel {
+
+    private List<MesWorkOrder> workOrderList;
+
+    private List<MesPart> partList;
+
+    private List<MesPlanOrder> planOrderList;
+
+    public RequestModel(List<MesWorkOrder> workOrderList, List<MesPart> partList) {
+        this.workOrderList = workOrderList;
+        this.partList = partList;
+    }
+
+    public List<MesWorkOrder> getWorkOrderList() {
+        return workOrderList;
+    }
+
+    public RequestModel() {
+    }
+
+    public void setWorkOrderList(List<MesWorkOrder> workOrderList) {
+        this.workOrderList = workOrderList;
+    }
+
+    public List<MesPart> getPartList() {
+        return partList;
+    }
+
+    public void setPartList(List<MesPart> partList) {
+        this.partList = partList;
+    }
+
+    public List<MesPlanOrder> getPlanOrderList() {
+        return planOrderList;
+    }
+
+    public void setPlanOrderList(List<MesPlanOrder> planOrderList) {
+        this.planOrderList = planOrderList;
+    }
+}

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

@@ -172,15 +172,19 @@ 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(),
                 mesQueueOrder.getCreateDateTimeEnd(),
                 "createDatetime", packBean, true);
 
-        DdlPreparedPack.getOrderDefault(mesQueueOrder);
-        DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesQueueOrder.getOrderByParam()} , packBean);
+        // DdlPreparedPack.getOrderDefault(mesQueueOrder);
+        // 按照队列序列号倒序
+        DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{"seq"} , packBean);
         return packBean;
     }
 }