修改库存快照的pojo,确保快照功能可以正常执行

yun-zuoyi
rock.yu 5 years ago
parent e9ce24d6f9
commit 11750e9bf1

@ -0,0 +1,153 @@
package cn.estsh.i3plus.pojo.wms.bean.snapshot;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
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.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.hibernate.annotations.GenericGenerator;
import javax.persistence.*;
import java.io.Serializable;
@Data
@MappedSuperclass
public class SnapshotBean implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GenericGenerator(name = "generator", strategy = "increment")
@GeneratedValue(generator = "generator")
@Column(name = "snap_id")
private Long snapId;
//此处使用hibernate的主键策略方式
//手动设置,使用iplus-platform-common中的idtool生成
//将Long类型系列化成String避免精度丢失
@Column(name="ID")
@ApiParam(value = "主键",example = "0")
@JsonSerialize(using = ToStringSerializer.class)
@AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
public Long id;
//get单独处理
public Long getId() {
if(id != null) {
return id.longValue();
}else{
return id;
}
}
/**
* MonogoDB _id
* @param id
*/
@JSONField(name="_id")
public void setId(Long id) {
this.id = id;
}
@Column(name="ORGANIZE_CODE", nullable = false)
@ApiParam(value ="组织代码")
// @AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isQuery = 2, isRequire = 2)
public String organizeCode;
@Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false)
@ApiParam(value = "有效性",example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description", hidden = true)
public Integer isValid; //CommonEnumUtil.IS_VAILD;
@Column(name="IS_DELETED", columnDefinition = "int default 2", nullable = false)
@ApiParam(value = "是否已删除",example = "2")
@AnnoOutputColumn(hidden = true)
//逻辑删除,软删除
public Integer isDeleted; //CommonEnumUtil.TRUE_OR_FALSEA
@Column(name="CREATE_USER",updatable = false)
@ApiParam(value = "创建用户")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
dataSrc = "/impp/operate/sys-user/query-user-by-pager",
searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName")
public String createUser;
@Column(name="CREATE_DATE_TIME",updatable = false)
@ApiParam(value = "创建日期")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
public String createDatetime;
@Column(name="MODIFY_USER")
@ApiParam(value = "修改人")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.LIST, getValWay = CommonEnumUtil.DYNAMIC_FIELD_GET_WAY.URL,
dataSrc = "/impp/operate/sys-user/query-user-by-pager",
searchColumnName = "userName", listColumnName = "userLoginName,userName", explicitColumnName = "userName")
public String modifyUser;
@Column(name="MODIFY_DATE_TIME")
@ApiParam(value = "修改日期")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.DATETIME, isRequire = 2)
public String modifyDatetime;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="创建日期查询用,查询起始日期",example = "2018-01-01 01:00:00")
@AnnoOutputColumn(hidden = true)
public String createDateTimeStart;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="创建日期查询用,查询结束日期",example = "2018-12-31 23:59:59")
@AnnoOutputColumn(hidden = true)
public String createDateTimeEnd;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value="修改日期查询用,查询起始日期",example = "2018-01-01 01:00:00")
@AnnoOutputColumn(hidden = true)
public String modifyDateTimeStart;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "修改日期查询用,查询结束日期",example = "2018-12-31 23:59:59")
@AnnoOutputColumn(hidden = true)
public String modifyDateTimeEnd;
@Transient
@ApiParam(value = "排序属性")
@AnnoOutputColumn(hidden = true)
public String orderByParam = "";
@Transient
@ApiParam(value = "排序类型1 正序2 倒序",example = "1")
@AnnoOutputColumn(hidden = true)
//CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc
public transient Integer ascOrDesc = 1;
public int getIsValidVal() {
return this.isValid == null ? 0 : this.isValid.intValue();
}
public int getIsDeletedVal() {
return this.isDeleted == null ? 0 : this.isDeleted.intValue();
}
//排序方式
public String orderBy(){
String result = "";
if (orderByParam!=null&&orderByParam.trim().length()>0) {
result = " order by " + orderByParam;
if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) {
result += " asc";
}else{
result += " desc";
}
}
return result;
}
}

@ -1,7 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean.snapshot;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -32,7 +33,7 @@ import javax.persistence.*;
@Index(columnList = "SNAPSHOT_TIME")
})
@Api("库存移动单明细信息")
public class WmsMoveDetailsSnapshot extends BaseBean {
public class WmsMoveDetailsSnapshot extends SnapshotBean {
private static final long serialVersionUID = -4095410692227226944L;
@ -141,6 +142,31 @@ public class WmsMoveDetailsSnapshot extends BaseBean {
@Transient
private Long finishedCounts;
@Column(name = "BOM_VERSION")
@ApiParam(value = "BOM版本号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
private String bomVersion;
@Column(name = "CONSIGNATION")
@ApiParam("是否寄售 1-是 2-否")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
private Integer consignation = 2;
@Column(name = "GROUP_NO")
@ApiParam("分组号")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
public String groupNo;
@Column(name = "HANDLED_QTY", columnDefinition = "decimal(18,8)", nullable = false)
@ApiParam(value = "已处理数量", example = "0")
@ColumnDefault("0")
@DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER)
public Double handledQty;
@Column(name = "QUEUE_GROUP_NO")
@ApiParam(value = "jis料架号")
private String queueGroupNo;
@Transient
@ApiParam("交易类型")
private String transTypeCode;
@ -182,10 +208,6 @@ public class WmsMoveDetailsSnapshot extends BaseBean {
@ApiParam("创建时间")
private String createDateTime;
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
public transient Integer lockVersion;
/* @JSONField(name="fPartNo")
public String getfPartNo() {
return fPartNo;

@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.wms.bean.snapshot;
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;
@ -31,7 +30,7 @@ import javax.persistence.*;
@Index(columnList = "SNAPSHOT_TIME")
})
@Api("库存移动单主表信息")
public class WmsMoveMasterSnapshot extends BaseBean {
public class WmsMoveMasterSnapshot extends SnapshotBean {
private static final long serialVersionUID = 3569874772643448726L;
@ -150,7 +149,6 @@ public class WmsMoveMasterSnapshot extends BaseBean {
@ApiParam(value = "设备编号")
public String fixId;
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
public transient Integer lockVersion;

@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.wms.bean.snapshot;
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;
@ -33,7 +32,7 @@ import javax.persistence.*;
@Index(columnList = "SNAPSHOT_TIME")
})
@Api("库存移动单条码信息")
public class WmsMoveSnSnapshot extends BaseBean {
public class WmsMoveSnSnapshot extends SnapshotBean {
private static final long serialVersionUID = 2588101374261238353L;
@ -189,11 +188,6 @@ public class WmsMoveSnSnapshot extends BaseBean {
@ApiParam("交易类型名称")
private String transTypeName;
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
public transient Integer lockVersion;
public WmsMoveSnSnapshot() {
}

@ -1,6 +1,5 @@
package cn.estsh.i3plus.pojo.wms.bean.snapshot;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.wms.bean.WmsLocate;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -33,7 +32,7 @@ import java.util.List;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value = "库存信息", description = "库存信息")
public class WmsStockQuanSnapshot extends BaseBean {
public class WmsStockQuanSnapshot extends SnapshotBean {
private static final long serialVersionUID = 8335719859185712904L;

@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.wms.bean.snapshot;
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;
@ -45,7 +44,7 @@ import java.util.List;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value = "库存条码信息", description = "库存条码信息")
public class WmsStockSnSnapshot extends BaseBean {
public class WmsStockSnSnapshot extends SnapshotBean {
private static final long serialVersionUID = 8641922373097608315L;

Loading…
Cancel
Save