Merge remote-tracking branch 'origin/master'

7 years ago · c7513710a9
parent ab06c1e165 4937974f60
commit c7513710a9
40 changed files with 1768 additions and 106 deletions
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java
@ -0,0 +1,60 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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 : hansen.ke
+ * @CreateDate : 2018-11-06 17:16
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="BAS_CUSTOMER")
+@DynamicInsert
+@DynamicUpdate
+@Api(value="客户信息表",description = "客户信息表")
+public class BasCustomer extends BaseBean {
+
+    @Column(name = "CUST_NO")
+    @ApiParam(value = "客户编号")
+    private String custNo;
+
+    @Column(name = "CUST_NAME")
+    @ApiParam(value = "客户简称")
+    private String custName;
+
+    @Column(name = "CUST_DESC")
+    @ApiParam(value = "客户全称")
+    private String custDesc;
+
+    @Column(name = "CUST_ADDR")
+    @ApiParam(value = "客户地址")
+    private String custAddr;
+
+    @Column(name = "CUST_OWNER")
+    @ApiParam(value = "联系人")
+    private String custOwner;
+
+    @Column(name = "CUST_EMAIL")
+    @ApiParam(value = "邮箱")
+    private String custEmail;
+
+    @Column(name = "CUST_TEL")
+    @ApiParam(value = "联系人电话")
+    private String custTel;
+
+    @Column(name = "CUST_FAX")
+    @ApiParam(value = "传真")
+    private String custFax;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
@ -38,9 +38,13 @@ public class WmsASNMaster extends BaseBean {
    @ApiParam("单据类型")
    public String type;

+    /**
+     * 状态:0=新建,10=收货中,20=收货完成,
+     * 30=入库中,40=入库完成,90=已关闭,91=已取消
+     */
    @Column(name="STATUS")
-    @ApiParam("状态")
-    public String status;
+    @ApiParam(value = "状态", example = "0")
+    public Integer status;

    @Column(name="VENDOR_NO")
    @ApiParam("供应商编号")
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java
@ -62,9 +62,12 @@ public class WmsASNMasterDetails extends BaseBean {
    @ApiParam("计划交货时间")
    public String zTime;

+    /**
+     * 状态:N=正常,C=行取消,R=已收货
+     */
    @Column(name="STATUS")
-    @ApiParam("状态")
-    public String status;
+    @ApiParam(value = "状态", example = "1")
+    public Integer status;

    @Column(name="PACKAGE")
    @ApiParam("包装名称")
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAreaOwner.java
@ -0,0 +1,60 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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 : silliter.yuan
+ * @CreateDate : 2018-11-06 17:16
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_AREA_OWNER")
+@DynamicInsert
+@DynamicUpdate
+@Api(value="责任区域分配信息",description = "责任区域分配信息")
+public class WmsAreaOwner extends BaseBean {
+
+    @Column(name = "WH_NO")
+    @ApiParam(value = "仓库代码")
+    private String whNo;
+
+    @Column(name = "ZONE_NO")
+    @ApiParam(value = "存储区编号")
+    private String zoneNo;
+
+    @Column(name = "LOCATE_NO")
+    @ApiParam(value = "库位编号")
+    private String locateNo;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name = "VENDOR_NO")
+    @ApiParam(value = "供应商编码")
+    private String vendorNo;
+
+    @Column(name = "OWNER_USER_NO")
+    @ApiParam(value = "负责人")
+    private String ownerUserNo;
+
+    @Column(name = "IS_PRE_ASSIGN")
+    @ApiParam(value = "是否预分配人员")
+    private String isPreAssign;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
@ -0,0 +1,79 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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 : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_DOC_CS_FACTTRANS")
+@Api("盘点实盘信息")
+public class WmsCSFactTrans extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name="WH_NO")
+    @ApiParam("仓库代码")
+    public String whNo;
+
+    @Column(name="ZONE_NO")
+    @ApiParam("存储区编号")
+    public String zoneNo;
+
+    @Column(name="LOCATE_NO")
+    @ApiParam("库位编号")
+    public String locateNo;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name="SN")
+    @ApiParam("条码")
+    public String sn;
+
+    @Column(name="QTY")
+    @ApiParam(value = "库存数量", example = "0")
+    public Double qty;
+
+    @Column(name="UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name="FACT_QTY")
+    @ApiParam(value = "实盘数量", example = "0")
+    public Double factQty;
+
+    /**
+     * 状态:0=创建,10=已处理
+     */
+    @Column(name="STATUS")
+    @ApiParam(value = "状态", example = "1")
+    public Integer status;
+
+    @Column(name="REMARK")
+    @ApiParam(value = "备注")
+    public String reMark;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSLocate.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSLocate.java
@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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 : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_DOC_CS_LOCATE")
+@Api("盘点库位信息")
+public class WmsCSLocate extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name="LOCATE_NO")
+    @ApiParam("库位代码")
+    public String locateNo;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java
@ -0,0 +1,89 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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 : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_DOC_CS_DETAILS")
+@Api("盘点单冻结信息")
+public class WmsCSOrderDetails extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name="WH_NO")
+    @ApiParam("仓库代码")
+    public String whNo;
+
+    @Column(name="ZONE_NO")
+    @ApiParam("存储区编号")
+    public String zoneNo;
+
+    @Column(name="LOCATE_NO")
+    @ApiParam("库位编号")
+    public String locateNo;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name="SN")
+    @ApiParam("条码")
+    public String sn;
+
+    @Column(name="QTY")
+    @ApiParam(value = "需求数量", example = "0")
+    public Double qty;
+
+    @Column(name="UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    /**
+     * 质检状态:0=未质检,10=质检中,20=质检合格,
+     * 30=质检不合格,40=已退货
+     */
+    @Column(name="QC_STATUS")
+    @ApiParam(value = "质检状态", example = "1")
+    public Integer qcStatus;
+
+    /**
+     * 条码状态:0=创建,10=已收货,20=已质检,
+     * 30=已入库,40=待出库,50=已出库,
+     * 60=在途,70=已隔离,80=破包,90=冻结,100=作废
+     */
+    @Column(name="STATUS")
+    @ApiParam(value = "条码状态", example = "1")
+    public Integer status;
+
+    /**
+     * 处理状态:0=已创建,5=已盘,10=已冻结
+     * ,20=已解冻,30=取消冻结
+     */
+    @Column(name="TRANS_STATUS")
+    @ApiParam(value = "处理状态", example = "1")
+    public Integer transStatus;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java
@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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 : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_DOC_CS_ORDER")
+@Api("盘点单主表信息")
+public class WmsCSOrderMaster extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    /**
+     * 单据类型:10=日常盘点,20=月度盘点,
+     * 30=季度盘点,40=年度盘点
+     */
+    @Column(name="ORDER_TYPE")
+    @ApiParam("单据类型")
+    public String orderType;
+
+    @Column(name="STATUS")
+    @ApiParam("状态")
+    public String status;
+
+    @Column(name="PERSENT")
+    @ApiParam("盘点进度")
+    public String persent;
+
+    @Column(name="REMARK")
+    @ApiParam("备注")
+    public String reMark;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSPart.java
@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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 : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_DOC_CS_PART")
+@Api("盘点区物料信息")
+public class WmsCSPart extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSZone.java
@ -0,0 +1,36 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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 : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_DOC_CS_ZONE")
+@Api("盘点存储区信息")
+public class WmsCSZone extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name="ZONE_NO")
+    @ApiParam("存储区代码")
+    public String zoneNo;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCheckFactRecord.java
@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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 : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_IB_CHECK_FACT")
+@Api("抽点记录信息")
+public class WmsCheckFactRecord extends BaseBean {
+
+    @Column(name="PO_NO")
+    @ApiParam("采购单号")
+    public String poNo;
+
+    @Column(name="ASN_NO")
+    @ApiParam("ANS单号")
+    public String asnNo;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name="VENDOR_NO")
+    @ApiParam("供应商编号")
+    public String vendorNo;
+
+    @Column(name="SN")
+    @ApiParam("条码")
+    public String sn;
+
+    @Column(name="REMARK")
+    @ApiParam("备注")
+    public String reMark;
+
+    @Column(name="PLAN_QTY")
+    @ApiParam(value = "应收数量", example = "0")
+    public Double planQty;
+
+    @Column(name="CHECK_QTY")
+    @ApiParam(value = "抽点数量", example = "0")
+    public Double checkQty;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFGInStock.java
@ -54,9 +54,12 @@ public class WmsFGInStock extends BaseBean {
    @ApiParam("条码")
    public String sn;

+    /**
+     * 状态:0=新建,10=已处理,20=处理出错
+     */
    @Column(name="STATUS")
-    @ApiParam("状态")
-    public String status;
+    @ApiParam(value = "状态", example = "0")
+    public Integer status;

    @Column(name="REMARK")
    @ApiParam("备注")
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java
@ -31,9 +31,9 @@ public class WmsIbCheckPlan extends BaseBean{
    @ApiParam(value ="物料编码")
    private String partNo;

-    @Column(name="PART_NAME")
+    @Column(name="PART_NAME_RDD")
    @ApiParam(value ="物料名称")
-    private String partName;
+    private String partNameRdd;

    @Column(name="START_DATE")
    @ApiParam(value ="开始日期")
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
@ -75,7 +75,7 @@ public class WmsLocate extends BaseBean {
    private Integer maxPartQty;

    @Column(name="STOCK_UNIT")
-    @ApiParam(value ="存放单位", example = "-1")
+    @ApiParam(value ="存放单位")
    private String stockUnit;

 }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
@ -0,0 +1,86 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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 : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_MOVE_DETAILS")
+@Api("库存移动单明细信息")
+public class WmsMoveDetails extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name="CUST_NO")
+    @ApiParam("客户编号")
+    public String custNo;
+
+    @Column(name="QTY")
+    @ApiParam(value = "需求数量", example = "0")
+    public Double qty;
+
+    @Column(name="TRANS_QTY")
+    @ApiParam(value = "处理数量", example = "0")
+    public Double transQty;
+
+    @Column(name="UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name="WH_NO")
+    @ApiParam("仓库代码")
+    public String whNo;
+
+    @Column(name="ZONE_NO")
+    @ApiParam("存储区代码")
+    public String zoneNo;
+
+    @Column(name="LOCATE_NO")
+    @ApiParam("库位代码")
+    public String locateNo;
+
+    /**
+     * 状态:0=创建,5=待处理,10=已处理
+     */
+    @Column(name="STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer status;
+
+    /**
+     * ASN,PO,SO
+     */
+    @Column(name="REF_TYPE")
+    @ApiParam("关联单据类型")
+    public String refType;
+
+    @Column(name="REF_SRC")
+    @ApiParam("关联单号")
+    public String refSrc;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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 : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_MOVE_MASTER")
+@Api("库存移动单主表信息")
+public class WmsMoveMaster extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    /**
+     * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
+     * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料,
+     * MI=移库入库,MO=移库出库,SO=发运
+     */
+    @Column(name="TYPE")
+    @ApiParam("业务类型")
+    public String type;
+
+    /**
+     * 状态:0=创建,5=待处理,10=已处理
+     */
+    @Column(name="STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer status;
+
+    @Column(name="REMARK")
+    @ApiParam("备注")
+    public String reMark;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentDetails.java
@ -78,9 +78,12 @@ public class WmsMoveMentDetails extends BaseBean {
    @ApiParam("源单号")
    public String srcNo;

+    /**
+     * 状态:N=正常,C=行取消
+     */
    @Column(name="STATUS")
-    @ApiParam("状态")
-    public String status;
+    @ApiParam(value = "状态", example = "1")
+    public Integer status;

    @Column(name="REMARK")
    @ApiParam("备注")
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMentMaster.java
@ -51,8 +51,8 @@ public class WmsMoveMentMaster extends BaseBean {
     * ,20=已完成,90=已关闭,91=已取消
     */
    @Column(name="STATUS")
-    @ApiParam("状态")
-    public String status;
+    @ApiParam(value = "状态", example = "0")
+    public Integer status;

    @Column(name="CUSTOMER_NO")
    @ApiParam("客户编号")
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
@ -0,0 +1,67 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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 : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_MOVE_SN")
+@Api("库存移动单条码信息")
+public class WmsMoveSn extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name="ITEM")
+    @ApiParam("行号")
+    public String item;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    /**
+     * 状态:0=创建,10=已处理
+     */
+    @Column(name="STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer status;
+
+    @Column(name="SN")
+    @ApiParam("条码")
+    public String sn;
+
+    @Column(name="REMARK")
+    @ApiParam("备注")
+    public String reMark;
+
+    @Column(name="LOT_NO")
+    @ApiParam("批次编号")
+    public String lotNo;
+
+    @Column(name="PACKAGE_NO")
+    @ApiParam("容器编号")
+    public String packAgeNo;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
@ -38,9 +38,13 @@ public class WmsPOMaster extends BaseBean {
    @ApiParam("单据类型")
    public String type;

+    /**
+     * 状态:0=新建,10=收货中,20=收货完成,
+     * 30=入库中,40=入库完成,90=已关闭,91=已取消
+     */
    @Column(name="STATUS")
-    @ApiParam("状态")
-    public String status;
+    @ApiParam(value = "状态", example = "0")
+    public Integer status;

    @Column(name="VENDOR_NO")
    @ApiParam("供应商编号")
--- 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
@ -78,6 +78,9 @@ public class WmsPOMasterDetails extends BaseBean {
    @ApiParam("默认入库仓库代码")
    public String whNo;

+    /**
+     * 状态:N=正常,C=行取消
+     */
    @Column(name="STATUS")
    @ApiParam("状态")
    public String status;
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPackage.java
@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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 : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_PACKAGE")
+@Api("物理包装信息")
+public class WmsPackage extends BaseBean {
+
+    @Column(name="PACKAGE_NO")
+    @ApiParam("包装编号")
+    public String packageNo;
+
+    @Column(name="PACKAGE_TYPE_ID")
+    @ApiParam(value = "包装类型", example = "1")
+    public Integer packTypeId;
+
+    @Column(name="PARENT_PACKAGE_NO")
+    @ApiParam("上级包装编号")
+    public String parentPackageNo;
+
+    @Column(name="SN")
+    @ApiParam("条码")
+    public String sn;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java
@ -0,0 +1,109 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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 : dragon.xu
+ * @CreateDate : 2018-11-07 16:06
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "WMS_PART")
+@Api("物料表")
+public class WmsPart extends BaseBean {
+    @Column(name="PART_NO")
+    @ApiParam(value ="物料编码")
+    private String partNo;
+
+    @Column(name="PART_NAME")
+    @ApiParam(value ="物料名称")
+    private String partName;
+
+    @Column(name="PART_SPEC")
+    @ApiParam(value ="物料规格")
+    private String partSpec;
+
+    @Column(name="PART_TYPE")
+    @ApiParam(value ="物料类型")
+    private String partType;
+
+    @Column(name="PART_TYPE_DESC")
+    @ApiParam(value ="物料类型描述")
+    private String partTypeDesc;
+
+    @Column(name="GRAPHI_NO")
+    @ApiParam(value ="图号")
+    private String graphiNo;
+
+    @Column(name="VERSION")
+    @ApiParam(value ="版本")
+    private String version;
+
+    @Column(name="COLOR")
+    @ApiParam(value ="颜色")
+    private String color;
+
+    @Column(name="STOCK_UNIT")
+    @ApiParam(value ="库存单位")
+    private String stockUnit;
+
+    @Column(name="ABC")
+    @ApiParam(value ="分类")
+    private String ABC;
+
+    @Column(name="BUY_UNIT")
+    @ApiParam(value ="采购单位")
+    private String buyUnit;
+
+    @Column(name="BU2SU")
+    @ApiParam(value ="换算率1",example = "1")
+    private Double bu2su;
+
+    @Column(name="PRICE_UNIT")
+    @ApiParam(value ="计价单位")
+    private String priceUnit;
+
+    @Column(name="PU2SU")
+    @ApiParam(value ="换算率2",example = "1")
+    private Double pu2su;
+
+    @Column(name="SNP")
+    @ApiParam(value ="标准包装",example = "1")
+    private Double snp;
+
+    @Column(name="IQC")
+    @ApiParam(value ="收货检验否",example = "1")
+    private Integer iqc;
+
+    @Column(name="MIN")
+    @ApiParam(value ="最低库存",example = "1")
+    private Double min;
+
+    @Column(name="MAX")
+    @ApiParam(value ="最高库存",example = "1")
+    private Double max;
+
+    @Column(name="PART_GROUP")
+    @ApiParam(value ="物料组")
+    private String partGroup;
+
+    @Column(name="LOT_CHECK_RULE")
+    @ApiParam(value ="批次校验规则")
+    private String lotCheckRule;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java
@ -0,0 +1,81 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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 : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_QC_DETAILS")
+@Api("质检单明细信息")
+public class WmsQCDetails extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name="ITEM")
+    @ApiParam("行号")
+    public String item;
+
+    /**
+     * 状态:N=正常,C=行取消
+     */
+    @Column(name="STATUS")
+    @ApiParam(value = "状态", example = "1")
+    public Integer status;
+
+    @Column(name="REMARK")
+    @ApiParam("备注")
+    public String reMark;
+
+    @Column(name="PLAN_QTY")
+    @ApiParam(value = "应检数量", example = "0")
+    public Double planQty;
+
+    @Column(name="FACT_QTY")
+    @ApiParam(value = "实检数量", example = "0")
+    public Double factQty;
+
+    @Column(name="REJECT_QTY")
+    @ApiParam(value = "不合格数量", example = "0")
+    public Double rejectQty;
+
+    @Column(name="QC_USER")
+    @ApiParam("检验员")
+    public String qcUser;
+
+    @Column(name="QC_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="检验时间",example = "2000-01-01 01:00:00")
+    public String qcTime;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name="UNIT")
+    @ApiParam("单位")
+    public String unit;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java
@ -0,0 +1,75 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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 : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_QC_MASTER")
+@Api("质检单主表信息")
+public class WmsQCMaster extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    /**
+     * 业务类型:IQC=进料检验,IPQC=在线检验,
+     * FQC=成品检验,OQC=出货检验
+     */
+    @Column(name="TYPE")
+    @ApiParam("业务类型")
+    public String type;
+
+    /**
+     * 状态:0=新建,5=待处理,10=已完成,90=已关闭,91=已取消
+     */
+    @Column(name="STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer status;
+
+    @Column(name="REMARK")
+    @ApiParam("备注")
+    public String reMark;
+
+    @Column(name="CUSTOMER_NO")
+    @ApiParam("客户编号")
+    public String customerNo;
+
+    @Column(name="VENDOR_NO")
+    @ApiParam("供应商编号")
+    public String vendorNo;
+
+    @Column(name="VERSION")
+    @ApiParam(value = "版本", example = "1")
+    public Integer version;
+
+    @Column(name="PO_NO")
+    @ApiParam("采购单号")
+    public String poNo;
+
+    @Column(name="ASN_NO")
+    @ApiParam("ASN单号")
+    public String asnNo;
+
+    @Column(name="IB_NO")
+    @ApiParam("入库单号")
+    public String ibNo;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java
@ -0,0 +1,67 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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 : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_QC_TRANS")
+@Api("质检单操作明细信息")
+public class WmsQCTrans extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name="ITEM")
+    @ApiParam("行号")
+    public String item;
+
+    /**
+     * 状态:0=创建,10=已处理
+     */
+    @Column(name="STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer status;
+
+    @Column(name="REMARK")
+    @ApiParam("备注")
+    public String reMark;
+
+    @Column(name="PASS_QTY")
+    @ApiParam("合格数量")
+    public String passQty;
+
+    @Column(name="REJECT_QTY")
+    @ApiParam("不合格数量")
+    public String rejectQty;
+
+    @Column(name="UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name="SN")
+    @ApiParam("条码")
+    public String sn;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java
@ -0,0 +1,61 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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 : hansen.ke
+ * @CreateDate : 2018-11-07 14:38
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_SHIPPING_FLAG")
+@DynamicInsert
+@DynamicUpdate
+@Api(value="客户发往地信息表",description = "客户发往地信息表")
+public class WmsShippingFlag extends BaseBean {
+
+    @Column(name = "FLAG_NO")
+    @ApiParam(value = "编号")
+    private String flagNo;
+
+    @Column(name = "FLAG_NAME")
+    @ApiParam(value = "简称")
+    private String flagName;
+
+    @Column(name = "FLAG_DESC")
+    @ApiParam(value = "全称")
+    private String flagDesc;
+
+    @Column(name = "FLAG_ADDR")
+    @ApiParam(value = "地址")
+    private String flagAddr;
+
+    @Column(name = "FLAG_OWNER")
+    @ApiParam(value = "联系人")
+    private String flagOwner;
+
+    @Column(name = "FLAG_EMAIL")
+    @ApiParam(value = "邮箱")
+    private String flagEmail;
+
+    @Column(name = "FLAG_TEL")
+    @ApiParam(value = "联系人电话")
+    private String flagTel;
+
+    @Column(name = "FLAG_FAX")
+    @ApiParam(value = "传真")
+    private String flagFax;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShopping.java
@ -50,9 +50,12 @@ public class WmsShopping extends BaseBean {
    @ApiParam("条码")
    public String sn;

+    /**
+     * 状态:0=新建,10=已处理,20=处理出错
+     */
    @Column(name="STATUS")
-    @ApiParam("状态")
-    public String status;
+    @ApiParam(value = "状态", example = "0")
+    public Integer status;

    @Column(name="REMARK")
    @ApiParam("备注")
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java
@ -0,0 +1,59 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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 : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_SN_PRINT")
+@Api("待打印信息")
+public class WmsSnPrint extends BaseBean {
+
+    @Column(name="SRC_TYPE")
+    @ApiParam("来源单据类型")
+    public String srcType;
+
+    @Column(name="SRC_NO")
+    @ApiParam("来源单据编号")
+    public String srcNo;
+
+    @Column(name="PRINT_CONTEXT")
+    @ApiParam("打印内容")
+    public String printContext;
+
+    @Column(name="REMARK")
+    @ApiParam("备注")
+    public String reMark;
+
+    /**
+     * 状态:0=创建,5=待处理,10=已处理
+     */
+    @Column(name="STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer status;
+
+    @Column(name="PRINT_TEMPLET")
+    @ApiParam("打印模板")
+    public String printTemplet;
+
+    @Column(name="PRINT_MACHINE")
+    @ApiParam("打印机")
+    public String printMachine;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuant.java
@ -15,7 +15,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;

 /**
- * @Description : 库存表
+ * @Description : 库存信息
 * @Reference :
 * @Author : jessica.chen
 * @CreateDate : 2018-11-02 11:06
@ -23,35 +23,12 @@ import javax.persistence.Table;
 **/
@Data
@Entity
-@Table(name="WMS_STOCK_QUANT")
+@Table(name="WMS_STOCK_QUAN")
@DynamicInsert
@DynamicUpdate
-@Api(value="库存表",description = "库存表")
+@Api(value="库存信息",description = "库存信息")
 public class WmsStockQuant extends BaseBean{

-    @Column(name="CUST_ID")
-    @ApiParam(value ="客户编号",example = "-1")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long custId;
-
-    @Column(name="CUST_CODE")
-    @ApiParam(value ="客户代码")
-    private String custCode;
-
-    @Column(name="SUPP_ID")
-    @ApiParam(value ="供应商编号",example = "-1")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long suppId;
-
-    @Column(name="SUPP_CODE")
-    @ApiParam(value ="供应商代码")
-    private String suppCode;
-
-    @Column(name="PART_ID")
-    @ApiParam(value ="零件id", example = "-1")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long partId;
-
    @Column(name="PART_NO")
    @ApiParam(value ="零件编号")
    private String partNo;
@ -60,74 +37,27 @@ public class WmsStockQuant extends BaseBean{
    @ApiParam(value ="零件名称")
    private String partNameRdd;

-    @Column(name="UNIT")
-    @ApiParam(value ="采购单位")
-    private String unit;
+    @Column(name="QTY")
+    @ApiParam(value = "可用数量", example = "0")
+    public Double qty;

-    @Column(name="QIT")
-    @ApiParam(value ="库存数", example = "0")
-    private Double qit;
+    @Column(name="UNIT")
+    @ApiParam("单位")
+    public String unit;

-    @Column(name="ERP_WAREHOUSE")
-    @ApiParam(value ="收货库存地")
-    private String erpWareHouse;
+    @Column(name="TOTAL_QTY")
+    @ApiParam(value ="总数量", example = "0")
+    private Double totalQty;

-    @Column(name="WH_ID")
-    @ApiParam(value ="仓库编号",example = "-1")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long whId;
+    @Column(name="ZONE_NO")
+    @ApiParam(value ="存储区编号")
+    private String zoneNo;

-    @Column(name="WH_CODE")
+    @Column(name="WH_NO")
    @ApiParam(value ="仓库代码")
-    private String whCode;
+    private String whNo;

-    @Column(name="LOC_ID")
-    @ApiParam(value ="库位编号",example = "-1")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long locId;
-
-    @Column(name="LOC_CODE")
+    @Column(name="LOCATE_NO")
    @ApiParam(value ="库位代码")
-    private String locCode;
-
-    public Long getCustId() {
-        if(custId != null) {
-            return custId.longValue();
-        }else{
-            return custId;
-        }
-    }
-
-    public Long getSuppId() {
-        if(suppId != null) {
-            return suppId.longValue();
-        }else{
-            return suppId;
-        }
-    }
-
-    public Long getPartId() {
-        if(partId != null) {
-            return partId.longValue();
-        }else{
-            return partId;
-        }
-    }
-
-    public Long getWhId() {
-        if(whId != null) {
-            return whId.longValue();
-        }else{
-            return whId;
-        }
-    }
-
-    public Long getLocId() {
-        if(locId != null) {
-            return locId.longValue();
-        }else{
-            return locId;
-        }
-    }
-
+    private String locateNo;
 }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java
@ -0,0 +1,51 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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 : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_TASK")
+@Api("ASN主表信息")
+public class WmsTaskInfo extends BaseBean {
+
+    @Column(name="MOVE_NO")
+    @ApiParam("移动单号")
+    public String moveNo;
+
+    @Column(name="USER_NO")
+    @ApiParam("作业人员")
+    public String userNo;
+
+    @Column(name="OP_TYPE_CODE")
+    @ApiParam("作业类型")
+    public String opTypeCode;
+
+    @Column(name="REMARK")
+    @ApiParam("备注")
+    public String reMark;
+
+    /**
+     * 状态:0=创建,5=待处理,10=已处理
+     */
+    @Column(name="STATUS")
+    @ApiParam(value = "状态", example = "0")
+    public Integer status;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTempOrderLock.java
@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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 : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_DOC_CS_ORDER")
+@Api("盘点单主表信息")
+public class WmsTempOrderLock extends BaseBean {
+
+    /**
+     * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发,
+     * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料,
+     * MI=移库入库,MO=移库出库,SO=发运
+     */
+    @Column(name="BIZ_TYPE")
+    @ApiParam("业务类型")
+    public String bizType;
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name="USER_NO")
+    @ApiParam("员工编号")
+    public String userNo;
+
+    @Column(name="IS_RUNNING")
+    @ApiParam("操作中")
+    public String isRunning;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java
@ -0,0 +1,89 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 库存交易条码信息 （移库类的交易需要记录2笔交易数据，正负各一笔）
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_TRANS_QUAN")
+@Api("库存交易信息")
+public class WmsTransQuan extends BaseBean {
+
+    @Column(name="ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
+    @Column(name="WH_NO")
+    @ApiParam("仓库代码")
+    public String whNo;
+
+    @Column(name="ZONE_NO")
+    @ApiParam("存储区编号")
+    public String zoneNo;
+
+    @Column(name="LOCATE_NO")
+    @ApiParam("库位编号")
+    public String locateNo;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name="SN")
+    @ApiParam("条码")
+    public String sn;
+
+    @Column(name="QTY")
+    @ApiParam(value = "需求数量", example = "0")
+    public Double qty;
+
+    @Column(name="UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    /**
+     * 质检状态:0=未质检,10=质检中,20=质检合格,
+     * 30=质检不合格,40=已退货
+     */
+    @Column(name="QC_STATUS")
+    @ApiParam(value = "质检状态", example = "1")
+    public Integer qcStatus;
+
+    /**
+     * 条码状态:0=创建,10=已收货,20=已质检,
+     * 30=已入库,40=待出库,50=已出库,
+     * 60=在途,70=已隔离,80=破包,90=冻结,100=作废
+     */
+    @Column(name="STATUS")
+    @ApiParam(value = "条码状态", example = "1")
+    public Integer status;
+
+    /**
+     * 处理状态:0=已创建,5=已盘,10=已冻结
+     * ,20=已解冻,30=取消冻结
+     */
+    @Column(name="TRANS_STATUS")
+    @ApiParam(value = "处理状态", example = "1")
+    public Integer transStatus;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransSn.java
@ -0,0 +1,72 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 库存交易条码信息（移库类的交易需要记录2笔交易数据，正负各一笔）
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2018-11-06 15:58
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name="WMS_TRANS_SN")
+@Api("库存交易条码信息")
+public class WmsTransSn extends BaseBean {
+
+    @Column(name="WH_NO")
+    @ApiParam("仓库代码")
+    public String whNo;
+
+    @Column(name="ZONE_NO")
+    @ApiParam("存储区编号")
+    public String zoneNo;
+
+    @Column(name="LOCATE_NO")
+    @ApiParam("库位编号")
+    public String locateNo;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料编码")
+    public String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    public String partNameRdd;
+
+    @Column(name="SN")
+    @ApiParam("条码")
+    public String sn;
+
+    @Column(name="PACKAGE_NO")
+    @ApiParam("容器编号")
+    public String packageNo;
+
+    @Column(name="UNIT")
+    @ApiParam("单位")
+    public String unit;
+
+    @Column(name="TRANS_CODE")
+    @ApiParam("事务代码")
+    public String transCode;
+
+    @Column(name="QTY")
+    @ApiParam(value = "交易数量", example = "0")
+    public Double qty;
+
+    @Column(name="TRANS_NO")
+    @ApiParam("事务编号")
+    public String transNo;
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java
@ -0,0 +1,77 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+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 : hansen.ke
+ * @CreateDate : 2018-11-06 11:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_ZONES")
+@DynamicInsert
+@DynamicUpdate
+@Api(value="存储区信息表",description = "存储区信息表")
+public class WmsZones extends BaseBean {
+
+    @Column(name = "WH_NO")
+    @ApiParam(value = "仓库代码")
+    private String whNo;
+
+    @Column(name = "AREA_NO")
+    @ApiParam(value = "库存地代码")
+    private String areaNo;
+
+    @Column(name = "ZONE_NO")
+    @ApiParam(value = "存储区代码")
+    private String zoneNo;
+
+    @Column(name = "ZONE_NAME")
+    @ApiParam(value = "存储区名称")
+    private String zoneName;
+
+    @Column(name = "IS_PM")
+    @ApiParam(value = "零件级管控" , example = "2")
+    private Integer isPm;
+
+    @Column(name = "IS_LM")
+    @ApiParam(value = "批次级管控" , example = "2")
+    private Integer isLm;
+
+    @Column(name = "IS_SN")
+    @ApiParam(value = "条码级管控" , example = "1")
+    private Integer isSn;
+
+    @Column(name = "IS_MIX")
+    @ApiParam(value = "允许混淆" , example = "1")
+    private Integer isMix;
+
+    @Column(name = "IS_SC")
+    @ApiParam(value = "库容检查" , example = "1")
+    private Integer isSc;
+
+    @Column(name = "STRATEGY")
+    @ApiParam(value = "堆放策略")
+    private String strategy;
+
+    @Column(name = "IS_NEGATIVE")
+    @ApiParam(value = "允许负库存" , example = "1")
+    private Integer isNegative;
+
+    @Column(name = "CHECK_FIFO")
+    @ApiParam(value = "校验先进先出" , example = "1")
+    private Integer checkFifo;
+
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepositry.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepositry.java
@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.BasCustomer;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :对象持久层仓用方法控制(客户信息)
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 17:27
+ * @Modify:
+ **/
+@Repository
+public interface BasCustomerRepositry extends BaseRepository<BasCustomer,Long> {
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRepository.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartRepository.java
@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPart;
+import org.springframework.stereotype.Repository;
+/**
+* @Description :
+* @Reference :
+* @Author : dragon.xu
+* @CreateDate : 2018-11-08 10:19
+* @Modify:
+**/
+@Repository
+public interface WmsPartRepository extends BaseRepository<WmsPart, Long> {
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepositry.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepositry.java
@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsShippingFlag;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :对象持久层仓用方法控制(客户发往地信息)
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-07 14:58
+ * @Modify:
+ **/
+@Repository
+public interface WmsShippingFlagRepositry extends BaseRepository<WmsShippingFlag, Long> {
+}
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepositry.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepositry.java
@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsZones;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :对象持久层仓用方法控制(存储区信息)
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 13:40
+ * @Modify:
+ **/
+@Repository
+public interface WmsZonesRepositry extends BaseRepository<WmsZones ,Long> {
+
+}
--- 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
@ -17,6 +17,40 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsTransType;
 public class WmsHqlPack {

    /**
+     * 库位物料信息 分页查询
+     * @param wmsLocatePart
+     * @return
+     */
+    public static String packHqlWmsLocatePart(WmsLocatePart wmsLocatePart) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result);
+        HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result);
+        HqlPack.getStringLikerPack(wmsLocatePart.getPartName(), "partName", result);
+
+        return result.toString();
+    }
+
+    /**
+     * 库位信息 分页查询
+     * @param wmsLocate
+     * @return
+     */
+    public static String packHqlWmsLocates(WmsLocate wmsLocate) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getStringLikerPack(wmsLocate.getLocateNo(),"locateNo",result);
+        HqlPack.getStringLikerPack(wmsLocate.getLocateName(),"locateName",result);
+        HqlPack.getStringLikerPack(wmsLocate.getLocateType(),"locateType",result);
+        HqlPack.getStringLikerPack(wmsLocate.getWhNo(),"whNo",result);
+        HqlPack.getStringLikerPack(wmsLocate.getZoneNo(),"zoneNo",result);
+
+        return result.toString();
+    }
+
+    /**
     * 工厂仓库模糊分页查询
     * @param wareHouse
     * @return
@ -124,4 +158,52 @@ public class WmsHqlPack {
        HqlPack.getStringEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()+"","isValid",result);
        return result.toString();
    }
+
+    /**
+     * 存储区信息 查询条件封装
+     * @param wmsZones
+     * @return
+     */
+    public static String packHqlWmsZones(WmsZones wmsZones) {
+        StringBuffer result = new StringBuffer();
+        //仓库代码
+        HqlPack.getStringLikerPack(wmsZones.getWhNo(),"whNo",result);
+        //库存地代码
+        HqlPack.getStringLikerPack(wmsZones.getAreaNo(),"areaNo",result);
+        //存储区代码
+        HqlPack.getStringLikerPack(wmsZones.getZoneNo(),"zoneNo",result);
+        return result.toString();
+    }
+
+    /**
+     * 客户信息 查询条件封装
+     * @param basCustomer
+     * @return
+     */
+    public static String packHqlBasCustomer(BasCustomer basCustomer){
+        StringBuffer result = new StringBuffer();
+        //客户编号
+        HqlPack.getStringLikerPack(basCustomer.getCustNo(),"custNo",result);
+        //客户简称
+        HqlPack.getStringLikerPack(basCustomer.getCustName(),"custName",result);
+        //客户全称
+        HqlPack.getStringLikerPack(basCustomer.getCustDesc(),"custDesc",result);
+        return result.toString();
+    }
+
+    /**
+     * 客户发往地信息 查询条件封装
+     * @param wmsShippingFlag
+     * @return
+     */
+    public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag){
+        StringBuffer result = new StringBuffer();
+        //供应商编号
+        HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(),"flagNo",result);
+        //供应商简称
+        HqlPack.getStringLikerPack(wmsShippingFlag.getFlagName(),"flagName",result);
+       //供应商全称
+        HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(),"flagDesc",result);
+        return result.toString();
+    }
 }