diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonDisposalCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonDisposalCfg.java index 126d29e..26d333c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonDisposalCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonDisposalCfg.java @@ -47,6 +47,10 @@ public class AndonDisposalCfg extends BaseBean { @ApiParam(value = "呼叫原因代码") private String acCode; + @Column(name = "AC_NAME_RDD") + @ApiParam(value = "呼叫原因描述") + private String acNameRdd; + @AnnoOutputColumn(refClass = AndonEnumUtil.APPROVAL_STATUS.class,refForeignKey = "value",value = "description") @Column(name = "APPROVAL_STATUS") @ApiParam(value = "审批状态") diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java index de3e10a..9f3a6ea 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java @@ -297,6 +297,24 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "重要等级名称") private String importanceNameRdd; + @Column(name = "ORGANIZE_NAME_RDD") + @ApiParam(value = "组织名称") + private String organizeNameRdd; + + /** + * 1 = 是，2 = 否 + */ + @Column(name = "IS_RESOLVE") + @ApiParam(value = "是否驳回", example = "2") + private Integer isResolve; + + @Column(name = "RESOLVE_OPINION") + @ApiParam(value = "驳回意见") + private String resolveOpinion; + + @Transient + @ApiParam(value = "安灯状态集合") + private List statusCodeList; // 是否转呼 public Integer getIsShiftCall() { @@ -368,7 +386,10 @@ public class AndonManageQueue extends BaseBean { * @param confirmTime * @param resetTime */ - public AndonManageQueue(String resetUser,String alarmCode,String callTime, String confirmTime,String resetTime){ + public AndonManageQueue(String organizeCode,String workCenterNameRdd,String workCellNameRdd,String resetUser,String alarmCode,String callTime, String confirmTime,String resetTime){ + this.organizeCode = organizeCode; + this.workCenterNameRdd = workCenterNameRdd; + this.workCellNameRdd = workCellNameRdd; this.resetUser = resetUser; this.alarmCode = alarmCode; this.callTime = callTime; @@ -398,6 +419,18 @@ public class AndonManageQueue extends BaseBean { public AndonManageQueue() { } + /** + * 安灯问题情况报表 + * @param organizeNameRdd + * @param workCenterNameRdd + * @param andonCount + */ + public AndonManageQueue(String organizeNameRdd, String workCenterNameRdd, Long andonCount) { + this.organizeNameRdd = organizeNameRdd; + this.workCenterNameRdd = workCenterNameRdd; + this.andonCount = andonCount; + } + public static void main(String[] args) { try { List ds = new ArrayList(); diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java index 09c6388..ae42d1b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesArea.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -42,20 +43,15 @@ public class MesArea extends BaseBean { @Transient @ApiParam(value ="子集列表") + @AnnoOutputColumn(hidden = true) private List childTreeList; @Transient @ApiParam(value ="名称") + @AnnoOutputColumn(hidden = true) private String name; public String getName(){ return areaName; } - - // 默认值 -1 - @Transient - @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long parentId; - } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java index 1933b6e..59d6249 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesEquipment.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -41,6 +43,7 @@ public class MesEquipment extends BaseBean { @Column(name="STATUS") @ApiParam("设备状态") + @AnnoOutputColumn(refClass = AndonEnumUtil.ANDON_EQUIPMENT_STATUS.class,refForeignKey = "value",value = "description") private String status; @Column(name="WORK_CELL_CODE") @@ -57,15 +60,10 @@ public class MesEquipment extends BaseBean { @Transient @ApiParam(value ="名称") + @AnnoOutputColumn(hidden = true) private String name; public String getName(){ return this.equipmentName; } - - // 默认值 -1 - @Transient - @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long parentId; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java index 25f802f..7b95b63 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCell.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -49,19 +50,15 @@ public class MesWorkCell extends BaseBean { @Transient @ApiParam(value ="子集列表") + @AnnoOutputColumn(hidden = true) private List childTreeList; @Transient @ApiParam(value ="名称") + @AnnoOutputColumn(hidden = true) private String name; public String getName(){ return this.workCellName; } - - // 默认值 -1 - @Transient - @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long parentId; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java index 575fd1c..eb81426 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesWorkCenter.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -53,22 +54,18 @@ public class MesWorkCenter extends BaseBean { @Transient @ApiParam(value ="子集列表") + @AnnoOutputColumn(hidden = true) private List childTreeList; @Transient @ApiParam(value ="名称") + @AnnoOutputColumn(hidden = true) private String name; public String getName(){ return this.workCenterName; } - // 默认值 -1 - @Transient - @ApiParam(value ="父节点" , access ="父节点" ,example = "-1") - @JsonSerialize(using = ToStringSerializer.class) - private Long parentId; - public MesWorkCenter(String organizeCode) { this.organizeCode = organizeCode; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index cd7d4e5..393f698 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -245,9 +245,12 @@ public class AndonHqlPack { getStringBuilderPack(andonManageRecord, result); - // 根据优先级倒序，序号升序排序 - DdlPreparedPack.getOrderByPack(new Object[]{2, 1}, - new String[]{"priorityLevel", "seq"}, result); +// // 根据优先级倒序，序号升序排序 +// DdlPreparedPack.getOrderByPack(new Object[]{2, 1}, +// new String[]{"priorityLevel", "seq"}, result); + // 信息时间排序 + DdlPreparedPack.getOrderDefault(andonManageRecord); + result.setOrderByStr(andonManageRecord.orderBy()); return result; } @@ -514,6 +517,11 @@ public class AndonHqlPack { */ public static DdlPackBean packAndonEventMethod(AndonEventMethod eventPhenoMenon) { DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(eventPhenoMenon.getAlarmCode(), "alarmCode", result); + DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEmName(), "emName", result); + DdlPreparedPack.getStringLikerPack(eventPhenoMenon.getEmCode(), "emCode", result); + getStringBuilderPack(eventPhenoMenon, result); return result; @@ -530,6 +538,8 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(plc.getAlarmCode(), "alarmCode", result); DdlPreparedPack.getStringLikerPack(plc.getTagAddress(),"tagAddress",result); DdlPreparedPack.getStringLikerPack(plc.getTagName(),"tagName",result); + DdlPreparedPack.getStringEqualPack(plc.getChannelName(),"channelName",result); + DdlPreparedPack.getStringEqualPack(plc.getGroupNo(),"groupNo",result); getStringBuilderPack(plc, result); return result; diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 888e1bd..e97c0bb 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -35,6 +35,10 @@ com.alibaba fastjson + + com.thoughtworks.xstream + xstream + diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/XStreamCDATA.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/XStreamCDATA.java new file mode 100644 index 0000000..9ade29e --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/XStreamCDATA.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.base.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * @Description : XStream 数据转换的CDATA + * @Reference : + * @Author : wei.peng + * @CreateDate : 2019-07-23 下午5:52 + * @Modify: + **/ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface XStreamCDATA { +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 58fc14d..0047cff 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -61,7 +61,7 @@ public abstract class BaseBean implements Serializable { @Column(name="ORGANIZE_CODE") @ApiParam(value ="组织代码") - @AnnoOutputColumn(hidden = true) +// @AnnoOutputColumn(hidden = true) public String organizeCode; @Column(name="IS_VALID") diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java new file mode 100644 index 0000000..8709cb6 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java @@ -0,0 +1,227 @@ +package cn.estsh.i3plus.pojo.base.common; + +import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.core.util.QuickWriter; +import com.thoughtworks.xstream.io.HierarchicalStreamWriter; +import com.thoughtworks.xstream.io.naming.NameCoder; +import com.thoughtworks.xstream.io.naming.NoNameCoder; +import com.thoughtworks.xstream.io.xml.PrettyPrintWriter; +import com.thoughtworks.xstream.io.xml.XppDomDriver; + +import java.io.Writer; +import java.lang.reflect.Field; + +/** + * @Description : Xml 工厂 + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-7-23 下午5:58 + * @Modify: + **/ +public class XStreamFactory { + + private static final XStream xStream = XStreamFactory.getXStream(); + + public static final String CDATA_PREFIX = ""; + + public static XStream getXStream() { + final NameCoder nameCoder = new NoNameCoder(); + XStream xStream = new XStream(new XppDomDriver(nameCoder) { + @Override + public HierarchicalStreamWriter createWriter(Writer out) { + return new PrettyPrintWriter(out, nameCoder) { + boolean cdataFlag = false; + Class targetClass = null; + + @Override + public void startNode(String name, Class clazz) { + super.startNode(name, clazz); + if (targetClass == null) { + targetClass = clazz; + } + cdataFlag = isCDATA(targetClass, name); + } + + @Override + public void writeText(QuickWriter writer, String text) { + if (cdataFlag) { + writer.write(CDATA_PREFIX); + writer.write(text); + writer.write(CDATA_SUFFIX); + } else { + writer.write(text); + } + } + }; + } + }); + return xStream; + } + + + private static boolean isCDATA(Class clazz, String fieldAlias) { + //检查类本身 + boolean cdataFlag = isExistCDATA(clazz, fieldAlias); + if (cdataFlag) { + return cdataFlag; + } + //继续检查父类 + Class superClazz = clazz.getSuperclass(); + while (!superClazz.equals(Object.class)) { + cdataFlag = isExistCDATA(superClazz, fieldAlias); + if (cdataFlag) { + return cdataFlag; + } + superClazz = superClazz.getClass().getSuperclass(); + } + return false; + } + + /** + * 检查是否有 @XStreamCDATA 注解 + * + * @param clazz clazz + * @param fieldAlias fieldAlias + * @return + */ + private static boolean isExistCDATA(Class clazz, String fieldAlias) { + Field[] fields = clazz.getDeclaredFields(); + for (Field field : fields) { + if (field.getAnnotation(XStreamCDATA.class) != null) { + XStreamAlias xStreamAlias = field.getAnnotation(XStreamAlias.class); + if (xStreamAlias != null && fieldAlias.equals(xStreamAlias.value())) { + return true; + } else { + if (fieldAlias.equals(field.getName())) { + return true; + } + } + } + } + return false; + } + + + + /** + * Javabean 转XML + * @param + * @return xml字符串 + */ + public static String toXml(T t) { + xStream.processAnnotations(t.getClass()); + String headLine = "\n"; + return headLine + xStream.toXML(t); + } + + /** + * XML字符串转javabean + * + * @param xmlStr xml字符串 + * @param + * @return Java对象 + */ + public static T toJavaBean(String xmlStr) { + return (T) xStream.fromXML(xmlStr); + } +// +// public static void main(String[] args) { +// User u = new User(0, "zhangsan0", "zhangsanpwd0"); +// User u1 = new User(1, "zhangsan1", "zhangsanpwd"); +// User u2 = new User(2, "zhangsan2", "zhangsanpwd"); +// User u3 = new User(3, "zhangsan3", "zhangsanpwd"); +// +// Role r1 = new Role(1, "Admin", "Admin1"); +// Role r2 = new Role(2, "Admin", "Admin2"); +// Role r3 = new Role(3, "Admin", "Admin3"); +// +// DataAdapter ad = new DataAdapter(10086L,UUID.randomUUID().toString(),"sssfwef",u1); +// u1.setRole(r1); +// +// u2.getRoleList().add(r1); +// u2.getRoleList().add(r2); +// u2.getRoleList().add(r3); +// +// u3.setRole(r1); +// u3.getRoleList().add(r2); +// u3.getRoleList().add(r3); +// +// System.out.println(toXml(u) + "\n\n "); +// System.out.println(toXml(u1) + "\n\n "); +// System.out.println(toXml(u2) + "\n\n "); +// System.out.println(toXml(u3) + "\n\n "); +// System.out.println(toXml(ad) + "\n\n "); +// +// System.out.println(JSON.toJSONString(toJavaBean(toXml(ad)))); +// +// } +} +// +//@Data +//@XStreamAlias("DataAdapter") +////对应carInfos元素 +//class DataAdapter implements Serializable { +// +// @XStreamAsAttribute +// private Long scId; +// private String key; +// @XStreamCDATA +// private String resultData; +// +// private Object auth; +// +// public DataAdapter(Long scId, String key, String resultData, Object auth) { +// this.scId = scId; +// this.key = key; +// this.resultData = resultData; +// this.auth = auth; +// } +//} +// +//@Data +//@XStreamAlias("user") +////对应carInfos元素 +//class User implements Serializable { +// private static final long serialVersionUID = -7554548655397869156L; +// +// @XStreamAsAttribute +// private Integer id; +// private String loginName; +// private String loginPwd; +// +// private Role role; +// private List roleList = new ArrayList(); +// private List roleArray; +// +// public User() { +// } +// +// public User(Integer id, String loginName, String loginPwd) { +// this.id = id; +// this.loginName = loginName; +// this.loginPwd = loginPwd; +// } +//} +// +//@Data +//@XStreamAlias("role") +////对应carInfos元素 +//class Role implements Serializable { +// private static final long serialVersionUID = -3134157833696958743L; +// @XStreamAsAttribute +// private Integer id; +// private String roleName; +// private String roleCode; +// +// public Role() { +// } +// +// public Role(Integer id, String roleName, String roleCode) { +// this.id = id; +// this.roleName = roleName; +// this.roleCode = roleCode; +// } +//} \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index a00d90e..b99bad0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -212,7 +212,8 @@ public class AndonEnumUtil { RESOLVE(3,"30","解决"), CANCEL(4,"40", "撤销"), COMMIT(5,"50","提交"), - PASS(6,"60","审批"); + PASS(6,"60","审批"), + REJECT(7,"70","驳回"); private int value; private String code; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index b6d4ef7..5e00634 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.StringUtils; /** * @Description : @@ -900,6 +901,64 @@ public class CommonEnumUtil { } } + /** + * Content-Type + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum CONTENT_TYPE { + FORM("x-www-form-urlencoded", "表单"), + FILE(" multipart/form-data", "文件"), + JSON(" application/json", "JSON"), + XML(" application/xml ", "XML"); + + private String value; + private String description; + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private CONTENT_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + public static CONTENT_TYPE valueOfContenType(String val) { + CONTENT_TYPE tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value, val)) { + tmp = values()[i]; + } + } + return tmp; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].value, val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + + // 数据有效的静态常量 public static final int VALID = CommonEnumUtil.IS_VAILD.VAILD.getValue(); // 数据未删除的静态常量 diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java index c5928ee..cb59c67 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java @@ -36,6 +36,18 @@ import javax.persistence.Table; @Api(value="定时任务执行日志",description = "定时任务执行记录") public class SysLogTaskTime extends BaseBean { + @Column(name="SCHEDULER_INSTANCE_ID") + @ApiParam(value ="调度器实例id") + private String schedulerInstanceId; + + @Column(name="SCHEDULER_SERVER_IP") + @ApiParam(value ="调度服务器ip") + private String schedulerServerIp; + + @Column(name="SCHEDULER_SERVER_PORT") + @ApiParam(value ="调度服务器端口") + private String schedulerServerPort; + @Column(name="NAME") @ApiParam(value ="任务名称") private String name; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java index 66fd04c..aa4d0b8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java @@ -61,14 +61,11 @@ public class SapBase { private String guid = UUID.randomUUID().toString(); public String getSynymdTime() { - SimpleDateFormat format = new SimpleDateFormat("YYYY-MM-DD"); - //format.format(new Date()) - return ""; + return (new SimpleDateFormat("yyyy-MM-dd")).format(new Date()); } public String getSynhmsTime() { SimpleDateFormat format = new SimpleDateFormat("HH:mm:ss"); - //format.format(new Date()) - return ""; + return format.format(new Date()); } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index ebf60a2..ad849e5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -154,11 +154,5 @@ public class WmsMoveMaster extends BaseBean { this.transQty = transQty; this.rejectQty = rejectQty; this.fixId = fixId; - } - - - - - } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java index d8d2132..a779b28 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveToERP.java @@ -157,6 +157,14 @@ public class WmsMoveToERP extends BaseBean { @ApiParam("关联单据行号") public String refItem; + @Column(name="IS_LOCK") + @ApiParam(value = "是否锁定", example = "2") + public Integer isLock= CommonEnumUtil.FALSE; + + @Column(name = "YEAR") + @ApiParam("年度") + public String year; + @ApiParam(value = "待出库数量", example = "0") @Transient private Long waitingCounts; @@ -168,6 +176,13 @@ public class WmsMoveToERP extends BaseBean { @Transient private Long shippingId; + @Transient + private Double transQtySum; + + public Double getTransQtySumVal() { + return this.transQtySum == null ? 0 : this.transQtySum.doubleValue(); + } + public Double getRejectQty(){ return this.rejectQty == null ? 0 : this.rejectQty.doubleValue(); } @@ -183,4 +198,15 @@ public class WmsMoveToERP extends BaseBean { public Long getFinishedCounts() { return finishedCounts == null ? 0L : this.finishedCounts; } + + public WmsMoveToERP() {} + + public WmsMoveToERP(String partNo, String partNameRdd, String vendorNo, String unit, String destAreaNo, Double transQtySum) { + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.vendorNo = vendorNo; + this.unit = unit; + this.destAreaNo = destAreaNo; + this.transQtySum = transQtySum; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java index 8d39279..5e11bd4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java @@ -44,4 +44,8 @@ public class WmsSapOrderLock extends BaseBean { @ApiParam("锁定标识") public String lockFlag; + @Column(name = "IS_SYNC") + @ApiParam("同步标识") + public Integer isSync = 1; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 20e8a9e..c9f016b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -240,6 +240,8 @@ public class WmsStockSn extends BaseBean { this.partNo = partNo; } + public Integer getSnType() { return snType == null ? 0 : snType.intValue();} + public Double getQty() { return qty == null ? 0L : qty.doubleValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java index 615269b..2e4b9bd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java @@ -40,7 +40,7 @@ public class WmsUnitConvert extends BaseBean { @ApiParam(value = "换算率") private Double unitCoefficient; - public Double getUnitCoefficient() { + public Double getUnitCoefficientVal() { return this.unitCoefficient == null ? 0 : this.unitCoefficient.doubleValue(); } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index f526946..889fa6a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -103,4 +103,17 @@ public class WmsInterfaceDataMapper extends BaseBean { */ @Column(name = "BUSI_ROUTE") public String busiRoute; + + /** + * 同步频率 + */ + @Column(name = "SYNC_FREQUENCY") + public int syncFrequency; + + /** + * 上次同步时间 + */ + @Column(name = "LAST_SYNC_TIME") + public String lastSyncTime; + } diff --git a/pom.xml b/pom.xml index 8975679..6c327d0 100644 --- a/pom.xml +++ b/pom.xml @@ -150,6 +150,11 @@ fastjson 1.2.49 + + com.thoughtworks.xstream + xstream + 1.4.11.1 +