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
汪云昊 5 years ago
parent b0a4eccca4 05077f1750
commit 081db93d0d
50 changed files with 1763 additions and 81 deletions
Show Stats Download Patch File Download Diff File

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

@ -25,6 +25,8 @@ public @interface DynamicField {
int sort() default 0;
// 是否标题字段加粗 是否加粗:默认1-加粗，2-非加粗
int isWider() default 2;
// 是否可选作查询条件:默认1-可选，2-不可选
int isQuery() default 1;
// 是否勾选:默认1-勾选，2-非勾选
int isSelect() default 1;
// 是否必选:默认1-必选，2-非必选

1
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
Unescape Escape View File

@ -65,6 +65,7 @@ public abstract class BaseBean implements Serializable {
@Column(name="ORGANIZE_CODE", nullable = false)
@ApiParam(value ="组织代码")
// @AnnoOutputColumn(hidden = true)
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT,isQuery = 2, isRequire = 2)
public String organizeCode;
@Column(name="IS_VALID", columnDefinition = "int default 1", nullable = false)

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

@ -83,6 +83,72 @@ public class MesEnumUtil {
}
/**
* 排序校验模式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CHECK_PROD_SEQ_FLAG {
PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"),
CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"),
OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"),
ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序");
private int value;
private String code;
private String description;
CHECK_PROD_SEQ_FLAG(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发运是否按主队列顺序扫描
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -1596,11 +1662,11 @@ public class MesEnumUtil {
MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"),
MES_DATASOURCE(360, "DB地址清单"),
MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"),
MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"),
MES_PLC(390,"PLC地址清单"),
MES_PROCESS(400,"工序信息"),
MES_KPSN_RULE(410,"关键件条码校验规则"),
MES_QUEUE_JIT_ACTUAL(420,"客户JIT生产队列");
MES_EQU_NOTIFY_OBJECT_CFG(380, "设备通知对象"),
MES_PLC(390, "PLC地址清单"),
MES_PROCESS(400, "工序信息"),
MES_KPSN_RULE(410, "关键件条码校验规则"),
MES_QUEUE_JIT_ACTUAL(420, "客户JIT生产队列");
private int value;
private String description;
@ -4243,4 +4309,185 @@ public class MesEnumUtil {
return tmp;
}
}
/**
* 关键件条码校验工步对应的物料分类的值
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PART_TYPE_THREE {
MM(10, "MM"),
MS(20, "MS");
private int value;
private String description;
PART_TYPE_THREE(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 QUEUE_ORDER_IS_LOCK {
TRUE(1, "是"),
FALSE(2, "否");
private int value;
private String description;
QUEUE_ORDER_IS_LOCK(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;
}
}
/**
* 查询散件BOM关键物料号工步对应的物料分类的值
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PART_TYPE_THREE_STATION_BOM {
MM(10, "MM"),
NLX(20, "NLX");
private int value;
private String description;
PART_TYPE_THREE_STATION_BOM(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 WORK_CELL_MONITOR_TYPE {
MONITOR(10, "监听组件"),
SHOW(20, "展示组件");
private int value;
private String description;
WORK_CELL_MONITOR_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
* 工位监听组件触发类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_MODULE_TRIGGER_TYPE {
BY_SN(10, "根据条码加载工步"),
BY_PART(20, "根据零件号加载工步");
private int value;
private String description;
WORK_MODULE_TRIGGER_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_MODULE_PARAM_TYPE {
NUMBER(10, "数值"),
STRING(20, "字符串");
private int value;
private String description;
WORK_MODULE_PARAM_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
}

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

@ -204,8 +204,8 @@ public class MesPcnEnumUtil {
PCN_LOGOUT(190, "PCN_LOGOUT", ""),
UPDATE_LOCALE_RES(200, "LOCALE_RES_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");
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");
private int value;
private String code;
@ -2806,4 +2806,149 @@ public class MesPcnEnumUtil {
return tmp;
}
}
/**
* 工位监听组件类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_CELL_MONITOR_TYPE {
MONITOR(10, "监听组件"),
SHOW(20, "展示组件");
private int value;
private String description;
WORK_CELL_MONITOR_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
* 工位监听组件触发类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_MODULE_TRIGGER_TYPE {
BY_SN(10, "根据条码加载工步"),
BY_PART(20, "根据零件号加载工步");
private int value;
private String description;
WORK_MODULE_TRIGGER_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum WORK_MODULE_PARAM_TYPE {
NUMBER(10, "数值"),
STRING(20, "字符串");
private int value;
private String description;
WORK_MODULE_PARAM_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
* 缓存类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CACHA_TYPE {
DATA_REVIEW(10, "数据复核");
private int value;
private String description;
CACHA_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
* 缓存队列状态
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CACHA_QUEUE_STATUS {
CREATE(10, "创建");
private int value;
private String description;
CACHA_QUEUE_STATUS(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
/**
* 配方类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PART_FORMULA_TYPE {
DEVICE_SEMAPHORE(10, "设备信号");
private int value;
private String description;
PART_FORMULA_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
}
}

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

@ -746,8 +746,7 @@ public class PtlPcnEnumUtil {
DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"),
REFRESH_CONTROL_CMD(30, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"),
SCAN_CONTROL_CMD(40, "SCAN_CONTROL_CMD", "scanControlService", "扫描"),
INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"),
GET_CONTROL_DATA_CONTROL_CMD(60, "GET_CONTROL_DATA_CONTROL_CMD", "getControlDataControlService", "获取控制器数据");
INIT_MODULE_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面");
// UNLOCK_CONTROL_CMD(50, "UNLOCK_CONTROL_CMD", "unlockControlService", "解锁"),
// LABEL_SELF_CHECK_CONTROL_CMD(60, "labelSelfCheck", "labelSelfCheckControlService", "标签自检"),
// LIGHT_DETAIL_CONTROL_CMD(70, "LABEL_SELF_CHECK_CONTROL_CMD", "lightDetailControlService", "亮灯明细");
@ -1458,16 +1457,6 @@ public class PtlPcnEnumUtil {
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);
}
@ -1515,16 +1504,6 @@ public class PtlPcnEnumUtil {
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);
}
@ -1570,16 +1549,6 @@ public class PtlPcnEnumUtil {
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);
}
@ -1626,11 +1595,47 @@ public class PtlPcnEnumUtil {
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* 主任务类型
*/
@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", "单点任务");
private int value;
private String code;
private String description;
MAIN_TASK_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
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].description.equals(desc)) {
tmp = values()[i].value;
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
@ -1679,15 +1684,5 @@ public class PtlPcnEnumUtil {
}
return tmp;
}
public static String valueOfDescription2(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
}
}
return tmp;
}
}
}

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

