From fa8a88c6d05ae88a231f8fcccf0f2b060279c88b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 29 Nov 2019 19:23:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6=EF=BC=9A?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=90=8E=E5=A6=82=E6=9E=9C=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=AC=AC=E4=B8=80=E4=B8=AA=E6=AD=A5=E9=AA=A4=E7=9A=84=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=96=B9=E6=B3=95=E5=8C=85=E5=90=AB=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E5=80=BC=E5=88=99=E5=8F=A0=E5=8A=A0=E5=9C=A8=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=B6=88=E6=81=AF=E5=90=8E+=E7=BB=99?= =?UTF-8?q?=E5=9F=BA=E7=B1=BBBaseBean=E7=9A=84isdeleted,isvalid=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E9=BB=98=E8=AE=A4=E5=80=BC=EF=BC=8C=E7=BB=99=E4=B8=A4?= =?UTF-8?q?=E4=B8=AA=E5=AE=9E=E4=BD=93=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=80=BC?= =?UTF-8?q?=E8=AF=95=E8=AF=95=E6=B0=B4+WmsCsDetailsModel=E7=B1=BB=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=A5=E9=87=8D=E4=B8=8D=E7=AC=A6=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=8C=83=EF=BC=8C=E5=B7=B2=E7=A7=BB=E8=87=B3Pojo-Model?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 7 +-- .../pojo/model/wms}/WmsCSOrderDetailsModel.java | 2 +- .../cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java | 52 +++++++++++----------- .../pojo/wms/bean/snapshot/WmsCheckPoint.java | 2 +- 4 files changed, 30 insertions(+), 33 deletions(-) rename modules/{i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio => i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms}/WmsCSOrderDetailsModel.java (95%) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 08085ad..ef05abd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -2,10 +2,7 @@ package cn.estsh.i3plus.pojo.base.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import com.alibaba.fastjson.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiParam; @@ -65,12 +62,12 @@ public abstract class BaseBean implements Serializable { // @AnnoOutputColumn(hidden = true) public String organizeCode; - @Column(name="IS_VALID") + @Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false) @ApiParam(value = "有效性",example = "1") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true) public Integer isValid; //CommonEnumUtil.IS_VAILD; - @Column(name="IS_DELETED") + @Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false) @ApiParam(value = "是否已删除",example = "2") @AnnoOutputColumn(hidden = true) //逻辑删除，软删除 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java similarity index 95% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java rename to modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java index 9a5fb95..5940720 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderDetailsModel.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.wms.bean.iotio; +package cn.estsh.i3plus.pojo.model.wms; import io.swagger.annotations.ApiParam; import lombok.Data; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java index 9efc5aa..1cb16f8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/AmpJisRec.java @@ -22,96 +22,96 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="AMP_JIS_REC") +@Table(name = "AMP_JIS_REC") @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="AMP_JIS收货",description = "AMP_JIS收货") -public class AmpJisRec extends BaseBean{ +@Api(value = "AMP_JIS收货", description = "AMP_JIS收货") +public class AmpJisRec extends BaseBean { private static final long serialVersionUID = 4460727160153551089L; - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("JIS单号") public String orderNo; - @Column(name="PART_NO") + @Column(name = "PART_NO", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("物料编码") public String partNo; - @Column(name="PART_NAME_RDD") + @Column(name = "PART_NAME_RDD", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("物料名称") public String partNameRdd; - @Column(name="QTY", columnDefinition = "decimal(18,8)") + @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0", nullable = false) @ColumnDefault("0") @ApiParam(value = "数量", example = "0") public Double qty; - @Column(name="UNIT") + @Column(name = "UNIT", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("单位") public String unit; - @Column(name="SN") + @Column(name = "SN", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("条码") public String sn; /** * 状态:10=新建,20=已处理,30=处理出错 */ - @Column(name="ORDER_STATUS") + @Column(name = "ORDER_STATUS", columnDefinition = "int default 0", nullable = false) @ApiParam(value = "状态", example = "10") public Integer orderStatus; - @Column(name="VENDOR_NO") + @Column(name = "VENDOR_NO", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam(value = "供应商编码", example = "10") public String vendorNo; - @Column(name="REMARK") + @Column(name = "REMARK", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("备注") public String remark; - @Column(name="SRC") + @Column(name = "SRC", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("单据来源") public String src; - @Column(name="SHIPPING_FLAG") + @Column(name = "SHIPPING_FLAG", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("特殊发货标志") public String shippingFlag; - @Column(name="ERROR_MESSAGE") + @Column(name = "ERROR_MESSAGE", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("错误信息") public String errorMessage; - @Column(name="AREA_NO") + @Column(name = "AREA_NO", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("ERP库存地") public String areaNo; - @Column(name="CAR_NO") + @Column(name = "CAR_NO", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("车号") public String carNo; - @Column(name="VIN") + @Column(name = "VIN", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("VIN号") public String vin; - @Column(name="SHIPPING_TIME") + @Column(name = "SHIPPING_TIME", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("发运时间") public String shippingTime; - @Column(name="SID") + @Column(name = "SID", columnDefinition = "varchar(225) default ''", nullable = false) @ApiParam("sid") public String sid; - @Column(name="IS_LOCK") - @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定" ) + @Column(name = "IS_LOCK", columnDefinition = "int default 0", nullable = false) + @ApiParam("是否锁定 是否锁定：1=锁定 2=未锁定") public Integer isLock; - @Column(name="ERP_SYNC_FLAG") - @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败" ) + @Column(name = "ERP_SYNC_FLAG", columnDefinition = "int default 0", nullable = false) + @ApiParam("ERP同步标识 ERP同步标识：10=待同步，20=同步成功，30=同步失败") public Integer erpSyncFlag; - public AmpJisRec(Long id,String partNo, String partNameRdd,String vendorNo,Double qty,String unit){ - this.id= id; + public AmpJisRec(Long id, String partNo, String partNameRdd, String vendorNo, Double qty, String unit) { + this.id = id; this.partNo = partNo; this.partNameRdd = partNameRdd; this.vendorNo = vendorNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java index 738ffbc..1a5b744 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/WmsCheckPoint.java @@ -21,7 +21,7 @@ public class WmsCheckPoint extends BaseBean { private static final long serialVersionUID = 5589497687871639189L; - @Column(name="SNAPSHOT_TIME") + @Column(name="SNAPSHOT_TIME", columnDefinition="varchar(225) default ''",nullable=false) @ApiParam("快照时间") public String snapshotTime; }