diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/sweb/WmsMovementToSweb.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/sweb/WmsMovementToSweb.java deleted file mode 100644 index ed6b236..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/sweb/WmsMovementToSweb.java +++ /dev/null @@ -1,86 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.bean.sweb; - -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; -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 : jason.niu - * @CreateDate : 2020-05-28 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_PO_TO_WMS") -@Api("库存移动单处理成功后的记录") -public class WmsMovementToSweb extends BaseBean { - private static final long serialVersionUID = 49215041475324487L; - - @Column(name = "ORDER_NO") - @ApiParam("单号") - public String orderNo; - - @Column(name = "ITEM") - @ApiParam("行号") - public String item; - - @Column(name = "SRC_WH_NO") - @ApiParam("源仓库代码") - public String srcWhNo; - - @Column(name = "DEST_ZONE_NO") - @ApiParam("目标存储区代码") - public String destZoneNo; - - @Column(name = "PART_NO") - @ApiParam("物料编码") - public String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "UNIT") - @ApiParam("单位") - public String unit; - - /** - * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, - * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料, - * MI=移库入库,MO=移库出库,SO=发运 - */ - @Column(name = "BUSI_TYPE") - @ApiParam("业务类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") - public Integer busiType; - - @Column(name = "PLAN_DATE") - @ApiParam(value = "计划日期") - private String planDate; - - @Column(name = "PLAN_TIME") - @ApiParam(value = "计划时间") - private String planTime; - - /** - * 状态:1=创建,10=待处理,20=已处理 - */ - @Column(name="ITEM_STATUS") - @ApiParam(value = "状态", example = "0") - public Integer itemStatus; -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/sweb/WmsMovementToWms.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/sweb/WmsMovementToWms.java deleted file mode 100644 index a31f935..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/sweb/WmsMovementToWms.java +++ /dev/null @@ -1,95 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.bean.sweb; - -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.hibernate.annotations.ColumnDefault; -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 : jason.niu - * @CreateDate : 2020-05-28 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_PO_TO_WMS") -@Api("库存移动单处理成功后的记录") -public class WmsMovementToWms extends BaseBean { - private static final long serialVersionUID = -8089219927352225317L; - - @Column(name = "ORDER_NO") - @ApiParam("单号") - public String orderNo; - - @Column(name = "ITEM") - @ApiParam("行号") - public String item; - - @Column(name = "VENDOR_NO") - @ApiParam(value = "供应商编号") - private String vendorNo; - - @Column(name = "PART_NO") - @ApiParam("物料编码") - public String partNo; - - @Column(name = "PART_NAME") - @ApiParam("物料名称") - private String partName; - - @Column(name = "QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "需求数量", example = "0") - public Double qty; - - @Column(name = "UNIT") - @ApiParam("单位") - public String unit; - - @Column(name = "SRC_WH_NO") - @ApiParam("源仓库代码") - public String srcWhNo; - - @Column(name = "DEST_ZONE_NO") - @ApiParam("目标存储区代码") - public String destZoneNo; - - /** - * 移动类型:IN=入库,OUT=出库,MOVE=移库 - */ - @Column(name = "MOVE_TYPE") - @ApiParam("移动类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class, refForeignKey = "value", value = "description") - public Integer moveType; - /** - * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, - * VJ=供应商退货,CJ=客户退货,WP=工单领料,WJ=工单退料, - * MI=移库入库,MO=移库出库,SO=发运 - */ - @Column(name = "BUSI_TYPE") - @ApiParam("业务类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") - public Integer busiType; - - /** - * 状态:1=创建,10=待处理,20=已处理 - */ - @Column(name="ITEM_STATUS") - @ApiParam(value = "状态", example = "0") - public Integer itemStatus; -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/sweb/WmsPoToSweb.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/sweb/WmsPoToSweb.java deleted file mode 100644 index d0420fb..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/sweb/WmsPoToSweb.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.bean.sweb; - -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 : jason.niu - * @CreateDate : 2020-05-28 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_PO_TO_WMS") -@Api("库存移动单处理成功后的记录") -public class WmsPoToSweb extends BaseBean { - private static final long serialVersionUID = 4710841067412420270L; - - @Column(name = "ORDER_NO") - @ApiParam("单号") - public String orderNo; - - /** - * 状态:1=创建,10=待处理,20=已处理 - */ - @Column(name="ITEM_STATUS") - @ApiParam(value = "状态", example = "0") - public Integer itemStatus; -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/sweb/WmsPoToWms.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/sweb/WmsPoToWms.java deleted file mode 100644 index 3cc9f63..0000000 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/sweb/WmsPoToWms.java +++ /dev/null @@ -1,93 +0,0 @@ -package cn.estsh.i3plus.pojo.wms.bean.sweb; - -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.ColumnDefault; -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 : jason.niu - * @CreateDate : 2020-05-28 - * @Modify: - **/ -@Data -@Entity -@DynamicInsert -@DynamicUpdate -@EqualsAndHashCode(callSuper = true) -@Table(name = "WMS_PO_TO_WMS") -@Api("库存移动单处理成功后的记录") -public class WmsPoToWms extends BaseBean { - - private static final long serialVersionUID = -3999194389200855165L; - @Column(name = "ORDER_NO") - @ApiParam("单号") - public String orderNo; - - @Column(name = "VERSION") - @ApiParam("版本") - public String version; - - @Column(name = "ITEM") - @ApiParam("行号") - private Integer item; - - @Column(name = "PART_NO") - @ApiParam("物料编码") - private String partNo; - - @Column(name = "PART_NAME_RDD") - @ApiParam("物料名称") - private String partNameRdd; - - @Column(name = "QTY", columnDefinition = "decimal(18,8)", nullable = false) - @ColumnDefault("0") - @ApiParam(value = "需求数量", example = "0") - private Double qty; - - @Column(name = "VENDOR_NO") - @ApiParam("供应商") - private String vendorNo; - - @Column(name = "PRINT_QTY", columnDefinition = "decimal(18,8)", nullable = false) - @ColumnDefault("0") - @ApiParam(value = "条码打印数量", example = "0") - private Double printQty; - - @Column(name = "UNIT") - @ApiParam("单位") - private String unit; - - @Column(name = "PLAN_DATE") - @ApiParam("计划交货日期") - private String planDate; - - @Column(name = "PLAN_TIME") - @ApiParam("计划交货时间") - private String planTime; - - @Column(name = "ERP_AREA_NO") - @ApiParam("默认收货库存地") - private String erpAreaNo; - - @Column(name = "SNP", columnDefinition = "decimal(18,8)") - @ApiParam("标准包装") - private Double snp; - - /** - * 状态:1=创建,10=待处理,20=已处理 - */ - @Column(name="ITEM_STATUS") - @ApiParam(value = "状态", example = "0") - public Integer itemStatus; -} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java index 43fe989..752e8bb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceEnumUtil.java @@ -9,7 +9,8 @@ public class WmsInterfaceEnumUtil { SAP2WMS(10, "SAP2WMS", "SAP --> WMS"), WMS2SAP(20, "WMS2SAP", "WMS --> SAP"), MES2WMS(30, "MES2WMS", "MES --> WMS"), - WMS2MES(40, "WMS2MES", "WMS --> MES"); + WMS2MES(40, "WMS2MES", "WMS --> MES"), + SWEB2WMS(50, "SWEB2WMS", "SWEB --> WMS"); private int value; private String name;