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 index b1738c3..a5c3a42 100644 --- 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 @@ -1,22 +1,33 @@ package cn.estsh.i3plus.pojo.base.common; import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; +import com.alibaba.fastjson.JSON; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamAsAttribute; 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 lombok.Data; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + +import java.io.Serializable; import java.io.Writer; import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +import static cn.estsh.i3plus.pojo.base.common.XStreamFactory.toJavaBean; +import static cn.estsh.i3plus.pojo.base.common.XStreamFactory.toXml; /** * @Description : Xml 工厂 - * 官方DOC: https://www.tutorialspoint.com/xstream/xstream_discussion.htm + * 官方DOC: https://www.tutorialspoint.com/xstream/xstream_discussion.htm * @Reference : * @Author : wei.peng * @CreateDate : 19-7-23 下午5:58 @@ -120,9 +131,9 @@ public class XStreamFactory { } - /** * Javabean 转XML + * * @param * @return xml字符串 */ @@ -132,8 +143,8 @@ public class XStreamFactory { for (int i = 1; i < RETRY_NUM; i++) { try { return headLine + xStream.toXML(t); - }catch (Exception e){ - LOGGER.error("Bean To Xml Error Message:{} Number:{}",e.getMessage(),i); + } catch (Exception e) { + LOGGER.error("Bean To Xml Error Message:{} Number:{}", e.getMessage(), i); } } return null; @@ -141,6 +152,7 @@ public class XStreamFactory { /** * Javabean 转XML + * * @param * @return xml字符串 */ @@ -159,101 +171,108 @@ public class XStreamFactory { 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 +class Test { + 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") + static +//对应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") + static +//对应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") + static +//对应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-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java new file mode 100644 index 0000000..a41617f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +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.Lob; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/7/30 9:30 AM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "IF_EDI_INITIAL_DATA") +@Api("EDI_初始数据表") +public class IfEdiInitialData extends BaseBean implements Serializable { + private static final long serialVersionUID = -523843818485699827L; + + @Column(name = "PROGRAM_DATA") + @ApiParam("EDI抓取程序代码") + private String programData; + + @Column(name = "CONTENT") + @ApiParam("数据") + private String content; + + @Column(name = "FILE_NAME") + @ApiParam("文件名称") + private String fileName; + + @Lob + @Column(name = "FILE_URL") + @ApiParam("文件URL") + private String fileUrl; + + @Column(name = "SYNC_STATUS") + @ApiParam("同步状态") + private Integer syncStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java index a4ba000..d65c83c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java @@ -79,7 +79,6 @@ public class IfQueueShipping extends BaseBean implements Serializable { @ApiParam("产品位置") private String produceCategoryCode; - @Column(name = "QUEUE_GROUP_NO") @ApiParam("分组队列编号") private String queueGroupNo; @@ -109,6 +108,10 @@ public class IfQueueShipping extends BaseBean implements Serializable { @ApiParam("原材料物料号") private String itemPartNo; + @Column(name = "CUST_PART_NO") + @ApiParam("客户物料号") + private String custPartNo; + @Column(name = "ITEM_PART_NAME") @ApiParam("原材料物料名称") private String itemPartName; @@ -121,4 +124,23 @@ public class IfQueueShipping extends BaseBean implements Serializable { @ApiParam("原材料物料用量") private String itemUnit; + @Column(name = "JIT_SEQ") + @ApiParam("jit排序号") + private String jitSeq; + + @Column(name = "JIT_TYPE_FLAG") + @ApiParam("jit类型标识") + private String jitTypeFlag; + + @Column(name = "CUST_POINT_DATE") + @ApiParam("客户需求时间") + private String custPointDate; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户工厂代码") + private String custPlantDate; + + @Column(name = "DOCK_NO") + @ApiParam("道口") + private String dockNo; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiParserConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiParserConfig.java new file mode 100644 index 0000000..5e4db8a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiParserConfig.java @@ -0,0 +1,52 @@ +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 java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/6/27 21:39 + * @desc + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_EDI_PARSER_CONFIG") +@Api("EDI解析配置表") +public class MesEdiParserConfig extends BaseBean implements Serializable { + private static final long serialVersionUID = 7225381299744633270L; + + @Column(name = "PARSER_CODE") + @ApiParam("解析配置代码") + private String parserCode; + + @Column(name = "PARSER_NAME") + @ApiParam("解析配置名称") + private String parserName; + + @Column(name = "PARSER_TYPE") + @ApiParam("解析程序集") + private String parserType; + + @Column(name = "GETTING_CODE") + @ApiParam("edi抓取程序代码") + private String gettingCode; + + @Column(name = "CURRENT_ORDER") + @ApiParam("当前订单号") + private String currentOrder; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index b4d21c1..30cffcc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -118,6 +118,14 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam("客户产线代码") private String custProdLineCode; + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Column(name = "IS_LOCK") + @ApiParam("锁定标识") + private Integer isLock; + @Transient @ApiParam("客户需求开始时间") private String custPointStartDate; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java index b6663bd..cde084a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java @@ -56,6 +56,10 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable { @ApiParam("用量") private Double qty = 0d; + @Column(name = "DOCK_NO") + @ApiParam("道口") + private String dockNo; + @Column(name = "PART_COLOR_VALUE") @ApiParam("零件色值") private String partColorValue; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java index 133b159..9fc4b52 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java @@ -89,6 +89,10 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @ApiParam("选项代码") private String optionCode; + @Column(name = "FORMULA_CONTENT") + @ApiParam("配方内容") + private String formulaContent; + @Column(name = "ASSY_NO") @ApiParam("组件编号") private String assyNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java index d982dab..b9483a5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -53,7 +54,7 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @Column(name = "SEQ") @ApiParam("计划排序号") - private String seq; + private Double seq; @Column(name = "STATUS") @ApiParam("状态") @@ -74,4 +75,34 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @Column(name = "VERSION") @ApiParam("版本号") private String version; + + @Column(name = "JIT_SEQ") + @ApiParam("JIT排序号") + private String jitSeq; + + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + + @Lob + @Column(name = "MEMO") + @ApiParam("备注") + private String memo; + + @Column(name = "SUPPLIER_CODE") + @ApiParam("供应商代码") + private String supplierCode; + + @Column(name = "SUPPLIER_NAME") + @ApiParam("供应商名称") + private String supplierName; + + @Column(name = "FILE_NAME") + @ApiParam("文件名称") + private String fileName; + + @Column(name = "FILE_URL") + @ApiParam("文件url") + private String fileUrl; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java index 1d9faad..5177ba9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java @@ -35,13 +35,17 @@ public class MesQueueJitPlanBom extends BaseBean implements Serializable { @ApiParam("队列编号") private String jisPlanNo; + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; - @Column(name = "ITEM_PART_NO") - @ApiParam("原材料物料号") - private String itemPartNo; + @Column(name = "CUST_PART_NO") + @ApiParam("客户物料号") + private String custPartNo; @Column(name = "DOCK_NO") @ApiParam("道口") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java index 7111b75..ed527ce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanDetail.java @@ -46,4 +46,17 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable { @Column(name = "PART_NAME") @ApiParam("产品名称") private String partName; + + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品位置代码") + private String produceCtgyCode; + + @Column(name = "CUST_PART_NO") + @ApiParam("客户物料号") + private String custPartNo; + + @Column(name = "FORMULA_CONTENT") + @ApiParam("配方内容") + private String formulaContent; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiFileModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiFileModel.java new file mode 100644 index 0000000..e7a11f5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiFileModel.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/6/23 15:23 + * @desc + */ +@Data +public class EdiFileModel implements Serializable { + private static final long serialVersionUID = 7085611430865514271L; + + private String content; + + private String fileName; + + private String fileUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiRequestModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiRequestModel.java new file mode 100644 index 0000000..e1361c9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiRequestModel.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/6/23 14:51 + * @desc + */ +@Data +public class EdiRequestModel implements Serializable { + private static final long serialVersionUID = 7203497485903427292L; + + private String organizeCode; + + private String sourcePath; + + private String fileName; + + private String fileUrl; + + private String content; + + private Integer ediType; + + private String ediCode; + + private String host; + + private String config; + + private String programCode; + + private String messageType; + + private Integer syncStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(); +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitPlanModel.java new file mode 100644 index 0000000..83fd71f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitPlanModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlan; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanBom; +import cn.estsh.i3plus.pojo.mes.bean.MesQueueJitPlanDetail; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/6/23 17:17 + * @desc + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class QueueJitPlanModel { + + private MesQueueJitPlan jitPlan; + + private List jitPlanDetails; + + private List jitPlanBoms; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/CodeRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/CodeRule.java new file mode 100644 index 0000000..50601e8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/CodeRule.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:36 + * @desc + */ +@Data +@XStreamAlias("coderule") +public class CodeRule implements Serializable { + private static final long serialVersionUID = 6090471998165282835L; + + @XStreamAlias("code") + private String code; + + @XStreamAlias("type") + private String type; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Document.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Document.java new file mode 100644 index 0000000..cfe4ed4 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Document.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:32 + * @desc + */ +@Data +@XStreamAlias("document") +public class Document implements Serializable { + private static final long serialVersionUID = 2814403876905527454L; + + @XStreamAlias("head") + private Head head; + + @XStreamAlias("message") + private Message message; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java new file mode 100644 index 0000000..4d2528a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:32 + * @desc + */ +@Data +@XStreamAlias("head") +public class Head implements Serializable { + private static final long serialVersionUID = 7799977037966652535L; + + @XStreamAlias("customerno") + private String customerno; + + @XStreamAlias("customername") + private String customername; + + @XStreamAlias("plantcode") + private String plantcode; + + @XStreamAlias("plantname") + private String plantname; + + @XStreamAlias("suppliernumber") + private String suppliernumber; + + @XStreamAlias("suppliername") + private String suppliername; + + @XStreamAlias("status") + private String status; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java new file mode 100644 index 0000000..ef61c84 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamImplicit; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:33 + * @desc + */ +@Data +@XStreamAlias("message") +public class Message implements Serializable { + private static final long serialVersionUID = 8628748312808962449L; + + @XStreamImplicit + private List pns; + + @XStreamAlias("customerno") + private String customerNo; + + @XStreamAlias("customername") + private String customerName; + + @XStreamAlias("plantcode") + private String plantCode; + + @XStreamAlias("plantname") + private String plantName; + + @XStreamAlias("suppliernumber") + private String supplierNumber; + + @XStreamAlias("suppliername") + private String supplierName; + + @XStreamAlias("status") + private String status; + + @XStreamAlias("sequenceno") + private String sequenceNo; + + @XStreamAlias("vin") + private String vin; + + @XStreamAlias("date") + private String date; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java new file mode 100644 index 0000000..a493487 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import cn.estsh.i3plus.pojo.mes.bean.MesScatterBomCfg; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.StringUtils; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * @author Wynne.Lu + * @date 2020/6/27 15:39 + * @desc + */ +@Data +@NoArgsConstructor +public class MgnBjJitPlanModel { + + private String org; + + private String userInfo; + + private List flPnParts; + + private String flPnRecipe; + + private List frPnParts; + + private String frPnRecipe; + + private List rlPnParts; + + private String rlPnRecipe; + + private List rrPnParts; + + private String rrPnRecipe; + + private Map> groupPartsMap = new HashMap<>(); + + public void setFlPnParts(List flPnParts) { + this.groupPartsMap.put("FL", flPnParts); + this.flPnRecipe = getGroupRecipe(flPnParts); + this.flPnParts = flPnParts; + } + + public void setFrPnParts(List frPnParts) { + this.groupPartsMap.put("FR", frPnParts); + this.frPnRecipe = getGroupRecipe(frPnParts); + this.frPnParts = frPnParts; + } + + public void setRlPnParts(List rlPnParts) { + this.groupPartsMap.put("RL", rlPnParts); + this.rlPnRecipe = getGroupRecipe(rlPnParts); + this.rlPnParts = rlPnParts; + } + + public void setRrPnParts(List rrPnParts) { + this.groupPartsMap.put("RR", rrPnParts); + this.rrPnRecipe = getGroupRecipe(rrPnParts); + this.rrPnParts = rrPnParts; + } + + public MgnBjJitPlanModel(String org, String userInfo) { + this.org = org; + this.userInfo = userInfo; + } + + private String getGroupRecipe(List groupParts) { + List groupPartsRecipe = groupParts.stream().filter(d -> StringUtils.isNotBlank(d.getRecipeSeq())) + .sorted(Comparator.comparing(Part::getRecipeSeq)) + .map(Part::getRecipeItem) + .collect(Collectors.toList()); + return String.join("", groupPartsRecipe); + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java new file mode 100644 index 0000000..e61fa14 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import lombok.Data; + +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/6/30 15:24 + * @desc + */ +@Data +public class MgnBjRecipePartsModel { + + private String location; + + private String recipe; + + private List parts; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/OptionCode.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/OptionCode.java new file mode 100644 index 0000000..8a7070f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/OptionCode.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:36 + * @desc + */ +@Data +@XStreamAlias("optioncode") +public class OptionCode implements Serializable { + private static final long serialVersionUID = -4790746701135990728L; + + @XStreamAlias("coderule") + private List codeRules; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java new file mode 100644 index 0000000..f6024e5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:35 + * @desc + */ +@Data +@XStreamAlias("part") +public class Part implements Serializable { + private static final long serialVersionUID = -8947770816754458901L; + + @XStreamAlias("item") + private String item; + + @XStreamAlias("dock") + private String dock; + + @XStreamAlias("qty") + private String qty; + + @ApiParam("是否是baseModule") + private boolean isBaseModule; + + @ApiParam("前左数量") + private String flQty; + + @ApiParam("前右数量") + private String frQty; + + @ApiParam("后左数量") + private String rlQty; + + @ApiParam("后右数量") + private String rrQty; + + @ApiParam("产品位置") + private String produceCtgyCode; + + @ApiParam("配方") + private String recipeItem; + + @ApiParam("配方顺序") + private String recipeSeq; + + + @ApiParam("Mes物料号") + private String partNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Parts.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Parts.java new file mode 100644 index 0000000..740b5a0 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Parts.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:35 + * @desc + */ +@Data +@XStreamAlias("parts") +public class Parts implements Serializable { + private static final long serialVersionUID = -7294906162624860932L; + + @XStreamAlias("parts") + private List parts; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java new file mode 100644 index 0000000..c1d74b6 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.mes.model.mgnbj; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author Wynne.Lu + * @date 2020/6/23 12:33 + * @desc + */ +@Data +@XStreamAlias("PN") +public class Pn implements Serializable { + private static final long serialVersionUID = 194164925380216505L; + + @XStreamAlias("vin") + private String vin; + + @XStreamAlias("seqno") + private String seqno; + + @XStreamAlias("date") + private String date; + + @XStreamAlias("vehicleCode") + private String vehicleCode; + + @XStreamAlias("version") + private String version; + + @XStreamAlias("parts") + private List parts; + + @XStreamAlias("optioncode") + private List codeRules; + + @ApiParam("新vin号") + private String newVin; + + @ApiParam("新vin号") + private Boolean result; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfEdiInitialDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfEdiInitialDataRepository.java new file mode 100644 index 0000000..63e234d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfEdiInitialDataRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.IfEdiInitialData; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wynne.lu + * @CreateDate : 2019-07-30 + * @Modify: + **/ +@Repository +public interface IfEdiInitialDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEdiParserConfigRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEdiParserConfigRepository.java new file mode 100644 index 0000000..031775b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEdiParserConfigRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEdiParserConfig; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wynne.lu + * @CreateDate : 2019-07-30 + * @Modify: + **/ +@Repository +public interface MesEdiParserConfigRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java index 062d2eb..3086942 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoForkCallBackDetails.java @@ -1,8 +1,10 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -91,9 +93,10 @@ public class WmsAutoForkCallBackDetails extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String robotCode; - //10=新建,20=已处理,30=处理出错 - @Column(name = "STATUS", nullable = false) + @Column(name = "STATUS", nullable = false, columnDefinition = "default 10") @ApiParam("处理标准") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "AUTO_FORK_TASK_STATUS") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description", hidden = true) public Integer status; @Column(name = "REMARK", nullable = false) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java index 892ea6e..4bf40f2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -13,8 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; -import java.util.List; /** * @Description :物流线路规则表 @@ -123,6 +121,10 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "目的单据条码状态") private Integer destMoveSnStatus; + @Column(name = "FILTER_SCRIPT_NO", length = 50) + @ApiParam(value = "过滤条件") + private String filterScriptNo; + public WmsRoutingRule(){} } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoFilterRoutingRuleModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoFilterRoutingRuleModel.java new file mode 100644 index 0000000..9fcf1fc --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoFilterRoutingRuleModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 自动过滤物流路线 + * @Reference : + * @Author : puxiao.liao + * @CreateDate : 2020-07-01 + * @Modify: + **/ +@Data +@Api("自动过滤物流路线") +public class WmsAutoFilterRoutingRuleModel { + + @ApiParam("工厂代码") + private String organizeCode; + + @ApiParam("料架车") + private String parentSpec; +}