生产队列

Signed-off-by: crish <570360737@qq.com>

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

@@ -36,6 +36,10 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("物料号")
     private String partNo;
 
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
     @Column(name="QTY")
     @ApiParam("数量")
     private Double qty;

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -33,12 +34,16 @@ public class MesQueueOrder extends BaseBean {
 
     @Column(name="VIN_CODE")
     @ApiParam("Vin")
-    private Integer vinCode;
+    private String vinCode;
 
     @Column(name="CUST_FLAG_NO")
     @ApiParam("客户标识号")
     private String custFlagNo;
 
+    @Column(name="PROD_CFG_CODE")
+    @ApiParam("产品配置代码")
+    private String prodCfgCode;
+
     @Column(name="SEQ")
     @ApiParam("排序")
     private Double seq;
@@ -59,6 +64,14 @@ public class MesQueueOrder extends BaseBean {
     @ApiParam("区域代码")
     private String areaCode;
 
+    @Transient
+    @ApiParam("起始车号")
+    private String custFlagNoStart;
+
+    @Transient
+    @ApiParam("截至车号")
+    private String custFlagNoEnd;
+
     public int getStatusVal() {
         return this.status == null ? 0 : this.status;
     }

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

@@ -33,7 +33,11 @@ public class MesQueueOrderDetail extends BaseBean {
 
     @Column(name="PART_NO")
     @ApiParam("物料号")
-    private Integer partNo;
+    private String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
 
     @Column(name="SERIAL_NUMBER")
     @ApiParam("产品条码")
@@ -53,7 +57,7 @@ public class MesQueueOrderDetail extends BaseBean {
 
     @Column(name="WORK_TYPE")
     @ApiParam("生产类型")
-    private String workType;
+    private String workOrderType;
 
     @Column(name="PRODUCE_CATEGORY")
     @ApiParam("产品类型")

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

@@ -88,6 +88,10 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
     @Column(name="WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;

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

@@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesPart;
 import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrder;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
 import org.apache.commons.lang3.StringUtils;
 
@@ -155,4 +156,29 @@ public class MesHqlPack {
         DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesWorkOrder.getOrderByParam()} , packBean);
         return packBean;
     }
+
+    /**
+     * 生产队列查询条件封装
+     * @param mesQueueOrder
+     * @return
+     */
+    public static DdlPackBean getQueueOrder(MesQueueOrder mesQueueOrder, String organizeCode) {
+        DdlPackBean packBean = getAllBaseData(organizeCode);
+        if (StringUtils.isNotEmpty(mesQueueOrder.getCustFlagNoStart())) {
+            DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getCustFlagNoStart(), "custFlagNo", packBean);
+        }
+
+        if (StringUtils.isNotEmpty(mesQueueOrder.getCustFlagNoEnd() + "")) {
+            DdlPreparedPack.getStringSmallerPack(mesQueueOrder.getCustFlagNoEnd(), "custFlagNo", packBean);
+        }
+        // 时间段查询
+        DdlPreparedPack.timeBuilder(
+                mesQueueOrder.getCreateDateTimeStart(),
+                mesQueueOrder.getCreateDateTimeEnd(),
+                "createDatetime", packBean, true);
+
+        DdlPreparedPack.getOrderDefault(mesQueueOrder);
+        DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesQueueOrder.getOrderByParam()} , packBean);
+        return packBean;
+    }
 }