@ -5087,4 +5087,67 @@ public class WmsEnumUtil {
return tmp;
}
}
/**
* 交易类型-单据回退类型
* 默认为 10
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORDER_BACK_TYPE {
REC_QTY(10, "REC_QTY", "已收货数量"),
PICK_QTY(20, "PICK_QTY", "已拣货数量"),
MOVE_QTY(30, "MOVE_QTY", "已移库数量"),
OUT_QTY(40, "OUT_QTY", "已出库数量");
private int value;
private String code;
private String description;
ORDER_BACK_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 ORDER_BACK_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;
}
}
}

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

@ -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/16 0016 - 15:09
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CACHA_QUEUE")
@Api("MES缓存队列")
public class MesCachaQueue extends BaseBean implements Serializable {
private static final long serialVersionUID = 8272649623030195332L;
@Column(name = "SERIAL_NUMBER")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name = "CACHA_TYPE")
@ApiParam("缓存类型")
private String cachaType;
}

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

@ -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/16 0016 - 15:50
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PART_FORMULA")
@Api("MES_物料配方")
public class MesPartFormula extends BaseBean implements Serializable {
private static final long serialVersionUID = 3120650997069271308L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "FORMULA_CONTENT")
@ApiParam("配方内容")
private String formulaContent;
@Column(name = "FORMULA_TYPE")
@ApiParam("配方类型")
private Integer formulaType;
}

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

@ -0,0 +1,55 @@
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;
import java.math.BigDecimal;
/**
* @Description :散件产品配置明细
* @Reference :
* @Author : zcg
* @Date : 2020/3/9 0009 - 17:52
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROD_SCATTER_CFG_BOM")
@Api("散件产品配置明细")
public class MesProdScatterCfgBom extends BaseBean implements Serializable {
@Column(name = "SP_CFG_CODE")
@ApiParam("散件配置编码")
private String spCfgCode;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品位置代码")
private String produceCtgyCode;
@Column(name = "PART_NO")
@ApiParam("散件产品代码")
private String partNo;
@Column(name = "ITEM_PART_NO")
@ApiParam("原材料物料号")
private String itemPartNo;
@Column(name = "QTY")
@ApiParam("用量")
private BigDecimal qty;
@Column(name = "IS_KEY_PART")
@ApiParam("是否关键件")
private Integer isKeyPart ;
}

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

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.pcn.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdScatterCfgBom;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : zcg
* @Date : 2020/3/9 0009 - 18:03
*/
@Repository
public interface MesProdScatterCfgBomRepository extends BaseRepository<MesProdScatterCfgBom, Long> {
}

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

