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

Jenkins自动合并

Browse Source
yun-zuoyi
jenkins 5 years ago
parent 4e8ee475b4 c51de088d6
commit 1fbd9c4357
22 changed files with 159 additions and 5 deletions
Show Stats Download Patch File Download Diff File

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

@ -802,7 +802,7 @@ public class MesEnumUtil {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}

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

@ -77,4 +77,12 @@ public class MesCustOrder extends BaseBean {
@Transient
@ApiParam(value = "订单日期查询用，查询结束日期", example = "2019-12-31 23:59:59")
public String orderTimeEnd;
@Transient
@ApiParam("订单类型名称")
private String orderTypeName;
@Transient
@ApiParam("状态名称")
private String statusName;
}

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

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Author: Wynne.Lu
@ -66,4 +67,8 @@ public class MesDataObject extends BaseBean {
@Column(name = "SELF_ADDITION_VALUE")
@ApiParam("自增列值")
private Long selfAdditionValue;
@Transient
@ApiParam("操作类型名称")
private String operateTypeName;
}

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

@ -48,4 +48,8 @@ public class MesEquNotifyObjectCfg extends BaseBean {
@ApiParam("对象类型")
private Integer notifyObjectType;
@Transient
@ApiParam("对象类型名称")
private String notifyObjectTypeName;
}

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

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :设备作业通知配置
@ -48,4 +49,16 @@ public class MesEquTaskNotifyCfg extends BaseBean {
@ApiParam("通知方式")
private Integer notifyPattern;
@Transient
@ApiParam("作业类型名称")
private String taskTypeName;
@Transient
@ApiParam("通知类型名称")
private String notifyTypeName;
@Transient
@ApiParam("通知方式名称")
private String notifyPatternName;
}

