diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java index cd04561..9dfac91 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/DynamicField.java @@ -43,4 +43,6 @@ public @interface DynamicField { String searchColumnName() default ""; // 回显列名 String explicitColumnName() default ""; + // 下拉框规则 + WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE selectRule() default WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_ENUM; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 691da86..ad2e0e4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -148,6 +148,72 @@ public class MesEnumUtil { return valueOf(val); } } + + /** + * 排序校验模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TOOLING_ACTION_RECORD_TYPE { + REPLACE(10, "REPLACE", "更换"), + WAREHOUSE(20, "WAREHOUSE", "入库"), + Use(30, "Use", "领用"); + + private int value; + private String code; + private String description; + + TOOLING_ACTION_RECORD_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String codeOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } /** * JIS发运是否按主队列顺序扫描 */ @@ -1173,7 +1239,9 @@ public class MesEnumUtil { public enum MES_PRODUCE_SN_TYPE { NORMAL(10, "正常件"), - FIRST_INSPECTION(20, "首检件"); + FIRST_INSPECTION(20, "首检件"), + HALF_PRODUCT(30, "半成品"), + KP(40, "关键件"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 00283d0..d48d6ad 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -202,7 +202,7 @@ public class MesPcnEnumUtil { PCN_MENU(170, "PCN_MENU", ""), PCN_MODULE(180, "PCN_MODULE", ""), PCN_LOGOUT(190, "PCN_LOGOUT", ""), - UPDATE_LOCALE_RES(200, "LOCALE_RES_URL", "LOCALE_RES_URL"), + UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"), PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""), PCN_SYS_ALL_LANGUAGE(220, "PCN_SYS_ALL_LANGUAGE", "PCN_SYS_ALL_LANGUAGE"), PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE"); @@ -418,7 +418,9 @@ public class MesPcnEnumUtil { public enum MES_PRODUCE_SN_TYPE { NORMAL(10, "正常件"), - FIRST_INSPECTION(20, "首检件"); + FIRST_INSPECTION(20, "首检件"), + HALF_PRODUCT(30, "半成品"), + KP(40, "关键件"); private int value; private String description; @@ -2215,43 +2217,6 @@ public class MesPcnEnumUtil { } /** - * 条码类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PCN_SN_TYPE { - - NORMAL(10, "正常件"), - FIRST_INSPECTION(20, "首检件"); - - private int value; - private String description; - - PCN_SN_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; - } - } - - - /** * MesPlanOrder实体对应的source值 计划来源 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -2482,7 +2447,8 @@ public class MesPcnEnumUtil { FILE("file", "定制内容文件"), IMAGE("image", "图片"), BUTTON("button", "按钮"), - TABLES("tables", "多个表格"); + TABLES("tables", "多个表格"), + DATA("data", "表格"); private String value; private String description; @@ -3098,4 +3064,78 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * mes_设备工装类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EQUIPMENT_TOOLING_TOOLING_TYPE { + + WORK_CLOTHES(10, "工装"), + CHECKING_TOOL(20, "检具"), + MOULD(30, "模具"); + + private int value; + private String description; + + EQUIPMENT_TOOLING_TOOLING_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; + } + } + + /** + * mes_工装操作记录表的操作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ACTION_TYPE { + + REPLACE(10, "更换"), + WAREHOUSING(20, "入库"), + RECEIVE(30, "领用"); + + private int value; + private String description; + + ACTION_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; + } + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 86e527d..4a4bb65 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -1469,9 +1469,9 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AREA_SECTION_TASK_TYPE { - CREATE(10, "CREATE", "JIT任务"), - RECEIPT(20, "IN_PROGRESS", "单据任务"), - RECEIPT_FINISH(30, "COMPLETED", "单点任务"); + JIT_TASK(10, "JIT_TASK", "JIT任务"), + DOCUMENT_TASK(20, "DOCUMENT_TASK", "单据任务"), + SINGLE_POINT_TASK(30, "SINGLE_POINT_TASK", "单点任务"); private int value; private String code; @@ -1560,9 +1560,9 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AREA_TASK_TYPE { - CREATE(10, "JIT_TASK", "JIT任务"), - RECEIPT(20, "DOCUMENT_TASK", "单据任务"), - RECEIPT_FINISH(30, "SINGLE_POINT_TASK", "单点任务"); + JIT_TASK(10, "JIT_TASK", "JIT任务"), + DOCUMENT_TASK(20, "DOCUMENT_TASK", "单据任务"), + SINGLE_POINT_TASK(30, "SINGLE_POINT_TASK", "单点任务"); private int value; private String code; @@ -1606,9 +1606,9 @@ public class PtlPcnEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MAIN_TASK_TYPE { - CREATE(10, "JIT_TASK", "JIT任务"), - RECEIPT(20, "DOCUMENT_TASK", "单据任务"), - RECEIPT_FINISH(30, "SINGLE_POINT_TASK", "单点任务"); + JIT_TASK(10, "JIT_TASK", "JIT任务"), + DOCUMENT_TASK(20, "DOCUMENT_TASK", "单据任务"), + SINGLE_POINT_TASK(30, "SINGLE_POINT_TASK", "单点任务"); private int value; private String code; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index d7b4c19..4fd1ad6 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1275,45 +1275,45 @@ public class WmsEnumUtil { } } - /** - * 盘点主表 单据类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum CS_STRATEGY_TYPE { - PART_COVERAGE(110, "物料分类覆盖"), - TOUCH(120, "动碰"), - ZORE_STOCK(130, "零库存"); - - private int value; - private String description; - - CS_STRATEGY_TYPE(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOf(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - - public static String valueOfDescription(int val) { - return valueOf(val); - } - } + /** + * 盘点主表 单据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CS_STRATEGY_TYPE { + PART_COVERAGE(110, "物料分类覆盖"), + TOUCH(120, "动碰"), + ZORE_STOCK(130, "零库存"); + + private int value; + private String description; + + CS_STRATEGY_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } /** * 盘点主表 单据类型 @@ -2986,7 +2986,6 @@ public class WmsEnumUtil { } return tmp; } - public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -4188,7 +4187,7 @@ public class WmsEnumUtil { } } - /** + /**分类 * 物流规则 处理单位 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -4425,10 +4424,10 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PACKAGE_OPERATE_TYPE { - PACKAGE_ADD("PACKAGE_ADD", "新增"), - PACKAGE_ADDITIONAL("PACKAGE_ADDITIONAL", "追加"), - PACKAGE_DELETE("PACKAGE_DELETE", "删除"), - PACKAGE_CLEAR("PACKAGE_CLEAR", "清空"); + PACKAGE_ADD("PACKAGE_ADD", "新建组号"), + PACKAGE_ADDITIONAL("PACKAGE_ADDITIONAL", "增添条码"), + PACKAGE_DELETE("PACKAGE_DELETE", "移除条码"), + PACKAGE_CLEAR("PACKAGE_CLEAR", "删除组号"); private String value; private String description; @@ -4909,10 +4908,18 @@ public class WmsEnumUtil { } return tmp; } + public static FIELD_TYPE codeOf(Integer value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value==value) { + return values()[i]; + } + } + return null; + } } /** - * 推送类型 + * 推送类型单位 * 默认为 10 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -5170,23 +5177,84 @@ public class WmsEnumUtil { } } - /** - * 推送类型单位 + * 插件类型 10-PDA插件，20-按钮增强插件，30-交易处理插件 + * 默认为 10 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum QAD_DOC_TYPE { - TYPE_S(10, "s","s"), TYPE_D(20, "d","d"); + public enum PLUGIN_TYPE { + PDA_PLUGIN(10, "PDA_PLUGIN", "PDA插件"), + BTN_PLUGIN(20, "BTN_PLUGIN", "按钮增强插件"), + TRANS_PLUGIN(30, "TRANS_PLUGIN", "交易处理插件"); private int value; private String code; private String description; + PLUGIN_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + public String getCode() { return code; } - QAD_DOC_TYPE(int value,String code, String description) { + public static PLUGIN_TYPE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 动态查询-下拉框规则 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DYNAMIC_FIELD_SELECT_RULE { + SINGLE_ENUM(10, "SINGLE_ENUM", "单选枚举"), + MULTIPLE_ENUM(20, "MULTIPLE_ENUM", "多选枚举"), + SINGLE_URL(30, "SINGLE_URL", "单选接口"), + MULTIPLE_URL(40, "MULTIPLE_URL", "多选接口"); + + private int value; + private String code; + private String description; + + DYNAMIC_FIELD_SELECT_RULE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; @@ -5200,7 +5268,20 @@ public class WmsEnumUtil { return description; } - public static String valueOfDescription(int val) { + public String getCode() { + return code; + } + + public static DYNAMIC_FIELD_SELECT_RULE codeOf(int value) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + return null; + } + + public static String valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -5209,5 +5290,15 @@ public class WmsEnumUtil { } return tmp; } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } } } \ No newline at end of file diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java index cb03681..5d5a48c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java @@ -105,4 +105,8 @@ public class MesPlc extends BaseBean implements Serializable { @Transient @ApiParam("设备名称") private String equipmentName; + + @Column(name = "TOOLING_CODE ") + @ApiParam("工装代码") + private String toolingCode; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java new file mode 100644 index 0000000..b29fae0 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesSnPhotoRelation.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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 java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/18 0018 - 9:07 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SN_PHOTO_RELATION") +@Api("条码照片关系") +public class MesSnPhotoRelation extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7732648131003455681L; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("条码") + private String serialNumber; + + @Column(name = "PHOTO_PATH") + @ApiParam("照片路径") + private String photoPath; + + @Column(name = "PHOTO_NAME") + @ApiParam("照片名称") + private String photoName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java new file mode 100644 index 0000000..9353299 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipmentTooling.java @@ -0,0 +1,88 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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.Transient; +import java.io.Serializable; + +/** + * @Description :MES_设备工装关系 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-03-19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EQUIPMENT_TOOLING") +@Api("MES_设备工装关系") +public class MesEquipmentTooling extends BaseBean implements Serializable { + private static final long serialVersionUID = 1947971369479107711L; + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name = "TOOLING_NO") + @ApiParam("工装编号") + private String toolingNo; + + @Column(name = "TOOLING_CODE") + @ApiParam("工装代码") + private String toolingCode ; + + @Column(name = "TOOLING_NAME") + @ApiParam("工装名称") + private String toolingName; + + @Column(name = "TOOLING_TYPE") + @ApiParam("工装类型") + private Integer toolingType; + + @Column(name = "USE_COUNT") + @ApiParam("使用次数") + private Integer useCount; + + @Column(name = "START_TIME") + @ApiParam("更换开始时间") + private String startTime; + + @Column(name = "END_TIME") + @ApiParam("更换结束时间") + private String endTime; + + @Transient + @ApiParam("最大次数") + private Integer useCountMax; + + public Integer getToolingType() { + return this.toolingType == null ? 0 : this.toolingType; + } + + public Integer getUseCount() { + return this.useCount == null ? 0 : this.useCount; + } + + public MesEquipmentTooling(){ + + } + + public MesEquipmentTooling(MesTooling tooling, Integer useCount) { + this.toolingCode = tooling.getToolingCode(); + this.toolingName = tooling.getToolingName(); + this.useCount = useCount; + this.useCountMax = tooling.getUseCountMax(); + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java index f9c2852..9c36828 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java @@ -41,4 +41,12 @@ public class MesFaultPhenomenon extends BaseBean implements Serializable { @Column(name = "PARENT_FP_CODE") @ApiParam("父阶现象代码") private String parentFpCode; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name = "FP_TYPE") + @ApiParam("故障现象类型") + private Integer fpType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java index befec26..5dd8c97 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java @@ -55,9 +55,9 @@ public class MesKpData extends BaseBean implements Serializable { @ApiParam("数据下限") private Double lowerLimit; - @Column(name = "TERMINAL_ID") + @Column(name = "WORK_CELL_CODE") @ApiParam("工位") - private Integer terminalId; + private String workCellCode; @Column(name = "TORQUE_GROUP") @ApiParam("扭矩组") @@ -79,6 +79,10 @@ public class MesKpData extends BaseBean implements Serializable { @ApiParam("JOB_ID") private Integer jobId; + @Column(name = "LAST_TIGHTENING_ID") + @ApiParam("最后一次扭矩id") + private Long lastTighteningId; + @Transient @ApiParam("扭矩值") private Double torqueValue; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java new file mode 100644 index 0000000..13e8069 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCheck.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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 java.io.Serializable; + +/** + * @Description :物料校验项 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PART_CHECK") +@Api("物料校验项") +public class MesPartCheck extends BaseBean implements Serializable { + + private static final long serialVersionUID = -7706120594398072630L; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "CHECK_SPEL_EXPRESS") + @ApiParam("校验表达式") + private String checkSpelExpress; + + @Column(name = "TYPE_SPEL_EXPRESS") + @ApiParam("类型表达式") + private String typeSpelExpress; + + @Column(name = "RECORD_NUM_SPEL_EXPRESS") + @ApiParam("记录数量表达式") + private String recordNumSpelExpress; + + @Column(name = "RECORD_NUM_DESC") + @ApiParam("校验表达式") + private String recordNumDesc; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 6c6aeec..b71bdbd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -127,5 +127,9 @@ public class MesPlc extends BaseBean implements Serializable { @Transient @ApiParam("OPC值") - private List opcValue; + private String opcValue; + + @Column(name = "TOOLING_CODE ") + @ApiParam("工装代码") + private String toolingCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java index 34389f0..6a40ee7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java @@ -42,4 +42,8 @@ public class MesProdCfg extends BaseBean implements Serializable { @Column(name = "PROD_CFG_Type_CODE") @ApiParam("产品配置类型代码") private String prodCfgTypeCode; + + @Column(name = "PROD_CFG_TYPE") + @ApiParam("产品配置类型") + private String prodCfgType; } 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 8590fbb..cd951ae 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 @@ -13,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; -import java.util.List; /** * @Description :生产数据 @@ -113,7 +112,7 @@ public class MesProductData extends BaseBean implements Serializable { @Lob @Column(name = "LINE_DATA") @ApiParam("生产数据") - private List lineData; + private String lineData; @Lob @Transient diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 04517c5..1fe5536 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -76,7 +76,7 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("产品类型名称") private String pptCode; - @Column(name = "QUEUE_GROUP_NO") + @Column(name = "QUEUE_GROUP_NO") @ApiParam("分组队列编号") private String queueGroupNo; @@ -84,10 +84,18 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("组内编号") private Integer groupNo; + @Column(name = "IS_GROUP_PRINTED") + @ApiParam("料架是否已打印") + private Integer isGroupPrinted; + @Transient @ApiParam("队列序号") private Double queueSeq; + @Column(name = "FINSIH_QTY") + @ApiParam("已生产数量") + private Double finsihQty; + public double getQueueSeqVal() { return this.queueSeq == null ? 0.0d : this.queueSeq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteStatus.java new file mode 100644 index 0000000..780af83 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteStatus.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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 java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "MES_ROUTE_STATUS") +@EqualsAndHashCode(callSuper = true) +@Api("流程状态") +public class MesRouteStatus extends BaseBean implements Serializable { + private static final long serialVersionUID = 4988786372428896721L; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name = "STATUS_CODE") + @ApiParam("状态代码") + private String statusCode; + + @Column(name = "STATUS_NAME") + @ApiParam("状态名称") + private String statusName; + + @Column(name = "NEXT_STATUS") + @ApiParam("下一状态") + private String nextStatus; + + @Column(name = "TRIGGER_TYPE") + @ApiParam("触发类型") + private Integer triggerType; + + @Column(name = "TRIGGER_EVENT") + @ApiParam("触发事件") + private String triggerEvent; + + @Column(name = "TRIGGER_WHERE") + @ApiParam("触发条件（MVEL）") + private String triggerWhere; + + @Column(name = "ACTION_AMG_ID") + @ApiParam("触发调用") + private Long actionAmgId; + + @Column(name = "IN_AMG_ID") + @ApiParam("进入状态调用") + private Long inAmgId; + + @Column(name = "OUT_AMG_ID") + @ApiParam("离开状态调用") + private Long outAmgId; + + @Column(name = "STATUS_TYPE") + @ApiParam("状态类型") + private Integer statusType; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java new file mode 100644 index 0000000..d54028c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSnPhotoRelation.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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 java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/18 0018 - 9:02 + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_SN_PHOTO_RELATION") +@Api("条码照片关系") +public class MesSnPhotoRelation extends BaseBean implements Serializable { + + private static final long serialVersionUID = -3062206473345277360L; + + @Column(name = "SERIAL_NUMBER") + @ApiParam("条码") + private String serialNumber; + + @Column(name = "PHOTO_PATH") + @ApiParam("照片路径") + private String photoPath; + + @Column(name = "PHOTO_NAME") + @ApiParam("照片名称") + private String photoName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java new file mode 100644 index 0000000..cf099ca --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTooling.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.mes.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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 java.io.Serializable; + +/** + * @Description :MES工装类型 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-19 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TOOLING") +@Api("MES工装类型") +public class MesTooling extends BaseBean implements Serializable { + private static final long serialVersionUID = -5033127912658757665L; + + @Column(name = "TOOLING_CODE ") + @ApiParam("工装代码") + private String toolingCode ; + + @Column(name = "TOOLING_NAME") + @ApiParam("工装名称") + private String toolingName; + + @Column(name = "TOOLING_TYPE") + @ApiParam("工装类型") + private Integer toolingType; + + @Column(name = "USE_COUNT_MAX") + @ApiParam("最大使用次数") + private Integer useCountMax; + + @Column(name = "USE_TIME_MAX") + @ApiParam("最大使用时间") + private String useTimeMax; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingActionRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingActionRecord.java new file mode 100644 index 0000000..ee236fc --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesToolingActionRecord.java @@ -0,0 +1,79 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +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 java.io.Serializable; + +/** + * @Description :MES_工装操作记录 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-03-20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_TOOLING_ACTION_RECORD") +@Api("MES_工装操作记录") +public class MesToolingActionRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 1947971369479107712L; + + @Column(name = "TOOLING_NO") + @ApiParam("工装编号") + private String toolingNo; + + @Column(name = "ACTION_TYPE") + @ApiParam("操作类型") + private Integer actionType; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name = "TOOLING_CODE") + @ApiParam("工装代码") + private String toolingCode ; + + @Column(name = "TOOLING_NAME") + @ApiParam("工装名称") + private String toolingName; + + @Column(name = "TOOLING_TYPE") + @ApiParam("工装类型") + private Integer toolingType; + + @Column(name = "USE_COUNT") + @ApiParam("使用次数") + private Integer useCount; + + @Column(name = "START_TIME") + @ApiParam("更换开始时间") + private String startTime; + + @Column(name = "END_TIME") + @ApiParam("更换结束时间") + private String endTime; + + + public Integer getToolingType() { + return this.toolingType == null ? 0 : this.toolingType; + } + + public Integer getUseCount() { + return this.useCount == null ? 0 : this.useCount; + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java index 535c59a..32e1908 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellModuleParam.java @@ -15,7 +15,7 @@ import javax.persistence.Table; import java.io.Serializable; /** - * @Description : + * @Description :工作单元组件参数配置 * @Reference : * @Author :QianHuaSheng * @CreateDate : 2020-03-12 7:45 下午 diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewStepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewStepModel.java new file mode 100644 index 0000000..22a3440 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/DataReviewStepModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("数据复核model") +public class DataReviewStepModel { + + @ApiParam("关键件") + private String itemPartNo; + + @ApiParam("需要数量") + private String needNum; + + @ApiParam("实际数量") + private String realNum; + + @ApiParam("对象代码") + private String objectCode; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductData.java new file mode 100644 index 0000000..eaba2fa --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductData.java @@ -0,0 +1,87 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.mes.annotation.ElasticSearch; +import cn.estsh.i3plus.pojo.mes.annotation.Json4Es; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/3/20 5:51 下午 + * @Modify: + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@ElasticSearch +public class EsProductData extends BaseBean implements Serializable { + + private static final long serialVersionUID = 4514407617515827040L; + + @ApiParam("工作中心") + private String workCenterCode; + + @ApiParam("工作中心名称") + private String workCenterName; + + @ApiParam("工作单元") + private String workCellCode; + + @ApiParam("工作单元名称") + private String workCellName; + + @ApiParam("过程条码") + private String serialNumber; + + @ApiParam("产品条码") + private String productSn; + + @ApiParam("工单号") + private String orderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partDesc; + + @ApiParam("设备代码") + private String equCode; + + @ApiParam("设备名称") + private String equName; + + @ApiParam("对象代码") + private String objectCode; + + @ApiParam("对象名称") + private String objectName; + + @ApiParam("字段代码") + private String fieldCode; + + @ApiParam("字段名称") + private String fieldName; + + @ApiParam("字段值") + private String fieldValue; + + @ApiParam("数据行号") + private String rowNo; + + @ApiParam("数据组号") + private String groupNo; + + @Json4Es + @ApiParam("生产数据") + private String lineData; + + @ApiParam("字段总数") + private Integer fieldNum; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java new file mode 100644 index 0000000..16d5f94 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataCacheModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("生产数据缓存model") +public class ProductDataCacheModel { + + @ApiParam("对象代码") + private String objectCode; + + @ApiParam("字段名称") + private List productDataModelList; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java new file mode 100644 index 0000000..5ae7b20 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitActualModule.java @@ -0,0 +1,37 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/3/20 9:02 下午 + * @Modify: + */ +@Data +public class QueueJitActualModule { + + private Long id; + @ApiParam("vin") + private String vinCode; + @ApiParam("排序号") + private Double seq; + @ApiParam("分组队列编号") + private String queueGroupNo; + @ApiParam("组内编号") + private Integer groupNo; + + public QueueJitActualModule() { + + } + + public QueueJitActualModule(Long id, String vinCode, Double seq, String queueGroupNo, Integer groupNo) { + this.id = id; + this.vinCode = vinCode; + this.seq = seq; + this.queueGroupNo = queueGroupNo; + this.groupNo = groupNo; + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index 9acf8a7..195d0d4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -49,6 +49,23 @@ public class QueueOrderModel implements Serializable { private String workCenterCode; @ApiParam("工位") private String workCellCode; + @ApiParam("队列类型") + private Integer queueType; + + @ApiParam("已生产数量") + private Double finsihQty; + + @ApiParam("包装数量") + private Double qty; + + @ApiParam("生产组代码") + private String pgCode; + @ApiParam("分组队列编号") + private String queueGroupNo; + @ApiParam("组内编号") + private Integer groupNo; + @ApiParam("产品配置代码") + private String prodCfgCode; public QueueOrderModel() { } @@ -68,6 +85,23 @@ public class QueueOrderModel implements Serializable { } public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, + String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType,Double finsihQty,Double qty) { + this.id = id; + this.queueSeq = queueSeq; + this.queDetailSeq = queDetailSeq; + this.custFlagNo = custFlagNo; + this.prodCfgNameRdd = prodCfgNameRdd; + this.categoryNameRdd = categoryNameRdd; + this.serialNumber = serialNumber; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.snStatus = snStatus; + this.workType = workType; + this.finsihQty=finsihQty; + this.qty=qty; + } + + public QueueOrderModel(Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd, String serialNumber, String partNo, String partNameRdd, Integer snStatus, String workType) { this.id = id; this.queueSeq = queueSeq; @@ -81,4 +115,13 @@ public class QueueOrderModel implements Serializable { this.snStatus = snStatus; this.workType = workType; } + + public QueueOrderModel(Long id, Double queDetailSeq, String pgCode, String queueGroupNo, Integer groupNo, String prodCfgCode) { + this.id = id; + this.queDetailSeq = queDetailSeq; + this.pgCode = pgCode; + this.queueGroupNo = queueGroupNo; + this.groupNo = groupNo; + this.prodCfgCode = prodCfgCode; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 6fcf819..5ff5cdc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.mes.bean.MesRouteStatus; +import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -98,6 +100,12 @@ public class StationRequestBean implements Serializable { @ApiParam("数据map") private Map dataMap; + @ApiParam("流程状态集合") + private List routeStatusList; + + @ApiParam("当前流程状态") + private MesRouteStatus curRouteStatus; + @Override public String toString() { return "StationRequestBean{" + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 2004603..9685268 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -5,6 +5,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Transient; + /** * @Description: 打印条码工步， 打印信息模板 * @Reference: @@ -18,6 +20,9 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("打印描述") private String printDesc; + @ApiParam(value = "打印时间") + private String printTime; + @ApiParam("条码") private String barCode; @@ -72,4 +77,24 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层") private Integer packLevel; + @ApiParam("生产组代码") + private String pgCode; + @ApiParam("分组队列编号") + private String queueGroupNo; + @ApiParam("组内编号") + private Integer groupNo; + @ApiParam("产品配置代码") + private String prodCfgCode; + @ApiParam("队列生产明细序号") + private Double queDetailSeq; + + @ApiParam("vin") + private String vinCode; + @ApiParam("客户JIT生产队列排序号") + private Double seq; + @ApiParam("jit车号") + private String jitCarNo; + @ApiParam("车型代码") + private String carModuleCode; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentToolingRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentToolingRepository.java new file mode 100644 index 0000000..173e73a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquipmentToolingRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesArea; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentTooling; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesEquipmentToolingRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartCheckRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartCheckRepository.java new file mode 100644 index 0000000..ca12e5b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartCheckRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPartCheck; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate: 2019\11\18 10:34 + * @Modify: + **/ +public interface MesPartCheckRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSnPhotoRelationRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSnPhotoRelationRepository.java new file mode 100644 index 0000000..4d8dd72 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSnPhotoRelationRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesShiftRest; +import cn.estsh.i3plus.pojo.mes.bean.MesSnPhotoRelation; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/3/18 0018 - 9:18 + */ +@Repository +public interface MesSnPhotoRelationRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingActionRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingActionRecordRepository.java new file mode 100644 index 0000000..54ae9a0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingActionRecordRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquipmentTooling; +import cn.estsh.i3plus.pojo.mes.bean.MesToolingActionRecord; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesToolingActionRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingRepository.java new file mode 100644 index 0000000..915b295 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesTooling; + +/** + * @Description :MES工装类型 + * @Reference : + * @Author : qianhuasheng + * @CreateDate : 2020-03-19 + * @Modify: + **/ +public interface MesToolingRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java index 43e219f..88d4883 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListSearchModel.java @@ -31,4 +31,7 @@ public class WmsListSearchModel { @ApiParam(value = "有效性") public Integer isValid; + + @ApiParam(value = "工厂代码") + public String organizeCode; } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java index 41fc4d0..05b54f6 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java @@ -33,6 +33,10 @@ public class PtlMainTask extends BaseBean implements Serializable { @ApiParam("主任务编号") private String taskNo; + @Column(name = "ORDER_NO") + @ApiParam("业务单号") + private String orderNo; + @Column(name = "SEQ") @ApiParam("主任务顺序号") private Integer seq; diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java index ba3146c..a0eb09b 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java @@ -38,9 +38,17 @@ public class PtlMainTaskDetail extends BaseBean implements Serializable { private String partNo; @Column(name = "PART_NAME") - @ApiParam("产品物料名称") + @ApiParam("产品物料号名称") private String partName; + @Column(name = "ITEM_PART_NO") + @ApiParam("拣选物料号") + private String itemPartNo; + + @Column(name = "ITEM_PART_NAME") + @ApiParam("拣选物料名称") + private String itemPartName; + @Column(name = "QTY") @ApiParam("数量") private Integer qty; @@ -49,4 +57,12 @@ public class PtlMainTaskDetail extends BaseBean implements Serializable { @ApiParam("物料种类") private Integer partCategory; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java new file mode 100644 index 0000000..167a62d --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrder.java @@ -0,0 +1,91 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: 生产队列主表 + * @Reference: + * @Author: wangjie + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@ApiModel("生产队列主表") +public class MesQueueOrder implements Serializable { + + private static final long serialVersionUID = -3124113504001270712L; + + @ApiParam("主队列编号") + private String orderNo; + + @ApiParam("Vin") + private String vinCode; + + @ApiParam("客户标识号") + private String custFlagNo; + + @ApiParam("产品配置代码") + private String prodCfgCode; + + @ApiParam("产品配置名称") + private String prodCfgNameRdd; + + @ApiParam("排序") + private Double seq; + + @ApiParam("生产工单号") + private String workOrderNo; + + @ApiParam("状态") + private Integer status; + + @ApiParam("客户产线代码") + private String custProdLineCode; + + @ApiParam("区域代码") + private String areaCode; + + @ApiParam("锁定标识") + private Integer isLock; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("工单类型") + private String workType; + + @ApiParam("队列类型") + private Integer queueType; + + @ApiParam("生产组代码") + private String pgCode; + + @ApiParam(value = "id") + public Long id; + + @ApiParam(value ="组织代码") + public String organizeCode; + + @ApiParam(value = "有效性") + public Integer isValid; + + @ApiParam(value = "是否已删除") + public Integer isDeleted; + + @ApiParam(value = "创建用户") + public String createUser; + + @ApiParam(value = "创建日期") + public String createDatetime; + + @ApiParam(value = "修改人") + public String modifyUser; + + @ApiParam(value = "修改日期") + public String modifyDatetime; + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java new file mode 100644 index 0000000..48d66be --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesQueueOrderDetail.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.pojo.ptl.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: 生产队列明细 + * @Reference: + * @Author: wangjie + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@ApiModel("生产队列明细") +public class MesQueueOrderDetail implements Serializable { + + private static final long serialVersionUID = 1945173626511595078L; + + @ApiParam("主队列编号") + private String orderNo; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("产品条码") + private String serialNumber; + + @ApiParam("队列明细序号") + private Double seq; + + @ApiParam("数量") + private Double qty; + + @ApiParam("状态") + private Integer status; + + @ApiParam("生产类型") + private String workType; + + @ApiParam("产品类型代码") + private String produceCategoryCode; + + @ApiParam("产品类型名称") + private String produceCategoryNameRdd; + + @ApiParam("产品类型名称") + private String pptCode; + + @ApiParam("分组队列编号") + private String queueGroupNo; + + @ApiParam("组内编号") + private Integer groupNo; + + @ApiParam("料架是否已打印") + private Integer isGroupPrinted; + + @ApiParam("已生产数量") + private Double finsihQty; + + @ApiParam(value = "id") + public Long id; + + @ApiParam(value ="组织代码") + public String organizeCode; + + @ApiParam(value = "有效性") + public Integer isValid; + + @ApiParam(value = "是否已删除") + public Integer isDeleted; + + @ApiParam(value = "创建用户") + public String createUser; + + @ApiParam(value = "创建日期") + public String createDatetime; + + @ApiParam(value = "修改人") + public String modifyUser; + + @ApiParam(value = "修改日期") + public String modifyDatetime; +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java new file mode 100644 index 0000000..fdfb332 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/MesStationBom.java @@ -0,0 +1,83 @@ +package cn.estsh.i3plus.pojo.ptl.model; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description :工位物料清单 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@ApiModel("工位物料清单") +public class MesStationBom implements Serializable { + + private static final long serialVersionUID = -2658812944873600461L; + + @ApiParam("零件号") + private String partNo; + + @ApiParam("产品物料名称") + private String partName; + + @ApiParam("工作中心") + private String workCenterCode; + + @ApiParam("工作单元") + private String workCellCode; + + @ApiParam("子零件") + private String itemPartNo; + + @ApiParam("原材料物料名称") + private String itemPartName; + + @ApiParam(value = "子零件数量") + private Double qty; + + @ApiParam(value = "是否可重复") + private Integer isRepeat; + + @ApiParam(value = "是否检查") + private Integer isCheck; + + @ApiParam(value = "是否投料配置") + private Integer isFeed; + + @ApiParam(value = "是否绑定关键件") + private Integer isBindKey; + + @ApiParam(value = "匹配规则") + private Integer matchRule; + + @ApiParam(value = "id") + public Long id; + + @ApiParam(value ="组织代码") + public String organizeCode; + + @ApiParam(value = "有效性") + public Integer isValid; + + @ApiParam(value = "是否已删除") + public Integer isDeleted; + + @ApiParam(value = "创建用户") + public String createUser; + + @ApiParam(value = "创建日期") + public String createDatetime; + + @ApiParam(value = "修改人") + public String modifyUser; + + @ApiParam(value = "修改日期") + public String modifyDatetime; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java index 6d70ddc..c632d9f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderMaster.java @@ -104,6 +104,10 @@ public class WmsCSOrderMaster extends BaseBean { public String wmsCSZonesStr; @Transient + @ApiParam(value = "盘点库存地清单") + public String wmsAreaNosStr; + + @Transient @ApiParam(value = "盘点库位清单") public String[] wmsCSLocates; @@ -117,4 +121,5 @@ public class WmsCSOrderMaster extends BaseBean { public Integer getIsInventoryVal() { return this.isInventory == null ? 0 :this.isInventory.intValue(); } + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 8b79c72..10e116b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -105,7 +105,7 @@ public class WmsDocMovementDetails extends BaseBean { */ @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description") private Integer itemStatus; /** diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 378144b..85ec609 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -50,7 +50,7 @@ public class WmsPart extends BaseBean { @Column(name = "PART_TYPE") @ApiParam(value = "物料类型") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "WMS_PART_TYPE") - @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_PART_TYPE_STR.class) private String partType; @Column(name = "PART_TYPE_DESC") @@ -75,7 +75,8 @@ public class WmsPart extends BaseBean { @Column(name = "STOCK_UNIT") @ApiParam(value = "库存单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, + isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") private String stockUnit; @Column(name = "ABC") @@ -85,7 +86,8 @@ public class WmsPart extends BaseBean { @Column(name = "BUY_UNIT") @ApiParam(value = "采购单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, + isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") private String buyUnit; @Column(name = "BU2SU", columnDefinition = "decimal(18,8)") @@ -95,7 +97,8 @@ public class WmsPart extends BaseBean { @Column(name = "PRICE_UNIT") @ApiParam(value = "计价单位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, + isRequire = 2, entityName = "/wms/wmsUnit/wms-unit/query", listColumnName = "unitCode", explicitColumnName = "unitCode") private String priceUnit; @Column(name = "PU2SU", columnDefinition = "decimal(18,8)") @@ -126,12 +129,14 @@ public class WmsPart extends BaseBean { @Column(name = "PART_GROUP") @ApiParam(value = "物料组") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, + isRequire = 2, entityName = "/wms/wms-enum/dictionary/code?code=PART_GROUP_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue") private String partGroup; @Column(name = "LOT_CHECK_RULE") @ApiParam(value = "批次校验规则") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, + isRequire = 2, entityName = "/wms/wms-enum/dictionary/code?code=LOT_CHECK_RULE", listColumnName = "name", explicitColumnName = "dictionaryValue") private String lotCheckRule; @Column(name = "SN_CONTROL") @@ -146,8 +151,8 @@ public class WmsPart extends BaseBean { @Column(name = "IN_LOCATE_NO") @ApiParam(value = "默认入库库位") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2,entityName="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", - searchColumnName = "locateNo,locateName",listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.LIST, isRequire = 2, entityName = "cn.estsh.i3plus.pojo.wms.bean.WmsLocate", + searchColumnName = "locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo") private String inLocateNo; @Column(name = "PROD_CFG_TYPE_CODE") @@ -197,7 +202,8 @@ public class WmsPart extends BaseBean { @Column(name = "PRODUCT_LINES") @ApiParam("报工产线") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.SINGLE_URL, + isRequire = 2, entityName = "/wms/work-center/list", listColumnName = "workCenterName", explicitColumnName = "workCenterCode") private String productLines; @Column(name = "PROPORTION", columnDefinition = "decimal(10,5)") @@ -222,7 +228,7 @@ public class WmsPart extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String stockLevelStatus; - @Column(name="verb_num") + @Column(name = "verb_num") @ApiParam(value = "单次拆包数") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double verbNum; @@ -233,9 +239,10 @@ public class WmsPart extends BaseBean { private Integer isProdLot = 2; @Column(name = "PULL_WAY") - @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, entityName = "PULL_WAY_STATUS") - @ApiParam(value = "拉动方式", example = "0") - private Integer pullWay = 0; + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, selectRule = WmsEnumUtil.DYNAMIC_FIELD_SELECT_RULE.MULTIPLE_ENUM, + isRequire = 2, entityName = "PULL_WAY_STATUS") + @ApiParam(value = "拉动方式") + private String pullWay; @Column(name = "CYCLE_RQUEST_PERIOD") @ApiParam(value = "循环补货周期", example = "0") @@ -252,11 +259,11 @@ public class WmsPart extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double curingTime = 0d; - public int getIqcVal(){ + public int getIqcVal() { return this.iqc == null ? 0 : this.iqc.intValue(); } - public int getCycleRquestPeriod(){ + public int getCycleRquestPeriod() { return this.cycleRquestPeriod == null ? 0 : this.cycleRquestPeriod.intValue(); } @@ -264,23 +271,23 @@ public class WmsPart extends BaseBean { } public Double getQty() { - return qty == null? 0:qty; + return qty == null ? 0 : qty; } public Double getMin() { - return min == null? 0: min; + return min == null ? 0 : min; } public Double getMax() { - return max == null? 0:max; + return max == null ? 0 : max; } public Double getCycleRquestQty() { - return this.cycleRquestQty == null? 0d:this.cycleRquestQty.doubleValue(); + return this.cycleRquestQty == null ? 0d : this.cycleRquestQty.doubleValue(); } public Double getCuringTime() { - return this.curingTime == null? 0d:this.curingTime.doubleValue(); + return this.curingTime == null ? 0d : this.curingTime.doubleValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java index b2119ad..892ea6e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -119,6 +119,10 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "目的库位") private String destMoveType; + @Column(name = "DEST_MOVE_SN_STATUS") + @ApiParam(value = "目的单据条码状态") + private Integer destMoveSnStatus; + public WmsRoutingRule(){} } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java index 0321169..01b511f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsFieldInfo.java @@ -43,7 +43,7 @@ public class WmsFieldInfo extends BaseBean { @Column(name = "FIELD_TYPE") @ApiParam(value = "字段类型") - private String fieldType; + private Integer fieldType; @Column(name = "ENUM_NAME") @ApiParam(value = "字段枚举名称") @@ -77,6 +77,10 @@ public class WmsFieldInfo extends BaseBean { @ApiParam(value = "是否加粗:默认1-加粗，2-非加粗") private Integer isWider; + @Column(name = "IS_QUERY") + @ApiParam(value = "是否可选作查询条件:默认1-可选，2-不可选") + private Integer isQuery; + @Column(name = "IS_SELECT") @ApiParam(value = "是否勾选:默认1-勾选，2-非勾选") private Integer isSelect; @@ -104,4 +108,8 @@ public class WmsFieldInfo extends BaseBean { @Column(name = "EXPLICIT_COLUMN_NAME") @ApiParam(value = "回显列名") private String explicitColumnName; + + @Column(name = "DYNAMIC_FIELD_SELECT_RULE") + @ApiParam(value = "下拉框规则") + private Integer selectRule; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java index 41f6b6f..1359939 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsListElement.java @@ -81,4 +81,24 @@ public class WmsListElement extends BaseBean { @Column(name = "FUNCTION_ID") @ApiParam(value = "功能菜单ID") private Long functionId; + + @Column(name = "FIELD_TYPE") + @ApiParam(value = "字段类型") + private Integer fieldType; + + @Column(name = "DYNAMIC_FIELD_SELECT_RULE") + @ApiParam(value = "下拉框规则") + private Integer selectRule; + + @Column(name = "ENTITY_NAME") + @ApiParam(value = "实体名称") + private String entityName; + + @Column(name = "LIST_COLUMN_NAME") + @ApiParam(value = "开窗列表显示列名称") + private String listColumnName; + + @Column(name = "EXPLICIT_COLUMN_NAME") + @ApiParam(value = "回显列名") + private String explicitColumnName; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java index 99b223f..7a9cbbb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java @@ -43,7 +43,7 @@ public class WmsSearchElement extends BaseBean { @Column(name = "FIELD_TYPE") @ApiParam(value = "字段类型") - private String fieldType; + private Integer fieldType; @Column(name = "CONDITION_EXPRE") @ApiParam(value = "条件表达式:>,<,>=等") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java index 876fd8e..af83020 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/plugin/BasPlugin.java @@ -63,7 +63,7 @@ public class BasPlugin extends BaseBean{ @Column(name = "COPYRIGHT") @ApiParam(value = "版权") - private Integer copyRight; + private String copyRight; @Column(name = "AUTHOR") @ApiParam(value = "作者") @@ -76,11 +76,14 @@ public class BasPlugin extends BaseBean{ @ApiParam(value = "插件状态", example = "1") private Integer pluginStatus; - @Column(name = "PLUGIN_DIRECTORY") - @ApiParam(value = "本地插件文件夹") - private String pluginDirectory; - @Column(name = "PLUGIN_PACKAGE_NAME") @ApiParam(value = "插件项目包名称") private String pluginPackName; + + /** + * 插件类型 10-PDA功能插件，20-交易处理插件 + */ + @Column(name="PLUGIN_TYPE") + @ApiParam(value = "插件类型", example = "10") + private Integer pluginType; } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasPluginLoggerModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasPluginLoggerModel.java new file mode 100644 index 0000000..ff7ca90 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/BasPluginLoggerModel.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; + +/** + * @Description : 插件日志 + * @Reference : + * @Author : siliter.yuan + * @CreateDate : 2020-03-23 11:18 + * @Modify: + **/ +@Data +@AllArgsConstructor +@Api("插件日志") +public class BasPluginLoggerModel { + + @ApiParam("插件名称") + private String pluginName; + + @ApiParam("插件实例类名称") + private String className; + + @ApiParam("插件调用方法名称") + private String methodName; + + @ApiParam("插件日志内容") + private String loggerContext; + + @ApiParam("日志打印日期") + private String printDate; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java index f87e945..dd2b411 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java @@ -14,8 +14,6 @@ import lombok.Data; @Api("未完成订单模型") public class WmsMoveUnfinishedOrderModel extends BaseBean{ - - @ApiParam("物料编码") private String partNo; @@ -26,7 +24,6 @@ public class WmsMoveUnfinishedOrderModel extends BaseBean{ private Double destQty; - @ApiParam("交易类型") private String transTypeCode; diff --git a/sonar-project.properties b/sonar-project.properties index 55e4e84..932bdd9 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-DEV-SNAPSHOT +sonar.projectVersion=1.0-TEST-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./