I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of i3-IMPP/i3plus-pojo into test

Browse Source
yun-zuoyi
陆卫豪 6 years ago committed by nancy.li
parent 8eb8c2f97e 492367670b
commit d6ff7aa2b1
28 changed files with 128 additions and 152 deletions
Show Stats Download Patch File Download Diff File

1
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java
Unescape Escape View File

@ -27,4 +27,5 @@ public @interface FieldAnnotation {
ApsEnumUtil.EDIT_TYPE editType() default ApsEnumUtil.EDIT_TYPE.NONE; // 定义字段的编辑类型
Class<?> multiEnumClass() default Object.class; // 多选枚举的类型。
String typeName() default ""; // 定义字段类型的简单名称，对于多选关联对象时有用。
String relation() default ""; // 关联字段标识
}

12
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/HolderAnnotation.java
Unescape Escape View File

@ -1,12 +0,0 @@
package cn.estsh.i3plus.pojo.aps.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface HolderAnnotation {
String[] notProperty();
}

11
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java
Unescape Escape View File

@ -28,6 +28,12 @@ import java.util.List;
@MappedSuperclass
@Api("订单基类")
public class BaseOrder extends BaseCode {
@Column(name="MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(relation = "Material")
private Long materialId;
@Column(name="COUNT")
@ApiParam(value ="数量")
private Double count;
@ -69,11 +75,6 @@ public class BaseOrder extends BaseCode {
@ApiParam(value ="专料号")
private String specifyMaterialNum;
@Column(name="MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(property = false)
private Long materialId;
@JsonBackReference
public List<Work> getWorks() {
return BeanRelation.list(this, EBaseOrder.Works);

10
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java
Unescape Escape View File

@ -29,6 +29,11 @@ import java.util.List;
@Table(name = "APS_OPER_INPUT")
@Api("工序输入")
public class OperInput extends BaseAPS {
@Column(name="MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(relation = "Material")
private Long materialId;
@Column(name="INPUT_COUNT")
@ApiParam(value ="输入数量")
private Double inputCount;
@ -59,11 +64,6 @@ public class OperInput extends BaseAPS {
@FieldAnnotation(property = false)
private Long operationId;
@Column(name="MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(property = false)
private Long materialId;
public Operation getOperation() {
return BeanRelation.get(this, EOperInput.Operation);
}

10
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java
Unescape Escape View File

@ -28,6 +28,11 @@ import java.util.List;
@Table(name = "APS_OPER_OUTPUT")
@Api("工序输出")
public class OperOutput extends BaseAPS {
@Column(name="MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(relation = "Material")
private Long materialId;
@Column(name="OUTPUT_COUNT")
@ApiParam(value ="输出数量")
private Double outputCount;
@ -45,11 +50,6 @@ public class OperOutput extends BaseAPS {
@FieldAnnotation(property = false)
private Long operationId;
@Column(name="MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(property = false)
private Long materialId;
public Operation getOperation() {
return BeanRelation.get(this, EOperOutput.Operation);
}

11
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java
Unescape Escape View File

@ -29,6 +29,12 @@ import java.util.List;
@Table(name = "APS_OPER_RESOURCE")
@Api("工序资源")
public class OperResource extends BaseAPS {
@Column(name="RESOURCE_ID")
@ApiParam(value ="资源")
@FieldAnnotation(relation = "Resource")
private Long resourceId;
@Column(name="USE_TYPE")
@ApiParam(value ="使用类型")
@FieldAnnotation(defaultValue = "MAIN")
@ -71,11 +77,6 @@ public class OperResource extends BaseAPS {
@FieldAnnotation(property = false)
private Long operationId;
@Column(name="RESOURCE_ID")
@ApiParam(value ="资源")
@FieldAnnotation(property = false)
private Long resourceId;
public Operation getOperation() {
return BeanRelation.get(this, EOperResource.Operation);
}

12
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java
Unescape Escape View File

@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.enums.*;
import cn.estsh.i3plus.pojo.aps.holders.EResource;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
import com.fasterxml.jackson.annotation.JsonBackReference;
@ -30,11 +29,6 @@ import java.util.List;
@Table(name = "APS_RESOURCE")
@Api("资源")
public class Resource extends BaseCode {
@Column(name="BOTTLENECK")
@ApiParam(value ="是否瓶颈资源")
@FieldAnnotation(defaultValue = "false")
private Boolean bottleneck;
@Column(name="TYPE")
@ApiParam(value ="资源类型")
@FieldAnnotation(defaultValue = "MAIN")
@ -89,17 +83,17 @@ public class Resource extends BaseCode {
@Column(name="EFFICIENCY_EFFECT")
@ApiParam(value ="效率影响类型")
@FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class)
@FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class)
private Integer EfficiencyEffect;
@Column(name="TIME_ROUND")
@ApiParam(value ="时间圆整影响")
@FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class)
@FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class)
private Integer timeRound;
@Column(name="TIME_TAIL_ROUND")
@ApiParam(value ="时间尾数影响")
@FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class)
@FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class)
private Integer timeTailRound;
@Column(name="LOCK_TYPE")

11
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java
Unescape Escape View File

@ -25,6 +25,12 @@ import javax.persistence.Table;
@Table(name = "APS_STAND_OPERATION")
@Api("标准工序")
public class StandOperation extends BaseCode {
@Column(name="DIRECTION")
@ApiParam(value ="排程方向")
@FieldAnnotation(defaultValue = "POSITIVE")
private ApsEnumUtil.DIRECTION direction;
@Column(name="RATIO")
@ApiParam(value ="分割比例")
private String ratio;
@ -37,11 +43,6 @@ public class StandOperation extends BaseCode {
@ApiParam(value ="分割批量")
private Double batch;
@Column(name="DIRECTION")
@ApiParam(value ="排程方向")
@FieldAnnotation(defaultValue = "POSITIVE")
private ApsEnumUtil.DIRECTION direction;
@Column(name="COMB_TYPE")
@ApiParam(value ="生产组合方式")
@FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE")

40
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
Unescape Escape View File

@ -38,7 +38,7 @@ public class Work extends BaseAPS {
@Column(name="ORDER_ID")
@ApiParam(value ="订单")
@FieldAnnotation(property = false)
@FieldAnnotation(relation = "Order")
private Long orderId;
@Column(name="WORK_TYPE")
@ -51,6 +51,25 @@ public class Work extends BaseAPS {
@FieldAnnotation(modify = false)
private Double count;
@Column(name="WORK_STATUS")
@ApiParam(value ="工作状态")
private ApsEnumUtil.WORK_STATUS workStatus;
@Column(name="PLAN_BEGIN")
@ApiParam(value ="计划开始时间")
@FieldAnnotation(modify = false)
private Date planBegin;
@Column(name="PLAN_END")
@ApiParam(value ="计划结束时间")
@FieldAnnotation(modify = false)
private Date planEnd;
@Column(name="PLAN_RESOURCE")
@ApiParam(value ="计划主资源")
@FieldAnnotation(modify = false)
private String planResource;
@Column(name="SPECIFY_COUNT")
@ApiParam(value ="指定数量")
private Double specifyCount;
@ -97,25 +116,6 @@ public class Work extends BaseAPS {
@FieldAnnotation(modify = false)
private Date calcLet;
@Column(name="WORK_STATUS")
@ApiParam(value ="工作状态")
private ApsEnumUtil.WORK_STATUS workStatus;
@Column(name="PLAN_BEGIN")
@ApiParam(value ="计划开始时间")
@FieldAnnotation(modify = false)
private Date planBegin;
@Column(name="PLAN_END")
@ApiParam(value ="计划结束时间")
@FieldAnnotation(modify = false)
private Date planEnd;
@Column(name="PLAN_RESOURCE")
@ApiParam(value ="计划主资源")
@FieldAnnotation(modify = false)
private String planResource;
@Column(name="FIX_SPLIT")
@ApiParam(value ="已分割的工作是否固定")
private Boolean fixSplit;

12
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java
Unescape Escape View File

@ -29,16 +29,16 @@ import java.util.List;
@Table(name = "APS_WORK_INPUT")
@Api("工作输入")
public class WorkInput extends BaseAPS {
@Column(name="MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(property = false)
private Long materialId;
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(property = false)
@FieldAnnotation(relation = "Work")
private Long workId;
@Column(name="MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(relation = "Material")
private Long materialId;
@Column(name="INPUT_COUNT")
@ApiParam(value ="输入数量")
@FieldAnnotation(modify = false)

12
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java
Unescape Escape View File

@ -31,16 +31,16 @@ import java.util.List;
@Api("工作输出")
public class WorkOutput extends BaseAPS {
@Column(name="MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(property = false)
private Long materialId;
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(property = false)
@FieldAnnotation(relation = "Work")
private Long workId;
@Column(name="MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(relation = "Material")
private Long materialId;
@Column(name="OUTPUT_COUNT")
@ApiParam(value ="输出数量")
@FieldAnnotation(modify = false)

29
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
Unescape Escape View File

@ -34,6 +34,17 @@ import java.util.List;
@Table(name="APS_WORK_PLAN")
@Api("工作计划")
public class WorkPlan extends BaseAPS {
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(relation = "Work")
private Long workId;
@Column(name="RESOURCE_ID")
@ApiParam(value ="资源")
@FieldAnnotation(relation = "Resource")
private Long resourceId;
@Column(name="TYPE")
@ApiParam(value ="工作计划类型")
@FieldAnnotation(modify = false, display = false)
@ -51,7 +62,7 @@ public class WorkPlan extends BaseAPS {
@Column(name="PREV_SET_TIME")
@ApiParam(value ="前设置时间")
@FieldAnnotation(modify = false)
@FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private Integer prevSetTime;
@Column(name="PRODUCE_BEGIN")
@ -68,7 +79,7 @@ public class WorkPlan extends BaseAPS {
@Column(name="PRODUCE_TIME")
@ApiParam(value ="生产时间")
@FieldAnnotation(modify = false)
@FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private Integer produceTime;
@Column(name="POST_SET_BEGIN")
@ -83,7 +94,7 @@ public class WorkPlan extends BaseAPS {
@Column(name="POST_SET_TIME")
@ApiParam(value ="后设置时间")
@FieldAnnotation(modify = false)
@FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private Integer postSetTime;
@Column(name="LOCK_BEGIN")
@ -99,19 +110,9 @@ public class WorkPlan extends BaseAPS {
@Column(name="LOCK_TIME")
@ApiParam(value ="锁定时间")
@FieldAnnotation(modify = false)
@FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private Integer lockTime;
@Column(name="WORK_ID")
@ApiParam(value ="工作对象id")
@FieldAnnotation(property = false)
private Long workId;
@Column(name="RESOURCE_ID")
@ApiParam(value ="资源对象id")
@FieldAnnotation(property = false)
private Long resourceId;
@Column(name="WORK_RESOURCE_ID")
@ApiParam(value ="工作资源对象id")
@FieldAnnotation(property = false)

10
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java
Unescape Escape View File

@ -30,27 +30,27 @@ public class WorkRelation extends BaseAPS {
@Column(name="MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(property = false)
@FieldAnnotation(relation = "Material")
private Long materialId;
@Column(name="PREV_ORDER_ID")
@ApiParam(value ="前订单")
@FieldAnnotation(property = false)
@FieldAnnotation(relation = "PrevOrder")
private Long prevOrderId;
@Column(name="POST_ORDER_ID")
@ApiParam(value ="后订单")
@FieldAnnotation(property = false)
@FieldAnnotation(relation = "PostOrder")
private Long postOrderId;
@Column(name="PREV_WORK_ID")
@ApiParam(value ="前工作")
@FieldAnnotation(property = false)
@FieldAnnotation(relation = "PrevWork")
private Long prevWorkId;
@Column(name="POST_WORK_ID")
@ApiParam(value ="后工作")
@FieldAnnotation(property = false)
@FieldAnnotation(relation = "PostWork")
private Long postWorkId;
@Column(name="COUNT")

10
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java
Unescape Escape View File

@ -30,12 +30,12 @@ public class WorkResource extends BaseAPS {
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(property = false)
@FieldAnnotation(relation = "Work")
private Long workId;
@Column(name="RESOURCE_ID")
@ApiParam(value ="资源")
@FieldAnnotation(property = false)
@FieldAnnotation(relation = "Resource")
private Long resourceId;
@Column(name="USE_TYPE")
@ -45,17 +45,17 @@ public class WorkResource extends BaseAPS {
@Column(name="PREV_TIME")
@ApiParam(value ="前设置时间")
@FieldAnnotation(modify = false)
@FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private Integer prevTime;
@Column(name="PRODUCE_TIME")
@ApiParam(value ="制造时间")
@FieldAnnotation(modify = false)
@FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private Integer produceTime;
@Column(name="POST_TIME")
@ApiParam(value ="后设置时间")
@FieldAnnotation(modify = false)
@FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION)
private Integer postTime;
@Column(name="PRIORITY")

24
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java
Unescape Escape View File

@ -1,24 +0,0 @@
package cn.estsh.i3plus.pojo.aps.enums;
/**
* @Description :资源效率影响的计划类型
* @Reference :
* @Author : jason.niu
* @CreateDate : 2019-10-17
* @Modify:
**/
public enum EFFICIENCY_EFFECT {
PREV_SET(1), // 前设置
PRODUCE(2), // 生产
POST_SET(4); // 后设置
private int _value;
EFFICIENCY_EFFECT(int value){
_value = value;
}
public int value() {
return this._value;
}
}

3
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java
Unescape Escape View File

@ -1,10 +1,7 @@
package cn.estsh.i3plus.pojo.aps.holders;
import io.swagger.annotations.ApiParam;
public enum EBaseOrder {
Works,
@ApiParam(value = "物料")
Material,
PrevRelations,
PostRelations,

4
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java
Unescape Escape View File

@ -1,9 +1,5 @@
package cn.estsh.i3plus.pojo.aps.holders;
import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation;
@HolderAnnotation(notProperty = {"ParentWork", "WorkResources", "WorkInputs", "WorkOutputs",
"PrevRelations", "PostRelations", "Operation"})
public enum EWork {
Order, // 订单
ParentWork, // 父工作

3
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java
Unescape Escape View File

@ -1,8 +1,5 @@
package cn.estsh.i3plus.pojo.aps.holders;
import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation;
@HolderAnnotation(notProperty = {"OperInput"})
public enum EWorkInput {
Work,
WorkRelations,

3
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java
Unescape Escape View File

@ -1,8 +1,5 @@
package cn.estsh.i3plus.pojo.aps.holders;
import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation;
@HolderAnnotation(notProperty = "OperOutput")
public enum EWorkOutput {
Work,
WorkRelations,

3
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java
Unescape Escape View File

@ -1,8 +1,5 @@
package cn.estsh.i3plus.pojo.aps.holders;
import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation;
@HolderAnnotation(notProperty = {"WorkResource", "MainPlan", "FurnacePlan"})
public enum EWorkPlan {
Work,
Resource,

3
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java
Unescape Escape View File

@ -1,8 +1,5 @@
package cn.estsh.i3plus.pojo.aps.holders;
import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation;
@HolderAnnotation(notProperty = {"WorkInput", "WorkOutput"})
public enum EWorkRelation {
Material,
PrevOrder,

3
modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java
Unescape Escape View File

@ -1,8 +1,5 @@
package cn.estsh.i3plus.pojo.aps.holders;
import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation;
@HolderAnnotation(notProperty = "OperResource")
public enum EWorkResource {
Work,
Resource,

26
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
Unescape Escape View File

@ -324,6 +324,32 @@ public class ApsEnumUtil {
}
/**
* 资源效率影响类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum EFFICIENCY_EFFECT {
PREV_SET(1, "前设置"), // 前设置
PRODUCE(2, "生产"), // 生产
POST_SET(4, "后设置"); // 后设置
private int value;
private String description;
EFFICIENCY_EFFECT(int value, String description){
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
* 预置的资源选择规则
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)

3
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java
Unescape Escape View File

@ -842,7 +842,8 @@ public class ImppEnumUtil {
NUMBER(2,"number","数字"),
DATE(3,"date","时间"),
SWITCH(4,"switch","布尔"),
SELECT(5,"select","选择");
SELECT(5,"select","选择"),
FILE(6,"select","选择");
private int value;
private String name;

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -1053,7 +1053,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STOCK_SN_QC_STATUS {
NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "ISOLATED", "报废");
NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废");
private int value;
private String code;

3
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java
Unescape Escape View File

@ -51,6 +51,9 @@ public class StepPrintSnModel extends MesProduceSn {
@ApiParam("客户名称")
private String customerName;
@ApiParam("客户零件号")
private String customerPartNo;
@ApiParam("客户物料名称")
private String customerPartName;

4
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java
Unescape Escape View File

@ -37,6 +37,10 @@ public class IfDismantleRecord extends BaseBean {
@ApiParam("产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位")
private String workCellCode;
@Column(name = "PARENT_PART_NO")
@ApiParam("产品物料编码")
private String parentPartNo;

5
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java
Unescape Escape View File

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
@ -19,8 +20,8 @@ import java.math.BigDecimal;
@Data
@NoArgsConstructor
@AllArgsConstructor
@Api("动作函数关系model")
public class IfRawPartDataModel implements Serializable {
@Api("原材料信息model")
public class IfRawPartDataModel extends BaseBean {
@ApiParam("id")
private Long id;

Write Preview
Loading…
Cancel
Save