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 test

Browse Source
yun-zuoyi
jenkins 6 years ago
parent 11d42b3221 b5696a63f7
commit 21d3c053ca
9 changed files with 194 additions and 23 deletions
Show Stats Download Patch File Download Diff File

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

@ -143,6 +143,10 @@ public class AndonManageQueue extends BaseBean {
@ApiParam(value = "解决人")
private String resetUser;
@Transient
@ApiParam(value = "异常时长")
private String resetUserName;
@Column(name = "IS_SHIFT_CALL")
@ApiParam(value = "是否转呼", example = "1")
private Integer isShiftCall;
@ -226,6 +230,22 @@ public class AndonManageQueue extends BaseBean {
@ApiParam(value = "响应时长", example = "0")
private Long signTime;
@Transient
@ApiParam(value = "ANDON次数（用于报表统计）", example = "0")
private Integer andonCount;
@Transient
@ApiParam(value = "平均响应时长", example = "0")
private Long avgSignTime;
@Transient
@ApiParam(value = "平均解决时长", example = "0")
private Long avgResolveTime;
@Transient
@ApiParam(value = "比例", example = "0")
private Double proportion;
@Column(name = "SEND_FLAG")
@ApiParam(value = "发送标志")
private String sendFlag;

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

@ -608,5 +608,40 @@ public class MesEnumUtil {
return tmp;
}
}
/**
* 工步参数类型
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STEP_PARAM_TYPE{
QUALIFIED(10,"数字"),
DEFECTED(20,"字符串"),
SCRAPED(30,"可选值");
private int value;
private String description;
STEP_PARAM_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;
}
}
}

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

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :产品流程配置操作参数表
@ -51,10 +52,19 @@ public class MesProdRouteOptParam extends BaseBean {
@ApiParam("工步参数代码")
private String paramCode;
@Column(name = "PARAM_TYPE")
@ApiParam("工步参数类型")
private Integer paramType;
@Column(name = "PARAM_VALUE")
@ApiParam("工步参数值")
private String paramValue;
@Transient
@Column(name = "PARAM_ATTRIBUTE")
@ApiParam("参数属性")
private String paramAttribute;
public long getProdRouteCfgIdVal() {
return this.prodRouteCfgId == null ? 0l : this.prodRouteCfgId;
}
@ -62,4 +72,8 @@ public class MesProdRouteOptParam extends BaseBean {
public int getStepSeq() {
return this.stepSeq == null ? 0 : this.stepSeq;
}
public int getParamTypeVal() {
return this.paramType == null ? 0 : this.paramType;
}
}

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

@ -34,4 +34,8 @@ public class MesRoute extends BaseBean {
@Column(name = "ROUTE_NAME")
@ApiParam("流程名称")
private String routeName;
@Column(name = "POSITION")
@ApiParam("GOJS位置")
private String position;
}

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

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :流程工序工步关系
@ -39,19 +40,32 @@ public class MesRouteProcessStep extends BaseBean {
@ApiParam("工步代码")
private String stepCode;
@Column(name = "STEP_SEQ")
@ApiParam("工步顺序")
private Integer stepSeq;
@Column(name = "SEQ")
@ApiParam("顺序")
private Integer seq;
@Column(name = "PARAM_CODE")
@ApiParam("工步参数代码")
private String paramCode;
@Column(name = "PARAM_TYPE")
@ApiParam("工步参数类型")
private Integer paramType;
@Column(name = "PARAM_VALUE")
@ApiParam("工步参数值")
private String paramValue;
@Transient
@Column(name = "PARAM_ATTRIBUTE")
@ApiParam("参数属性")
private String paramAttribute;
public int getStepSeqVal() {
return this.stepSeq == null ? 0 : this.stepSeq;
return this.seq == null ? 0 : this.seq;
}
public int getParamTypeVal() {
return this.paramType == null ? 0 : this.paramType;
}
}

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

@ -31,6 +31,10 @@ public class MesStepParam extends BaseBean {
@ApiParam("工步代码")
private String stepCode;
@Column(name = "PARAM_TYPE")
@ApiParam("参数类型")
private Integer paramType;
@Column(name = "PARAM_CODE")
@ApiParam("参数代码")
private String paramCode;

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

@ -19,6 +19,7 @@ public class MesHqlPack {
/**
* 通用查询条件
*
* @param organizeCode
* @return
*/
@ -32,6 +33,7 @@ public class MesHqlPack {
/**
* 生产计划查询条件封装
*
* @param mesPlanOrder
* @return
*/
@ -72,13 +74,14 @@ public class MesHqlPack {
"createDatetime", packBean, true);
// 排序
DdlPreparedPack.getOrderDefault(mesPlanOrder);
DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesPlanOrder.getOrderByParam()} , packBean);
DdlPreparedPack.getOrderDefault(mesPlanOrder);
DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPlanOrder.getOrderByParam()}, packBean);
return packBean;
}
/**
* 物料信息查询条件封装
*
* @param mesPart
* @return
*/
@ -105,12 +108,13 @@ public class MesHqlPack {
}
DdlPreparedPack.getOrderDefault(mesPart);
DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesPart.getOrderByParam()} , packBean);
DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPart.getOrderByParam()}, packBean);
return packBean;
}
/**
* 生产工单查询条件封装
*
* @param mesWorkOrder
* @return
*/
@ -151,12 +155,13 @@ public class MesHqlPack {
// mesWorkOrder.getEndTimeEnd(),
// "endTime", packBean, true);
DdlPreparedPack.getOrderDefault(mesWorkOrder);
DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesWorkOrder.getOrderByParam()} , packBean);
DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean);
return packBean;
}
/**
* 生产队列查询条件封装
*
* @param mesQueueOrder
* @return
*/
@ -185,12 +190,13 @@ public class MesHqlPack {
// DdlPreparedPack.getOrderDefault(mesQueueOrder);
// 按照队列序列号倒序
DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{"seq"} , packBean);
DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{"seq"}, packBean);
return packBean;
}
/**
* 通用查询条件
*
* @param organizeCode
* @return
*/
@ -204,6 +210,7 @@ public class MesHqlPack {
/**
* MES区域信息查询条件封装
*
* @param mesArea
* @return
*/
@ -218,6 +225,7 @@ public class MesHqlPack {
/**
* MES工作中心信息查询条件封装
*
* @param mesWorkCenter
* @return
*/
@ -226,7 +234,7 @@ public class MesHqlPack {
if (StringUtils.isNotEmpty(mesWorkCenter.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
}
if (StringUtils.isNotEmpty(mesWorkCenter.getAreaCode())){
if (StringUtils.isNotEmpty(mesWorkCenter.getAreaCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);
}
@ -235,6 +243,7 @@ public class MesHqlPack {
/**
* MES工作单元信息查询条件封装
*
* @param mesWorkCell
* @return
*/
@ -243,10 +252,10 @@ public class MesHqlPack {
if (StringUtils.isNotEmpty(mesWorkCell.getWorkCenterCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean);
}
if (StringUtils.isNotEmpty(mesWorkCell.getAreaCode())){
if (StringUtils.isNotEmpty(mesWorkCell.getAreaCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean);
}
if (StringUtils.isNotEmpty(mesWorkCell.getWorkCellCode())){
if (StringUtils.isNotEmpty(mesWorkCell.getWorkCellCode())) {
DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean);
}
@ -254,19 +263,30 @@ public class MesHqlPack {
}
/**
* MES设备信息查询条件封装
* @param mesEquipment
* 流程查询条件封装
*
* @param mesRoute
* @return
*/
public static DdlPackBean getMesEquipment(MesEquipment mesEquipment, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquipment, organizeCode);
if (StringUtils.isNotEmpty(mesEquipment.getWorkCellCode())){
DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean);
}
if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())){
DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean);
}
public static DdlPackBean packHqlMesRoute(MesRoute mesRoute, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesRoute, organizeCode);
DdlPreparedPack.getStringLikerPack(mesRoute.getRouteCode(), "routeCode", packBean);
DdlPreparedPack.getStringLikerPack(mesRoute.getRouteName(), "routeName", packBean);
packBean.setOrderByStr(mesRoute.orderBy());
return packBean;
}
/**
* 产品流程配置查询条件封装
*
* @param mesProdRouteCfg
* @param organizeCode
* @return
*/
public static DdlPackBean packHqlMesProdRouteCfg(MesProdRouteCfg mesProdRouteCfg, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdRouteCfg, organizeCode);
DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean);
packBean.setOrderByStr(mesProdRouteCfg.orderBy());
return packBean;
}

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

@ -0,0 +1,30 @@
package cn.estsh.i3plus.pojo.model.mes;
import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess;
import cn.estsh.i3plus.pojo.model.wms.WmsActionGroupDetailsModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Description : 流程Model
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2019-05-15 13:27
* @Modify:
**/
@Data
@Api("流程Model")
public class MesRouteModel implements Serializable {
@ApiParam("流程代码")
public String routeCode;
@ApiParam("工厂代码")
public String organizeCode;
@ApiParam("GOJS位置")
public String position;
@ApiParam("流程明细Model集合")
public List<MesRouteProcessModel> mesRouteProcessModelList;
}

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

@ -0,0 +1,30 @@
package cn.estsh.i3plus.pojo.model.mes;
import cn.estsh.i3plus.pojo.mes.bean.MesProdRouteOptParam;
import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcess;
import cn.estsh.i3plus.pojo.mes.bean.MesRouteProcessStep;
import cn.estsh.i3plus.pojo.wms.bean.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.util.List;
import java.util.Map;
/**
* @Description : 流程工序Model
* @Reference :
* @Author : dragon.xu
* @CreateDate : 2019-04-29 15:39
* @Modify:
**/
@Data
@Api("流程工序Model")
public class MesRouteProcessModel {
@ApiParam("流程工序")
public MesRouteProcess mesRouteProcess;
@ApiParam("流程工步参数配置表(根据Seq分组)")
public Map<String, List<MesRouteProcessStep>> mesRouteProcessStepMap;
@ApiParam("流程工步参数配置表(根据Seq分组)")
public Map<String, List<MesProdRouteOptParam>> mesProdRouteOptParamMap;
}
Write Preview
Loading…
Cancel
Save