yun-zuoyi
汪云昊 5 years ago
commit 2f71b79ed8

BIN
.DS_Store vendored

Binary file not shown.

@ -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;
import java.io.Serializable;
/**
@ -46,4 +47,12 @@ public class AndonAlarmRoute extends BaseBean implements Serializable {
@ApiParam("流程类型")
private Integer routeType;
@Transient
@ApiParam("安灯类型名称")
private String alarmName;
@Transient
@ApiParam("流程名称")
private String routeName;
}

@ -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;
import java.io.Serializable;
/**
@ -38,4 +39,24 @@ public class AndonAlarmType extends BaseBean implements Serializable {
@ApiParam("安灯类型名称")
private String alarmName;
@Column(name = "CODE")
@ApiParam("菜单编号")
private String code;
@Column(name = "COLOR")
@ApiParam("BI颜色")
private String color;
@Column(name = "SEQ")
@ApiParam("顺序")
private Integer seq;
@Transient
@ApiParam("安灯类型代码")
private String value;
@Transient
@ApiParam("安灯类型名称")
private String description;
}

@ -10,10 +10,7 @@ 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 javax.persistence.*;
import java.io.Serializable;
/**
@ -81,4 +78,9 @@ public class AndonMessageRecord extends BaseBean implements Serializable {
@Column(name = "MEMO")
@ApiParam(value = "备注")
private String memo;
@Lob
@Column(name = "MESSAGE")
@ApiParam(value = "广播内容")
private String message;
}

@ -85,15 +85,15 @@ public class AndonRouteStatus extends BaseBean implements Serializable {
private Long alarmRouteId;
@Transient
@ApiParam("默认不缓存")
private boolean cacheFlag = false;
@Transient
@ApiParam("触发组件集默认未执行")
@ApiParam("当前状态点的触发组件集默认未执行")
private boolean actionAmgIdFalg = false;
@Transient
@ApiParam("触发类型默认不需要外部触发")
@ApiParam("进入触发方法时默认不需要校验外部触发")
private boolean checkTriggerTypeFalg = false;
@Transient
@ApiParam("每个组件执行完成根据业务设置下个触发事件如果需要外部告知下个触发事件则设置null一个组件集执行完毕后将这个值赋给CommonMsgModel的triggerEvent")
private String nextTriggerEvent;
}

@ -1,6 +1,5 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
@ -9,10 +8,7 @@ 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 javax.persistence.*;
import java.io.Serializable;
/**
@ -20,7 +16,6 @@ import java.io.Serializable;
* @date 2020/2/12 17:41
* @desc
*/
@Data
@Entity
@DynamicInsert
@ -45,7 +40,7 @@ public class AndonRouteStatusErrorRecord extends BaseBean implements Serializabl
public String andonOrderNo;
@Column(name = "ERROR_DESC")
@ApiParam(value = "失败描述")
@ApiParam(value = "异常描述")
public String errorDesc;
@Column(name = "WORK_CENTER_CODE")
@ -53,7 +48,7 @@ public class AndonRouteStatusErrorRecord extends BaseBean implements Serializabl
public String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam(value = "工作中心")
@ApiParam(value = "工作单元")
public String workCellCode;
@Column(name = "ALARM_CODE")
@ -64,4 +59,12 @@ public class AndonRouteStatusErrorRecord extends BaseBean implements Serializabl
@ApiParam(value = "安灯来源类型")
private String sourceType;
@Column(name = "CACHE_KEY")
@ApiParam(value = "缓存KEY")
private String cacheKey;
@Column(name = "HANDLE_STATUS")
@ApiParam(value = "处理状态")
private Integer handleStatus;
}

@ -0,0 +1,36 @@
package cn.estsh.i3plus.pojo.andon.model;
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRouteModuleParam;
import cn.estsh.i3plus.pojo.andon.bean.AndonRouteModuleParam;
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 : wangjie
* @CreateDate : 2020-04-10 13:27
* @Modify:
**/
@Data
@Api("流程明细Model")
public class AndonActionModuleGroupModel implements Serializable {
private static final long serialVersionUID = 2483914575357867288L;
@ApiParam("组件代码")
private String amCode;
@ApiParam("执行顺序")
private Integer seq;
@ApiParam("流程组件参数集合")
private List<AndonRouteModuleParam> routeModuleParamList;
@ApiParam("安灯流程组件参数集合")
private List<AndonAlarmRouteModuleParam> alarmRouteModuleParamList;
}

@ -0,0 +1,35 @@
package cn.estsh.i3plus.pojo.andon.model;
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 : wangjie
* @CreateDate : 2020-04-10 13:27
* @Modify:
**/
@Data
@Api("作业流程Model")
public class AndonBussinessProcessModel implements Serializable {
private static final long serialVersionUID = 801986911134685985L;
@ApiParam("流程代码")
private String routeCode;
@ApiParam("GOJS位置")
private String position;
@ApiParam("流程明细Model集合")
private List<AndonProcessDetailModel> processDetailModelList;
@ApiParam("安灯流程ID")
private Long alarmRouteId;
}

@ -0,0 +1,54 @@
package cn.estsh.i3plus.pojo.andon.model;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* @Description : Model
* @Reference :
* @Author : wangjie
* @CreateDate : 2020-04-10 13:27
* @Modify:
**/
@Data
@Api("流程明细Model")
public class AndonProcessDetailModel implements Serializable {
private static final long serialVersionUID = 5240991498276455147L;
@ApiParam("状态代码")
private String statusCode;
@ApiParam("状态名称")
private String statusName;
@ApiParam("触发类型")
private Integer triggerType;
@ApiParam("触发条件MVEL")
private String triggerWhere;
@ApiParam("组件集MAP")
private Map<String, List<AndonActionModuleGroupModel>> actionModuleGroupMap;
@ApiParam("下个状态点MAP")
private Map<String, String> nextStatusMap;
@ApiParam("触发调用")
private Long actionAmgId;
@ApiParam("进入状态调用")
private Long inAmgId;
@ApiParam("离开状态调用")
private Long outAmgId;
@ApiParam("界面编号")
private String interfaceNo;
}

