diff --git 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 index 2082515..713c550 100644 --- 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("供应商编号") diff --git 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 index 5bd0124..fec412e 100644 --- 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,6 +62,9 @@ public class WmsASNMasterDetails extends BaseBean { @ApiParam("计划交货时间") public String zTime; + /** + * 状态:N=正常,C=行取消,R=已收货 + */ @Column(name="STATUS") @ApiParam("状态") public String status; diff --git 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 new file mode 100644 index 0000000..8b5cb29 --- /dev/null +++ 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; +} diff --git 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 new file mode 100644 index 0000000..3e970c4 --- /dev/null +++ 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; +} diff --git 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 new file mode 100644 index 0000000..61f7b21 --- /dev/null +++ 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; +} diff --git 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 new file mode 100644 index 0000000..365196f --- /dev/null +++ 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; +} diff --git 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 new file mode 100644 index 0000000..650a3f4 --- /dev/null +++ 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; +} diff --git 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 new file mode 100644 index 0000000..04ce4e7 --- /dev/null +++ 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; +} diff --git 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 new file mode 100644 index 0000000..ebfe0df --- /dev/null +++ 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; +} diff --git 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 index 7dbdf5c..5d25594 100644 --- 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("备注") diff --git 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 new file mode 100644 index 0000000..31e6802 --- /dev/null +++ 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; +} diff --git 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 new file mode 100644 index 0000000..375238b --- /dev/null +++ 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; +} diff --git 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 index fce7757..0dfb2ce 100644 --- 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,6 +78,9 @@ public class WmsMoveMentDetails extends BaseBean { @ApiParam("源单号") public String srcNo; + /** + * 状态:N=正常,C=行取消 + */ @Column(name="STATUS") @ApiParam("状态") public String status; diff --git 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 index e59cc58..e9a7946 100644 --- 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("客户编号") diff --git 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 new file mode 100644 index 0000000..daa3cb8 --- /dev/null +++ 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; +} diff --git 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 index d96f711..06c7238 100644 --- 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("供应商编号") diff --git 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 index bae9ff3..12d6ff4 100644 --- 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; diff --git 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 new file mode 100644 index 0000000..47a8fcb --- /dev/null +++ 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("状态") + public String 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; +} diff --git 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 new file mode 100644 index 0000000..755bd06 --- /dev/null +++ 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; +} diff --git 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 new file mode 100644 index 0000000..8d96924 --- /dev/null +++ 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; +} diff --git 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 index 74e7c99..81072cd 100644 --- 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("备注") diff --git 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 new file mode 100644 index 0000000..06bfc76 --- /dev/null +++ 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; +} diff --git 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 new file mode 100644 index 0000000..1dd1a1b --- /dev/null +++ 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; +} diff --git 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 new file mode 100644 index 0000000..ede0bb7 --- /dev/null +++ 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; +} diff --git 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 new file mode 100644 index 0000000..c939bee --- /dev/null +++ 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; +}