Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfIntercept.java

@@ -34,9 +34,9 @@ public class BfIntercept extends BaseBean {
     @ApiParam(value ="拦截器名称")
     private String interceptName;
 
+    // BlockFormEnumUtil.EXECUTION_TYPE
     @Column(name="EXECUTE_MODE")
     @ApiParam(value ="执行方式")
-    @JsonSerialize(using = ToStringSerializer.class)
     private Integer executeMode;
 
     @Column(name="EXECUTE_CONTENT")

modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java

@@ -13,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 表单菜单目录
@@ -76,4 +78,8 @@ public class BfMenu extends BaseBean {
     @Column(name = "MENU_STATUS")
     @ApiParam(value = "菜单状态")
     private Integer menuStatus;
+
+    @Transient
+    @ApiParam(value = "菜单状态")
+    private List<BfMenu> bfMenuList;
 }

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

@@ -39,4 +39,8 @@ public class MesAction extends BaseBean {
     @Column(name="ACTION_TYPE")
     @ApiParam("动作类型")
     private Integer actionType;
+
+    public int getActionTypeVal() {
+        return this.actionType == null ? 0 : this.actionType;
+    }
 }

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

@@ -39,4 +39,9 @@ public class MesActionMethod extends BaseBean {
     @Column(name="SEQ")
     @ApiParam("序号")
     private Integer seq;
+
+    public int getSeqVal() {
+        return this.seq == null ? 0 : this.seq;
+    }
+
 }

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

@@ -72,10 +72,18 @@ public class MesBom extends BaseBean {
     @Column(name = "EFF_START_TIME")
     @ApiParam(value = "生效时间")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date effStartTime;
+    private String effStartTime;
 
     @Column(name = "EFF_END_TIME")
     @ApiParam(value = "失效时间")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private Date effEndTime;
+    private String effEndTime;
+
+    public double getQtyVal() {
+        return this.qty == null ? 0.0d : this.qty;
+    }
+
+    public double getitemQtyVal() {
+        return this.itemQty == null ? 0.0d : this.itemQty;
+    }
 }

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

@@ -0,0 +1,62 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-16-17:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_DEFECT_RECORD")
+@Api("生产工单")
+public class MesDefectRecord extends BaseBean {
+    @Column(name="SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="DEFECT_CODE")
+    @ApiParam("不良代码")
+    private String defectCode;
+
+    @Column(name="REPAIR_STATUS")
+    @ApiParam("维修状态")
+    private Integer repairStatus;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name="MEMO")
+    @ApiParam("备注")
+    private String memo;
+
+    public int getRepairStatusVal() {
+        return this.repairStatus == null ? 0 : this.repairStatus;
+    }
+}

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

@@ -39,4 +39,8 @@ public class MesEvent extends BaseBean {
     @Column(name="EVENT_TYPE")
     @ApiParam("事件类型")
     private Integer eventType;
+
+    public int getEventTypeVal() {
+        return this.eventType == null ? 0 : this.eventType;
+    }
 }

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

@@ -39,4 +39,10 @@ public class MesEventAction extends BaseBean {
     @Column(name="SEQ")
     @ApiParam("序号")
     private Integer seq;
+
+    public int getSeqVal() {
+        return this.seq == null ? 0 : this.seq;
+    }
+
+
 }

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

@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-16-17:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_KEY_DATA")
+@Api("设备关键数据")
+public class MesKeyData extends BaseBean {
+    @Column(name="KEY_DATA_CODE")
+    @ApiParam("关键数据代码")
+    private String keyDataCode;
+
+    @Column(name="KEY_DATA_NAME")
+    @ApiParam("关键数据名称")
+    private Integer keyDataName;
+
+    @Column(name="UPPER_LIMIT")
+    @ApiParam("数据上限")
+    private Double upperLimit;
+
+    @Column(name="LOWER_LIMIT")
+    @ApiParam("数据下限")
+    private Double lowerLimit;
+
+    public double getUpperLimitVal() {
+        return this.upperLimit == null ? 0.0d : this.upperLimit;
+    }
+
+    public double getLowerLimitVal() {
+        return this.lowerLimit == null ? 0.0d : this.lowerLimit;
+    }
+}

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

@@ -0,0 +1,93 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-16-17:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_KPSN_RULE")
+@Api("关键件条码校验规则")
+public class MesKpsnRule extends BaseBean {
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="LENGTH")
+    @ApiParam("长度")
+    private Integer length;
+
+    @Column(name="FROM1")
+    @ApiParam("起始1")
+    private Integer from1;
+
+    @Column(name="TO1")
+    @ApiParam("至1")
+    private Integer to1;
+
+    @Column(name="FIX1")
+    @ApiParam("内容1")
+    private String fix1;
+
+    @Column(name="FROM2")
+    @ApiParam("起始2")
+    private Integer from2;
+
+    @Column(name="TO2")
+    @ApiParam("至2")
+    private Integer to2;
+
+    @Column(name="FIX2")
+    @ApiParam("内容2")
+    private String fix2;
+
+    @Column(name="TYPE")
+    @ApiParam("类型")
+    private String type;
+
+    @Column(name="BIND_RULE")
+    @ApiParam("绑定规则")
+    private Integer bandRule;
+
+    @Column(name="SUPPLIER_CODE")
+    @ApiParam("供应商代码")
+    private String supplierCode;
+
+    public int getLengthVal() {
+        return this.length == null ? 0 : this.length;
+    }
+
+    public int getFrom1Val() {
+        return this.from1 == null ? 0 : this.from1;
+    }
+
+    public int getTo1Val() {
+        return this.to1 == null ? 0 : this.to1;
+    }
+
+    public int getFrom2Val() {
+        return this.from2 == null ? 0 : this.from2;
+    }
+
+    public int getTo2Val() {
+        return this.to2 == null ? 0 : this.to2;
+    }
+}

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