@ -42,7 +42,7 @@ public class CommonMsgModel implements Serializable {
@ApiModelProperty("触发事件")
private String triggerEvent;
@ApiModelProperty("下个触发事件一个组件集执行完毕后这个值赋给triggerEvent")
private String nextTriggerEvent;
@ApiModelProperty("默认非异常内部处理,内部异常处理是设置为true")
private boolean errorInnerAction = false;
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonActionModuleGroup;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-05-13 11:07
* @Modify:
**/
@Repository
public interface IAndonActionModuleGroupRepository extends BaseRepository<AndonActionModuleGroup, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonActionRoute;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-05-13 11:07
* @Modify:
**/
@Repository
public interface IAndonActionRouteRepository extends BaseRepository<AndonActionRoute, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmRoute;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-05-13 11:07
* @Modify:
**/
@Repository
public interface IAndonAlarmRouteRepository extends BaseRepository<AndonAlarmRoute, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonRouteModuleParam;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-05-13 11:07
* @Modify:
**/
@Repository
public interface IAndonRouteModuleParamRepository extends BaseRepository<AndonRouteModuleParam, Long> {
}

@ -57,6 +57,7 @@ public class AndonHqlPack {
DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpLevel(), "rpLevel", packBean);
DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpObjectCode(), "rpObjectCode", packBean);
DdlPreparedPack.getStringEqualPack(andonMessageRecord.getStatusCode(), "statusCode", packBean);
DdlPreparedPack.getStringEqualPack(andonMessageRecord.getIsSucceed(), "isSucceed", packBean);
if(!StringUtils.isEmpty(andonMessageRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(andonMessageRecord.getCreateDateTimeEnd())){
DdlPreparedPack.timeBuilder(andonMessageRecord.getCreateDateTimeStart(), andonMessageRecord.getCreateDateTimeEnd(), "createDatetime", packBean, true);
}
@ -788,7 +789,9 @@ public class AndonHqlPack {
DdlPreparedPack.getNumNOEqualPack(mesArea.getId(),"id",result);
}
DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(),"areaCode",result);
if (mesArea != null) {
DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", result);
}
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
return result;
@ -805,7 +808,9 @@ public class AndonHqlPack {
DdlPreparedPack.getNumNOEqualPack(mesWorkCenter.getId(),"id",result);
}
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(),"workCenterCode",result);
if (mesWorkCenter != null) {
DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", result);
}
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
return result;
@ -822,7 +827,9 @@ public class AndonHqlPack {
DdlPreparedPack.getNumNOEqualPack(mesWorkCell.getId(),"id",result);
}
DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(),"workCellCode",result);
if (mesWorkCell != null) {
DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", result);
}
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
return result;
@ -839,7 +846,9 @@ public class AndonHqlPack {
DdlPreparedPack.getNumNOEqualPack(mesEquipment.getId(),"id",result);
}
DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(),"equipmentCode",result);
if (mesEquipment != null) {
DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", result);
}
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
return result;
@ -857,7 +866,9 @@ public class AndonHqlPack {
DdlPreparedPack.getStringNoEqualPack(mesShift.getWorkCenterCode(),"workCenterCode",result);
}
DdlPreparedPack.getStringEqualPack(mesShift.getShiftCode(),"shiftCode",result);
if (mesShift != null) {
DdlPreparedPack.getStringEqualPack(mesShift.getShiftCode(), "shiftCode", result);
}
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
return result;
@ -1034,4 +1045,49 @@ public class AndonHqlPack {
}
return packBean;
}
/**
*
* @param actionRoute
* @param organizeCode
* @return
*/
public static DdlPackBean packHqlAndonActionRoute(AndonActionRoute actionRoute, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(actionRoute, organizeCode);
DdlPreparedPack.getStringLikerPack(actionRoute.getRouteCode(), "routeCode", packBean);
DdlPreparedPack.getStringLikerPack(actionRoute.getRouteName(), "routeName", packBean);
DdlPreparedPack.getNumEqualPack(actionRoute.getRouteType(), "routeType", packBean);
return packBean;
}
/**
*
* @param alarmRoute
* @param organizeCode
* @return
*/
public static DdlPackBean packHqlAndonAlarmRoute(AndonAlarmRoute alarmRoute, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(alarmRoute, organizeCode);
DdlPreparedPack.getStringLikerPack(alarmRoute.getRouteCode(), "routeCode", packBean);
DdlPreparedPack.getStringLikerPack(alarmRoute.getAlarmCode(), "alarmCode", packBean);
DdlPreparedPack.getNumEqualPack(alarmRoute.getRouteType(), "routeType", packBean);
return packBean;
}
/**
*
* @param routeStatusErrorRecord
* @param organizeCode
* @return
*/
public static DdlPackBean getAndonRouteStatusErrorRecord(AndonRouteStatusErrorRecord routeStatusErrorRecord, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(routeStatusErrorRecord, organizeCode);
DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getRouteCode(), "routeCode", packBean);
DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getStatusCode(), "statusCode", packBean);
DdlPreparedPack.getStringLikerPack(routeStatusErrorRecord.getAndonOrderNo(), "andonOrderNo", packBean);
DdlPreparedPack.getStringEqualPack(routeStatusErrorRecord.getAlarmCode(), "alarmCode", packBean);
DdlPreparedPack.getStringEqualPack(routeStatusErrorRecord.getSourceType(), "sourceType", packBean);
DdlPreparedPack.getNumEqualPack(routeStatusErrorRecord.getHandleStatus(), "handleStatus", packBean);
return packBean;
}
}

