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

6 years ago · 31d53c515c
parent 3b47469aad f64d1fb89f
commit 31d53c515c
14 changed files with 687 additions and 35 deletions
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java
@ -0,0 +1,58 @@
+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 Integer partNo;
+
+    @Column(name="DEFECT_CODE")
+    @ApiParam("不良代码")
+    private String defectCode;
+
+    @Column(name="REPAIR_STATUS")
+    @ApiParam("维修状态")
+    private Double repairStatus;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private Double workCenterCode;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private Double workCellCode;
+
+    @Column(name="MEMO")
+    @ApiParam("备注")
+    private Double memo;
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java
@ -0,0 +1,45 @@
+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;
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.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_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;
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
+++ b/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;
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java
@ -0,0 +1,45 @@
+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;
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java
@ -0,0 +1,85 @@
+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;
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java
@ -37,6 +37,6 @@ public class MesProdCfgDetail extends BaseBean {
    private String partNo;

    @Column(name="IS_VIRTUAL")
-    @ApiParam("产品配置类型代码")
+    @ApiParam("是否虚零件")
    private Integer isVirtual;
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java
@ -0,0 +1,106 @@
+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;
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java
@ -0,0 +1,61 @@
+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 Double workOrderNo;
+
+    @Column(name="STATUS")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name="CUST_PROD_LINE_CODE")
+    @ApiParam("客户产线代码")
+    private Double custProdLineCode;
+
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private Double areaCode;
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java
@ -0,0 +1,61 @@
+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 Double workType;
+
+    @Column(name="PRODUCE_CATEGORY")
+    @ApiParam("产品类型")
+    private Double produceCategory;
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java
@ -0,0 +1,113 @@
+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 Integer 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;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
+++ b/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;
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
+++ b/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=免费
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/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;
    }

    /**
@ -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;
    }

    /**