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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
yun-zuoyi
1111 6 years ago
parent d35c6e97cd 1720952d23
commit e0a5b36061
22 changed files with 190 additions and 118 deletions
Show Stats Download Patch File Download Diff File

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

@ -0,0 +1,12 @@
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();
}

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

@ -30,25 +30,25 @@ public class DynamicSetTime extends BaseAPS {
private String resCode;
@Column(name="TYPE")
@ApiParam(value ="应用工作计划类型")
@ApiParam(value ="影响类型")
@FieldAnnotation(defaultValue = "ALL")
private ApsEnumUtil.DYNAMIC_SET_TYPE type;
@Column(name="CONSIDER_ASS_RES")
@ApiParam(value ="是否启用副资源动态设置时间")
@ApiParam(value ="启用副资源设置时间")
private Boolean considerAssRes;
@Column(name="CONSIDER_MATERIAL")
@ApiParam(value ="是否启用物料动态设置时间")
@ApiParam(value ="启用物料设置时间")
private Boolean considerMaterial;
@Column(name="ASS_RES_CALC")
@ApiParam(value ="副资源动态设置计算方式")
@ApiParam(value ="副资源设置计算方式")
@FieldAnnotation(defaultValue = "MAX")
private ApsEnumUtil.DYNAMIC_SET_CALC assResCalc;
@Column(name="MATERIAL_CALC")
@ApiParam(value ="物料动态设置时间计算方式")
@ApiParam(value ="物料设置时间计算方式")
@FieldAnnotation(defaultValue = "MAX")
private ApsEnumUtil.DYNAMIC_SET_CALC materialCalc;

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

@ -1,5 +1,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.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
@ -50,18 +51,22 @@ public class FieldInfo extends BaseCode {
@Column(name="CUSTOMIZE")
@ApiParam(value ="是否为自定义字段")
private Boolean customize;
@FieldAnnotation(defaultValue = "true")
private Boolean customize = true;
@Column(name="MODIFY")
@ApiParam(value ="是否能修改")
private Boolean modify;
@FieldAnnotation(defaultValue = "true")
private Boolean modify = true;
@Column(name="DISPLAY")
@ApiParam(value ="是否在界面显示")
private Boolean display;
@FieldAnnotation(defaultValue = "true")
private Boolean display = true;
@Column(name="PRIC")
@ApiParam(value ="浮点数显示精度")
@FieldAnnotation(defaultValue = "2")
private Integer pric;
@Column(name="TIPS")

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

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BaseCode;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.EWork;
@ -29,10 +30,20 @@ import java.util.List;
@Entity
@Table(name = "APS_WORK")
@Api("工作")
public class Work extends BaseCode {
public class Work extends BaseAPS {
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true)
private String code;
@Column(name="ORDER_ID")
@ApiParam(value ="订单")
@FieldAnnotation(property = false)
private Long orderId;
@Column(name="WORK_TYPE")
@ApiParam(value ="工作类型")
@FieldAnnotation(modify = false)
@FieldAnnotation(property = false)
private ApsEnumUtil.WORK_TYPE workType;
@Column(name="count")
@ -124,11 +135,6 @@ public class Work extends BaseCode {
@FieldAnnotation(modify = false)
private String failedReason;
@Column(name="ORDER_ID")
@ApiParam(value ="订单")
@FieldAnnotation(property = false)
private Long orderId;
@Column(name="OPERATION_ID")
@ApiParam(value ="工序")
@FieldAnnotation(property = false)

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

@ -29,10 +29,15 @@ import java.util.List;
@Table(name = "APS_WORK_INPUT")
@Api("工作输入")
public class WorkInput extends BaseAPS {
@Column(name="INPUT_TIME")
@ApiParam(value ="输入时间")
@FieldAnnotation(modify = false)
private Date inputTime;
@Column(name="MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(property = false)
private Long materialId;
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(property = false)
private Long workId;
@Column(name="INPUT_COUNT")
@ApiParam(value ="输入数量")
@ -44,15 +49,10 @@ public class WorkInput extends BaseAPS {
@FieldAnnotation(modify = false)
private Double shortCount;
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(property = false)
private Long workId;
@Column(name="MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(property = false)
private Long materialId;
@Column(name="INPUT_TIME")
@ApiParam(value ="输入时间")
@FieldAnnotation(modify = false)
private Date inputTime;
@Column(name="OPER_INPUT_ID")
@ApiParam(value ="工序输入")

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

@ -30,10 +30,16 @@ import java.util.List;
@Table(name = "APS_WORK_OUTPUT")
@Api("工作输出")
public class WorkOutput extends BaseAPS {
@Column(name="OUTPUT_TIME")
@ApiParam(value ="输出时间")
@FieldAnnotation(modify = false)
private Date outputTime;
@Column(name="MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(property = false)
private Long materialId;
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(property = false)
private Long workId;
@Column(name="OUTPUT_COUNT")
@ApiParam(value ="输出数量")
@ -45,15 +51,10 @@ public class WorkOutput extends BaseAPS {
@FieldAnnotation(modify = false)
private Double remainCount;
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(property = false)
private Long workId;
@Column(name="MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(property = false)
private Long materialId;
@Column(name="OUTPUT_TIME")
@ApiParam(value ="输出时间")
@FieldAnnotation(modify = false)
private Date outputTime;
@Column(name="OPER_OUTPUT_ID")
@ApiParam(value ="工序输出")

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

@ -27,6 +27,37 @@ import javax.persistence.Table;
@Table(name = "APS_Work_Relation")
@Api("工作关联")
public class WorkRelation extends BaseAPS {
@Column(name="MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(property = false)
private Long materialId;
@Column(name="PREV_ORDER_ID")
@ApiParam(value ="前订单")
@FieldAnnotation(property = false)
private Long prevOrderId;
@Column(name="POST_ORDER_ID")
@ApiParam(value ="后订单")
@FieldAnnotation(property = false)
private Long postOrderId;
@Column(name="PREV_WORK_ID")
@ApiParam(value ="前工作")
@FieldAnnotation(property = false)
private Long prevWorkId;
@Column(name="POST_WORK_ID")
@ApiParam(value ="后工作")
@FieldAnnotation(property = false)
private Long postWorkId;
@Column(name="COUNT")
@ApiParam(value ="关联数量")
@FieldAnnotation(modify = false)
private Double count;
@Column(name="TYPE")
@ApiParam(value ="关联类型")
@FieldAnnotation(modify = false)
@ -47,11 +78,6 @@ public class WorkRelation extends BaseAPS {
@FieldAnnotation(modify = false)
private String minSpaceTime;
@Column(name="COUNT")
@ApiParam(value ="关联数量")
@FieldAnnotation(modify = false)
private Double count;
@Column(name="FIX_RELATION")
@ApiParam(value ="是否固定关联")
private Boolean fixRelation;
@ -70,31 +96,6 @@ public class WorkRelation extends BaseAPS {
@FieldAnnotation(property = false)
private Long workOutputId;
@Column(name="PREV_WORK_ID")
@ApiParam(value ="前工作")
@FieldAnnotation(property = false)
private Long prevWorkId;
@Column(name="POST_WORK_ID")
@ApiParam(value ="后工作")
@FieldAnnotation(property = false)
private Long postWorkId;
@Column(name="PREV_ORDER_ID")
@ApiParam(value ="前订单")
@FieldAnnotation(property = false)
private Long prevOrderId;
@Column(name="POST_ORDER_ID")
@ApiParam(value ="后订单")
@FieldAnnotation(property = false)
private Long postOrderId;
@Column(name="MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(property = false)
private Long materialId;
public WorkInput getWorkInput() {
return BeanRelation.get(this, EWorkRelation.WorkInput);
}

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

@ -27,6 +27,17 @@ import javax.persistence.Table;
@Table(name = "APS_WORK_RESOURCE")
@Api("工作资源")
public class WorkResource extends BaseAPS {
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(property = false)
private Long workId;
@Column(name="RESOURCE_ID")
@ApiParam(value ="资源")
@FieldAnnotation(property = false)
private Long resourceId;
@Column(name="USE_TYPE")
@ApiParam(value ="使用类型")
@FieldAnnotation(modify = false)
@ -72,16 +83,6 @@ public class WorkResource extends BaseAPS {
@FieldAnnotation(modify = false)
private String userMatchNumber;
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(property = false)
private Long workId;
@Column(name="RESOURCE_ID")
@ApiParam(value ="资源")
@FieldAnnotation(property = false)
private Long resourceId;
@Column(name="OPER_RESOURCE_ID")
@ApiParam(value ="工序资源")
@FieldAnnotation(property = false)

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

@ -28,8 +28,4 @@ public abstract class BaseCode extends BaseAPS {
@ApiParam(value ="名称")
@FieldAnnotation(popSearch = true)
private String name;
@Column(name="REMARK")
@ApiParam(value ="备注")
private String remark;
}

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

@ -1,5 +1,9 @@
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,5 +1,8 @@
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,5 +1,8 @@
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,5 +1,8 @@
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,

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

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

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

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

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

@ -2962,7 +2962,8 @@ public class MesEnumUtil {
SUPPLY_SWITCH(150,"SUPPLY_SWITCH",""),
PCN_LOGIN(160, "PCN_LOGIN",""),
PCN_MENU(170, "PCN_MENU",""),
PCN_MODULE(180, "PCN_MODULE","");
PCN_MODULE(180, "PCN_MODULE",""),
PCN_LOGOUT(190, "PCN_LOGOUT","");
private int value;
@ -3073,6 +3074,39 @@ public class MesEnumUtil {
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ONLINE_SEND_TYPE {
PLC("PLC", "PLC"),
DB("DB", "DB");
private String value;
private String description;
ONLINE_SEND_TYPE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* WC_CHECK_TYPE 开线检查的模块
*/

12
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java
Unescape Escape View File

@ -100,21 +100,9 @@ public class MesPackage extends BaseBean {
private String printStrStatus;
@Transient
@ApiParam("客户代码名称")
private String custCodeName;
@Transient
@ApiParam("打印缓存id")
private String printId;
@Transient
@ApiParam("包装层级名称")
private String packLevelName;
@Transient
@ApiParam("是否封箱名称")
private String isSealedName;
public MesPackage() {
}

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

@ -44,6 +44,10 @@ public class MesShift extends BaseBean {
@ApiParam("开班时间")
private String startTime;
@Column(name = "END_TIME")
@ApiParam("下班时间")
private String endTime;
@Column(name = "WORK_TIMES")
@ApiParam("作业时长")
private Double workTimes;

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

@ -73,9 +73,6 @@ public class ProdPackageModel {
@ApiParam("打印状态文字")
private String printStrStatus;
@ApiParam("客户代码名称")
private String custCodeName;
@ApiParam("包装层级名称")
private String packLevelName;

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

@ -53,4 +53,20 @@ public class StepPrintSnModel extends MesProduceSn {
@ApiParam("客户物料名称")
private String customerPartName;
@ApiParam("物料名称")
private String partNameRdd;
@ApiParam("单位")
private String unit;
@ApiParam("特殊批号")
private String fixLotNo;
@ApiParam("生产工单号")
private String workOrderNo;
@ApiParam("生产线代码")
private String workCenterCode;
}

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

@ -99,16 +99,4 @@ public class MesPackage extends BaseBean {
@ApiParam("打印状态文字")
private String printStrStatus;
@Transient
@ApiParam("客户代码名称")
private String custCodeName;
@Transient
@ApiParam("包装层级名称")
private String packLevelName;
@Transient
@ApiParam("是否封箱名称")
private String isSealedName;
}

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

@ -44,6 +44,10 @@ public class MesShift extends BaseBean {
@ApiParam("开班时间")
private String startTime;
@Column(name = "END_TIME")
@ApiParam("下班时间")
private String endTime;
@Column(name = "WORK_TIMES")
@ApiParam("作业时长")
private Double workTimes;

Write Preview
Loading…
Cancel
Save