@ -25,6 +25,7 @@ import javax.persistence.Table;
@Table(name = "APS_ASSIST_RESOURCE_SET_TIME")
@Api("副资源设置时间")
public class AssistResourceSetTime extends BaseAPS {
private static final long serialVersionUID = 901172392855536686L;
@Column(name="RES_CODE")
@ApiParam(value ="资源编码")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

@ -34,6 +34,7 @@ import java.util.List;
@ExcludeImportExport
@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
public class BaseOrder extends BaseAPS {
private static final long serialVersionUID = -2571085172798608026L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true)

@ -24,6 +24,7 @@ import javax.persistence.MappedSuperclass;
@Api("规则参数基类")
@ExcludeImportExport
public class BaseRule extends BaseAPS {
private static final long serialVersionUID = -1818853814377611968L;
@Column(name="CODE")
@ApiParam(value ="规则编码")
@FieldAnnotation(popSearch = true, mainkey = true)

@ -22,6 +22,7 @@ import javax.persistence.Table;
@Table(name = "APS_CANCEL_PLAN_RULE")
@Api("取消计划规则")
public class CancelPlanRule extends BaseRule {
private static final long serialVersionUID = 2674055522875545446L;
@Column(name="WORK_FILTERS")
@ApiParam(value ="工作筛选")
private String workFilters;

@ -25,6 +25,7 @@ import javax.persistence.Table;
@Table(name = "APS_DATA_LINK")
@Api("数据集成数据连接信息")
public class DataLink extends BaseAPS {
private static final long serialVersionUID = 8324774871058505466L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(notEmpty = true)

@ -28,6 +28,7 @@ import javax.persistence.Table;
@Api("班次")
@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
public class DayShift extends BaseAPS {
private static final long serialVersionUID = 7964370027924366093L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true)

@ -25,6 +25,7 @@ import javax.persistence.Table;
@Table(name = "APS_DYNAMIC_SET_TIME")
@Api("动态设置时间")
public class DynamicSetTime extends BaseAPS {
private static final long serialVersionUID = -1696499471488104793L;
@Column(name="RES_CODE")
@ApiParam(value ="资源代码")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

@ -27,6 +27,7 @@ import javax.persistence.Table;
@Api("数据导出明细")
public class ExportDetail extends BaseAPS {
private static final long serialVersionUID = -8898414164032180539L;
@Column(name="OUT_NAME")
@ApiParam(value ="外部表名")
private String outName;

@ -29,6 +29,7 @@ import java.util.List;
@Table(name = "APS_EXPORT_PROJECT")
@Api("数据导出明细集合")
public class ExportProject extends BaseAPS {
private static final long serialVersionUID = -7281303629295174330L;
@Column(name="NAME")
@ApiParam(value ="标识名")
private String name;

@ -23,6 +23,7 @@ import javax.persistence.Table;
@Table(name = "APS_EXPRESSION_RECORD")
@Api("表达式记录")
public class ExpressionRecord extends BaseAPS {
private static final long serialVersionUID = 4038954046132896632L;
@Column(name="BEAN_NAME")
@ApiParam(value ="表名")
private String beanName;

@ -16,6 +16,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.lang.reflect.Method;
import java.sql.JDBCType;
@ -35,6 +36,7 @@ import java.sql.JDBCType;
@Api("字段信息")
@ExcludeImportExport
public class FieldInfo extends BaseAPS {
private static final long serialVersionUID = -6195036426929675850L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true)
@ -121,11 +123,15 @@ public class FieldInfo extends BaseAPS {
private Boolean notEmpty;
@JsonIgnore
@Transient
private transient Class<? extends BaseBean> clazz;
@JsonIgnore
@Transient
private transient Class<?> typeClass;
@JsonIgnore
@Transient
private transient Method getMethod;
@JsonIgnore
@Transient
private transient Method setMethod;
}

@ -24,6 +24,7 @@ import javax.persistence.Table;
@Table(name = "APS_FIELD_SET_RULE")
@Api("属性赋值规则")
public class FieldSetRule extends BaseRule {
private static final long serialVersionUID = 6880145972942618559L;
@Column(name="BEAN")
@ApiParam(value ="实体名")
private ApsEnumUtil.FIELD_SET_BEAN bean;

@ -31,6 +31,7 @@ import javax.validation.constraints.Min;
@Api("炉容量")
public class FurnaceCapacity extends BaseAPS {
private static final long serialVersionUID = -5657804042629460659L;
@Column(name="RES_CODES")
@ApiParam(value ="资源编码")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

@ -32,6 +32,7 @@ import java.util.List;
@Api("炉资源计划")
public class FurnacePlan extends BaseAPS {
private static final long serialVersionUID = 6816465736285211114L;
@Column(name="CAPACITY", columnDefinition = "decimal(18,8)")
@ApiParam(value ="已占用的能力")
private Double capacity;

@ -30,6 +30,7 @@ import javax.persistence.Table;
@Api("组炉设置")
public class FurnaceSetting extends BaseAPS {
private static final long serialVersionUID = -4566911526487268870L;
@Column(name="RES_CODES")
@ApiParam(value ="资源编码")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

@ -24,6 +24,7 @@ import javax.persistence.Table;
@Table(name = "APS_HEURISTIC_RULE")
@Api("排程运算规则")
public class HeuristicRule extends BaseRule {
private static final long serialVersionUID = -4856714428377308150L;
@Column(name="WORK_FILTER")
@ApiParam(value ="工作筛选")
private String workFilter;

@ -28,6 +28,7 @@ import javax.persistence.Table;
@Api("数据导入明细")
public class ImportDetail extends BaseAPS {
private static final long serialVersionUID = 1264030397500660450L;
@Column(name="OUT_NAME")
@ApiParam(value ="外部表名")
private String outName;

@ -28,6 +28,7 @@ import java.util.List;
@Table(name = "APS_IMPORT_PROJECT")
@Api("数据导入明细集合")
public class ImportProject extends BaseAPS {
private static final long serialVersionUID = -1899074765155621438L;
@Column(name="NAME")
@ApiParam(value ="标识名")
private String name;

@ -26,6 +26,7 @@ import javax.persistence.Table;
@Table(name = "APS_INVENTORY")
@Api("库存")
public class Inventory extends BaseOrder {
private static final long serialVersionUID = 2378846162007550439L;
@Column(name="SPECIFY_TOP_ORDER")
@ApiParam(value ="指定顶层订单")
private String specifyTopOrder;

@ -24,6 +24,7 @@ import javax.persistence.Table;
@Table(name = "APS_MAT_CALC_RULE")
@Api("物料运算规则")
public class MatCalcRule extends BaseRule {
private static final long serialVersionUID = 2102986260688118982L;
@Column(name="MATERIAL_FILTER")
@ApiParam(value ="物料筛选")
private String materialFilter;

@ -34,6 +34,7 @@ import java.util.List;
@Api("物料")
@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
public class Material extends BaseAPS {
private static final long serialVersionUID = -7928225487946173108L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true)

@ -25,6 +25,7 @@ import javax.persistence.Table;
@Table(name = "APS_MATERIAL_SET_TIME")
@Api("物料设置时间")
public class MaterialSetTime extends BaseAPS {
private static final long serialVersionUID = -7996431489447641539L;
@Column(name="RES_CODE")
@ApiParam(value ="资源编码")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

@ -29,6 +29,7 @@ import java.util.List;
@Table(name = "APS_OPER_INPUT")
@Api("工序输入")
public class OperInput extends BaseAPS {
private static final long serialVersionUID = 6653235155693766804L;
@Column(name="OPERATION_ID")
@ApiParam(value ="工序")
@FieldAnnotation(relation = "Operation", notEmpty = true, display = false)

@ -28,6 +28,7 @@ import java.util.List;
@Table(name = "APS_OPER_OUTPUT")
@Api("工序输出")
public class OperOutput extends BaseAPS {
private static final long serialVersionUID = 3185682762290147209L;
@Column(name="OPERATION_ID")
@ApiParam(value ="工序")
@FieldAnnotation(relation = "Operation", notEmpty = true, display = false)

@ -29,6 +29,7 @@ import java.util.List;
@Table(name = "APS_OPER_RESOURCE")
@Api("工序资源")
public class OperResource extends BaseAPS {
private static final long serialVersionUID = -8683889582369342606L;
@Column(name="OPERATION_ID")
@ApiParam(value ="工序")
@FieldAnnotation(relation = "Operation", notEmpty = true, display = false)

@ -29,6 +29,7 @@ import java.util.List;
@Table(name = "APS_OPERATION")
@Api("工序")
public class Operation extends BaseAPS {
private static final long serialVersionUID = 4394179144091116858L;
@Column(name="NUMBER")
@ApiParam(value ="工序号")
@FieldAnnotation(notEmpty = true)

@ -24,6 +24,7 @@ import java.util.Date;
@Api("订单树")
@ExcludeImportExport
public class OrderTree extends BaseAPS {
private static final long serialVersionUID = -7505923374791695738L;
@ApiParam(value ="物料编码")
private String material;

@ -26,6 +26,7 @@ import java.util.Date;
@Table(name = "APS_OVERTIME_CALENDAR")
@Api("加班日历")
public class OvertimeCalendar extends BaseAPS {
private static final long serialVersionUID = -501715721073189464L;
@Column(name="RES_CODES")
@ApiParam(value ="资源代码")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

@ -32,6 +32,7 @@ import java.util.List;
@Api("父工作")
@ExcludeImportExport
public class ParentWork extends BaseAPS {
private static final long serialVersionUID = 8792781216193806606L;
@Column(name="count", columnDefinition = "decimal(18,8)")
@ApiParam(value ="数量")
private Double count;

@ -27,6 +27,7 @@ import javax.persistence.Table;
@Api("工作反馈")
public class PlanFeedback extends BaseAPS {
private static final long serialVersionUID = 2520555825093741381L;
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(property = false)

@ -30,6 +30,7 @@ import java.util.List;
@Table(name = "APS_PRODUCT_ORDER")
@Api("生产订单")
public class ProductOrder extends BaseOrder {
private static final long serialVersionUID = 6900226668783662736L;
@Column(name="EST")
@ApiParam(value ="最早开始时间")
private Date est;

@ -33,6 +33,7 @@ import java.util.List;
@Api("工艺路线")
@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
public class ProductRouting extends BaseAPS {
private static final long serialVersionUID = 4905294866468216722L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true)

@ -27,6 +27,7 @@ import javax.persistence.Table;
@Table(name = "APS_PURCHASE_ORDER")
@Api("采购订单")
public class PurchaseOrder extends BaseOrder {
private static final long serialVersionUID = 4699381603433121631L;
@Column(name="SPECIFY_TOP_ORDER")
@ApiParam(value ="指定顶层订单")
private String specifyTopOrder;

@ -29,6 +29,7 @@ import java.util.List;
@Table(name = "APS_RES_CALENDAR")
@Api("日历")
public class ResCalendar extends BaseAPS {
private static final long serialVersionUID = 8338930205816433211L;
@Column(name="RES_CODES")
@ApiParam(value ="资源编码")
@FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

@ -33,6 +33,7 @@ import java.util.List;
@Api("资源")
@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
public class Resource extends BaseAPS {
private static final long serialVersionUID = 3304084329600816457L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true)

@ -30,6 +30,7 @@ import javax.persistence.Table;
@ExcludeImportExport
public class RuleDetail extends BaseAPS {
private static final long serialVersionUID = -6433950357039396107L;
@Column(name="TYPE")
@ApiParam(value ="规则类型")
private ApsEnumUtil.RULE_TYPE type;

@ -29,6 +29,7 @@ import java.util.List;
@Api("规则组合")
@ExcludeImportExport
public class RuleGroup extends BaseAPS {
private static final long serialVersionUID = 4741897751041891075L;
@Column(name="CODE")
@ApiParam(value ="编码")
private String code;

@ -28,6 +28,7 @@ import java.util.Date;
@Table(name = "APS_SALES_ORDER")
@Api("销售订单")
public class SalesOrder extends BaseOrder {
private static final long serialVersionUID = -511784925441907538L;
@Column(name="LOW_EST")
@ApiParam(value ="底阶最早开始时间")
private Date lowEst;

@ -26,6 +26,7 @@ import javax.persistence.Table;
@ExcludeImportExport
public class SerialNumber extends BaseAPS {
private static final long serialVersionUID = 312483211086701109L;
@Column(name="NUMBER")
@ApiParam(value ="流水号")
private Integer number;

@ -27,6 +27,7 @@ import javax.persistence.Table;
@Api("运输时间")
public class ShippingTime extends BaseAPS {
private static final long serialVersionUID = -8698904420363808737L;
@Column(name="PREV_RES_CODE")
@ApiParam(value ="前资源编码")
@FieldAnnotation(relation = "PrevRes")

@ -29,6 +29,7 @@ import javax.persistence.Table;
@Api("标准工序")
@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
public class StandOperation extends BaseAPS {
private static final long serialVersionUID = -6869403951765771775L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true)

@ -26,6 +26,7 @@ import java.util.Date;
@Table(name = "APS_SYS_PARAM")
@Api("系统参数")
public class SysParam extends BaseAPS {
private static final long serialVersionUID = 3115620726438869596L;
@Column(name="BASE_TIME")
@ApiParam(value ="基准时间")
private Date baseTime;

@ -34,6 +34,7 @@ import java.util.List;
@Api("工作")
@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
public class Work extends BaseAPS {
private static final long serialVersionUID = 6471740978550523187L;
@Column(name="CODE")
@ApiParam(value ="编码")
@FieldAnnotation(popSearch = true, mainkey = true, modify = false)

@ -29,6 +29,7 @@ import java.util.List;
@Table(name = "APS_WORK_INPUT")
@Api("工作输入")
public class WorkInput extends BaseAPS {
private static final long serialVersionUID = 2654389476284740183L;
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(relation = "Work")

@ -31,6 +31,7 @@ import java.util.List;
@Api("工作输出")
public class WorkOutput extends BaseAPS {
private static final long serialVersionUID = 6031001499619328313L;
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(relation = "Work")

@ -35,6 +35,7 @@ import java.util.List;
@Api("工作计划")
public class WorkPlan extends BaseAPS {
private static final long serialVersionUID = 5489548115780676195L;
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(relation = "Work")

@ -28,6 +28,7 @@ import javax.persistence.Table;
@Api("工作关联")
public class WorkRelation extends BaseAPS {
private static final long serialVersionUID = -5824884364328962956L;
@Column(name="MATERIAL_ID")
@ApiParam(value ="物料")
@FieldAnnotation(relation = "Material", modify = false)

@ -28,6 +28,7 @@ import javax.persistence.Table;
@Api("工作资源")
public class WorkResource extends BaseAPS {
private static final long serialVersionUID = 4791940404968841144L;
@Column(name="WORK_ID")
@ApiParam(value ="工作")
@FieldAnnotation(relation = "Work")

@ -25,6 +25,7 @@ import java.util.HashMap;
@MappedSuperclass
@ExcludeImportExport
public abstract class BaseAPS extends BaseBean {
private static final long serialVersionUID = -8638842158403944318L;
@JsonIgnore
@Lob
@FieldAnnotation(property = false)
@ -43,9 +44,4 @@ public abstract class BaseAPS extends BaseBean {
public void setCustomField(String code, Object value) {
customFields.put(code, value);
}
@Override
public boolean equals(Object obj) {
return this == obj;
}
}

@ -77,7 +77,7 @@ public class DateDuration {
* @return
*/
public long getTimeInMillis() {
return this.time * 1000;
return this.time * 1000l;
}
@Override
@ -153,7 +153,7 @@ public class DateDuration {
* @return
*/
public long getTimeInMillis(double amount) {
return this.getTime(amount) * 1000;
return this.getTime(amount) * 1000l;
}
private void parse() {

@ -12,7 +12,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
public class CustomDateDeserializer extends JsonDeserializer<Date> {
public static SimpleDateFormat DATETIME_FORMATOR = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
public SimpleDateFormat DATETIME_FORMATOR = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@Override
public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {

@ -9,7 +9,7 @@ import java.text.SimpleDateFormat;
import java.util.Date;
public class CustomDateSerializer extends JsonSerializer<Date> {
public static SimpleDateFormat DATETIME_FORMATOR = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
public SimpleDateFormat DATETIME_FORMATOR = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@Override
public void serialize(Date date, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {

@ -13,6 +13,73 @@ import org.apache.commons.lang3.StringUtils;
public class AndonEnumUtil {
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS {
TRUE(10, "已处理"),
FALSE(20, "未处理");
private int value;
private String description;
ROUTE_STATUS_ERROR_RECORD_HANDLE_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 ROUTE_STATUS_ACTION_TYPE {
TRIGGER("10", "trigger", "触发"),
ENTRY("20", "entry", "进入状态"),
EXIT("30", "exit", "离开状态");
private String value;
private String code;
private String description;
ROUTE_STATUS_ACTION_TYPE(String value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public static ROUTE_STATUS_ACTION_TYPE getByValue(String value) {
for (ROUTE_STATUS_ACTION_TYPE actionType : values()) {
if (actionType.getValue().equals(value)) {
return actionType;
}
}
return null;
}
public String getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -116,14 +183,14 @@ public class AndonEnumUtil {
* -
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTE_TRIGGER_TYPE {
public enum ROUTE_STATUS_TRIGGER_TYPE {
INNER_TRIGGER(10, "内部触发"),
OUTER_TRIGGER(20, "外部触发");
private int value;
private String description;
ROUTE_TRIGGER_TYPE(int value, String description) {
ROUTE_STATUS_TRIGGER_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -144,8 +211,7 @@ public class AndonEnumUtil {
public enum ROUTE_STATUS_TYPE {
START(10, "START", "开始状态"),
EXECUTING(20, "EXECUTING", "执行中状态"),
TERMINATE(30, "TERMINATE", "中断状态"),
FINISH(40, "FINISH", "完成状态");
FINISH(30, "FINISH", "完成状态");
private int value;
private String code;
@ -1134,7 +1200,6 @@ public class AndonEnumUtil {
}
}
/**
* ANDONMM= QM= EQ= GY= JC=
*

@ -2520,4 +2520,12 @@ public class CommonEnumUtil {
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DYNAMIC_DATA_SOURCE_TYPE {
MASTER,NODE
}
}

@ -705,7 +705,8 @@ public class MesEnumUtil {
BOARD("BOARD", "看板类型"),
EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象");
EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"),
BH_PACKAGE_TYPE_VALUE("EQU_DEFECT_PHENOMENON", "B&H包装条码赋值样品类型值");
private String value;
private String description;
@ -723,7 +724,7 @@ public class MesEnumUtil {
return description;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -932,7 +933,7 @@ public class MesEnumUtil {
return null;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -1015,7 +1016,7 @@ public class MesEnumUtil {
return description;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -3117,7 +3118,9 @@ public class MesEnumUtil {
public enum METHOD_TYPE {
EXEC(10, "执行方法"),
COMPLETE(20, "完成方法");
COMPLETE(20, "完成方法"),
HNC_ISSUED(30,"队列自动下达"),
LABEL_PROPERTIES(40,"标签属性查询方法");
private int value;
private String description;
@ -3342,7 +3345,7 @@ public class MesEnumUtil {
return description;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -3381,7 +3384,7 @@ public class MesEnumUtil {
return description;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -4506,7 +4509,8 @@ public class MesEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QUEUE_ORDER_QUEUE_TYPE {
PRODUCT_QUEUE(10, "生产队列"),
PRELOAD_QUEUE(20, "预装队列");
PRELOAD_QUEUE(20, "预装队列"),
FIRST_STATION_QUEUE(30, "首工位队列");
private int value;
private String description;
@ -5087,7 +5091,8 @@ public class MesEnumUtil {
public enum BOARD_TYPE {
BOARD_CAPACITY_JIT("BOARD_CAPACITY_JIT", "产能监控看板(JIT)"),
BOARD_EQU_STATUS("BOARD_EQU_STATUS", "设备状态监控看板(布局模式)"),
BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE");
BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"),
BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板");
private String code;
private String description;
@ -5396,7 +5401,7 @@ public class MesEnumUtil {
return null;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -5519,7 +5524,7 @@ public class MesEnumUtil {
return null;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -6032,4 +6037,207 @@ public class MesEnumUtil {
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CALIBRATION_STATUS {
UNEXECUTED(10, "UNEXECUTED", "待执行"),
EXECUTE(20, "EXECUTE", "执行中"),
CANCEL(30, "CANCEL", "取消"),
FINISH(40, "FINISH", "完成");
private int value;
private String code;
private String description;
CALIBRATION_STATUS(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 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);
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum GUN_TYPE {
DL(10, "DL", "小枪"),
PF(20, "PF", "大枪");
private int value;
private String code;
private String description;
GUN_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 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);
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TOPIC_TYPE {
COLOUR(10, "颜色"),
GRADE(20, "等级"),
TO_CONFIGURE(30, "配置");
private int value;
private String description;
TOPIC_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) {
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 OPTION_TYPE {
OPTION(10, "选配件"),
BOM_DISASSEMBLY(20, "BOM拆解");
private int value;
private String description;
OPTION_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) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

@ -369,8 +369,12 @@ public class MesPcnEnumUtil {
REPAIR("REPAIR", "处理措施"),
SCRAP("SCRAP", "报废原因"),
QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"),
WC_CHECK("WC_CHECK", "开线检查项");
WC_CHECK("WC_CHECK", "开线检查项"),
BOARD("BOARD", "看板类型"),
EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"),
BH_PACKAGE_TYPE_VALUE("BH_PACKAGE_TYPE_VALUE", "B&H包装条码赋值样品类型值");
private String value;
private String description;
@ -387,7 +391,7 @@ public class MesPcnEnumUtil {
return description;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -608,6 +612,16 @@ public class MesPcnEnumUtil {
return tmp;
}
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 MES_MATCH_TYPE getByValue(int value) {
for (MES_MATCH_TYPE mesMatchType : values()) {
if (mesMatchType.getValue() == value) {
@ -1812,7 +1826,8 @@ public class MesPcnEnumUtil {
BH_ORDER(40, "B&H工单"),
JIT_ORDER(50, "JIT工单"),
STOCK_ORDER(60, "库存工单"),
REPAIR(70,"返修插单");
REPAIR(70, "返修插单"),
EMERGENCY_ORDER(80, "紧急插单");
private int value;
private String description;
@ -1911,7 +1926,7 @@ public class MesPcnEnumUtil {
return description;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -1950,7 +1965,7 @@ public class MesPcnEnumUtil {
return description;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -2209,7 +2224,7 @@ public class MesPcnEnumUtil {
return description;
}
public static String valueOfDescription(String val) {
public static String valueOfDescription(Integer val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -2342,7 +2357,7 @@ public class MesPcnEnumUtil {
return description;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -2353,16 +2368,14 @@ public class MesPcnEnumUtil {
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRODUCE_SN_STATUS {
CREATE(10, "创建"),
PROCESS(20, "加工"),
OFFLINE(30, "下线"),
PACKAGE_SCAN(35, "打包扫描"),
INSTOCKED(40, "入库"),
SHIPING(50, "发运"),
SHIPPING(50, "发运"),
CLOSE(90, "关闭");
private int value;
@ -2549,7 +2562,11 @@ public class MesPcnEnumUtil {
BUTTON("button", "按钮"),
TABLES("tables", "多个表格"),
CUSTOM("custom", "定制页面"),
FORM("form", "文本按钮");
CUSTOM_DIALOG("custom_dialog", "定制弹窗"),
FORM("form", "文本按钮"),
SPEC_TEXT("spec_text", "工步弹框文本"),
IMAGE_LIST("image_list", "图片列表"),
SHOW_ASSEMBLE_TABLE("SHOW_ASSEMBLE_TABLE", "展示组件表格");
private String value;
private String description;
@ -3248,7 +3265,7 @@ public class MesPcnEnumUtil {
GREEN("green", "绿色"),
RED("red", "红色"),
YELLOW("Yellow", "黄色");
YELLOW("yellow", "黄色");
private String code;
private String description;
@ -3312,6 +3329,41 @@ public class MesPcnEnumUtil {
}
}
/**
* IT
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SP_SHIPPING_STATUS {
CREATE(10, "创建"),
SHIPPED(20, "已发运");
private int value;
private String description;
SP_SHIPPING_STATUS(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 FSM_EVENT {
TRIGGER(10, "trigger", "触发"),
@ -3527,7 +3579,7 @@ public class MesPcnEnumUtil {
return description;
}
public static String valueOfDescription(int val) {
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
@ -3651,7 +3703,8 @@ public class MesPcnEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QUEUE_ORDER_QUEUE_TYPE {
PRODUCT_QUEUE(10, "生产队列"),
PRELOAD_QUEUE(20, "预装队列");
PRELOAD_QUEUE(20, "预装队列"),
FIRST_CELL_QUEUE(30, "首工位队列");
private int value;
private String description;
@ -3680,4 +3733,417 @@ public class MesPcnEnumUtil {
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum VERIFY_MODE {
PART_NO("10", "按物料号匹配"),
WORK_CENTER_CODE("20", "按产线匹配");
private String value;
private String description;
VERIFY_MODE(String value, String description) {
this.value = value;
this.description = description;
}
public String getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* (10-20-)
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum YELLOW_GUN_RULE {
COLLECT_TORQUE(10, "继续采集扭矩"),
SEND_NEXT_GROUP_CODE(20, "发送下一个组合码");
private int value;
private String description;
YELLOW_GUN_RULE(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 WINDOW_TYPE {
BUTTON_CFG(10, "按钮组件"),
BOARD_BASE_WINDOW(20, "看板基础页面"),
STEP_WINDOW(30, "工步界面");
private int value;
private String description;
WINDOW_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;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CALIBRATION_STATUS {
UNEXECUTED(10, "UNEXECUTED", "待执行"),
EXECUTE(20, "EXECUTE", "执行中"),
CANCEL(30, "CANCEL", "取消"),
FINISH(40, "FINISH", "完成");
private int value;
private String code;
private String description;
CALIBRATION_STATUS(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 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);
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum GUN_TYPE {
DL(10, "DL", "小枪"),
PF(20, "PF", "大枪");
private int value;
private String code;
private String description;
GUN_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 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);
}
}
/**
*
*/
@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);
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PRODUCE_ERROR_RECORD {
JUMP_PROCESS(10, "跳过工序"),
JUMP_STEP(20, "跳过工步"),
JUMP_STATE(30, "跳过状态点");
private int value;
private String description;
PRODUCE_ERROR_RECORD(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 TOPIC_TYPE {
COLOUR(10, "零件颜色"),
GRADE(20, "等级"),
TO_CONFIGURE(30, "配置");
private int value;
private String description;
TOPIC_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) {
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 STOP_MACHINE_TYPE {
TIMER_TIME_OUT(10, "计时器超时停机"),
DELAY_HELP(20, "延时帮助停机"),
URGENT_STOP(30, "急停停机");
private int value;
private String description;
STOP_MACHINE_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) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

@ -14,14 +14,14 @@ public class PtlEnumUtil {
* -
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TRIGGER_TYPE {
public enum ROUTE_STATUS_TRIGGER_TYPE {
INNER_TRIGGER(10, "内部触发"),
OUTER_TRIGGER(20, "外部触发");
private int value;
private String description;
TRIGGER_TYPE(int value, String description) {
ROUTE_STATUS_TRIGGER_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -73,17 +73,16 @@ public class PtlEnumUtil {
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STATUS_TYPE {
public enum ROUTE_STATUS_TYPE {
START(10, "START", "开始状态"),
EXECUTING(20, "EXECUTING", "执行中状态"),
TERMINATE(30, "TERMINATE", "中断状态"),
FINISH(40, "FINISH", "完成状态");
FINISH(30, "FINISH", "完成状态");
private int value;
private String code;
private String description;
STATUS_TYPE(int value, String code, String description) {
ROUTE_STATUS_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -137,7 +136,7 @@ public class PtlEnumUtil {
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTE_EVENT {
public enum ROUTE_STATUS_ACTION_TYPE {
TRIGGER("10", "trigger", "触发"),
ENTRY("20", "entry", "进入状态"),
EXIT("30", "exit", "离开状态");
@ -146,16 +145,16 @@ public class PtlEnumUtil {
private String code;
private String description;
ROUTE_EVENT(String value, String code, String description) {
ROUTE_STATUS_ACTION_TYPE(String value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public static ROUTE_EVENT getByValue(String value) {
for (ROUTE_EVENT routeEvent : values()) {
if (routeEvent.getValue().equals(value)) {
return routeEvent;
public static ROUTE_STATUS_ACTION_TYPE getByValue(String value) {
for (ROUTE_STATUS_ACTION_TYPE actionType : values()) {
if (actionType.getValue().equals(value)) {
return actionType;
}
}
return null;

@ -14,6 +14,31 @@ import static cn.estsh.i3plus.pojo.base.enumutil.PtlPcnEnumUtil.MONITOR_PROCESS_
public class PtlPcnEnumUtil {
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTE_STATUS_ERROR_RECORD_HANDLE_STATUS {
TRUE(10, "已处理"),
FALSE(20, "未处理");
private int value;
private String description;
ROUTE_STATUS_ERROR_RECORD_HANDLE_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)
@ -553,7 +578,7 @@ public class PtlPcnEnumUtil {
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ROUTE_EVENT {
public enum ROUTE_STATUS_ACTION_TYPE {
TRIGGER("10", "trigger", "触发"),
ENTRY("20", "entry", "进入状态"),
EXIT("30", "exit", "离开状态");
@ -562,7 +587,7 @@ public class PtlPcnEnumUtil {
private String code;
private String description;
ROUTE_EVENT(String value, String code, String description) {
ROUTE_STATUS_ACTION_TYPE(String value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -654,14 +679,14 @@ public class PtlPcnEnumUtil {
* -
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TRIGGER_TYPE {
public enum ROUTE_STATUS_TRIGGER_TYPE {
INNER_TRIGGER(10, "内部触发"),
OUTER_TRIGGER(20, "外部触发");
private int value;
private String description;
TRIGGER_TYPE(int value, String description) {
ROUTE_STATUS_TRIGGER_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -931,17 +956,16 @@ public class PtlPcnEnumUtil {
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum STATUS_TYPE {
public enum ROUTE_STATUS_TYPE {
START(10, "START", "开始状态"),
EXECUTING(20, "EXECUTING", "执行中状态"),
TERMINATE(30, "TERMINATE", "中断状态"),
FINISH(40, "FINISH", "完成状态");
FINISH(30, "FINISH", "完成状态");
private int value;
private String code;
private String description;
STATUS_TYPE(int value, String code, String description) {
ROUTE_STATUS_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;

@ -531,4 +531,119 @@ public class SwebEnumUtil {
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OUT_MOVEMENT_BUSI_TYPE {
PRODUCTION_MATERIAS(10, "PROD_MATERIALS", "生产领料"),
CUSTOMER_SHPING(20, "CUS_SHPING", "客户发运"),
OUTWARD_SHIPMENT(30, "OUT_SHIPMENT", "委外发运"),
ALLOCATION(40, "ALLOCATION", "调拨"),
SCATTERED_OUT(50, "SCATTERED_OUT", "零星出库"),
SCATTERED_IN(60, "SCATTERED_IN", "零星入库"),
NC_WAREHOSING_IN(70, "NC_WAREHOSING", "NC入库"),
SUPPLIER_RETURN(80, "SUPPLIER_RETURN", "供应商退货"),//默认DMR
CUSTOMER_RETURN(90, "CUSTOMER_RETURN", "客户退货"),
PRODUCT_RETURN(100, "PRODUCT_RETURN", "生产退料"),
INSTRUCTION_MOVE(110, "INSTRUCTION_MOVE", "指令移库"),
SCRAPPING_OUT(120, "SCRAPPING_OUT", "报废出库"),
RECEIVING_IN(130, "RECEIVING_IN", "收货入库"),
OUTSOURCING_BACK(140, "OUTSOURCING_BACK", "委外退回"),
NC_WAREHOSING_OUT(150, "NC_WAREHOSING_OUT", "NC出库"),
SUPPLIER_RETURN_SMRR(190, "SUPPLIER_RETURN_SMRR", "供应商退货(SMRR)"),
NC_DISMANTLING_PICKING(160, "NC_DISMANTLING_PICKING", "NC拆解领料"),
NC_DISMANTLING_RETREAT(170, "NC_DISMANTLING_RETREAT", "NC拆解退料"),
LINE_EDGE_SCRAPPING_OUT(180, "LINE_EDGE_SCRAPPING_OUT", "线边报废出库"),
ASN(200, "ASN", "ASN"),
PO(210, "PO", "PO"),
QC(220, "QC", "QC"),
AMPR(230, "AMPR", "AMPR"),
FINISHGOODS(240, "FINISHGOODS", "VDA生产快速入库"),
VDA_REPORT(250, "VDA_REPORT", "VDA生产报工"),
VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库"),
VDA_PICKING_GOODS(270, "VDA_PICKING_GOODS", "VDA生产领料"),
VDA_ONE_PICKING_GOODS(280, "VDA_ONE_PICKING_GOODS", "VDA单箱领料"),
VDA_QC(290, "VDA_QC", "VDA质检"),
VDA_SN_SPLIT(300, "VDA_SN_SPLIT", "VDA物料拆分"),
VDA_SN_MERGE(310, "VDA_SN_MERGE", "VDA物料合并"),
KT_RECEPTION(320, "KT_RECEPTION", "KT让步接收"),
KT_SCRAP(330, "KT_SCRAP", "KT报废"),
KT_QUARANTINE(340, "KT_QUARANTINE", "KT隔离"),
KT_BACK_QUARANTINE(350, "KT_BACK_QUARANTINE", "KT反隔离"),
KT_DEFINITE_FAIL(360, "KT_DEFINITE_FAIL", "KT不合格"),
KT_RETURN(370, "KT_RETURN", "KT退货"),
KT_REWORK(380, "KT_REWORK", "KT返工"),
KT_MISCALCULATION(390, "KT_MISCALCULATION", "KT误判"),
KT_SORTING(400, "KT_SORTING", "KT分选"),
VDA_STATIC_CS(410, "VDA_STATIC_CS", "静态盘点"),
VDA_CS_SEARCH(420, "VDA_CS_SEARCH", "VDA盘点查询"),
KT_DEFINITE(430, "KT_DEFINITE", "KT合格"),
VDA_PACKAGE_MANAGE(440, "VDA_PACKAGE_MANAGE", "VDA编组管理"),
KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"),
KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"),
FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"),
KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"),
PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"),
UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"),
TG_PICKING_GOODS(510, "TG_PICKING_GOODS", "TG生产领料"),
EXTERNAL_PULL(520, "EXTERNAL_PULL", "外部拉动"),
LOADING_ORDER(530, "LOADING_ORDER", "装车单");
private int value;
private String code;
private String description;
OUT_MOVEMENT_BUSI_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);
}
}
}

@ -6456,7 +6456,7 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FG_INSTOCK_SN_TYPE {
NORMAL(10, "NORMAL", "实物条码(正常)"),
NORMAL(10, "NORMAL", "正常"),
FIRST_PIECE(20, "FIRST_PIECE", "首件"),
MIDDLE_PIECE(30, "MIDDLE_PIECE", "中件"),
TAIL_PIECE(40, "TAIL_PIECE", "末件");
@ -6505,8 +6505,9 @@ public class WmsEnumUtil {
public enum REWORK_STATUS {
INIT(10, "INIT", "初始化"),
BE_HANDLE(20, "BE_HANDLE", "待处理"),
FINISH(30, "FINISH", "已处理"),
NONE(40, "NONE", "不处理");
HANDLING(30, "HANDLING", "处理中"),
FINISH(40, "FINISH", "已处理"),
NONE(50, "NONE", "不处理");
private int value;
private String code;
@ -6836,17 +6837,79 @@ public class WmsEnumUtil {
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum HEALTH_INDICATOR_LEVEL {
HEALTH(10, "HEALTH", "健康"),
SUB_HEALTH(20, "SUB_HEALTH", "亚健康"),
NO_HEALTH(30, "NO_HEALTH", "不健康");
private int value;
private String code;
private String description;
HEALTH_INDICATOR_LEVEL(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 valueOfDescription(int val) {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
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;
}
}
/**
* BH
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum BH_TEST_RESULT_STATUS {
NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格");
public enum SOFT_DATA_FORM {
XML(10, "XML", "XML"), JSON(20, "JSON", "JSON");
private int value;
private String code;
private String description;
BH_TEST_RESULT_STATUS(int value, String code, String description) {
SOFT_DATA_FORM(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -6893,7 +6956,7 @@ public class WmsEnumUtil {
return tmp;
}
public static BH_TEST_RESULT_STATUS codeOf(Integer value) {
public static SOFT_DATA_FORM codeOf(Integer value) {
if (value == null) {
return null;
} else {
@ -6908,18 +6971,92 @@ public class WmsEnumUtil {
}
/**
*
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum HEALTH_INDICATOR_LEVEL {
HEALTH(10, "HEALTH", "健康"),
SUB_HEALTH(20, "SUB_HEALTH", "亚健康"),
NO_HEALTH(30, "NO_HEALTH", "不健康");
public enum APPROVAL_STATUS {
APPROVE_PROCESSING(10, "APPROVE_PROCESSING", "审批中"),
APPROVE_COMPLETED(20, "APPROVE_COMPLETED", "审批通过"),
APPROVE_REFUSE(30, "APPROVE_REFUSE", "已驳回");
private int value;
private String code;
private String description;
HEALTH_INDICATOR_LEVEL(int value, String code, String description) {
APPROVAL_STATUS(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 valueOfDescription(int val) {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
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 APPROVAL_STATUS codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum NORMAL_ABNORMAL {
NORMAL(10, "NORMAL", "正常"),
ABNORMAL(20, "ABNORMAL", "非正常");
private int value;
private String code;
private String description;
NORMAL_ABNORMAL(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -6965,20 +7102,39 @@ public class WmsEnumUtil {
}
return tmp;
}
public static NORMAL_ABNORMAL codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
/**
*
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SOFT_DATA_FORM {
XML(10, "XML", "XML"), JSON(20, "JSON", "JSON");
public enum BACTH_TRANS_TYPE {
REPORT(10, "REPORT", "报工"),
UNTYING(20, "UNTYING", "解绑"),
CHECK(30, "CHECK", "检测"),
PICK(40, "REPAIR", "挑选"),
REPAIR(50, "REPAIR", "返修"),
BIND(60, "BIND", "绑定"),
OUTSTOCK(70, "OUTSTOCK", "出库");
private int value;
private String code;
private String description;
SOFT_DATA_FORM(int value, String code, String description) {
BACTH_TRANS_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -7025,7 +7181,285 @@ public class WmsEnumUtil {
return tmp;
}
public static SOFT_DATA_FORM codeOf(Integer value) {
public static BACTH_TRANS_TYPE codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
/**
* BH
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum BH_TYPE {
HOLD_LOCATE(10, "hold库位"),
QUALITY_CONTROL(20, "质检中"),
PRE_INSTOCK(30, "待入库");
private int value;
private String description;
BH_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 Integer descriptionOfValue(String desc) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
* BH
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum BH_LOCATE_TYPE {
HOLD(10, "HOLD", "HOLD库位"),
WAIT_CHECK(20, "WAIT_CHECK", "待检测库位"),
WAIT_OUT(30, "WAIT_OUT", "待出库库位");
private int value;
private String code;
private String description;
BH_LOCATE_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 valueOfDescription(int val) {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
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 BH_LOCATE_TYPE codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
/**
* BH
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum BH_WORK_STATUS {
WAIT_CHECK(10, "WAIT_CHECK", "待检验"),
SUBMIT_CHECK(20, "SUBMIT_CHECK", "已送检"),
IN_CHECK(30, "IN_CHECK", "检验中"),
WAIT_CONFIRM(40, "WAIT_CONFIRM", "待确认"),
WAIT_REPARI(50, "WAIT_OUT", "待返修"),
WAIT_PICK(60, "WAIT_OUT", "待挑选"),
IN_REPARI(70, "WAIT_OUT", "返修中"),
IN_PICK(80, "WAIT_OUT", "挑选中"),
WAIT_OUT(90, "WAIT_OUT", "待出库"),
OUT(100, "WAIT_OUT", "已出库");
private int value;
private String code;
private String description;
BH_WORK_STATUS(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 valueOfDescription(int val) {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
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 BH_WORK_STATUS codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum LOCATE_PROPORTION {
ZERO(10, "ZERO", "0%"),
GENERAL(20, "GENERAL", "0%-30%"),
MEDIUM(30, "MEDIUM", "30%-60%"),
WELL(40, "WELL", "60%-100%");
private int value;
private String code;
private String description;
LOCATE_PROPORTION(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 valueOfDescription(int val) {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
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 LOCATE_PROPORTION codeOf(Integer value) {
if (value == null) {
return null;
} else {

@ -20,7 +20,13 @@ import java.io.Serializable;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.UUID;
/**
* @Description :
@ -1579,8 +1585,10 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
}
Query query = entityManager.createQuery(queryString.toString());
for (String key : packBean.getHqlPreparedMap().keySet()) {
query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key));
if (packBean != null) {
for (String key : packBean.getHqlPreparedMap().keySet()) {
query.setParameter("m_" + key, packBean.getHqlPreparedMap().get(key));
}
}
return query.getResultList();

@ -300,6 +300,16 @@ public class DdlPreparedPack {
}
/**
*
*
* @param columnName
* @param packBean
*/
public static void getStringNullPack(String columnName, DdlPackBean packBean) {
packBean.addColumnQuery(null, " and ( model." + columnName +
" is null or model." + columnName + " ='')", null);
}
/**
* Stringequal
*
* @param columnName
@ -668,6 +678,28 @@ public class DdlPreparedPack {
}
/**
*
*
* @param columnName
* @param packBean
*/
public static void getIsNull(String columnName, DdlPackBean packBean) {
packBean.addColumnQuery(columnName, " and (model." + columnName + " is null or model." + columnName + " = '')", null);
}
/**
*
*
* @param columnName
* @param packBean
*/
public static void getIsNotNull(String columnName, DdlPackBean packBean) {
packBean.addColumnQuery(columnName, " and (model." + columnName + " is not null and model." + columnName + " != '')", null);
}
/**
*
*
* @param columnName

@ -403,8 +403,8 @@ public final class FormHqlPack {
public static DdlPackBean packHqlBfCascade(BfCascade bfCascade){
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bfCascade);
DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeName(), "objectName", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeDescription(), "objectClassName", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeName(), "cascadeName", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bfCascade.getCascadeDescription(), "cascadeDescription", ddlPackBean);
return ddlPackBean;
}

@ -99,4 +99,12 @@ public class IfPackageDetail extends BaseBean implements Serializable {
@Column(name = "CT_NO")
@ApiParam("容器编号")
private String ctNo;
@Column(name = "SN_TYPE")
@ApiParam("条码类型")
private String snType;
@Column(name = "SHIPPING_FLAG")
@ApiParam("客户发往地")
private String shippingFlag;
}

@ -27,7 +27,7 @@ import java.io.Serializable;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "if_queue_shipping")
@Table(name = "IF_QUEUE_SHIPPING")
@Api("JIT发运数据同步")
public class IfQueueShipping extends BaseBean implements Serializable {
private static final long serialVersionUID = -3385698810529084423L;
@ -105,4 +105,20 @@ public class IfQueueShipping extends BaseBean implements Serializable {
@ApiParam("接口代码")
private String ifCode;
@Column(name = "ITEM_PART_NO")
@ApiParam("原材料物料号")
private String itemPartNo;
@Column(name = "ITEM_PART_NAME")
@ApiParam("原材料物料名称")
private String itemPartName;
@Column(name = "ITEM_QTY")
@ApiParam("原材料物料用量")
private Double itemQty;
@Column(name = "ITEM_UNIT")
@ApiParam("原材料物料用量")
private String itemUnit;
}

@ -0,0 +1,72 @@
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 : siliter.yuan
* @CreateDate : 2020-06-03 15:38
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_AGV_STOP_RECORD")
@Api("MES_停机记录表")
public class MesAgvStopRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -8961182851767690154L;
@Column(name = "STOP_TYPE")
@ApiParam("停机类型")
private Integer stopType;
@Column(name = "PRODUCT_SN")
@ApiParam("产品条码")
private String productSn;
@Column(name = "SERIAL_NUMBER")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam("物料名称")
private String partName;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "STOP_START_TIME")
@ApiParam("停机开始时间")
private String stopStartTime;
@Column(name = "STOP_END_TIME")
@ApiParam("停机结束时间")
private String stopEndTime;
@Column(name = "STOP_REASON")
@ApiParam("停机原因")
private String stopReason;
}

@ -0,0 +1,67 @@
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.*;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: jessica.chen
* @CreateDate:
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BLIND_HISTORY")
@Api("MES_盲检记录")
public class MesBlindHistory extends BaseBean implements Serializable {
private static final long serialVersionUID = -7459452475180601499L;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "BLIND_OBJECT")
@ApiParam("盲检对象")
private String blindObject;
@Column(name = "BLIND_ITEM")
@ApiParam("盲检问题")
private String blindItem;
@Column(name = "SYSTEM_ANSWER")
@ApiParam("系统答案")
private String systemAnswer;
@Column(name = "CHOOSED_ANSWER")
@ApiParam("选中答案")
private String choosedAnswer;
@Column(name = "CHECKED")
@ApiParam("是否一致")
private Integer checked;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Transient
@ApiParam("主队列编号")
private String orderNo;
}

@ -0,0 +1,70 @@
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:
* @Reference:
* @Author: jessica.chen
* @CreateDate:
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BLIND_RULE")
@Api("MES_盲检规则")
public class MesBlindRule extends BaseBean implements Serializable {
private static final long serialVersionUID = -7459452475180601498L;
@Column(name = "RULE_ID")
@ApiParam("匹配规则ID")
private String ruleId;
@Column(name = "CAR_TYPE")
@ApiParam("车辆类型")
private String carType;
@Column(name = "CAR_COLOR")
@ApiParam("车辆颜色")
private String carColor;
@Column(name = "PART_CODE")
@ApiParam("零件号")
private String partCode;
@Column(name = "PART_NAME")
@ApiParam("零件名称")
private String partName;
@Column(name = "CAR_CONFIG")
@ApiParam("配置")
private String carConfig;
@Column(name = "CAR_LEVEL")
@ApiParam("等级")
private String carLevel;
@Column(name = "PART_COLOR")
@ApiParam("零件颜色")
private String partColor;
@Transient
@ApiParam("零件颜色")
private String rightKey;
}

@ -0,0 +1,65 @@
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: jessica.chen
* @CreateDate:
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_BLIND_TOPIC_SETTING")
@Api("MES_盲检问题设置")
public class MesBlindTopicSetting extends BaseBean implements Serializable {
private static final long serialVersionUID = -7459452475180601497L;
@Column(name = "TOPIC_ID")
@ApiParam("序号")
private String topicId;
@Column(name = "TOPIC_CODE")
@ApiParam("题目编号")
private String topicCode;
@Column(name = "TOPIC_DESC")
@ApiParam("题目描述")
private String topicDesc;
@Column(name = "TOPIC_OBJECT")
@ApiParam("零件名称")
private String topicObject;
@Column(name = "TOPIC_TYPE")
@ApiParam("盲检类型")
private Integer topicType;
@Column(name = "QTY")
@ApiParam("错误答案数量")
private Integer qty;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
}

@ -0,0 +1,91 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
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 java.io.Serializable;
/**
* @Description : MES_
* @Reference :
* @Author : amy
* @CreateDate : 2018-11-07 14:21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_BOARD_WORK_CELL")
@Api("MES_看板工位信息")
public class MesBoardWorkCell extends BaseBean implements Serializable {
private static final long serialVersionUID = 6251886604848913685L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "X_AXES")
@ApiParam("横坐标")
private Double xAxes = 0d;
@Column(name = "Y_AXES")
@ApiParam("纵坐标")
private Double yAxes = 0d;
@Column(name = "WORK_CELL_IP")
@ApiParam("工位IP")
private String workCellIp;
@Transient
@ApiParam("看板工位状态")
private Boolean boardWorkCellStatus;
@JsonProperty("xAxes")
public Double getxAxes() {
return xAxes;
}
public void setxAxes(Double xAxes) {
this.xAxes = xAxes;
}
@JsonProperty("yAxes")
public Double getyAxes() {
return yAxes;
}
public void setyAxes(Double yAxes) {
this.yAxes = yAxes;
}
public double getXAxes() {
return this.xAxes == null ? 0.0d : this.xAxes;
}
public double getYAxes() {
return this.yAxes == null ? 0.0d : this.yAxes;
}
}

@ -46,4 +46,8 @@ public class MesCachaQueue extends BaseBean implements Serializable {
@ApiParam("物料号")
private String partNo;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("生产线")
private String workCenterCode;
}

@ -53,4 +53,8 @@ public class MesCustomer extends BaseBean implements Serializable {
@Column(name = "TELEPHONE")
@ApiParam("客户电话")
private String telephone;
@Column(name = "SHIPPING_FLAG")
@ApiParam("客户发往地")
private String shippingFlag;
}

@ -44,6 +44,10 @@ public class MesDefect extends BaseBean implements Serializable {
@ApiParam("缺陷类型")
private String defectType;
@Column(name = "PROD_CFG_TYPE_CODE")
@ApiParam("项目代码")
private String prodCfgTypeCode;
@Transient
@ApiParam("缺陷类型名称")
private String defectTypeName;

@ -62,6 +62,10 @@ public class MesEsop extends BaseBean implements Serializable {
@ApiParam("文件id")
private Long fileId;
@Column(name = "ESOP_URL")
@ApiParam("文件路径")
private String esopUrl;
@Transient
@ApiParam("文件名称")
private String fileName;
@ -90,4 +94,8 @@ public class MesEsop extends BaseBean implements Serializable {
@ApiParam("同步标记")
private Integer syncTag = 0;
@Transient
@ApiParam("过程条码")
private String serialNumber;
}

@ -0,0 +1,81 @@
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:
* @Author: jokelin
* @Date: 2020/5/27 2:20
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_GUN_CALIBRATION_RECORD")
@Api("校枪记录表")
public class MesGunCalibrationRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = -6166370020956801528L;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "GUN_CODE")
@ApiParam("枪号")
private String gunCode;
@Column(name = "CUN_TYPE")
@ApiParam("扭矩枪类型")
private String cunType;
@Column(name = "PSET_CODE")
@ApiParam("PSET号")
private String psetCode;
@Column(name = "EXPECT_COUNT")
@ApiParam("设定枪数")
private Integer expectCount;
@Column(name = "REAL_COUNT")
@ApiParam("实际枪叔")
private Integer realCount;
@Column(name = "CALIBRATION_STATUS")
@ApiParam("校枪状态")
private Integer calibrationStatus;
@Column(name = "START_TIME")
@ApiParam("开始校枪时间")
private String startTime;
@Column(name = "END_TIME")
@ApiParam("结束校枪时间")
private String endTime;
@Transient
@ApiParam("校枪状态名称")
private String calibrationStatusName;
@Transient
@ApiParam("界面编号")
private String windowNo;
}

@ -42,6 +42,10 @@ public class MesLabelTemplate extends BaseBean implements Serializable {
@ApiParam(value = "模板内容")
private String templateContent;
@Column(name = "METHOD_CODE")
@ApiParam("方法代码")
private String methodCode;
@ApiParam(value = "第二个模板内容")
private String otherTemplateContent;

@ -110,6 +110,14 @@ public class MesPackage extends BaseBean implements Serializable {
@ApiParam("容器编号")
private String ctNo;
@Column(name = "SN_TYPE")
@ApiParam("条码类型")
private String snType;
@Transient
@ApiParam("客户发往地")
private String shippingFlag;
public MesPackage() {
}

@ -112,6 +112,9 @@ public class MesProdBindRecord extends BaseBean implements Serializable {
@ApiParam("原材料零件名称")
private String itemPartName;
@ApiParam("生产队列号")
private String orderNo;
public int getIsFeedVal() {
return this.isFeed == null ? 0 : this.isFeed;

@ -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;
import java.io.Serializable;
/**
@ -81,4 +82,12 @@ public class MesProdModelCfg extends BaseBean implements Serializable {
@Column(name = "PROCESS_LABEL_TEMPLATE")
@ApiParam("过程标签模板")
private String processLabelTemplate;
@Transient
@ApiParam("产品颜色")
private String produceColor;
@Transient
@ApiParam("Vin")
private String vinCode;
}

@ -0,0 +1,67 @@
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;
/**
* @author Wynne.Lu
* @date 2020/5/28 14:32
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_PRODUCE_ERROR_RECORD")
@Api("生产异常操作记录")
public class MesProduceErrorRecord extends BaseBean {
private static final long serialVersionUID = 209753108845613052L;
@Column(name = "ERROR_TYPE")
@ApiParam("异常类型 10:工序跳过 20:工步跳过")
private Integer errorType;
@Column(name = "SERIAL_NUMBER")
@ApiParam("过程条码")
private String serialNumber;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("产线代码")
private String workCenterCode;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工位代码")
private String workCellCode;
@Column(name = "PROCESS_CODE")
@ApiParam("工序代码")
private String processCode;
@Column(name = "STEP_CODE")
@ApiParam("工步代码")
private String stepCode;
@Column(name = "STATUS_CODE")
@ApiParam("状态点代码")
private String statusCode;
}

@ -132,6 +132,14 @@ public class MesProduceSn extends BaseBean implements Serializable {
@ApiParam("操作类型")
private Integer operateType;
@Column(name = "PROCESS_LABEL_TEMPLATE")
@ApiParam("过程标签模板")
private String processLabelTemplate;
@Column(name = "PROD_LABEL_TEMPLATE")
@ApiParam("产品标签模板")
private String prodLabelTemplate;
// @Version
// @Column(name = "LOCK_VERSION")
// @ApiParam(value = "乐观锁", example = "1")

@ -116,4 +116,8 @@ public class MesQcOrder extends BaseBean implements Serializable {
@Transient
private String mesWorkNo;
@Transient
@ApiParam("产品条码")
private String productSn;
}

@ -83,4 +83,8 @@ public class MesQcOrderDetail extends BaseBean implements Serializable {
@ApiParam(value = "已完成数量")
@Transient
private Integer finishQty;
@ApiParam(value = "检测项类型名称")
@Transient
private String businessTypeName;
}

@ -4,8 +4,7 @@ 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;
import lombok.EqualsAndHashCode;
import lombok.*;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
@ -28,12 +27,13 @@ import java.io.Serializable;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_JIT_ACTUAL")
@NoArgsConstructor
@AllArgsConstructor
@Builder
@Api("MES_客户JIT生产队列")
public class MesQueueJitActual extends BaseBean implements Serializable {
private static final long serialVersionUID = 655875369308810110L;
@Column(name = "JIS_ACTUAL_NO")
@ApiParam("队列编号")
private String jisActualNo;
@ -71,7 +71,7 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
private String custCode;
@Column(name = "CUST_PLANT_CODE")
@ApiParam("客户产线代码")
@ApiParam("客户工厂代码")
private String custPlantCode;
@Column(name = "MEMO")
@ -86,6 +86,38 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
@ApiParam("JIT排序号")
private String jitSeq;
@Column(name = "SUPPLIER_CODE")
@ApiParam("供应商代码")
private String supplierCode;
@Column(name = "SUPPLIER_NAME")
@ApiParam("供应商名称")
private String supplierName;
@Column(name = "VEHICLE_CODE")
@ApiParam("车型代码")
private String vehicleCode;
@Column(name = "VEHICLE_NAME")
@ApiParam("车型名称")
private String vehicleName;
@Column(name = "MODEL_YEAR")
@ApiParam("年度型")
private String modelYear;
@Column(name = "CAR_MODEL_CODE")
@ApiParam("车系编号")
private String carModelCode;
@Column(name = "CAR_SERIES")
@ApiParam("车系名称")
private String carSeries;
@Column(name = "CUST_PROD_LINE_CODE")
@ApiParam("客户产线代码")
private String custProdLineCode;
@Transient
@ApiParam("客户需求开始时间")
private String custPointStartDate;

@ -0,0 +1,62 @@
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.*;
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 : joke
* @CreateDate : 2020-03-06 10:01
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@NoArgsConstructor
@AllArgsConstructor
@Builder
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_QUEUE_JIT_ACTUAL_BOM")
@Api("客户JIT生产队列散件清单")
public class MesQueueJitActualBom extends BaseBean implements Serializable {
private static final long serialVersionUID = 1604529847020812472L;
@Column(name = "JIS_ACTUAL_NO")
@ApiParam("队列编号")
private String jisActualNo;
@Column(name = "ASSY_NO")
@ApiParam("组件编号")
private String assyNo;
@Column(name = "PRODUCE_CTGY_CODE")
@ApiParam("产品位置代码")
private String produceCtgyCode;
@Column(name = "CUST_PART_NO")
@ApiParam("客户物料号")
private String custPartNo;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "QTY")
@ApiParam("用量")
private Double qty = 0d;
@Column(name = "PART_COLOR_VALUE")
@ApiParam("零件色值")
private String partColorValue;
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save