@ -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 :MES_缓存队列
* @Reference :
* @Author : zcg
* @Date : 2020/3/16 0016 - 14:52
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_CACHA_QUEUE")
@Api("MES缓存队列")
public class MesCachaQueue extends BaseBean implements Serializable {
private static final long serialVersionUID = 6875307024103023380L;
@Column(name = "SERIAL_NUMBER")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name = "CACHA_TYPE")
@ApiParam("缓存类型")
private String cachaType;
}

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

@ -55,6 +55,30 @@ public class MesKpData extends BaseBean implements Serializable {
@ApiParam("数据下限")
private Double lowerLimit;
@Column(name = "TERMINAL_ID")
@ApiParam("工位")
private Integer terminalId;
@Column(name = "TORQUE_GROUP")
@ApiParam("扭矩组")
private String torqueGroup;
@Column(name = "TORQUE_GROUP_SEQ")
@ApiParam("扭矩组顺序")
private Integer torqueGroupSeq;
@Column(name = "TORQUE")
@ApiParam("扭矩项")
private String torque;
@Column(name = "TORQUE_SEQ")
@ApiParam("扭矩项顺序")
private Integer torqueSeq;
@Column(name = "JOB_ID")
@ApiParam("JOB_ID")
private Integer jobId;
@Transient
@ApiParam("扭矩值")
private Double torqueValue;
@ -63,6 +87,19 @@ public class MesKpData extends BaseBean implements Serializable {
@ApiParam("是否在范围之内")
private Boolean ok;
@Transient
@ApiParam("应采个数")
private Integer shouldNum;
@Transient
@ApiParam("实采个数")
private Integer actualNum;
@Transient
@ApiParam("记录颜色")
private String color;
public double getKeyDataCountVal() {
return this.keyDataCount == null ? 0 : this.keyDataCount;
}

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

@ -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/16 0016 - 15:45
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PART_FORMULA")
@Api("MES_物料配方")
public class MesPartFormula extends BaseBean implements Serializable {
private static final long serialVersionUID = 4905294092563287950L;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "FORMULA_CONTENT")
@ApiParam("配方内容")
private String formulaContent;
@Column(name = "FORMULA_TYPE")
@ApiParam("配方类型")
private Integer formulaType;
}

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

@ -14,6 +14,7 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.List;
/**
* @Description:
@ -104,7 +105,27 @@ public class MesPlc extends BaseBean implements Serializable {
@ApiParam("对象代码")
private String objectCode;
@Column(name = "OPC_URL")
@ApiParam("OPCUA路径")
private String opcUrl;
@Column(name = "NAME_SPACE_INDEX")
@ApiParam("空间索引")
private Integer nameSpaceIndex = 2;
@Column(name = "USER_NAME")
@ApiParam("用户名")
private String userName;
@Column(name = "PASSWORD")
@ApiParam("密码")
private String password;
@Transient
@ApiParam("设备名称")
private String equipmentName;
@Transient
@ApiParam("OPC值")
private List opcValue;
}

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

@ -0,0 +1,55 @@
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;
import java.math.BigDecimal;
/**
* @Description :
* @Reference :
* @Author : zcg
* @Date : 2020/3/9 0009 - 17:58
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PROD_SCATTER_CFG_BOM")
@Api("散件产品配置明细")
public class MesProdScatterCfgBom extends BaseBean implements Serializable {
@Column(name = "SP_CFG_CODE")
@ApiParam("散件配置编码")
private String spCfgCode;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品位置代码")
private String produceCtgyCode;
@Column(name = "PART_NO")
@ApiParam("散件产品代码")
private String partNo;
@Column(name = "ITEM_PART_NO")
@ApiParam("原材料物料号")
private String itemPartNo;
@Column(name = "QTY")
@ApiParam("用量")
private BigDecimal qty;
@Column(name = "IS_KEY_PART")
@ApiParam("是否关键件")
private Integer isKeyPart ;
}

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

@ -13,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* @Description :生产数据
@ -112,7 +114,7 @@ public class MesProductData extends BaseBean implements Serializable {
@Lob
@Column(name = "LINE_DATA")
@ApiParam("生产数据")
private String lineData;
private List lineData;
@Lob
@Transient

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

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -100,4 +101,8 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
@ApiParam("特殊标识名称")
private String specialFlagName;
@Transient
@ApiParam(value = "下达按钮编号")
public String buttonCode;
}

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

@ -81,7 +81,7 @@ public class MesQueueOrder extends BaseBean implements Serializable {
private String custCode;
@Column(name = "WORK_TYPE")
@ApiParam("区域代码")
@ApiParam("工单类型")
private String workType;
@Column(name = "QUEUE_TYPE")
@ -100,6 +100,18 @@ public class MesQueueOrder extends BaseBean implements Serializable {
@ApiParam("截至车号")
private String custFlagNoEnd;
@Transient
@ApiParam("工单类型名称")
private String workTypeName;
@Transient
@ApiParam("锁定标识名称")
private String isLockName;
@Transient
@ApiParam("队列类型名称")
private String queueTypeName;
public int getStatusVal() {
return this.status == null ? 0 : this.status;
}

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

@ -72,7 +72,7 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
@ApiParam("产品类型名称")
private String produceCategoryNameRdd;
@Column(name = "产品生产类型")
@Column(name = "PPT_CODE")
@ApiParam("产品类型名称")
private String pptCode;
@ -82,7 +82,9 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable {
@Column(name = "GROUP_NO")
@ApiParam("组内编号")
private Integer groupNo; @Transient
private Integer groupNo;
@Transient
@ApiParam("队列序号")
private Double queueSeq;

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

@ -0,0 +1,46 @@
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 : Wynne.Lu
* @CreateDate : 2019-09-17
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL_MODULE")
@Api("作业程序组件参数")
public class MesWorkCellModule extends BaseBean implements Serializable {
private static final long serialVersionUID = -3537487776977917751L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位")
private String workCellCode;
@Column(name = "MODULE_CODE")
@ApiParam("组件代码")
private String moduleCode;
}

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

@ -0,0 +1,60 @@
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.Index;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author :QianHuaSheng
* @CreateDate : 2020-03-12 7:45 下午
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_CELL_MODULE_PARAM", indexes = {
@Index(columnList = "CREATE_DATE_TIME")
})
@Api("工作单元组件参数配置")
public class MesWorkCellModuleParam extends BaseBean implements Serializable {
private static final long serialVersionUID = 4836155960343256982L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "MODULE_CODE")
@ApiParam("组件代码")
private String moduleCode;
@Column(name = "CALL_CLASS")
@ApiParam("调用类")
private String callClass;
@Column(name = "PARAM_CODE")
@ApiParam("参数代码")
private String paramCode;
@Column(name = "PARAM_VALUE")
@ApiParam("参数值")
private String paramValue;
}

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

@ -58,6 +58,10 @@ public class MesWorkCenter extends BaseBean implements Serializable {
@ApiParam("运行状态")
private String runningStatus;
@Column(name = "PRODUCTION_CAPACITY")
@ApiParam("产能")
private Integer productionCapacity;
@Transient
@ApiParam(value = "子集列表")
private List<MesWorkCell> childTreeList;

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

@ -0,0 +1,55 @@
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 : Wynne.Lu
* @CreateDate : 2019-09-17
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_MODULE")
@Api("作业程序组件")
public class MesWorkModule extends BaseBean implements Serializable {
private static final long serialVersionUID = -4121840589026322086L;
@Column(name = "MODULE_CODE")
@ApiParam("组件代码")
private String moduleCode;
@Column(name = "MODULE_NAME")
@ApiParam("组件名称")
private String moduleName;
@Column(name = "MODULE_TYPE")
@ApiParam("组件类型")
private Integer moduleType;
@Column(name = "CALL_CLASS")
@ApiParam("调用类")
private String callClass;
@Column(name = "TRIGGER_TYPE")
@ApiParam("触发类型")
private Integer triggerType;
}

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

@ -0,0 +1,51 @@
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 : Wynne.Lu
* @CreateDate : 2019-09-17
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_WORK_MODULE_PARAM")
@Api("作业程序组件参数")
public class MesWorkModuleParam extends BaseBean implements Serializable {
private static final long serialVersionUID = -3965186392895014717L;
@Column(name = "MODULE_CODE")
@ApiParam("组件代码")
private String moduleCode;
@Column(name = "PARAM_CODE")
@ApiParam("参数代码")
private String paramCode;
@Column(name = "PARAM_NAME")
@ApiParam("参数名称")
private String paramName;
@Column(name = "PARAM_TYPE")
@ApiParam("参数类型")
private Integer paramType;
}

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.mes.model;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
import java.util.Map;
@ -11,27 +13,33 @@ import java.util.Map;
* @desc
*/
@Data
public class ActorMessageModel<T> {
@NoArgsConstructor
@AllArgsConstructor
public class ActorMessageModel {
private String msgType;
private boolean success;
private String clientInfo;
private Object dataObj;
private String workCellCode;
public boolean isSuccess() {
return success;
}
private String workCenterCode;
public static ActorMessageModel getSuccess() {
return new ActorMessageModel(true, null);
}
private String organizeCode;
public static ActorMessageModel getFailure() {
return new ActorMessageModel(true, null);
}
private String routeCode;
public static ActorMessageModel getSuccess(Object data) {
return new ActorMessageModel(true, data);
}
private String serialNumber;
public static ActorMessageModel getFailure(Object data) {
return new ActorMessageModel(false, data);
}
private String productSn;
private T dataObj;
private List<? extends T> dataList;
private Map<String, Object> dataMap;
}

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

@ -0,0 +1,28 @@
package cn.estsh.i3plus.pojo.mes.model;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellModuleParam;
import cn.estsh.i3plus.pojo.mes.bean.MesWorkModule;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2020/3/10 15:24
* @desc
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class MonitoringModel {
private String monitorType;
private Boolean isStop;
private MesWorkModule workModule;
private List<MesWorkCellModuleParam> cellModuleParams;
}

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

@ -7,6 +7,7 @@ import lombok.Data;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* @Description : 工位请求bean
@ -68,6 +69,15 @@ public class StationRequestBean implements Serializable {
@ApiParam("业务类型")
private String busiType;
@ApiParam("工位监听类型")
private String monitorType;
@ApiParam("工位监听组件")
private String monitorModule;
@ApiParam("工位监听消息")
private String monitorMsg;
@ApiParam("工单号")
private String workOrderNo;
@ -83,6 +93,9 @@ public class StationRequestBean implements Serializable {
@ApiParam("生产主队列编号")
private String orderNo;
@ApiParam("数据map")
private Map<String, Object> dataMap;
@Override
public String toString() {
return "StationRequestBean{" +

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

@ -0,0 +1,29 @@
package cn.estsh.i3plus.pojo.mes.model;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author Wynne.Lu
* @date 2020/3/13 17:55
* @desc
*/
@Data
@NoArgsConstructor
public class StepDispatchModel {
private String stepListKey;
private String firstScanKey;
private String cellParamKey;
private String scanInfo;
public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String scanInfo) {
this.stepListKey = stepListKey;
this.firstScanKey = firstScanKey;
this.cellParamKey = cellParamKey;
this.scanInfo = scanInfo;
}
}

15
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCachaQueueRepository.java
Unescape Escape View File

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesCachaQueue;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : zcg
* @Date : 2020/3/16 0016 - 15:05
*/
@Repository
public interface MesCachaQueueRepository extends BaseRepository<MesCachaQueue,Long> {
}

15
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartFormulaRepository.java
Unescape Escape View File

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesPartFormula;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : zcg
* @Date : 2020/3/16 0016 - 15:59
*/
@Repository
public interface MesPartFormulaRepository extends BaseRepository<MesPartFormula,Long> {
}

15
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProdScatterCfgBomRepository.java
Unescape Escape View File

@ -0,0 +1,15 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesProdScatterCfgBom;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : zcg
* @Date : 2020/3/9 0009 - 18:56
*/
@Repository
public interface MesProdScatterCfgBomRepository extends BaseRepository<MesProdScatterCfgBom, Long> {
}

14
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellModuleParamRepository.java
Unescape Escape View File

@ -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.MesWorkCellModuleParam;
import org.springframework.stereotype.Repository;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/9/18 10:05 AM
* @Description:
**/
@Repository
public interface MesWorkCellModuleParamRepository extends BaseRepository<MesWorkCellModuleParam, Long> {
}

14
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellModuleRepository.java
Unescape Escape View File

@ -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.MesWorkCellModule;
import org.springframework.stereotype.Repository;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/9/18 10:05 AM
* @Description:
**/
@Repository
public interface MesWorkCellModuleRepository extends BaseRepository<MesWorkCellModule, Long> {
}

14
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkModuleParamRepository.java
Unescape Escape View File

@ -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.MesWorkModuleParam;
import org.springframework.stereotype.Repository;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/9/18 10:05 AM
* @Description:
**/
@Repository
public interface MesWorkModuleParamRepository extends BaseRepository<MesWorkModuleParam, Long> {
}

14
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkModuleRepository.java
Unescape Escape View File

@ -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.MesWorkModule;
import org.springframework.stereotype.Repository;
/**
* @Author: Wynne.Lu
* @CreateDate: 2019/9/18 10:05 AM
* @Description:
**/
@Repository
public interface MesWorkModuleRepository extends BaseRepository<MesWorkModule, Long> {
}

26
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -227,16 +227,16 @@ public class MesHqlPack {
}
if (!StringUtils.isEmpty(mesQueueOrder.getWorkType())) {
DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getWorkType(), "workType", packBean);
DdlPreparedPack.getStringEqualPack(mesQueueOrder.getWorkType(), "workType", packBean);
}
if (!StringUtils.isEmpty(mesQueueOrder.getCustProdLineCode())) {
DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean);
DdlPreparedPack.getStringLikePack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean);
}
if (!StringUtils.isEmpty(mesQueueOrder.getPgCode())) {
DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getPgCode(), "pgCode", packBean);
DdlPreparedPack.getStringLikePack(mesQueueOrder.getPgCode(), "pgCode", packBean);
}
if (mesQueueOrder.getQueueType() != null) {
DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getQueueType(), "queueType", packBean);
DdlPreparedPack.getNumEqualPack(mesQueueOrder.getQueueType(), "queueType", packBean);
}
// 只查询创建状态的队列
@ -2219,4 +2219,22 @@ public class MesHqlPack {
}
return packBean;
}
/**
* 生产组
*
* @param produceGroup
* @param organizeCode
* @return
*/
public static DdlPackBean getMesProduceGroup(MesProduceGroup produceGroup, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(produceGroup, organizeCode);
if (!StringUtils.isEmpty(produceGroup.getPgCode())) {
DdlPreparedPack.getStringLikerPack(produceGroup.getPgCode(), "pgCode", packBean);
}
if (!StringUtils.isEmpty(produceGroup.getPgName())) {
DdlPreparedPack.getStringLikerPack(produceGroup.getPgName(), "pgName", packBean);
}
return packBean;
}
}

