diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index e0ce76a..025a99d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -111,6 +111,10 @@ public class MesProductData extends BaseBean implements Serializable { @ApiParam("数据组号") private String groupNo; + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + @Json4Es @Lob @Column(name = "LINE_DATA") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java index e8b1087..631c6cb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java @@ -24,7 +24,7 @@ public class ProduceDispPassPlatoQueryModel extends BaseBean { */ @ApiParam("工序") - private String processCode; + private List processCodeList; //质量状态(20冻结,30报废) @ApiParam("质量状态") @@ -40,7 +40,7 @@ public class ProduceDispPassPlatoQueryModel extends BaseBean { //统计方式(0按月,1按天) @ApiParam("统计方式") - private Integer statisticalPlacer; + private Integer statisticalMethod; @ApiParam("开始时间") private String modifyStartDate; diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java index 7d33c67..c8ac075 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebDocMovementMaster.java @@ -1,18 +1,15 @@ package cn.estsh.i3plus.pojo.sweb.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; 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; +import javax.persistence.*; /** * @Description : @@ -149,4 +146,8 @@ public class SwebDocMovementMaster extends BaseBean { @Column(name = "SHIP_TIME") @ApiParam(value = "发运时间") private String shipTime; + + @Column(name = "IS_SYNC", nullable = false) + @ApiParam("是否同步") + public Integer isSync = CommonEnumUtil.FALSE; }