yun-zuoyi
曾贞一 4 years ago
commit 54e691bc30

@ -337,6 +337,7 @@ public class BlockFormEnumUtil {
return tmp;
}
}
/**
*
*/
@ -988,7 +989,6 @@ public class BlockFormEnumUtil {
}
/**
*
*/
@ -1394,7 +1394,6 @@ public class BlockFormEnumUtil {
}
/**
*
*/
@ -1751,8 +1750,8 @@ public class BlockFormEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TRIGGER_EVENT {
CLICK(10, "CLICK", "单击");
// DB_LCLICK(20, "DB_LCLICK", "双击"),
CLICK(10, "CLICK", "单击"),
DOUBLE_CLICK(20, "DOUBLE_CLICK", "双击");
// MOUSE_OUT(30, "MOUSE_OUT", "鼠标指针移出"),
// MOUSE_OVER(40, "MOUSE_OVER", "鼠标指针移入");
@ -1830,6 +1829,88 @@ public class BlockFormEnumUtil {
}
/**
*
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TRIGGER_ACTION {
REFRESH(10, "REFRESH", "刷新元素"),
SHOW_METHOD(20, "SHOW_METHOD", "展示其他功能明细");
private int value;
private String code;
private String description;
private TRIGGER_ACTION(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public static String valueOfCode(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 codeOfValue(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
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;
}
public static TRIGGER_ACTION valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -2204,7 +2285,6 @@ public class BlockFormEnumUtil {
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -2405,7 +2485,6 @@ public class BlockFormEnumUtil {
* PROCEDURE_INOUT_PARAM30-sqlserver
* PROCEDURE_OUT_PARAM40-
* PROCEDURE_RETURN50-mysqlsqlserver
*
*/
public enum ORIGIN_PROPERTY_TYPE {
NORMAL_PROPERTY(10, "正常属性"),

@ -62,6 +62,11 @@ public class BfMethodDetailProperty extends BaseBean {
@ApiParam(value = "主对象元素事件")
private Integer priElementEvent;
// 枚举:BlockFormEnumUtil.TRIGGER_ACTION
@Column(name = "PRI_ELEMENT_ACTION")
@ApiParam(value = "主对象元素动作")
private Integer priElementAction;
@Column(name = "SEC_METHOD_DETAIL_ID")
@ApiParam(value = "关联功能明细id")
@JsonSerialize(using = ToStringSerializer.class)

@ -26,7 +26,7 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BF_METHOD_DETAIL_PROPERTY")
@Table(name="BF_METHOD_DETAIL_PROPERTY_REF")
@Api(value="表单功能明细关联属性",description = "表单功能明细关联属性")
public class BfMethodDetailPropertyRef extends BaseBean {

@ -1,47 +0,0 @@
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 javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
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:
* @CreateDate: 2020/10/13
* @Author: simon.song
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "MES_BOARD_IMAGE")
@Api("MES_看板图片")
public class MesBoardImage extends BaseBean implements Serializable {
private static final long serialVersionUID = -3511836584646450267L;
@Column(name = "BOARD_CODE")
@ApiParam("看板代码")
private String boardCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name = "IMAGE_URL")
@ApiParam("图片路径")
private String imageUrl;
}

@ -54,13 +54,38 @@ public class MesNumberRule extends BaseBean implements Serializable {
@Column(name = "SERIALNO_INCREMENT")
@ApiParam("增量")
private Integer serialnoIncrement;
private Integer serialnoIncrement = 1;
@Column(name = "BEGIN_VAL")
@ApiParam("起始值")
private Integer beginVal = 1;
@Column(name = "END_VAL")
@ApiParam("最大值")
private Integer endVal;
@Column(name = "IS_CYCLE")
@ApiParam("最大值后循环")
private Integer isCycle;
@Column(name = "IMPL_CLASS")
@ApiParam("最大值后不循环的实现类")
private String implClass;
@Column(name = "SPILT_RULE")
@ApiParam("拼接规则")
@ApiParam("拼接固定字符,多个逗号分隔")
private String spiltRule;
public Integer getBeginVal() {
return this.beginVal == null ? 1 : this.beginVal;
}
public Integer getSerialnoIncrement() {
return this.serialnoIncrement == null ? 1 : this.serialnoIncrement;
}
public Integer getSerialnoLength() {
return this.serialnoLength == null ? 1 : this.serialnoLength;
}
}

@ -47,6 +47,14 @@ public class MesProdCfgDetail extends BaseBean implements Serializable {
@ApiParam("是否虚零件")
private Integer isVirtual;
@Column(name = "IS_LEFT_PART")
@ApiParam("是否左零件")
private Integer isLeftPart;
@Column(name = "PRINTER_NAME")
@ApiParam("打印机名称")
private String printerName;
@Transient
@ApiParam("零件名称")
private String partName;

@ -236,6 +236,18 @@ public class MesProduceSn extends BaseBean implements Serializable {
@ApiParam("物料版本号")
private String versionNo;
@Transient
@ApiParam("配方内容")
private String formulaContent;
@Transient
@ApiParam("分组队列编号")
private String queueGroupNo;
@Transient
@ApiParam("组内编号")
private Integer groupNo;
public MesProduceSn() {
}

@ -8,12 +8,7 @@ import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Table;
import javax.persistence.*;
import java.io.Serializable;
/**
@ -74,4 +69,8 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable {
@Column(name = "PART_COLOR_VALUE")
@ApiParam("零件色值")
private String partColorValue;
@Transient
@ApiParam("物料名称")
private String partName;
}

@ -0,0 +1,148 @@
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.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
/**
* @Description:
* @Reference:
* @Author: Crish
* @CreateDate:2019-04-16-17:36
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Inheritance(strategy = InheritanceType.JOINED)
@Table(name = "MES_QUEUE_ORDER_DETAIL_RECORD", indexes = {
@Index(columnList = "ORDER_NO"),
@Index(columnList = "SERIAL_NUMBER"),
@Index(columnList = "QUEUE_GROUP_NO"),
@Index(columnList = "PRODUCE_CATEGORY_CODE")
})
@Api("生产队列明细记录表")
public class MesQueueOrderDetailRecord extends BaseBean implements Serializable {
private static final long serialVersionUID = 7840873844253353896L;
@Column(name = "ORDER_NO")
@ApiParam("主队列编号")
private String orderNo;
@Column(name = "PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name = "PART_NAME_RDD")
@ApiParam("物料名称")
private String partNameRdd;
@Column(name = "SERIAL_NUMBER")
@ApiParam("产品条码")
private String serialNumber;
@Column(name = "SEQ", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("队列明细序号")
private Double seq;
@Column(name = "QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("数量")
private Double qty;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name = "WORK_TYPE")
@ApiParam("生产类型")
private String workType;
@Column(name = "PRODUCE_CATEGORY_CODE")
@ApiParam("产品位置")
private String produceCategoryCode;
@Column(name = "PRODUCE_CATEGORY_NAME_RDD")
@ApiParam("产品位置名称")
private String produceCategoryNameRdd;
@Column(name = "PPT_CODE")
@ApiParam("产品类型名称")
private String pptCode;
@Column(name = "QUEUE_GROUP_NO")
@ApiParam("分组队列编号")
private String queueGroupNo;
@Column(name = "GROUP_NO")
@ApiParam("组内编号")
private Integer groupNo;
@Column(name = "IS_GROUP_PRINTED")
@ApiParam("料架是否已打印")
private Integer isGroupPrinted = 2;
@Column(name = "PRODUCE_COLOR")
@ApiParam("产品颜色")
private String produceColor;
@Column(name = "PRODUCE_COLOR_CODE")
@ApiParam("产品颜色代码")
private String produceColorCode;
@Column(name = "OPTION_CODE")
@ApiParam("选项代码")
private String optionCode;
@Column(name = "ASSY_NO")
@ApiParam("组件编号")
private String assyNo;
@Column(name = "FORMULA_CONTENT")
@ApiParam("配方内容")
private String formulaContent;
@Column(name = "FINSIH_QTY", columnDefinition = "decimal(18,8)")
@ColumnDefault("0")
@ApiParam("已生产数量")
private Double finsihQty;
@Column(name = "GROUP_SIDE")
@ApiParam("料架摆放位置")
private String groupSide;
@Column(name = "GROUP_SEQ")
@ApiParam("分组序号")
private String groupSeq;
@Column(name = "PRODUCT_SN")
@ApiParam("产品条码")
private String productSn;
@Column(name = "IS_EMPTY")
@ApiParam("是否放空")
private Integer isEmpty;
@Column(name = "JIS_BACKFLUSH_STATUS")
@ApiParam("回冲标识")
private String jisBackflushStatus;
@Column(name = "WORK_CELL_CODE")
@ApiParam("工作单元代码")
private String workCellCode;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
}

@ -115,9 +115,10 @@ public class MesStateMachineStatus extends BaseBean implements Serializable {
public MesStateMachineStatus() {
}
public MesStateMachineStatus(String smCode, String statusCode, String nextStatus, String statusName, String nextStatusName, Integer triggerType,
public MesStateMachineStatus(Long id, String smCode, String statusCode, String nextStatus, String statusName, String nextStatusName, Integer triggerType,
String triggerEvent, String triggerWhere, Long triggerAmgId, Long inAmgId, Long outAmgId, Integer statusType, Integer seq,
Integer isInit, String routeCode, String processCode) {
this.id = id;
this.smCode = smCode;
this.statusCode = statusCode;
this.nextStatus = nextStatus;

@ -80,6 +80,10 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
@ApiParam("工单状态")
private Integer workOrderStatus;
@Column(name = "IS_PULL")
@ApiParam("是否投料")
private Integer isPull = 1;
@Column(name = "WO_TYPE")
@ApiParam("工单类型")
private Integer workOrderType;
@ -188,6 +192,14 @@ public class MesWorkOrderLog extends BaseBean implements Serializable {
@ApiParam("父阶物料号")
private String parentPartNo;
@Column(name = "PRINT_STATUS")
@ApiParam("打印状态")
private Integer printStatus;
@Column(name = "SORT_SEQ")
@ApiParam("排序序号")
private String sortSeq;
/********************** 冗余字段 *********************************/
@Transient
@ApiParam(value = "工作中心名称")

@ -35,6 +35,9 @@ public class BypassModel {
@ApiParam("状态")
private String status;
@ApiParam("检测结果")
private Integer result;
@ApiParam("颜色")
private String color;

@ -106,6 +106,9 @@ public class GenSerialNoModel {
@ApiParam("颜色名称")
private String colorName;
@ApiParam("拼接动态字符,多个逗号分隔")
private String dynamicRule;
public GenSerialNoModel(String ruleCode) {
this.ruleCode = ruleCode;

@ -0,0 +1,32 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description:
* @Author: jokelin
* @Date: 2021/2/19 2:58 PM
* @Modify:
*/
@Data
public class IfReportModel {
@ApiParam("接口表代码")
private String ifTableCode;
@ApiParam("接口表名称")
private String ifTableName;
@ApiParam("总数")
private Integer total;
@ApiParam("已同步数量")
private Integer alreadySync;
@ApiParam("未同步数量")
private Integer noSync;
@ApiParam("修改时间")
private String modifyDatetime;
}

@ -20,6 +20,8 @@ public class SnPrintDataModel {
@ApiParam("打印数据")
private List<StepPrintSnModel> valueList;
@ApiParam("打印数据")
private List<StepPrintSnModel> templateData;
@ApiParam("打印模板及参数")
private MesLabelTemplate labelTemplate;

@ -1,14 +0,0 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesBoardImage;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @CreateDate: 2020/10/13
* @Author: simon.song
*/
@Repository
public interface MesBoardImageRepository extends BaseRepository<MesBoardImage, Long> {
}

@ -0,0 +1,13 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrderDetailRecord;
/**
* @Description:
* @Author: jokelin
* @Date: 2021/2/26 10:18 AM
* @Modify:
*/
public interface MesQueueOrderDetailRecordRepository extends BaseRepository<MesQueueOrderDetailRecord, Long> {
}

@ -1906,6 +1906,9 @@ public class MesHqlPack {
if (!StringUtils.isEmpty(mesDataObject.getFieldPk())) {
DdlPreparedPack.getStringLikerPack(mesDataObject.getFieldPk(), "fieldPk", packBean);
}
if (!StringUtils.isEmpty(mesDataObject.getDsCode())) {
DdlPreparedPack.getStringLikerPack(mesDataObject.getDsCode(), "dsCode", packBean);
}
return packBean;
}
@ -2120,7 +2123,7 @@ public class MesHqlPack {
DdlPreparedPack.getNumEqualPack(mesProduceSn.getQcStatus(), "qcStatus", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getVinCode())) {
DdlPreparedPack.getStringEqualPack(mesProduceSn.getVinCode(), "vinCode", packBean);
DdlPreparedPack.getStringLikerPack(mesProduceSn.getVinCode(), "vinCode", packBean);
}
if (!StringUtils.isEmpty(mesProduceSn.getOutWorkCenterTimeEnd())) {
DdlPreparedPack.getStringSmallerPack(mesProduceSn.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);

@ -0,0 +1,39 @@
package cn.estsh.i3plus.pojo.model.platform;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2021/2/20 4:39
* @desc
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Api("日志字段模型")
public class LogFieldModel implements Serializable {
private static final long serialVersionUID = 6303989757683476327L;
@ApiParam("日志时间")
private String time;
@ApiParam("线程")
private String thread;
@ApiParam("日志等级")
private String level;
@ApiParam("执行堆栈")
private String stack;
@ApiParam("日志信息")
private String message;
}

@ -0,0 +1,57 @@
package cn.estsh.i3plus.pojo.model.platform;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2021/2/20 12:55
* @desc
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Api("系统日志模型")
public class SysLogModel implements Serializable {
private static final long serialVersionUID = -2982120258911167575L;
@ApiParam("查询日期")
private String queryDate;
@ApiParam("查询开始时间")
private String queryBeginTime;
@ApiParam("查询结束时间")
private String queryEndTime;
@ApiParam("索引名称")
private String indexName;
@ApiParam("索引类型")
private Integer indexType;
@ApiParam("聚合时间")
private Integer aggsDuration;
@ApiParam("日志等级")
private Integer level;
@ApiParam("执行线程")
private String thread;
@ApiParam("服务器环境变量HostId")
private String hostId;
@ApiParam("日志信息")
private List<LogFieldModel> logs;
}

@ -17,7 +17,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@AllArgsConstructor
@Api("系统登录模型")
public class SystemLoginModel {
public class SysLoginModel {
@ApiParam(value = "登录名")
private String loginName;

@ -34,6 +34,7 @@ public class SysLogOperate extends BaseBean {
@ApiParam(value = "系统模块(枚举)", example = "1")
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class, refForeignKey = "value", value = "description")
private Integer softType;
public String getSoftTypeTxt() {
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
}
@ -55,6 +56,9 @@ public class SysLogOperate extends BaseBean {
@ApiParam(value = "请求IP", access = "请求IP")
private String remoteIp;
@ApiParam(value = "本机名/Ip", access = "本机名/Ip")
private String serverHost;
@ApiParam(value = "请求路径", access = "请求路径")
private String requestUrl;

@ -486,6 +486,11 @@ public class WmsDocMovementDetails extends BaseBean {
@ApiParam("项目名称")
String prodCfgTypeName;
@Transient
@ApiParam("完成时间")
public String complateDateTime;

@ -377,4 +377,9 @@ public class WmsMoveMaster extends BaseBean {
public int getBusiTypeCodeVal() {
return this.busiTypeCode == null ? 0 : this.busiTypeCode.intValue();
}
public WmsMoveMaster(String createDatetime, String createUser) {
this.createDatetime = createDatetime;
this.createUser = createUser;
}
}

@ -7,18 +7,18 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.Table;
/**
* @Description :
* @Description :
* @Reference :
* @Author : puxiao.liao
* @CreateDate : 2020-08-19 14:50

@ -243,6 +243,10 @@ public class WmsStockQuan extends BaseBean {
return this.lockVersion == null ? 0 : this.lockVersion;
}
public boolean getShowNoDiffStock() {
return this.showNoDiffStock == null ? false : this.showNoDiffStock;
}
public WmsStockQuan() {
}

Loading…
Cancel
Save