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

【pojo 冲突提交】

Browse Source
yun-zuoyi
zcg 5 years ago
parent bd82a0fba7 8dad0bf7cb
commit 9388e3b4f2
13 changed files with 183 additions and 12 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)

3
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", "亮灯明细");

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;
}

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

@ -104,7 +104,19 @@ 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;
@Transient
@ApiParam("设备名称")
private String equipmentName;
@Transient
@ApiParam("OPC值")
private String opcValue;
}

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;
}

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

@ -0,0 +1,58 @@
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 {
@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/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
@ -83,6 +84,9 @@ public class StationRequestBean implements Serializable {
@ApiParam("生产主队列编号")
private String orderNo;
@ApiParam("数据map")
private Map<String, Object> dataMap;
@Override
public String toString() {
return "StationRequestBean{" +

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

@ -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.MesWorkCellModuleParam;
import org.springframework.stereotype.Repository;
/**
* @Description: 工作单元组件参数配置
* @Reference:
* @Author: qianhuasheng
* @CreateDate:2019-04-17-17:11
* @Modify:
**/
@Repository
public interface MesWorkCellModuleParamRepository extends BaseRepository<MesWorkCellModuleParam, 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;
}
}

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;

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;

Write Preview
Loading…
Cancel
Save