5
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.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:
@ -71,6 +72,10 @@ public class MesKpsnRule extends BaseBean {
@ApiParam("供应商代码")
private String supplierCode;
@Transient
@ApiParam("绑定规则名称")
private String bandRuleName;
public int getLengthVal() {
return this.length == null ? 0 : this.length;
}

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

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Author: Wynne.Lu
@ -55,4 +56,8 @@ public class MesObjectCfg extends BaseBean {
@ApiParam("是否存储")
private Integer isSave;
@Transient
@ApiParam("是否存储")
private String isSaveName;
}

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

@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description :包装规格
@ -73,6 +74,22 @@ public class MesPackSpec extends BaseBean {
@ApiParam("是否混包4")
private Integer isMixed4;
@Transient
@ApiParam("是否混包名称")
private String isMixedName;
@Transient
@ApiParam("是否混包2名称")
private String isMixedName2;
@Transient
@ApiParam("是否混包3名称")
private String isMixedName3;
@Transient
@ApiParam("是否混包4名称")
private String isMixedName4;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;

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

@ -88,4 +88,16 @@ public class MesPart extends BaseBean {
@Column(name = "PRODUCT_MATCH_TYPE")
@ApiParam("产品编码匹配类型")
private Integer productMatchType;
@Transient
@ApiParam("过程编码匹配类型名称")
private String processMatchTypeName;
@Transient
@ApiParam("包装编码匹配类型")
private String packageMatchTypeName;
@Transient
@ApiParam("产品编码匹配类型")
private String productMatchTypeName;
}

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

@ -40,7 +40,7 @@ public class MesPcn extends BaseBean {
private String areaCode;
@Column(name = "AREA_NAME")
@ApiParam("区域")
@ApiParam("区域名称")
private String areaName;
@Column(name = "WORK_CENTER_CODE")
@ -48,7 +48,7 @@ public class MesPcn extends BaseBean {
private String workCenterCode;
@Column(name = "WORK_CENTER_NAME")
@ApiParam("工作中心")
@ApiParam("工作中心名称")
private String workCenterName;
@Column(name = "PCN_VERSION")

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

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* @Description:
@ -79,6 +80,18 @@ public class MesPcnSyncCfg extends BaseBean {
@ApiParam(value = "同步的时候是否区分工厂")
private Integer isIgnoreOrg = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
@Transient
@ApiParam("同步方式")
private String syncPatternName;
@Transient
@ApiParam("同步类型名称")
private String syncTypeName;
@Transient
@ApiParam(value = "同步的时候是否区分工厂")
private String isIgnoreOrgName;
public int getIsIgnoreOrgVal() {
return this.isIgnoreOrg == null ? 0 : this.isIgnoreOrg;
}

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

@ -99,6 +99,14 @@ public class MesPlanOrder extends BaseBean {
public String areaCode;
@Transient
@ApiParam("状态名称")
private String statusName;
@Transient
@ApiParam("计划类型")
private String planTypeName;
@Transient
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiParam(value = "创建日期查询用，查询结束日期", example = "2018-12-31 23:59:59")
public String startTimeStart;

9
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.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:
@ -43,4 +44,12 @@ public class MesProductEncodeCfg extends BaseBean {
@Column(name = "RULE_CODE")
@ApiParam("编码规则代码")
private String ruleCode;
@Transient
@ApiParam("编码类型名称")
private String codeTypeName;
@Transient
@ApiParam("匹配类型名称")
private String matchTypeName;
}

5
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.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:
@ -64,4 +65,8 @@ public class MesQcCheckStandard extends BaseBean {
@ApiParam("检测项类型")
private String checkItemType;
@Transient
@ApiParam("检测类型名称")
private String checkTypeName;
}

9
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.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 :工序工作单元
@ -43,4 +44,12 @@ public class MesRouteProcessCell extends BaseBean {
@ApiParam("工作中心")
private String workCenterCode;
@Transient
@ApiParam("流程代码名称")
private String routeCodeName;
@Transient
@ApiParam("工序代码名称")
private String processCodeName;
}

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

@ -88,6 +88,22 @@ public class MesStationBom extends BaseBean {
@ApiParam(value = "绑定数量")
private Double boundQty;
@Transient
@ApiParam(value = "是否可重复名称")
private String isRepeatName;
@Transient
@ApiParam(value = "是否检查名称")
private String isCheckName;
@Transient
@ApiParam(value = "是否投料配置名称")
private String isFeedName;
@Transient
@ApiParam(value = "是否绑定关键件名称")
private String isBindKeyName;
public double getQtyVal() {
return this.qty == null ? 0.0d : this.qty;
}

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

@ -68,4 +68,9 @@ public class MesWorkCell extends BaseBean {
@ApiParam(value = "父节点", access = "父节点", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
@Transient
@ApiParam("工位类型名称")
private String workCellTypeName;
}

9
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.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 :工作单元参数
@ -43,4 +44,12 @@ public class MesWorkCellParam extends BaseBean {
@Column(name = "PARAM_MODEL")
@ApiParam("参数模式")
private Integer paramModel;
@Transient
@ApiParam("参数类型名称")
private String paramTypeName;
@Transient
@ApiParam("参数模式名称")
private String paramModelName;
}

5
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.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 :工作单元参数配置
@ -50,4 +51,8 @@ public class MesWorkCellParamCfg extends BaseBean {
@Column(name = "IS_CHECK")
@ApiParam("是否必须校验")
private Integer isCheck;
@Transient
@ApiParam("是否必须校验名称")
private String isCheckName;
}

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

@ -68,6 +68,9 @@ public class MesDatasourceModel implements Serializable {
@ApiParam("数据库名称")
private String dsDbName;
@ApiParam("数据源类型名称")
private String dsTypeName;
public MesDatasourceModel() {
}

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

@ -58,10 +58,10 @@ public class MesEquTaskPlanModel implements Serializable {
@ApiParam("修改日期")
public String modifyDatetime;
@ApiParam("作业类型")
@ApiParam("作业类型名称")
private String taskTypeName;
@ApiParam("设备类别")
@ApiParam("设备类别名称")
private String equipmentCategoryName;

3
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java
Unescape Escape View File

@ -61,4 +61,7 @@ public class WmsTmsShipDto extends BaseDto implements Serializable {
@ApiParam("回执单地址")
private String pathUrl;
@ApiParam("关联单号")
private String refOrderNo;
}

Write Preview
Loading…
Cancel
Save