@@ -43,4 +43,8 @@ public class MesMethod extends BaseBean {
     @Column(name="METHOD_TYPE")
     @ApiParam("方法类型")
     private Integer methodType;
+
+    public int getMethodTypeVal() {
+        return this.methodType == null ? 0 : this.methodType;
+    }
 }

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

@@ -53,4 +53,16 @@ public class MesPackSpec extends BaseBean {
     @Column(name="SPEC_LEVEL")
     @ApiParam("规格级别")
     private Integer specLevel;
+
+    public double getQtyVal() {
+        return this.qty == null ? 0.0d : this.qty;
+    }
+
+    public int getIsMixedVal() {
+        return this.isMixed == null ? 0 : this.isMixed;
+    }
+
+    public int getSpecLevelVal() {
+        return this.specLevel == null ? 0 : this.specLevel;
+    }
 }

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

@@ -63,4 +63,12 @@ public class MesPart extends BaseBean {
     @Column(name="PACK_SPEC_CODE")
     @ApiParam("包装规格代码")
     private String packSpecCode;
+
+    @Column(name="DEFAULT_WORK_CENTER")
+    @ApiParam("默认工作中心")
+    private String defaultWorkCenter;
+
+    @Column(name="PRODUCE_CATEGORY")
+    @ApiParam("产品类型")
+    private String  produceCategory;
 }

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

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-16-17:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PART_SCHEDULE_BOM")
+@Api("生产排程清单")
+public class MesPartScheduleBom extends BaseBean {
+    @Column(name="PART_NO")
+    @ApiParam("排程物料号")
+    private String partNo;
+
+    @Column(name="ITEM_PART_NO")
+    @ApiParam("关联物料号")
+    private Integer itemPartNo;
+
+    @Column(name="ITEM_QTY")
+    @ApiParam("用量")
+    private String itemQty;
+
+    @Column(name="SCHEDULE_TYPE")
+    @ApiParam("排程类型")
+    private Double scheduleType;
+
+    public double getScheduletTypeVal() {
+        return this.scheduleType == null ? 0.0d : this.scheduleType;
+    }
+}

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

