yun-zuoyi
许心洁 6 years ago
commit ac43296df3

@ -25,5 +25,6 @@ public @interface FieldAnnotation {
String defaultValue() default ""; // 字段的默认值
boolean popSearch() default false; // 弹出选择对象时是否显示
EDIT_TYPE editType() default EDIT_TYPE.NONE; // 定义字段的编辑类型
Class<?> multiEnumClass() default Object.class; // 多选枚举的类型。
String typeName() default ""; // 定义字段类型的简单名称,对于多选关联对象时有用。
}

@ -1,6 +1,12 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
/**
* @Description :
@ -9,5 +15,11 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
* @CreateDate : 2019-09-17
* @Modify:
**/
@Data
@MappedSuperclass
@Api("规则参数基类")
public class BaseRule extends BaseAPS {
@Column(name="CODE")
@ApiParam(value ="规则编码")
private String code;
}

@ -75,7 +75,7 @@ public class FieldInfo extends BaseCode {
@Column(name="POSITION")
@ApiParam(value ="位置")
private String position;
private Integer position;
@Column(name="MAIN_KEY")
@ApiParam(value ="主键标识")

@ -1,9 +1,12 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
import cn.estsh.i3plus.pojo.aps.enums.EDIT_TYPE;
import cn.estsh.i3plus.pojo.aps.enums.ORDER_DEL_LIMIT;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.hibernate.annotations.Fetch;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -39,6 +42,7 @@ public class MatCalcRule extends BaseRule {
@Column(name="DEL_LIMIT")
@ApiParam(value ="删除补充订单限制条件")
@FieldAnnotation(defaultValue = "NONE")
private ORDER_DEL_LIMIT delLimit;
@Column(name="KEEP_RELATION")
@ -55,6 +59,7 @@ public class MatCalcRule extends BaseRule {
@Column(name="ASSIGN_LIMIT")
@ApiParam(value ="物料分配制约")
@FieldAnnotation(editType = EDIT_TYPE.MULTI_ENUM, defaultValue = "NONE")
private Integer assignLimit;
}

@ -3,6 +3,7 @@ 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.CALENDAR_WEEK;
import cn.estsh.i3plus.pojo.aps.enums.EDIT_TYPE;
import cn.estsh.i3plus.pojo.aps.holders.EResCalendar;
import com.fasterxml.jackson.annotation.JsonBackReference;
@ -34,6 +35,7 @@ public class ResCalendar extends BaseAPS {
@Column(name="WEEKS")
@ApiParam(value ="星期")
@FieldAnnotation(multiEnumClass = CALENDAR_WEEK.class)
private Integer weeks;
@Column(name="DATES")

@ -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);
}
}

