Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts: modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.javayun-zuoyi
rock.yu
4 years ago
commit
38126d9812
@ -0,0 +1,57 @@
|
||||
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;
|
||||
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 : 系统参数配置
|
||||
* @Reference :
|
||||
* @Author : siliter
|
||||
* @CreateDate : 2019-03-07 09:58
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Inheritance(strategy = InheritanceType.JOINED)
|
||||
@Table(name="ANDON_PLC_COLOR_CFG")
|
||||
@Api(value="PLC三色灯控制")
|
||||
public class AndonPlcColorCfg extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -3284234821448131212L;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam("工作单元")
|
||||
private String workCellCode;
|
||||
|
||||
@Column(name="RED_PLC_CODE")
|
||||
@ApiParam(value ="红灯PLC代码")
|
||||
private String redPlcCode;
|
||||
|
||||
@Column(name="YELLOW_PLC_CODE")
|
||||
@ApiParam(value ="黄灯PLC代码")
|
||||
private String yellowPlcCode;
|
||||
|
||||
@Column(name="GREEN_PLC_CODE")
|
||||
@ApiParam(value ="绿灯PLC代码")
|
||||
private String greenPlcCode;
|
||||
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
package cn.estsh.i3plus.pojo.andon.model;
|
||||
|
||||
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.NoArgsConstructor;
|
||||
|
||||
import javax.persistence.Column;
|
||||
|
||||
/**
|
||||
* @Description : 人员model
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2018-10-11 11:02
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Api("用户信息model")
|
||||
public class AndonUserModel extends BaseBean {
|
||||
|
||||
@ApiParam(value ="部门名称")
|
||||
private String departmentNameRdd;
|
||||
|
||||
@ApiParam(value ="用户名称" , access ="账号名称")
|
||||
private String userName;
|
||||
|
||||
@Column(name="USER_LOGIN_NAME")
|
||||
@ApiParam(value ="员工编号")
|
||||
private String userEmpNo;
|
||||
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonActionModule;
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonPlcColorCfg;
|
||||
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 IAndonPlcColorCfgRepository extends BaseRepository<AndonPlcColorCfg, Long> {
|
||||
}
|
||||
@ -0,0 +1,46 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
|
||||
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.Lob;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description : 排程优化规则
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2021-03-24
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_HEURISTIC_OPTIMIZE")
|
||||
@Api("排程优化规则")
|
||||
public class HeuristicOptimize extends BaseRule {
|
||||
private static final long serialVersionUID = -464821596740369199L;
|
||||
|
||||
@Column(name="WORK_FILTER")
|
||||
@ApiParam(value ="工作筛选")
|
||||
private String workFilter;
|
||||
|
||||
@Column(name="RES_FILTER")
|
||||
@ApiParam(value ="资源筛选")
|
||||
private String resFilter;
|
||||
|
||||
@Lob
|
||||
@Column(name="RES_SELECT")
|
||||
@ApiParam(value ="资源选择")
|
||||
private String resSelect;
|
||||
|
||||
@Column(name="OPTIMIZE_INTERVAL")
|
||||
@ApiParam(value ="优化间隔")
|
||||
private String optimizeInterval;
|
||||
}
|
||||
@ -0,0 +1,68 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
|
||||
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.EInsertedOrder;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
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 : 2021-03-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_INSERTED_ORDER")
|
||||
@Api("插单管理")
|
||||
public class InsertedOrder extends BaseOrder {
|
||||
private static final long serialVersionUID = -5036380772996107234L;
|
||||
|
||||
@Column(name="ORDER_STATUS")
|
||||
@ApiParam(value ="订单状态")
|
||||
@FieldAnnotation(defaultValue = "UNCOMMIT")
|
||||
private ApsEnumUtil.INSERTED_ORDER_STATUS orderStatus = ApsEnumUtil.INSERTED_ORDER_STATUS.UNCOMMIT;
|
||||
|
||||
@Column(name="STAND_OPERATIONS")
|
||||
@ApiParam("工序")
|
||||
private String standOperations;
|
||||
|
||||
@Column(name="PRODUCT_ROUTING_ID")
|
||||
@ApiParam(value ="工艺路线")
|
||||
@FieldAnnotation(property = false)
|
||||
private Long productRoutingId;
|
||||
|
||||
@Column(name="FINISH_COUNT")
|
||||
@ApiParam(value ="完工数")
|
||||
private Double finishCount;
|
||||
|
||||
@Column(name="REMARK")
|
||||
@ApiParam(value ="备注")
|
||||
private String remark;
|
||||
|
||||
public ProductRouting getProductRouting() {
|
||||
return BeanRelation.get(this, EInsertedOrder.ProductRouting);
|
||||
}
|
||||
|
||||
public void setProductRouting(ProductRouting routing) {
|
||||
this.productRoutingId = routing != null ? routing.getId() : 0l;
|
||||
BeanRelation.set(this, EInsertedOrder.ProductRouting, routing);
|
||||
}
|
||||
|
||||
@JsonIgnore
|
||||
public Work getWork() {
|
||||
return BeanRelation.get(this, EBaseOrder.Works);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,50 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
|
||||
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
|
||||
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.EInterMediateDetail;
|
||||
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 : 2021-04-27
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_INTER_MEDIATE_DETAIL")
|
||||
@Api("计算中间结果")
|
||||
public class InterMediateDetail extends BaseAPS {
|
||||
private static final long serialVersionUID = -2588016171684238811L;
|
||||
|
||||
@Column(name="RESULT_ID")
|
||||
@ApiParam(value ="中间结果")
|
||||
@FieldAnnotation(relation = "InterMediateResult")
|
||||
private Long resultId;
|
||||
|
||||
@Column(name="RULE")
|
||||
@ApiParam(value ="评估规则")
|
||||
private String rule;
|
||||
|
||||
@Column(name="EVALUATE_VALUE")
|
||||
@ApiParam(value ="评估值")
|
||||
private Double evaluateValue;
|
||||
|
||||
public InterMediateResult getResult() { return BeanRelation.get(this, EInterMediateDetail.Result); }
|
||||
|
||||
public void setResult(InterMediateResult result) {
|
||||
this.resultId = result != null ? result.getId() : 0;
|
||||
BeanRelation.set(this, EInterMediateDetail.Result, result);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,67 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
|
||||
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
|
||||
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.EInterMediateResult;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.EWorkInput;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan;
|
||||
import com.fasterxml.jackson.annotation.JsonBackReference;
|
||||
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;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description :计算中间结果
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2021-04-25
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_INTER_MEDIATE_RESULT")
|
||||
@Api("计算中间结果")
|
||||
public class InterMediateResult extends BaseAPS {
|
||||
private static final long serialVersionUID = -1869359887027950540L;
|
||||
|
||||
@Column(name="WORK_ID")
|
||||
@ApiParam(value ="工作")
|
||||
@FieldAnnotation(relation = "Work")
|
||||
private Long workId;
|
||||
|
||||
@Column(name="RESOURCE_ID")
|
||||
@ApiParam(value ="资源")
|
||||
@FieldAnnotation(relation = "Resource")
|
||||
private Long resourceId;
|
||||
|
||||
@Column(name="EVALUATE_VALUE")
|
||||
@ApiParam(value ="评估值")
|
||||
private Double evaluateValue;
|
||||
|
||||
public Work getWork() {
|
||||
return BeanRelation.get(this, EInterMediateResult.Work);
|
||||
}
|
||||
|
||||
public void setWork(Work work) {
|
||||
this.workId = work != null ? work.getId() : 0l;
|
||||
BeanRelation.set(this, EInterMediateResult.Work, work);
|
||||
}
|
||||
|
||||
public Resource getResource() { return BeanRelation.get(this, EInterMediateResult.Resource); }
|
||||
|
||||
public void setResource(Resource resource) {
|
||||
this.resourceId = resource != null ? resource.getId() : 0l;
|
||||
BeanRelation.set(this, EInterMediateResult.Resource, resource);
|
||||
}
|
||||
|
||||
@JsonBackReference
|
||||
public List<InterMediateDetail> getDetails() { return BeanRelation.get(this, EInterMediateResult.Details); }
|
||||
}
|
||||
@ -0,0 +1,79 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
|
||||
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
|
||||
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.EOrderFeedback;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.EPlanFeedback;
|
||||
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 : 2020-03-19
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_ORDER_FEEDBACK")
|
||||
@Api("订单反馈")
|
||||
public class OrderFeedback extends BaseAPS {
|
||||
private static final long serialVersionUID = 7822380202121225936L;
|
||||
|
||||
@Column(name="ORDER_ID")
|
||||
@ApiParam(value ="顶层订单号")
|
||||
@FieldAnnotation(relation = "Order", modify = false)
|
||||
private Long orderId;
|
||||
|
||||
@Column(name="DELIVER_RATE")
|
||||
@ApiParam(value ="发货百分比")
|
||||
private Double deliverRate;
|
||||
|
||||
@Column(name="QUALIFIED_RATE")
|
||||
@ApiParam(value ="成品合格百分比")
|
||||
private Double qualifiedRate;
|
||||
|
||||
@Column(name="INVENTORY_COUNT")
|
||||
@ApiParam(value ="库存扣减数量")
|
||||
private Double inventoryCount;
|
||||
|
||||
@Column(name="LAST_OPERATION_COUNT")
|
||||
@ApiParam(value ="硫化报工数量")
|
||||
private Double lastOperationCount;
|
||||
|
||||
@Column(name="UNQUALIFIED_COUNT")
|
||||
@ApiParam(value ="不良数量")
|
||||
private Double unqualifiedCount;
|
||||
|
||||
@Column(name="QUALIFIED_COUNT")
|
||||
@ApiParam(value ="成品合格数量")
|
||||
private Double qualifiedCount;
|
||||
|
||||
@Column(name="ADD_UNQUALIFIED_COUNT")
|
||||
@ApiParam(value ="累加不良数量")
|
||||
@FieldAnnotation(display = false)
|
||||
private Double addUnqualifiedCount;
|
||||
|
||||
@Column(name="ADD_QUALIFIED_COUNT")
|
||||
@ApiParam(value ="累加合格数量")
|
||||
@FieldAnnotation(display = false)
|
||||
private Double addQualifiedCount;
|
||||
|
||||
public BaseOrder getOrder() {
|
||||
return BeanRelation.get(this, EOrderFeedback.Order);
|
||||
}
|
||||
|
||||
public void setOrder(BaseOrder order) {
|
||||
this.orderId = order != null ? order.getId() : 0l;
|
||||
BeanRelation.set(this, EOrderFeedback.Order, order);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,38 @@
|
||||
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 : 2021-04-08
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_PRIORITY_TYPE")
|
||||
@Api("优先级")
|
||||
public class PriorityType extends BaseAPS {
|
||||
private static final long serialVersionUID = 445577901076659576L;
|
||||
|
||||
@Column(name="CODE")
|
||||
@ApiParam(value ="标识")
|
||||
@FieldAnnotation(mainkey = true, popSearch = true)
|
||||
private String code;
|
||||
|
||||
@Column(name="VALUE")
|
||||
@ApiParam(value ="值")
|
||||
@FieldAnnotation(notEmpty = true, popSearch = true)
|
||||
private Integer value;
|
||||
}
|
||||
@ -0,0 +1,59 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
|
||||
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.ESafeStockOrder;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
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 : 2021-02-23
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_SAFE_STOCK_ORDER")
|
||||
@Api("安全库存订单")
|
||||
public class SafeStockOrder extends BaseOrder {
|
||||
|
||||
private static final long serialVersionUID = 5944067344390531794L;
|
||||
|
||||
@Column(name="ORDER_STATUS")
|
||||
@ApiParam(value ="订单状态")
|
||||
@FieldAnnotation(defaultValue = "UNCOMMIT")
|
||||
private ApsEnumUtil.SAFE_STOCK_ORDER_STATUS orderStatus = ApsEnumUtil.SAFE_STOCK_ORDER_STATUS.UNCOMMIT;
|
||||
|
||||
@Column(name="INVENTORY_ID")
|
||||
@ApiParam(value ="库存")
|
||||
@FieldAnnotation(relation = "Inventory", notEmpty = true)
|
||||
private Long inventoryId;
|
||||
|
||||
@Column(name="FINISH_COUNT")
|
||||
@ApiParam(value ="完工数")
|
||||
private Double finishCount;
|
||||
|
||||
@JsonIgnore
|
||||
public Work getWork() {
|
||||
return BeanRelation.get(this, EBaseOrder.Works);
|
||||
}
|
||||
|
||||
public Inventory getInventory() { return BeanRelation.get(this, ESafeStockOrder.Inventory); }
|
||||
|
||||
public void setInventory(Inventory inventory) {
|
||||
this.inventoryId = inventory != null ? inventory.getId() : 0;
|
||||
BeanRelation.set(this, ESafeStockOrder.Inventory, inventory);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,40 @@
|
||||
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 : 2021-03-22
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_WORK_SHOP")
|
||||
@Api("车间")
|
||||
public class WorkShop extends BaseAPS {
|
||||
private static final long serialVersionUID = 5627016086816721284L;
|
||||
|
||||
@Column(name="CODE")
|
||||
@ApiParam(value ="编码")
|
||||
@FieldAnnotation(popSearch = true, mainkey = true)
|
||||
private String code;
|
||||
|
||||
@Column(name="NAME")
|
||||
@ApiParam(value ="名称")
|
||||
@FieldAnnotation(popSearch = true, notEmpty = true)
|
||||
private String name;
|
||||
|
||||
|
||||
}
|
||||
@ -1,5 +1,6 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EImportDetail {
|
||||
Project
|
||||
Project,
|
||||
Fields
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue