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
crish 6 years ago
parent 3645541765 c4ed0f1f37
commit 92c1e846b6
21 changed files with 265 additions and 97 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,

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

@ -251,4 +251,80 @@ public class LacEnumUtil {
}
}
/**
* 指令操作类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum COMMAND_OPERATE_TYPE{
COMMAND_STACK(10,"指令集"),
COMMAND_STACK_STEP(20,"指令集步骤"),
COMMAND_STACK_STEP_TASK(30,"指令集步骤任务");
private int value;
private String description;
COMMAND_OPERATE_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 指令操作类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum COMMAND_OPERATE{
RESUME(11,"恢复",COMMAND_OPERATE_TYPE.COMMAND_STACK),
PAUSE(12,"暂停",COMMAND_OPERATE_TYPE.COMMAND_STACK),
CLOSE(13,"关闭",COMMAND_OPERATE_TYPE.COMMAND_STACK),
NEXT_STEP(14,"下一步",COMMAND_OPERATE_TYPE.COMMAND_STACK),
INTERRUPT(21,"中断",COMMAND_OPERATE_TYPE.COMMAND_STACK_STEP_TASK);
private int value;
private String description;
private COMMAND_OPERATE_TYPE commandOperateType;
COMMAND_OPERATE(int value, String description,COMMAND_OPERATE_TYPE commandOperateType) {
this.value = value;
this.description = description;
this.commandOperateType = commandOperateType;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

30
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java
Unescape Escape View File

@ -0,0 +1,30 @@
package cn.estsh.i3plus.pojo.lac.bean;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-11-19 16:14
* @Modify:
**/
@Data
@ApiModel("指令操作")
public class LacCommandOperate {
@ApiParam(value ="指令集记录id" , example = "-1")
private Long commandStackRecordId;
@ApiParam(value ="步骤任务id" , example = "-1")
private Long commandStackStepTaskIdId;
@ApiParam(value ="操作类型" , example = "-1")
private Integer operateType;
@ApiParam(value ="操作" , example = "-1")
private Integer operate;
}

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

@ -94,6 +94,10 @@ public class LacCommandStackRecord extends BaseBean {
private String executionDescription;
@Transient
@ApiParam(value ="Lac实例id")
private String lacInstanceId;
@Transient
@ApiParam(value ="指令集模板")
private LacCommandStackTemplate template;

28
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java
Unescape Escape View File

@ -2,9 +2,19 @@ package cn.estsh.i3plus.pojo.lac.sqlpack;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.lac.bean.*;
import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord;
import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStep;
import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask;
import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackTemplate;
import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackType;
import cn.estsh.i3plus.pojo.lac.bean.LacLogTask;
import cn.estsh.i3plus.pojo.lac.bean.LacLogTaskDetail;
import cn.estsh.i3plus.pojo.lac.bean.LacSuitTask;
import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParam;
import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParamAdapter;
import cn.estsh.i3plus.pojo.lac.bean.LacTaskType;
import java.util.List;
/**
@ -61,9 +71,9 @@ public class LacHqlPack {
public static DdlPackBean packHqlLacCommandStackStepTask(LacCommandStackStepTask bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bean.getStepId(),"stepId",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bean.getTemplateId(), "templateId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bean.getStepId(), "stepId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bean.getTaskId(), "taskId", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bean.getTaskNameRdd(), "taskNameRdd", ddlPackBean);
return ddlPackBean;
@ -104,7 +114,7 @@ public class LacHqlPack {
public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
if(bean == null){
if (bean == null) {
return ddlPackBean;
}
DdlPreparedPack.getNumEqualPack(bean.getParamType(), "paramType", ddlPackBean);
@ -143,4 +153,10 @@ public class LacHqlPack {
);
return ddlPackBean;
}
public static DdlPackBean packHqlNotFinishLacCommandStackRecord() {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumberSmallerPack(LacEnumUtil.STACK_STATUS.FINISH.getValue(), "stackStatus", ddlPackBean);
return ddlPackBean;
}
}

1
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java
Unescape Escape View File

@ -44,6 +44,7 @@ public class LacCommandStackModel {
*/
private Exception exception;
public void setException(Exception exception){
LoggerFactory.getLogger("YYYY").error("异常信息：{}",exception);
this.exception = exception;

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java
Unescape Escape View File

@ -142,7 +142,7 @@ public class WmsPoSn extends BaseBean {
@ApiParam(value = "最晚收货时间")
public String latestReceTime;
@Column(name = "FIX_LOT_NO", nullable = false)
@Column(name = "FIX_LOT_NO")
@ApiParam(value = "特殊批次")
private String fixLotNo = "";

Write Preview
Loading…
Cancel
Save