@ -1,11 +1,17 @@
package cn.estsh.i3plus.pojo.aps.bean;
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
import cn.estsh.i3plus.pojo.aps.holders.ERuleGroup;
import com.fasterxml.jackson.annotation.JsonBackReference;
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;
import java.util.List;
/**
* @Description :
@ -19,4 +25,14 @@ import javax.persistence.Table;
@Table(name = "APS_RULE_GROUP")
@Api("规则组合")
public class RuleGroup extends BaseAPS {
@Column(name="CODE")
@ApiParam(value ="编码")
private String code;
@Column(name="ORDER_NUMBER")
@ApiParam(value ="序号")
private Integer orderNumber;
@JsonBackReference
List<RuleDetail> getDetails() { return BeanRelation.list(this, ERuleGroup.Details); }
}

@ -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>

@ -1134,4 +1134,51 @@ public class CommonEnumUtil {
// 数据未删除的静态常量
public static final int FALSE = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum LOG_DETAIL_SHOW_TYPE {
DEBUG(1, "DEBUG"),
OVER_TIME(2, "记录超时服务"),
ALL_METHOD(3, "所有服务"),
ALL_METHOD_PARAMETER(4, "所有服务和入参");
private int value;
private String description;
private LOG_DETAIL_SHOW_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 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;
}
}
}

@ -2712,7 +2712,8 @@ public class MesEnumUtil {
PCN_PUSH(70, "PCN_PUSH"),
FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"),
REWORK_REPAIR(90, "REWORK_REPAIR"),
PCN_LOGIN(100, "PCN_LOGIN");
PCN_LOGIN(100, "PCN_LOGIN"),
PCN_MENU(110, "PCN_MENU");
private int value;
private String description;

@ -806,7 +806,10 @@ public class WmsEnumUtil {
VDA_NC_UN_FREEZE("VDA_NC_UN_FREEZE", "VDA_NC解冻"),
VDA_PART_BOXING_ERROR_PROOFING("VDA_PART_BOXING_ERROR_PROOFING", "VDA装箱防错"),
VDA_SN_SPLIT("VDA_SN_SPLIT", "VDA条码拆分"),
VDA_SN_("VDA_SN_MERGE", "VDA条码合并");
VDA_SN_("VDA_SN_MERGE", "VDA条码合并"),
VDA_SCAN_QUERY("VDA_SCAN_QUERY", "VDA扫描查询"),
VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY","VDA事务查询");
private String value;
private String description;

@ -85,6 +85,10 @@ public class MesDismantleRecord extends BaseBean {
@ApiParam("备注")
private String memo;
@Column(name = "LOT_NO")
@ApiParam("关联批次")
private String lotNo;
@Transient
private String serialNumber;
}

@ -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.util.List;
/**
@ -49,17 +46,13 @@ public class MesPcnSysUserOffline extends BaseBean {
@ApiParam(value = "登陆名称", access = "登陆名称")
private String loginName;
@Column(name = "ORGANIZE_ID")
@ApiParam(value = "部门ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long organizeId;
@Column(name = "ORGANIZE_NAME")
@ApiParam(value = "部门名称", access = "部门名称")
private String organizeName;
@Column(name="USER_TYPE")
@ApiParam(value ="账号类型(枚举,待定)" , example ="-1")
private Integer userType;
@Lob
@Column(name="MENU_LIST")
@ApiParam(value ="菜单" , access ="菜单")
private String menuList;
}

@ -46,11 +46,13 @@ public class MesProdBindRecordModel {
private String modifyDatetime;
@ApiParam("产品条码")
private String serialNumber;
@ApiParam("关联批次")
private String lotNo;
public MesProdBindRecordModel() {
}
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty) {
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, Double dismantleQty, String lotNo) {
this.id = id;
this.itemPartNo = itemPartNo;
this.itemPartName = itemPartName;
@ -64,9 +66,10 @@ public class MesProdBindRecordModel {
this.parentPartNo = parentPartNo;
this.parentPartName = parentPartName;
this.dismantleQty = dismantleQty;
this.lotNo = lotNo;
}
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName) {
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String lotNo) {
this.id = id;
this.itemPartNo = itemPartNo;
this.itemPartName = itemPartName;
@ -80,9 +83,10 @@ public class MesProdBindRecordModel {
this.kpSn = kpSn;
this.parentPartNo = parentPartNo;
this.parentPartName = parentPartName;
this.lotNo = lotNo;
}
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber) {
public MesProdBindRecordModel(Long id, String itemPartNo, String itemPartName, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String parentPartName, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String serialNumber, String lotNo) {
this.id = id;
this.itemPartNo = itemPartNo;
this.itemPartName = itemPartName;
@ -101,9 +105,10 @@ public class MesProdBindRecordModel {
this.modifyUser = modifyUser;
this.modifyDatetime = modifyDatetime;
this.serialNumber = serialNumber;
this.lotNo = lotNo;
}
public MesProdBindRecordModel(String itemPartNo, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String serialNumber) {
public MesProdBindRecordModel(String itemPartNo, Double qty, Integer isValid, Integer isDeleted, String organizeCode, Integer isFeed, String workCenterCode, String workCellCode, String kpSn, String parentPartNo, String serialNumber, String lotNo) {
this.itemPartNo = itemPartNo;
this.qty = qty;
this.isValid = isValid;
@ -115,5 +120,6 @@ public class MesProdBindRecordModel {
this.kpSn = kpSn;
this.parentPartNo = parentPartNo;
this.serialNumber = serialNumber;
this.lotNo = lotNo;
}
}

@ -225,7 +225,6 @@ public class WmsMoveSn extends BaseBean {
this.transTypeCode = transTypeCode;
this.refSrc = refSrc;
}
public WmsMoveSn(String partNo, String partNameRdd, Double destQty, String transTypeCode, String refSrc) {
this.partNo = partNo;
this.partNameRdd = partNameRdd;
@ -234,6 +233,16 @@ public class WmsMoveSn extends BaseBean {
this.refSrc = refSrc;
}
public WmsMoveSn(String partNo, String srcLocateNo, String destLocateNo, String createUser, String createDatetime, Integer busiTypeCode, Double qty) {
this.partNo = partNo;
this.srcLocateNo = srcLocateNo;
this.destLocateNo = destLocateNo;
this.createUser = createUser;
this.createDatetime = createDatetime;
this.busiTypeCode = busiTypeCode;
this.qty = qty;
}
public WmsMoveSn(String organizeCode, String orderNo, Integer item, String partNo, String partNameRdd,
String transTypeCode, String transTypeName, Integer itemStatus, String unit, String srcLocateNo, String destLocateNo, Double srcQty, Double destQty, Integer srcQcStatus, Integer descQcStatus, Integer srcSnStatus,
Integer destSnStatus, String lotNo, String dateCode, String refSrc, String destZoneNo, String destWhNo, Integer busiTypeCode, String sn,

Loading…
Cancel
Save