@@ -0,0 +1,101 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-16-17:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PLAN_ORDER")
+@Api("生产主计划")
+public class MesPlanOrder extends BaseBean {
+    @Column(name="ORDER_NO")
+    @ApiParam("生产计划单号")
+    private String orderNo;
+
+    @Column(name="ORDER_TYPE")
+    @ApiParam("计划类型")
+    private Integer orderType;
+
+    @Column(name="PROD_CFG_CODE")
+    @ApiParam("产品配置代码")
+    private String prodCfgCode;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="PLAN_QTY")
+    @ApiParam("计划数量")
+    private Double planQty;
+
+    @Column(name="DECOMPOSE_QTY")
+    @ApiParam("分解数量")
+    private Double decomposeQty;
+
+    @Column(name="STATUS")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name="START_TIME")
+    @ApiParam("计划开始时间")
+    private String startTime;
+
+    @Column(name="END_TIME")
+    @ApiParam("计划结束时间")
+    private String endTime;
+
+    @Column(name="DELIVERY_DATE")
+    @ApiParam("交货日期")
+    private String deliveryDate;
+
+    @Column(name="CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name="CUST_ORDER_NO")
+    @ApiParam("客户订单号")
+    private String custOrderNo;
+
+    @Column(name="SOURCE")
+    @ApiParam("计划来源")
+    private String source;
+
+    @Column(name="MEMO")
+    @ApiParam("备注")
+    private String memo;
+
+    public double getPlanQtyVal() {
+        return this.planQty == null ? 0.0d : this.planQty;
+    }
+
+    public double getDecomposeQtyVal() {
+        return this.decomposeQty == null ? 0.0d : this.decomposeQty;
+    }
+
+    public int getStatusVal() {
+        return this.status == null ? 0 : this.status;
+    }
+
+    public int getOrderTypeVal() {
+        return this.orderType == null ? 0 : this.orderType;
+    }
+}

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

@@ -55,4 +55,16 @@ public class MesProcessBom extends BaseBean {
     @Column(name = "IS_CHECK")
     @ApiParam(value = "是否检查")
     private Integer isCheck;
+
+    public double getQtyVal() {
+        return this.qty == null ? 0.0d : this.qty;
+    }
+
+    public int getIsRepeatVal() {
+        return  this.isRepeat == null ? 0 : this.isRepeat;
+    }
+
+    public int getIsCheckVal() {
+        return this.isCheck == null ? 0 : this.isCheck;
+    }
 }

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

@@ -37,6 +37,10 @@ public class MesProdCfgDetail extends BaseBean {
     private String partNo;
 
     @Column(name="IS_VIRTUAL")
-    @ApiParam("产品配置类型代码")
+    @ApiParam("是否虚零件")
     private Integer isVirtual;
+
+    public int getIsVirtualVal() {
+        return this.isVirtual == null ? 0 : this.isVirtual;
+    }
 }

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

@@ -54,4 +54,12 @@ public class MesProdRouteOptParam extends BaseBean {
     @Column(name = "PARAM_VALUE")
     @ApiParam("工步参数值")
     private String paramValue;
+
+    public long getProdRouteCfgIdVal() {
+        return this.prodRouteCfgId == null ? 0l : this.prodRouteCfgId;
+    }
+
+    public int getStepSeq() {
+        return this.stepSeq == null ? 0 : this.stepSeq;
+    }
 }

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

