Merge branch 'test'
WYnneaoapc
6 years ago
commit
2cde398cca
@ -0,0 +1,49 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
|
||||
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description : 保存的表达式录入记录
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-12-03
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_EXPRESSION_RECORD")
|
||||
@Api("表达式记录")
|
||||
public class ExpressionRecord extends BaseAPS {
|
||||
@Column(name="BEAN_NAME")
|
||||
@ApiParam(value ="表名")
|
||||
@FieldAnnotation(property = false)
|
||||
private String beanName;
|
||||
|
||||
@Column(name="FIELD_NAME")
|
||||
@ApiParam(value ="字段名")
|
||||
@FieldAnnotation(property = false)
|
||||
private String fieldName;
|
||||
|
||||
@Column(name="NAME")
|
||||
@ApiParam(value ="名称")
|
||||
@FieldAnnotation(notEmpty = true)
|
||||
private String name;
|
||||
|
||||
@Column(name="EXPRESSION")
|
||||
@ApiParam(value ="表达式")
|
||||
private String expression;
|
||||
|
||||
@Column(name="REMARK")
|
||||
@ApiParam(value ="备注")
|
||||
private String remark;
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
package cn.estsh.i3plus.pojo.aps.model;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class FunctionModel {
|
||||
private String code;
|
||||
private String name;
|
||||
private String params;
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.aps.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.ExpressionRecord;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface ExpressionRecordRepository extends CrudRepository<ExpressionRecord, Long> {
|
||||
}
|
||||
@ -0,0 +1,50 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.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;
|
||||
|
||||
/**
|
||||
* @Description :mes系统业务事件
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-12
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_EVENT")
|
||||
@Api("系统业务事件")
|
||||
public class MesEvent extends BaseBean {
|
||||
@Column(name = "EVENT_CODE")
|
||||
@ApiParam("事件代码")
|
||||
private String eventCode;
|
||||
|
||||
@Column(name = "EVENT_NAME")
|
||||
@ApiParam("事件名称")
|
||||
private String eventName;
|
||||
|
||||
@Column(name = "EVENT_TYPE")
|
||||
@ApiParam("事件类型")
|
||||
private Integer eventType;
|
||||
|
||||
@Column(name = "BUTTON_CODE")
|
||||
@ApiParam("按钮代码")
|
||||
private String buttonCode;
|
||||
|
||||
public int getEventTypeVal() {
|
||||
return this.eventType == null ? 0 : this.eventType;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,52 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.bean;
|
||||
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description :mes系统业务事件动作
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-12
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_EVENT_ACTION")
|
||||
@Api("系统业务事件动作")
|
||||
public class MesEventAction extends BaseBean {
|
||||
@Column(name = "EVENT_CODE")
|
||||
@ApiParam("事件代码")
|
||||
private String eventCode;
|
||||
|
||||
@Column(name = "ACTION_CODE")
|
||||
@ApiParam("动作代码")
|
||||
private String actionCode;
|
||||
|
||||
@Column(name = "SEQ")
|
||||
@ApiParam("序号")
|
||||
private Integer seq;
|
||||
|
||||
public int getSeqVal() {
|
||||
return this.seq == null ? 0 : this.seq;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,38 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @Description : 动作请求参数
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-12
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class ActionRequestBean<Obj> implements Serializable {
|
||||
|
||||
@ApiParam("事件代码")
|
||||
@Deprecated
|
||||
public String eventCode;
|
||||
|
||||
@ApiParam("按钮代码")
|
||||
public String buttonCode;
|
||||
|
||||
@ApiParam("单个结果")
|
||||
public Obj resultObject;
|
||||
|
||||
@ApiParam("List请求集")
|
||||
public List<Obj> resultList;
|
||||
|
||||
@ApiParam("Map请求集")
|
||||
public Map<String, Object> resultMap;
|
||||
|
||||
@ApiParam("目的状态")
|
||||
private Integer destStatus;
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.pcn.bean.MesEvent;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesEventRepository extends BaseRepository<MesEvent, Long> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,106 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\12\3 18:59
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class ProdBindRecordModel implements Serializable {
|
||||
|
||||
private Long id;
|
||||
private String createUser;
|
||||
private String createDatetime;
|
||||
private String modifyUser;
|
||||
private String modifyDatetime;
|
||||
|
||||
@ApiParam(value = "产品条码")
|
||||
private String serialNumber;
|
||||
|
||||
@ApiParam("产品条码零件号")
|
||||
private String partNo;
|
||||
|
||||
@ApiParam("产品条码零件名称")
|
||||
private String partName;
|
||||
|
||||
@ApiParam("工单号")
|
||||
private String workOrderNo;
|
||||
|
||||
@ApiParam(value = "工作中心")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam(value = "工作单元")
|
||||
private String workCellCode;
|
||||
|
||||
@ApiParam(value = "工步代码")
|
||||
private String stepCode;
|
||||
|
||||
@ApiParam("原材料零件号")
|
||||
private String itemPartNo;
|
||||
|
||||
@ApiParam("原材料零件名称")
|
||||
private String itemPartName;
|
||||
|
||||
@ApiParam("原材料条码")
|
||||
private String kpSn;
|
||||
|
||||
@ApiParam(value = "原材料数量", example = "0")
|
||||
private Double kpQty;
|
||||
|
||||
@ApiParam("供应商")
|
||||
private String supplierCode;
|
||||
|
||||
@ApiParam
|
||||
private String lotNo;
|
||||
|
||||
@ApiParam
|
||||
private Integer isFeed;
|
||||
|
||||
@ApiParam("版本")
|
||||
private String version;
|
||||
|
||||
@ApiParam(value = "结果")
|
||||
private String result;
|
||||
|
||||
@ApiParam(value = "是否绑定关键件")
|
||||
private Integer isBindKey;
|
||||
|
||||
@ApiParam(value = "动作类型")
|
||||
private String actionType;
|
||||
|
||||
public ProdBindRecordModel() {
|
||||
|
||||
}
|
||||
|
||||
public ProdBindRecordModel(Long id, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber, String partNo, String partName, String workOrderNo, String workCenterCode, String workCellCode, String stepCode, String itemPartNo, String itemPartName, String kpSn, Double kpQty, String supplierCode, String lotNo, Integer isFeed, String version, String result, Integer isBindKey, String actionType) {
|
||||
this.id = id;
|
||||
this.createUser = createUser;
|
||||
this.createDatetime = createDatetime;
|
||||
this.modifyUser = modifyUser;
|
||||
this.modifyDatetime = modifyDatetime;
|
||||
this.serialNumber = serialNumber;
|
||||
this.partNo = partNo;
|
||||
this.partName = partName;
|
||||
this.workOrderNo = workOrderNo;
|
||||
this.workCenterCode = workCenterCode;
|
||||
this.workCellCode = workCellCode;
|
||||
this.stepCode = stepCode;
|
||||
this.itemPartNo = itemPartNo;
|
||||
this.itemPartName = itemPartName;
|
||||
this.kpSn = kpSn;
|
||||
this.kpQty = kpQty;
|
||||
this.supplierCode = supplierCode;
|
||||
this.lotNo = lotNo;
|
||||
this.isFeed = isFeed;
|
||||
this.version = version;
|
||||
this.result = result;
|
||||
this.isBindKey = isBindKey;
|
||||
this.actionType = actionType;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,43 @@
|
||||
package cn.estsh.i3plus.pojo.model.wms;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author ealvis
|
||||
* @date 2019/12/2 14:45
|
||||
* 昆泰成品发运看板model
|
||||
*/
|
||||
@Data
|
||||
public class WmsFinalShipmentModel {
|
||||
/*订单号*/
|
||||
private String orderNo;
|
||||
/*车牌号*/
|
||||
private String carNo;
|
||||
/*物料号*/
|
||||
private String partNo;
|
||||
/*计划数量*/
|
||||
private Double qty;
|
||||
/*已发运数量*/
|
||||
private Double pickQty;
|
||||
/*计划发货时间*/
|
||||
private String planTime;
|
||||
/*实际发运时间*/
|
||||
private String finishTime;
|
||||
/*状态*/
|
||||
private Integer orderStatus;
|
||||
|
||||
public WmsFinalShipmentModel(){
|
||||
|
||||
}
|
||||
|
||||
public WmsFinalShipmentModel(String orderNo, String carNo, String partNo, Double qty, Double pickQty, String planTime, String finishTime, Integer orderStatus) {
|
||||
this.orderNo = orderNo;
|
||||
this.carNo = carNo;
|
||||
this.partNo = partNo;
|
||||
this.qty = qty;
|
||||
this.pickQty = pickQty;
|
||||
this.planTime = planTime;
|
||||
this.finishTime = finishTime;
|
||||
this.orderStatus = orderStatus;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue