edi

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java

@@ -1,18 +1,29 @@
 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 工厂
@@ -120,9 +131,9 @@ public class XStreamFactory {
     }
 
 
-
     /**
      * Javabean 转XML
+     *
      * @param <T>
      * @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 <T>
      * @return xml字符串
      */
@@ -159,101 +171,108 @@ public class XStreamFactory {
     public static <T> 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<Role> roleList = new ArrayList<Role>();
-//    private List<Role> 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;
-//    }
-//}
+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<Role> roleList = new ArrayList<Role>();
+        private List<Role> 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;
+        }
+    }
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java

@@ -0,0 +1,54 @@
+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.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;
+
+    @Column(name = "FILE_URL")
+    @ApiParam("文件URL")
+    private String fileUrl;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java

@@ -30,6 +30,6 @@ public class CellFeedModel {
 
     private String scanQty;
 
-    private String LineRemainQty;
+    private String lineRemainQty;
 
 }

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;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiRequestModel.java

@@ -0,0 +1,33 @@
+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 List<EdiFileModel> files;
+
+    private Integer ediType;
+
+    private String host;
+
+    private String config;
+
+    private String programCode;
+
+    private Integer syncStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+}

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<MesQueueJitPlanDetail> jitPlanDetails;
+
+    private List<MesQueueJitPlanBom> jitPlanBoms;
+}

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;
+}

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;
+}

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;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java

@@ -0,0 +1,22 @@
+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
+    List<Pn> pns;
+}

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<CodeRule> codeRules;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java

@@ -0,0 +1,30 @@
+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;
+}

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<Part> parts;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java

@@ -0,0 +1,45 @@
+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<Part> parts;
+
+    @XStreamAlias("optioncode")
+    private List<CodeRule> codeRules;
+
+    @ApiParam("新vin号")
+    private String newVin;
+
+
+}

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<IfEdiInitialData, Long> {
+}