@@ -0,0 +1,126 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-16-17:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PRODUCE_SN")
+@Api("产品条码表")
+public class MesProduceSn extends BaseBean {
+
+    @Column(name="SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name="QC_STATUS")
+    @ApiParam("质量状态")
+    private Integer qcStatus;
+
+    @Column(name="SN_STATUS")
+    @ApiParam("条码状态")
+    private Integer snStatus;
+
+    @Column(name="PRINT_COUNT")
+    @ApiParam("打印次数")
+    private Integer printCount;
+
+    @Column(name="PRINT_STATUS")
+    @ApiParam("打印状态")
+    private Integer printStatus;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name="ROUTE_CODE")
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @Column(name="PROCESS_CODE")
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @Column(name="NEXT_PROCESS_CODE")
+    @ApiParam("下一工序代码")
+    private String nextProcessCode;
+
+    @Column(name="IN_WC_TIME")
+    @ApiParam("进产线时间")
+    private String inWorkCenterTime;
+
+    @Column(name="OUT_WC_TIME")
+    @ApiParam("出产线时间")
+    private String outWorkCenterTime;
+
+    @Column(name="SHIPPING_TIME")
+    @ApiParam("发运时间")
+    private String shippingTime;
+
+    @Column(name="WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @Column(name="CUST_SN")
+    @ApiParam("客户条码")
+    private String custSn;
+
+    @Column(name="CUST_PART_NO")
+    @ApiParam("客户零件号")
+    private String custPartNo;
+
+    @Column(name="PACKAGE_SN")
+    @ApiParam("包装条码")
+    private String packageSn;
+
+    public double getQtyVal() {
+        return this.qty == null ? 0.0d : this.qty;
+    }
+
+    public int getQcStatusVal() {
+        return this.qcStatus == null ? 0 : this.qcStatus;
+    }
+
+    public int getSnStatusVal() {
+        return this.snStatus == null ? 0 : this.snStatus;
+    }
+
+    public int getPrintCountVal() {
+        return this.printCount == null ? 0 : this.printCount;
+    }
+
+    public int getPrintStatusVal() {
+        return this.printStatus == null ? 0 : this.printStatus;
+    }
+}

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

@@ -0,0 +1,69 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-16-17:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_QUEUE_ORDER")
+@Api("生产队列主表")
+public class MesQueueOrder extends BaseBean {
+    @Column(name="ORDER_NO")
+    @ApiParam("主队列编号")
+    private String orderNo;
+
+    @Column(name="VIN_CODE")
+    @ApiParam("Vin")
+    private Integer vinCode;
+
+    @Column(name="CUST_FLAG_NO")
+    @ApiParam("客户标识号")
+    private String custFlagNo;
+
+    @Column(name="SEQ")
+    @ApiParam("排序")
+    private Double seq;
+
+    @Column(name="WORK_ORDER_NO")
+    @ApiParam("生产工单号")
+    private String workOrderNo;
+
+    @Column(name="STATUS")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name="CUST_PROD_LINE_CODE")
+    @ApiParam("客户产线代码")
+    private String custProdLineCode;
+
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    public int getStatusVal() {
+        return this.status == null ? 0 : this.status;
+    }
+
+    public double getSeq() {
+        return this.seq == null ? 0.0d : this.seq;
+    }
+}

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

