Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts: modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.javayun-zuoyi
WYnneaoapc
6 years ago
commit
56e6cf7918
@ -0,0 +1,56 @@
|
||||
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.enums.RULE_TYPE;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.ERuleDetail;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description :规则组合下的规则明细
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-11-05
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Table(name = "APS_RULE_DETAIL")
|
||||
@Api("规则明细")
|
||||
public class RuleDetail extends BaseAPS {
|
||||
|
||||
@Column(name="TYPE")
|
||||
@ApiParam(value ="规则类型")
|
||||
private RULE_TYPE type;
|
||||
|
||||
@Column(name="RULE_GROUP_ID")
|
||||
@ApiParam(value ="规则组合ID")
|
||||
@FieldAnnotation(property = false)
|
||||
private Long ruleGroupId;
|
||||
|
||||
@Column(name="RULE_ID")
|
||||
@ApiParam(value ="规则配置ID")
|
||||
@FieldAnnotation(property = false)
|
||||
private Long ruleId;
|
||||
|
||||
public RuleGroup getRuleGroup() { return BeanRelation.get(this, ERuleDetail.RuleGroup); }
|
||||
|
||||
public void setRuleGroup(RuleGroup ruleGroup) {
|
||||
this.ruleGroupId = ruleGroup != null ? ruleGroup.getId() : 0;
|
||||
BeanRelation.set(this, ERuleDetail.RuleGroup, ruleGroup);
|
||||
}
|
||||
|
||||
public BaseRule getRule() { return BeanRelation.get(this, ERuleDetail.Rule); }
|
||||
|
||||
public void setRule(BaseRule rule) {
|
||||
this.ruleId = rule != null ? rule.getId() : 0;
|
||||
BeanRelation.set(this, ERuleDetail.Rule, rule);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
package cn.estsh.i3plus.pojo.aps.converter;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonParser;
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.databind.DeserializationContext;
|
||||
import com.fasterxml.jackson.databind.JsonDeserializer;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.text.ParseException;
|
||||
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");
|
||||
|
||||
@Override
|
||||
public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
|
||||
try {
|
||||
return DATETIME_FORMATOR.parse(jsonParser.getText());
|
||||
} catch (ParseException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
package cn.estsh.i3plus.pojo.aps.converter;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonGenerator;
|
||||
import com.fasterxml.jackson.databind.JsonSerializer;
|
||||
import com.fasterxml.jackson.databind.SerializerProvider;
|
||||
|
||||
import java.io.IOException;
|
||||
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");
|
||||
|
||||
@Override
|
||||
public void serialize(Date date, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
|
||||
jsonGenerator.writeString(DATETIME_FORMATOR.format(date));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
public enum CALENDAR_WEEK {
|
||||
MONDAY(1), // 星期一
|
||||
TUESDAY(2), // 星期二
|
||||
WEDNESDAY(4), // 星期三
|
||||
THURSDAY(8), // 星期四
|
||||
FRIDAY(16), // 星期五
|
||||
SATURDAY(32), // 星期六
|
||||
SUNDAY(64); // 星期天
|
||||
|
||||
private int _value;
|
||||
|
||||
CALENDAR_WEEK(int value) {
|
||||
_value = value;
|
||||
}
|
||||
|
||||
public int value() {
|
||||
return this._value;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,8 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
public enum RULE_TYPE {
|
||||
CANCEL_PLAN,
|
||||
MAT_CALC,
|
||||
HEURISTIC,
|
||||
FIELD_SET
|
||||
}
|
||||
@ -0,0 +1,4 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EBaseRule {
|
||||
}
|
||||
@ -0,0 +1,6 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum ERuleDetail {
|
||||
RuleGroup,
|
||||
Rule
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum ERuleGroup {
|
||||
Details
|
||||
}
|
||||
@ -1,25 +1,23 @@
|
||||
package cn.estsh.i3plus.pojo.aps.model;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
|
||||
import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class GanttCalendarModel {
|
||||
@Data
|
||||
public static class Block {
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date beginTime;
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date endTime;
|
||||
private Boolean onDuty;
|
||||
}
|
||||
private Long resourceId;
|
||||
private List<Block> timeBlocks = new ArrayList<>();
|
||||
private Long parent;
|
||||
@JsonSerialize(using = CustomDateSerializer.class)
|
||||
@JsonDeserialize(using = CustomDateDeserializer.class)
|
||||
private Date start_date;
|
||||
@JsonSerialize(using = CustomDateSerializer.class)
|
||||
@JsonDeserialize(using = CustomDateDeserializer.class)
|
||||
private Date end_date;
|
||||
private String color;
|
||||
private Long id;
|
||||
private String text;
|
||||
}
|
||||
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.aps.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.RuleDetail;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface RuleDetailRepository extends CrudRepository<RuleDetail, Long> {
|
||||
}
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="RuleDetail">
|
||||
<Relation field="Rule" name="BaseRule" type="MULTI_TO_ONE" owner="false">
|
||||
</Relation>
|
||||
</Class>
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="RuleGroup">
|
||||
<Relation field="Details" name="RuleDetail" reverse="RuleGroup" type="ONE_TO_MULTI" owner="true">
|
||||
</Relation>
|
||||
</Class>
|
||||
@ -0,0 +1,83 @@
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\11\6 11:45
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_CUST_ORDER")
|
||||
@Api("客户信息")
|
||||
public class MesCustOrder extends BaseBean {
|
||||
|
||||
@Column(name = "ORDER_NO")
|
||||
@ApiParam("订单号")
|
||||
private String orderNo;
|
||||
|
||||
@Column(name = "ORDER_TYPE")
|
||||
@ApiParam("订单类型")
|
||||
private Integer orderType;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "PART_NAME")
|
||||
@ApiParam("物料名称")
|
||||
private String partName;
|
||||
|
||||
@Column(name = "QTY")
|
||||
@ApiParam("数量")
|
||||
private Integer qty;
|
||||
|
||||
@Column(name = "STATUS")
|
||||
@ApiParam("状态")
|
||||
private Integer status;
|
||||
|
||||
@Column(name = "ORDER_DATE")
|
||||
@ApiParam("订单日期")
|
||||
private String orderDate;
|
||||
|
||||
@Column(name = "CUST_CODE")
|
||||
@ApiParam("客户代码")
|
||||
private String custCode;
|
||||
|
||||
@Column(name = "CUST_ORDER_NO")
|
||||
@ApiParam("客户订单号")
|
||||
private String custOrderNo;
|
||||
|
||||
@Column(name = "SOURCE")
|
||||
@ApiParam("计划来源")
|
||||
private String source;
|
||||
|
||||
@Column(name = "MEMO")
|
||||
@ApiParam("备注")
|
||||
private String memo;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value = "订单日期查询用，查询开始日期", example = "2019-01-31 23:59:59")
|
||||
public String orderTimeStart;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value = "订单日期查询用，查询结束日期", example = "2019-12-31 23:59:59")
|
||||
public String orderTimeEnd;
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.mes.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.MesCustOrder;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference:
|
||||
* @Author: joke.wang
|
||||
* @CreateDate: 2019\11\6 13:47
|
||||
* @Modify:
|
||||
**/
|
||||
public interface MesCustOrderRepository extends BaseRepository<MesCustOrder, Long> {
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
package cn.estsh.i3plus.pojo.model.wms;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* 操作日志信息推送至队列后台处理
|
||||
*/
|
||||
@Data
|
||||
public class WmsLogInfoSendToMqModel implements Serializable {
|
||||
private static final long serialVersionUID = -5490167040159056107L;
|
||||
@ApiParam("处理类型")
|
||||
private int handleType;
|
||||
@ApiParam("日志对象DAO层")
|
||||
private String baseRepository;
|
||||
@ApiParam("日志对象（新增）")
|
||||
private BaseBean logBean;
|
||||
@ApiParam("查询条件名称（修改）")
|
||||
private String[] conditionNames;
|
||||
@ApiParam("查询条件值（修改）")
|
||||
private Object[] conditionValues;
|
||||
@ApiParam("更新条件名称（修改）")
|
||||
private String[] updateNames;
|
||||
@ApiParam("更新条件值（修改）")
|
||||
private Object[] updateValues;
|
||||
}
|
||||
Loading…
Reference in New Issue