59
modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaActorAction.java
Unescape Escape View File

@ -0,0 +1,59 @@
package cn.estsh.i3plus.pojo.ptl.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
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 = "PTL_AREA_ACTOR_ACTION")
@EqualsAndHashCode(callSuper = true)
@Api("PTL_区域观察者事件配置")
public class PtlAreaActorAction extends BaseBean implements Serializable {
private static final long serialVersionUID = -1596837642283797995L;
@Column(name = "AREA_NO")
@ApiParam("区域代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String areaNo;
@Column(name = "ACTOR_CODE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("观察者编码")
private String actorCode;
@Column(name = "MT_CODE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("消息类型代码")
private String mtCode;
@Column(name = "OTHER_WHERE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("特定条件")
private String otherWhere;
@Column(name = "AMG_ID")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("组件集编号")
private Long amgId;
}

64
modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRouteModuleParam.java
Unescape Escape View File

@ -0,0 +1,64 @@
package cn.estsh.i3plus.pojo.ptl.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
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 = "PTL_AREA_ROUTE_MODULE_PARAM")
@EqualsAndHashCode(callSuper = true)
@Api("PTL_区域流程组件调用参数")
public class PtlAreaRouteModuleParam extends BaseBean implements Serializable {
private static final long serialVersionUID = -1596829442283797995L;
@Column(name = "AREA_NO")
@ApiParam("区域代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String areaNo;
@Column(name = "ROUTE_CODE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("流程代码")
private String routeCode;
@Column(name = "AMG_ID")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("组件集编号")
private Long amgId;
@Column(name = "AM_CODE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("组件代码")
private String amCode;
@Column(name = "PARAM_CODE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("参数代码")
private String paramCode;
@Column(name = "PARAM_VALUE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("参数值")
private String paramValue;
}

59
modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlIf.java
Unescape Escape View File

@ -0,0 +1,59 @@
package cn.estsh.i3plus.pojo.ptl.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
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 = "PTL_IF")
@EqualsAndHashCode(callSuper = true)
@Api("PTL_接口清单")
public class PtlIf extends BaseBean implements Serializable {
private static final long serialVersionUID = -1596882732758197995L;
@Column(name = "IF_CODE")
@ApiParam("接口代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String ifCode;
@Column(name = "IF_NAME")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("接口名称")
private String ifName;
@Column(name = "IF_CONNECT_TYPE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
@ApiParam("交互方式")
private String ifConnectType;
@Column(name = "IF_CLASS")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
@ApiParam("接口实现类")
private String ifClass;
@Column(name = "IF_CALL_TYPE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
@ApiParam("接口调用方向")
private String ifCallType;
}

59
modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRfid.java
Unescape Escape View File

@ -0,0 +1,59 @@
package cn.estsh.i3plus.pojo.ptl.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
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 = "PTL_RFID")
@EqualsAndHashCode(callSuper = true)
@Api("PTL_RFID")
public class PtlRfid extends BaseBean implements Serializable {
private static final long serialVersionUID = -1596837642758197995L;
@Column(name = "RFID_CONTROL_NO")
@ApiParam("RFID读写器代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String rfidControlNo;
@Column(name = "IP")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("IP")
private String ip;
@Column(name = "PORT")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("端口号")
private String port;
@Column(name = "AREA_NO")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT)
@ApiParam("区域代码")
private String areaNo;
@Column(name = "RFID_VALUE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("rfid内容")
private String rfidValue;
}

47
modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java
Unescape Escape View File

@ -0,0 +1,47 @@
package cn.estsh.i3plus.pojo.ptl.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
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;
import java.util.ArrayList;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2020/2/12 17:41
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "PTL_WINDOW")
@EqualsAndHashCode(callSuper = true)
@Api("PTL_界面")
public class PtlWindow extends BaseBean implements Serializable {
private static final long serialVersionUID = -1596443842758197995L;
@Column(name = "WINDOW_NO")
@ApiParam("界面代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String windowNo;
@Column(name = "WINDOW_NAME")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("界面名称")
private String windowName;
}

44
modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java
Unescape Escape View File

@ -0,0 +1,44 @@
package cn.estsh.i3plus.pojo.ptl.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
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 = "PTL_WINDOW_ELEMENT")
@EqualsAndHashCode(callSuper = true)
@Api("PTL_界面元素")
public class PtlWindowElement extends BaseBean implements Serializable {
private static final long serialVersionUID = -1596427582758197995L;
@Column(name = "WINDOW_NO")
@ApiParam("界面代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String windowNo;
@Column(name = "ELEMENT_NO")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("元素代码")
private String elementNo;
}

55
modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java
Unescape Escape View File

@ -0,0 +1,55 @@
package cn.estsh.i3plus.pojo.ptl.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
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 = "PTL_WINDOW_ELEMENT_ATTRIBUTE")
@EqualsAndHashCode(callSuper = true)
@Api("PTL_界面元素属性")
public class PtlWindowElementAttribute extends BaseBean implements Serializable {
private static final long serialVersionUID = -1596427582758285995L;
@Column(name = "WINDOW_NO")
@ApiParam("界面代码")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
private String windowNo;
@Column(name = "ELEMENT_NO")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("元素代码")
private String elementNo;
@Column(name = "ATTRIBUTE_NO")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("属性代码")
private String attributeNo;
@Column(name = "ATTRIBUTE_VALUE")
@DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
@ApiParam("属性值")
private String attributeValue;
}

18
modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java
Unescape Escape View File

@ -47,4 +47,22 @@ public class LightOnModel implements Serializable {
@ApiParam("状态")
private Integer status;
@ApiParam("控制器ip")
private String ip;
@ApiParam("端口")
private String port;
@ApiParam("控制器编号")
private String controlNo;
public LightOnModel() {
}
public LightOnModel(Integer tagNo, String ip, String port, String controlNo) {
this.tagNo = tagNo;
this.ip = ip;
this.port = port;
this.controlNo = controlNo;
}
}

8
modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java
Unescape Escape View File

@ -1,5 +1,7 @@
package cn.estsh.i3plus.pojo.ptl.model;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -32,6 +34,12 @@ public class WsResultBean<T> implements Serializable {
@ApiParam("数据类型")
private String dataType;
@ApiParam("是否需要获取数据,默认展示")
private Integer isInitData = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
@ApiParam("执行结果信息是否需要展示,默认展示")
private Integer isShow = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
@ApiParam("执行结果信息")
private String message;

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

@ -160,6 +160,10 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam("客户订单号")
public String custOrderNo;
@Column(name = "ASSIGN_DATE_CODE")
@ApiParam(value = "指定生产日期")
private String assignDateCode;
@Transient
@ApiParam("实际批次")
private String actualLot;

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

@ -12,10 +12,7 @@ import org.hibernate.annotations.ColumnDefault;
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 javax.persistence.*;
/**
* @Description :物料实体
@ -29,7 +26,9 @@ import javax.persistence.Transient;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "WMS_PART")
@Table(name = "WMS_PART", indexes = {
@Index(columnList = "ORGANIZE_CODE")
})
@Api("物料表")
public class WmsPart extends BaseBean {
private static final long serialVersionUID = 4849044986767609346L;

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

@ -399,4 +399,12 @@ public class WmsStockSn extends BaseBean {
this.modifyDatetime = modifyDatetime;
this.modifyUser = modifyUser;
}
public WmsStockSn (String partNo, String packageNo,String locateNo, String createDatetime, String modifyDatetime) {
this.partNo = partNo;
this.packageNo =packageNo;
this.locateNo = locateNo;
this.createDatetime=createDatetime;
this.modifyDatetime = modifyDatetime;
}
}

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

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -70,6 +72,11 @@ public class WmsTransType extends BaseBean {
@ApiParam(value = "是否发送异常邮件")
private Integer isSendErrorEmail;
@Column(name = "ORDER_BACK_TYPE")
@ApiParam(value = "单据回退类型")
@AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_BACK_TYPE.class, refForeignKey = "value", value = "description")
private Integer orderBackType;
@Transient
@ApiParam("菜单URL")
private String menuUrl;
@ -78,7 +85,6 @@ public class WmsTransType extends BaseBean {
@ApiParam("交易处理组件调用类")
private String callClass;
public String getMenuUrl() {
return "/handle?transTypeCode=" + this.transTypeCode;
}

1
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -418,6 +418,7 @@ public class WmsHqlPack {
//查询参数封装
DdlPreparedPack.getStringRightLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result);
DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result);
DdlPreparedPack.getNumEqualPack(wmsTransType.getOrderBackType(),"orderBackType",result);
DdlPreparedPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result);
getStringBuilderPack(wmsTransType, result);

Write Preview
Loading…
Cancel
Save