@@ -0,0 +1,73 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-16-17:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_QUEUE_ORDER_DETAIL")
+@Api("生产队列明细")
+public class MesQueueOrderDetail extends BaseBean {
+    @Column(name="ORDER_NO")
+    @ApiParam("工单号")
+    private String orderNo;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private Integer partNo;
+
+    @Column(name="SERIAL_NUMBER")
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @Column(name="DETAIL_SEQ")
+    @ApiParam("队列明细序号")
+    private Double detailSeq;
+
+    @Column(name="QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name="STATUS")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name="WORK_TYPE")
+    @ApiParam("生产类型")
+    private String workType;
+
+    @Column(name="PRODUCE_CATEGORY")
+    @ApiParam("产品类型")
+    private String produceCategory;
+
+    public double getDetailSeqVal() {
+        return this.detailSeq == null ? 0.0d : this.detailSeq;
+    }
+
+    public double getQtyVal() {
+        return this.qty == null ? 0.0d : this.qty;
+    }
+
+    public int getStatusVal() {
+        return this.status == null ? 0 : this.status;
+    }
+}

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

@@ -50,4 +50,12 @@ public class MesRouteProcess extends BaseBean {
     @Column(name = "IS_NECESSARY")
     @ApiParam("是否必须")
     private Integer isNecessary;
+
+    public int getSeqVal() {
+        return this.seq == null ? 0 : this.seq;
+    }
+
+    public int getIsNecessaryVal() {
+        return this.isNecessary == null ? 0 : this.isNecessary;
+    }
 }

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

@@ -50,4 +50,8 @@ public class MesRouteProcessStep extends BaseBean {
     @Column(name = "PARAM_VALUE")
     @ApiParam("工步参数值")
     private String paramValue;
+
+    public int getStepSeqVal() {
+        return this.stepSeq == null ? 0 : this.stepSeq;
+    }
 }

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

@@ -0,0 +1,141 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-16-17:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_WORK_ORDER")
+@Api("生产工单")
+public class MesWorkOrder extends BaseBean {
+    @Column(name="ORDER_NO")
+    @ApiParam("工单号")
+    private String orderNo;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="PROD_CFG_CODE")
+    @ApiParam("产品配置代码")
+    private String prodCfgCode;
+
+    @Column(name="QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name="COMPLETE_QTY")
+    @ApiParam("完成数量")
+    private Double completeQty;
+
+    @Column(name="REPAIR_QTY")
+    @ApiParam("返修数量")
+    private Double repairQty;
+
+    @Column(name="SCRAP_QTY")
+    @ApiParam("报废数量")
+    private Double scrapQty;
+
+    @Column(name="SEQ")
+    @ApiParam("工单序号")
+    private Double seq;
+
+    @Column(name="WO_STATUS")
+    @ApiParam("工单状态")
+    private Integer workOrderStatus;
+
+    @Column(name="WO_TYPE")
+    @ApiParam("工单类型")
+    private Integer workOrderType;
+
+    @Column(name="NEXT_ORDER")
+    @ApiParam("下一工单")
+    private String nextOrder;
+
+    @Column(name="PLAN_ORDER_NO")
+    @ApiParam("生产计划单号")
+    private String planOrderNo;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name="SCHEDULE_DATE")
+    @ApiParam("排产日期")
+    private String scheduleDate;
+
+    @Column(name="CUST_PROD_LINE_CODE")
+    @ApiParam("客户禅产线代码")
+    private String custProdLineCode;
+
+    @Column(name="SHIFT_CODE")
+    @ApiParam("班次")
+    private String shiftCode;
+
+    @Column(name="START_TIME")
+    @ApiParam("开始时间")
+    private String startTime;
+
+    @Column(name="END_TIME")
+    @ApiParam("结束时间")
+    private String endTime;
+
+    @Column(name="WO_SOURCE")
+    @ApiParam("工单来源")
+    private String workOrderSource;
+
+    @Column(name="MEMO")
+    @ApiParam("备注")
+    private String memo;
+
+    public double getQtyVal() {
+        return this.qty == null ? 0.0d : this.qty;
+    }
+
+    public double getCompleteQtyVal() {
+        return this.completeQty == null ? 0.0d : this.completeQty;
+    }
+
+    public double getRepairQtyVal() {
+        return this.repairQty == null ? 0.0d : this.repairQty;
+    }
+
+    public double getScrapQtyVal() {
+        return this.scrapQty == null ? 0.0d : this.scrapQty;
+    }
+
+    public double getSeqVal() {
+        return this.seq == null ? 0.0d : this.seq;
+    }
+
+    public int getWorkOrderStatusVal() {
+        return this.workOrderStatus == null ? 0 : this.workOrderStatus;
+    }
+
+    public int getWorkOrderTypeVal() {
+        return this.workOrderType == null ? 0 : this.workOrderType;
+    }
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDefectRecordRepositoty.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesDefectRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-17-17:01
+ * @Modify:
+ **/
+@Repository
+public interface MesDefectRecordRepositoty extends BaseRepository<MesDefectRecord, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKeyDataRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesKeyData;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-17-17:03
+ * @Modify:
+ **/
+public interface MesKeyDataRepository extends BaseRepository<MesKeyData, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesKpsnRuleReposity.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesKpsnRule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-17-17:04
+ * @Modify:
+ **/
+@Repository
+public interface MesKpsnRuleReposity extends BaseRepository<MesKpsnRule, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartScheduleBomRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartScheduleBom;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-17-17:07
+ * @Modify:
+ **/
+@Repository
+public interface MesPartScheduleBomRepository extends BaseRepository<MesPartScheduleBom, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlanOrderRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-17-17:08
+ * @Modify:
+ **/
+@Repository
+public interface MesPlanOrderRepository extends BaseRepository<MesPlanOrder, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProduceSnRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-17-17:10
+ * @Modify:
+ **/
+@Repository
+public interface MesProduceSnRepository extends BaseRepository<MesProduceSn, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueOrderDetailRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderDetail;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-17-17:12
+ * @Modify:
+ **/
+@Repository
+public interface MesQueueOrderDetailRepository extends BaseRepository<MesQueueOrderDetail, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQueueOrderRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrder;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-17-17:11
+ * @Modify:
+ **/
+@Repository
+public interface MesQueueOrderRepository extends BaseRepository<MesQueueOrder, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkOrderRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-04-17-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesWorkOrderRepository extends BaseRepository<MesWorkOrder, Long> {
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/FormModel.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.model.form;
 
+import cn.estsh.i3plus.pojo.form.bean.BfButton;
 import cn.estsh.i3plus.pojo.form.bean.BfLayout;
 import cn.estsh.i3plus.pojo.form.bean.BfMethod;
 import cn.estsh.i3plus.pojo.form.bean.BfMethodDetail;
@@ -33,6 +34,18 @@ public class FormModel {
     @ApiParam(value = "功能布局")
     private BfLayout layout;
 
+    // 表单功能按钮
+    @ApiParam(value = "表单功能按钮")
+    private List<BfButton> formButtonList;
+
+    // 表单功能明细按钮
+    @ApiParam(value = "表单功能明细按钮")
+    private List<BfButton> methodDetailButtonList;
+
+    // 元素功能按钮
+    @ApiParam(value = "元素功能按钮")
+    private List<BfButton> elementButtonList;
+
     // 功能明细
     @ApiParam(value = "功能明细")
     private List<BfMethodDetail> methodDetailList;
@@ -40,4 +53,5 @@ public class FormModel {
     // 元素
     @ApiParam(value = "元素Model")
     private List<ElementModel> elementModelList;
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java

@@ -115,10 +115,6 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam(value = "是否散件", example = "1")
     private Integer isPart;
 
-    @Column(name = "IS_SN")
-    @ApiParam(value = "是否指定条码", example = "1")
-    private Integer isSn;
-
     @Transient
     @ApiParam(value = "发运单号")
     private String shipOrderNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java

@@ -105,7 +105,7 @@ public class WmsPOMasterDetails extends BaseBean {
 
     @Column(name = "SNP")
     @ApiParam("标准包装")
-    public Integer snp;
+    public Double snp;
 
     /**
      * 是否免费:0=计费,1=免费

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

@@ -136,18 +136,19 @@ public class WmsHqlPack {
      * @param wmsDocMovementMaster
      * @return
      */
-    public static String packWmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packWmsDocMovementMaster(WmsDocMovementMaster wmsDocMovementMaster) {
+        DdlPackBean packBean = new DdlPackBean();
+//        StringBuffer result = new StringBuffer();
 
         //查询参数封装
-        HqlPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result);
-        HqlPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", result);
-        HqlPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", result);
-        HqlPack.getStringLikerPack(wmsDocMovementMaster.getCustNo(), "custNo", result);
+        DdlPreparedPack.getStringRightLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
+        DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", packBean);
+        DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
+        DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
 
-        getStringBuilderPack(wmsDocMovementMaster, result);
+        getStringBuilderPack(wmsDocMovementMaster, packBean);
 
-        return result.toString();
+        return packBean;
     }
 
     /**
@@ -412,16 +413,16 @@ public class WmsHqlPack {
      * @param wmsOpType
      * @return
      */
-    public static String packHqlWmsOpType(WmsOpType wmsOpType) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlWmsOpType(WmsOpType wmsOpType) {
+        DdlPackBean result = new DdlPackBean();
 
-        HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
-        HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result);
-        HqlPack.getNumEqualPack(wmsOpType.getSeq(), "seq", result);
+        DdlPreparedPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
+        DdlPreparedPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result);
+        DdlPreparedPack.getNumEqualPack(wmsOpType.getSeq(), "seq", result);
 
         getStringBuilderPack(wmsOpType, result);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -461,15 +462,15 @@ public class WmsHqlPack {
         return result.toString();
     }
 
-    public static String packHqlWmsOpTypeUnique(WmsOpType wmsOpType) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlWmsOpTypeUnique(WmsOpType wmsOpType) {
+        DdlPackBean result = new DdlPackBean();
 
-        HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
-        HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result);
+        DdlPreparedPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result);
+        DdlPreparedPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result);
 
         getStringBuilderPack(wmsOpType, result);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -984,28 +985,28 @@ public class WmsHqlPack {
      * @param wmsMoveDetails
      * @return
      */
-    public static String packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails) {
-        StringBuffer result = new StringBuffer();
-
-        HqlPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", result);
-        HqlPack.getStringEqualPack(wmsMoveDetails.getPartNo(), "partNo", result);
-        HqlPack.getStringLikerPack(wmsMoveDetails.getPartNameRdd(), "partNameRdd", result);
-        HqlPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", result);
-        HqlPack.getStringEqualPack(wmsMoveDetails.getCustNo(), "custNo", result);
-        HqlPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", result);
-        HqlPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", result);
-        HqlPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", result);
-        HqlPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", result);
-        HqlPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", result);
-        HqlPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(), "srcLocateNo", result);
-        HqlPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(), "destLocateNo", result);
-        HqlPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", result);
-        HqlPack.getNumEqualPack(wmsMoveDetails.getRefType(), "refType", result);
-        HqlPack.getStringLikerPack(wmsMoveDetails.getRefSrc(), "refSrc", result);
-
-        getStringBuilderPack(wmsMoveDetails, result);
+    public static DdlPackBean packHqlWmsMoveDetails(WmsMoveDetails wmsMoveDetails) {
+        DdlPackBean packBean = new DdlPackBean();
+//        StringBuffer result = new StringBuffer();
+        DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getOrderNo(), "orderNo", packBean);
+        DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(wmsMoveDetails.getPartNameRdd(), "partNameRdd", packBean);
+        DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getVendorNo(), "vendorNo", packBean);
+        DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getCustNo(), "custNo", packBean);
+        DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getUnit(), "unit", packBean);
+        DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcWhNo(), "srcWhNo", packBean);
+        DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestWhNo(), "destWhNo", packBean);
+        DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcZoneNo(), "srcZoneNo", packBean);
+        DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestZoneNo(), "destZoneNo", packBean);
+        DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getSrcLocateNo(), "srcLocateNo", packBean);
+        DdlPreparedPack.getStringEqualPack(wmsMoveDetails.getDestLocateNo(), "destLocateNo", packBean);
+        DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getItemStatus(), "itemStatus", packBean);
+        DdlPreparedPack.getNumEqualPack(wmsMoveDetails.getRefType(), "refType", packBean);
+        DdlPreparedPack.getStringLikerPack(wmsMoveDetails.getRefSrc(), "refSrc", packBean);
+
+        getStringBuilderPack(wmsMoveDetails, packBean);
 
-        return result.toString();
+        return packBean;
     }
 
     /**
@@ -1430,13 +1431,13 @@ public class WmsHqlPack {
      *
      * @return
      */
-    public static String packHqlWmsDataAuth(WmsDataAuth dataAuth, List<String> roleIds) {
-        StringBuffer result = new StringBuffer();
-        HqlPack.getStringEqualPack(dataAuth.getDataObj(), "dataObj", result);
+    public static DdlPackBean packHqlWmsDataAuth(WmsDataAuth dataAuth, List<String> roleIds) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(dataAuth.getDataObj(), "dataObj", result);
         String data = String.join(",", roleIds);
-        HqlPack.getInPackString(data, "roleCode", result);
+        DdlPreparedPack.getInPack(data, "roleCode", result);
         getStringBuilderPack(new WmsDataAuth(), result);
-        return result.toString();
+        return result;
     }
 
     /**
@@ -1445,8 +1446,8 @@ public class WmsHqlPack {
      * @param groupDataAuth
      * @return
      */
-    public static String packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlWmsTaskDetail(Map<String, List<WmsDataAuth>> groupDataAuth) {
+        DdlPackBean result = new DdlPackBean();
         Set<Map.Entry<String, List<WmsDataAuth>>> entries = groupDataAuth.entrySet();
         //拼sql
         entries.stream().filter(o -> !Strings.isNullOrEmpty(o.getKey())).forEach(o -> {
@@ -1457,25 +1458,25 @@ public class WmsHqlPack {
                 List<Map> mapList = JSONObject.parseArray(data, Map.class);
                 if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.WAREHOUSE.getValue() + "", o.getKey())) {
                     for (Map whNoItem : mapList) {
-                        HqlPack.getInOrPackString(whNoItem.get("WH_CODE").toString(), "destWhNo", result);
+                        DdlPreparedPack.getInOrPackString(whNoItem.get("WH_CODE").toString(), "destWhNo", result);
                     }
                 } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.LOCATE.getValue() + "", o.getKey())) {
                     for (Map locateNoItem : mapList) {
-                        HqlPack.getInOrPackString(locateNoItem.get("LOCATE_NO").toString(), "destLocateNo", result);
+                        DdlPreparedPack.getInOrPackString(locateNoItem.get("LOCATE_NO").toString(), "destLocateNo", result);
                     }
                 } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.ZONE.getValue() + "", o.getKey())) {
                     for (Map zoneNoItem : mapList) {
-                        HqlPack.getInOrPackString(zoneNoItem.get("ZONE_CODE").toString(), "destZoneNo", result);
+                        DdlPreparedPack.getInOrPackString(zoneNoItem.get("ZONE_CODE").toString(), "destZoneNo", result);
                     }
                 } else if (StringUtils.equalsIgnoreCase(WmsEnumUtil.DATA_OBJ_TYPE.MATERIAL.getValue() + "", o.getKey())) {
                     for (Map zoneNoItem : mapList) {
-                        HqlPack.getInOrPackString(zoneNoItem.get("PART_NO").toString(), "partNo", result);
+                        DdlPreparedPack.getInOrPackString(zoneNoItem.get("PART_NO").toString(), "partNo", result);
                     }
                 }
             }
         });
         getStringBuilderPack(new WmsDataAuth(), result);
-        return result.toString();
+        return result;
     }
 
     /**
@@ -1485,14 +1486,17 @@ public class WmsHqlPack {
      * @param vals
      * @return
      */
-    public static String packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> vals) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> vals) {
+        DdlPackBean packBean = new DdlPackBean();
         String data = String.join(",", vals);
-        HqlPack.getInPackString(data, columnName, result);
-        HqlPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", result);
-        HqlPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", result);
-        getStringBuilderPack(bean, result);
-        return result.toString();
+        DdlPreparedPack.getInPack(data, columnName, packBean);
+        DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean);
+        DdlPreparedPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", packBean);
+
+        getStringBuilderPack(bean, packBean);
+
+        DdlPreparedPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, packBean);
+        return packBean;
     }
 
     /**