From cf1edee02eeac79236fcfa1bb881d1a08b22c2e4 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 23 Jun 2020 22:24:58 +0800 Subject: [PATCH 01/31] edi --- .../i3plus/pojo/base/common/XStreamFactory.java | 219 +++++++++++---------- .../i3plus/pojo/mes/bean/IfEdiInitialData.java | 54 +++++ .../estsh/i3plus/pojo/mes/model/CellFeedModel.java | 2 +- .../estsh/i3plus/pojo/mes/model/EdiFileModel.java | 21 ++ .../i3plus/pojo/mes/model/EdiRequestModel.java | 33 ++++ .../i3plus/pojo/mes/model/QueueJitPlanModel.java | 27 +++ .../i3plus/pojo/mes/model/mgnbj/CodeRule.java | 23 +++ .../i3plus/pojo/mes/model/mgnbj/Document.java | 23 +++ .../cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java | 39 ++++ .../estsh/i3plus/pojo/mes/model/mgnbj/Message.java | 22 +++ .../i3plus/pojo/mes/model/mgnbj/OptionCode.java | 22 +++ .../cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java | 30 +++ .../estsh/i3plus/pojo/mes/model/mgnbj/Parts.java | 21 ++ .../cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java | 45 +++++ .../mes/repository/IfEdiInitialDataRepository.java | 16 ++ 15 files changed, 496 insertions(+), 101 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiFileModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiRequestModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueJitPlanModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/CodeRule.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Document.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Head.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Message.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/OptionCode.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Parts.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/IfEdiInitialDataRepository.java 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..a735c3d --- /dev/null +++ b/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(); + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java index 6913759..976542a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CellFeedModel.java +++ b/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; } 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..81f7156 --- /dev/null +++ b/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 files; + + private Integer ediType; + + private String host; + + private String config; + + private String programCode; + + 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..6c530e1 --- /dev/null +++ b/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 pns; +} 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..300e621 --- /dev/null +++ b/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; +} 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..167b4ab --- /dev/null +++ b/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 parts; + + @XStreamAlias("optioncode") + private List codeRules; + + @ApiParam("新vin号") + private String newVin; + + +} 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 { +} From 3b5142a1f8aff85de77df33123b617aeed82ae09 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 26 Jun 2020 15:16:17 +0800 Subject: [PATCH 02/31] edi --- .../cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java | 19 +++++++++++++++++++ .../java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Pn.java | 3 +++ 2 files changed, 22 insertions(+) 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 index 300e621..09dd62f 100644 --- 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 @@ -27,4 +27,23 @@ public class Part implements Serializable { @ApiParam("是否是baseModule") private boolean isBaseModule; + + @ApiParam("前左数量") + private String flQty = "0"; + + @ApiParam("前右数量") + private String frQty = "0"; + + @ApiParam("后左数量") + private String rlQty = "0"; + + @ApiParam("后右数量") + private String rrQty = "0"; + + @ApiParam("配方") + private String recipeItem; + + @ApiParam("配方顺序") + private String recipeSeq; + } 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 index 167b4ab..c1d74b6 100644 --- 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 @@ -41,5 +41,8 @@ public class Pn implements Serializable { @ApiParam("新vin号") private String newVin; + @ApiParam("新vin号") + private Boolean result; + } From 2478fc3b14e4de400b63dad335a2106c76fafe49 Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 28 Jun 2020 10:13:39 +0800 Subject: [PATCH 03/31] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java | 5 ----- sonar-project.properties | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java index 0b9d661..1363382 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java @@ -31,11 +31,6 @@ import java.io.Serializable; @Api("工位投料信息") public class MesCellFeed extends BaseBean implements Serializable { private static final long serialVersionUID = 1947971369479107782L; - - @Column(name = "ORDER_NO") - @ApiParam("工单号") - private String orderNo; - @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/sonar-project.properties b/sonar-project.properties index 932bdd9..3428e74 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo # defaults to project key sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0-PROD-SNAPSHOT # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From aabd7b5d1d1dbdce6a8912d22aedd7427456e117 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sun, 28 Jun 2020 21:02:23 +0800 Subject: [PATCH 04/31] Fix Bug #9112 --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index e02f6cf..280de6b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java @@ -111,4 +111,8 @@ public class IfPackageDetail extends BaseBean implements Serializable { @Column(name = "CUST_DELIVERY_LOCATION") @ApiParam("客户发往地") private String custDeliveryLocation; + + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 141f713..2be9e5b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java @@ -127,4 +127,8 @@ public class IfProductOffLine extends BaseBean implements Serializable { @Column(name = "CT_NO") @ApiParam("容器编号") private String ctNo; + + @Column(name = "CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; } From d2869dc31a26e658a0d72b166a7626c82954d373 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Sun, 28 Jun 2020 21:38:27 +0800 Subject: [PATCH 05/31] tmp --- .../i3plus/pojo/mes/bean/IfEdiInitialData.java | 2 + .../i3plus/pojo/mes/bean/IfQueueShipping.java | 24 +++++- .../i3plus/pojo/mes/bean/MesEdiParserConfig.java | 52 +++++++++++++ .../i3plus/pojo/mes/bean/MesQueueJitPlan.java | 31 ++++++++ .../i3plus/pojo/mes/bean/MesQueueJitPlanBom.java | 10 ++- .../pojo/mes/bean/MesQueueJitPlanDetail.java | 13 ++++ .../i3plus/pojo/mes/model/EdiRequestModel.java | 10 ++- .../pojo/mes/model/mgnbj/MgnBjJitPlanModel.java | 88 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java | 15 +++- .../repository/MesEdiParserConfigRepository.java | 16 ++++ 10 files changed, 252 insertions(+), 9 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEdiParserConfig.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEdiParserConfigRepository.java 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 index a735c3d..a41617f 100644 --- 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 @@ -12,6 +12,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; @@ -42,6 +43,7 @@ public class IfEdiInitialData extends BaseBean implements Serializable { @ApiParam("文件名称") private String fileName; + @Lob @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/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/MesQueueJitPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java index d982dab..e51b3f0 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; @@ -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/EdiRequestModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EdiRequestModel.java index 81f7156..e1361c9 100644 --- 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 @@ -19,15 +19,23 @@ public class EdiRequestModel implements Serializable { private String sourcePath; - private List files; + 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/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..c62cdd3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjJitPlanModel.java @@ -0,0 +1,88 @@ +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 scatterBomCfgOptions; + + private List scatterBomCfgBaseModules; + + private List messageCustPartNos; + + private List messageCodeRules; + + 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<>(); + + private Map> recipePartsMap = 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/Part.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/Part.java index 09dd62f..f6024e5 100644 --- 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 @@ -29,16 +29,19 @@ public class Part implements Serializable { private boolean isBaseModule; @ApiParam("前左数量") - private String flQty = "0"; + private String flQty; @ApiParam("前右数量") - private String frQty = "0"; + private String frQty; @ApiParam("后左数量") - private String rlQty = "0"; + private String rlQty; @ApiParam("后右数量") - private String rrQty = "0"; + private String rrQty; + + @ApiParam("产品位置") + private String produceCtgyCode; @ApiParam("配方") private String recipeItem; @@ -46,4 +49,8 @@ public class Part implements Serializable { @ApiParam("配方顺序") private String recipeSeq; + + @ApiParam("Mes物料号") + private String partNo; + } 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 { +} From 31d7b71872a5ebf8ba5245120d07a0c6cb60f884 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 29 Jun 2020 11:37:03 +0800 Subject: [PATCH 06/31] mes enum order type --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index b5b8273..3696fa3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3290,6 +3290,16 @@ public class MesEnumUtil { } return tmp; } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** From 1fb2f07ca37a20cfd0ba4fe7a5fedb43038c2603 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 29 Jun 2020 20:30:07 +0800 Subject: [PATCH 07/31] =?UTF-8?q?edi=20=E6=B7=BB=E5=8A=A0=E9=98=9F?= =?UTF-8?q?=E5=88=97=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/bean/MesQueueJitActual.java | 8 +++++ .../i3plus/pojo/mes/bean/MesQueueJitActualBom.java | 4 +++ .../pojo/mes/bean/MesQueueJitActualDetail.java | 4 +++ .../i3plus/pojo/mes/bean/MesQueueJitPlan.java | 2 +- .../estsh/i3plus/pojo/mes/model/mgnbj/Message.java | 34 +++++++++++++++++++++- 5 files changed, 50 insertions(+), 2 deletions(-) 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 e51b3f0..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 @@ -54,7 +54,7 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @Column(name = "SEQ") @ApiParam("计划排序号") - private String seq; + private Double seq; @Column(name = "STATUS") @ApiParam("状态") 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 index 6c530e1..ef61c84 100644 --- 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 @@ -18,5 +18,37 @@ public class Message implements Serializable { private static final long serialVersionUID = 8628748312808962449L; @XStreamImplicit - List pns; + 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; + + } From aaf9f8a21b0a24f7bd9027a247bd5c46fe3381ba Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 29 Jun 2020 22:43:45 +0800 Subject: [PATCH 08/31] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B9=90=E8=A7=82?= =?UTF-8?q?=E9=94=81=20=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 09296ef..add5b48 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -177,7 +177,10 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("条码类型名称") private String snTypeName; - + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public transient Integer lockVersion; public MesProduceSn() { } From 614582ce36c7036b575fdb0d6312d726874d3965 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 29 Jun 2020 23:10:02 +0800 Subject: [PATCH 09/31] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=B9=90=E8=A7=82=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index add5b48..6120f9d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -180,7 +180,7 @@ public class MesProduceSn extends BaseBean implements Serializable { @Version @Column(name = "LOCK_VERSION") @ApiParam(value = "乐观锁", example = "1") - public transient Integer lockVersion; + public Integer lockVersion; public MesProduceSn() { } From 32eb9dc7970671ad90d209d7fc514f74c83dca71 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 30 Jun 2020 17:00:14 +0800 Subject: [PATCH 10/31] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 9f9717e..807bef5 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index a9e288f..b948580 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index a44418c..e12eaee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 2de88b5..c338f71 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 50ab2c2..7637865 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 7f94617..d98b7d8 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index d800ecf..bf96e57 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 60fc467..a758a6a 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 8171a4d..215b102 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index a785f21..dba12cc 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index d6d2f8e..81670b2 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 0fbfb69..26a7311 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 76739f9..eaf2544 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 0368700..0f615b6 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index d221913..183a03c 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 5fcd08a..0fea52b 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 2eddf76..cc8fce6 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 69562594962b403eb9cbe4ec56759a4108339141 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Tue, 30 Jun 2020 18:19:51 +0800 Subject: [PATCH 11/31] EDI Finish Task #2215 Cost:48h Left:0h --- .../pojo/mes/model/mgnbj/MgnBjJitPlanModel.java | 10 ---------- .../pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgnbj/MgnBjRecipePartsModel.java 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 index c62cdd3..a493487 100644 --- 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 @@ -21,14 +21,6 @@ public class MgnBjJitPlanModel { private String userInfo; - private List scatterBomCfgOptions; - - private List scatterBomCfgBaseModules; - - private List messageCustPartNos; - - private List messageCodeRules; - private List flPnParts; private String flPnRecipe; @@ -47,8 +39,6 @@ public class MgnBjJitPlanModel { private Map> groupPartsMap = new HashMap<>(); - private Map> recipePartsMap = new HashMap<>(); - public void setFlPnParts(List flPnParts) { this.groupPartsMap.put("FL", flPnParts); this.flPnRecipe = getGroupRecipe(flPnParts); 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; +} From 559fc003c8da83f0feb60728e55ec40cf62b27fe Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 1 Jul 2020 09:50:36 +0800 Subject: [PATCH 12/31] =?UTF-8?q?Finish=20Task=20#2184=20Cost:8h=202184=20?= =?UTF-8?q?06=201.2.3.7.1=E7=89=A9=E6=B5=81=E8=B7=AF=E7=BA=BF=E6=A3=80?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/bean/WmsAutoForkCallBackDetails.java | 7 +++++-- .../estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java | 6 ++++-- .../modelbean/WmsAutoFilterRoutingRuleModel.java | 24 ++++++++++++++++++++++ 3 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoFilterRoutingRuleModel.java 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; +} From 1d2c2b7be2b4f8c417d8be3fa0c908d7054bb5a1 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 1 Jul 2020 22:23:20 +0800 Subject: [PATCH 13/31] =?UTF-8?q?=E6=B5=B7=E7=BA=B3=E5=B7=9D=E6=99=BA?= =?UTF-8?q?=E8=83=BD=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index b911540..d3df613 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -8330,7 +8330,7 @@ public class WmsEnumUtil { /** - * 发运看板状态 + * AUTO 命令状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AUTO_FORK_TASK_STATUS { From 3d826c5edcecefb26cc9ed5784aae249bc53ea46 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 1 Jul 2020 22:24:11 +0800 Subject: [PATCH 14/31] =?UTF-8?q?=E3=80=90=E6=99=BA=E8=83=BD=E5=8C=96?= =?UTF-8?q?=E5=BC=80=E5=8F=91-=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 91 ++++++++++++++++++++-- .../estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java | 7 ++ .../pojo/wms/modelbean/WmsAutoTaskModel.java | 4 + 3 files changed, 96 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index b911540..a24096c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -8146,16 +8146,16 @@ public class WmsEnumUtil { /** * 动作类型 - * 10-锁定库存，20-解锁库存、30-锁定库位、40-解锁库位、50-锁定料车、60-解锁料车、70-生成任务、 + * 10-锁定库位，20-锁定库存、30-锁定料车、40-解锁库存、50-解锁库位、60-解锁料车、70-生成任务、 * 80-取消任务、90-递进交换 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STRATEGY_ACTION_TYPE { - LOCKING_IN_STOCK(10, "LOCKING_IN_STOCK", "锁定库存"), - UNLOCK_IN_STOCK(20, "UNLOCK_IN_STOCK", "解锁库存"), - LOCKING_LOCATE(30, "LOCKING_LOCATE", "锁定库位"), - UNLOCK_LOCATE(40, "UNLOCK_LOCATE", "解锁库位"), - LOCKING_FEED_CAR(50, "LOCKING_FEED_CAR", "锁定料车"), + LOCKING_LOCATE(10, "LOCKING_LOCATE", "锁定库位"), + LOCKING_IN_STOCK(20, "LOCKING_IN_STOCK", "锁定库存"), + LOCKING_FEED_CAR(30, "LOCKING_FEED_CAR", "锁定料车"), + UNLOCK_IN_STOCK(40, "UNLOCK_IN_STOCK", "解锁库存"), + UNLOCK_LOCATE(50, "UNLOCK_LOCATE", "解锁库位"), UNLOCK_FEED_CAR(60, "UNLOCK_FEED_CAR", "解锁料车"), GENERATE_TASK(70, "GENERATE_TASK", "生成任务"), CANCEL_TASK(80, "CANCEL_TASK", "取消任务"), @@ -8374,4 +8374,83 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 自动化日志记录-操作类型 + * 10-单据生成，20-策略动作、30-任务生成、40-START、50-END、60-其它 + * + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OPERATE_TYPE { + ORDER_GENERATE(10, "ORDER_GENERATE", "单据生成"), + STRATEGIC_ACTION(20, "STRATEGIC_ACTION", "策略动作"), + TASK_GENERATE(30, "TASK_GENERATE", "任务生成"), + START(40, "START", "START"), + END(50, "END", "END"), + OTHER(60, "OTHER", "其它"); + + private int value; + private String code; + private String description; + + OPERATE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + 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 String valueOfDescription(int val) { + return valueOf(val); + } + + public static int descriptionOfValue(String desc) { + return descOf(desc); + } + + + 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; + } + + public static OPERATE_TYPE codeOf(Integer value) { + if (value == null) { + return null; + } else { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + return values()[i]; + } + } + } + return null; + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java index 153e954..640c0d4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsAutoTaskLog.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -45,6 +47,11 @@ public class WmsAutoTaskLog extends BaseBean { @ApiParam("策略动作") public String strategyAction; + @Column(name = "OPERATE_TYPE") + @ApiParam("操作类型") + @AnnoOutputColumn(refClass = WmsEnumUtil.OPERATE_TYPE.class) + public String operateType; + @Column(name = "ERROR_MSG") @ApiParam("错误信息") public String errorMsg; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java index bbfaa61..6b5d6b9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsAutoTaskModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.wms.modelbean; +import cn.estsh.i3plus.pojo.wms.bean.WmsAutoTaskLog; import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementDetails; import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn; import io.swagger.annotations.ApiParam; @@ -64,6 +65,9 @@ public class WmsAutoTaskModel { @ApiParam("锁定条码") private List lockStockSnList; + @ApiParam("动作日志记录") + private WmsAutoTaskLog wmsAutoTaskLog; + @ApiParam("任务生成数量") private Double taskQty; From 7517a11a904d2acd0d5de7747312bc1b32587ab1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 3 Jul 2020 13:47:25 +0800 Subject: [PATCH 15/31] =?UTF-8?q?[=E4=BB=BB=E5=8A=A1=EF=BC=9A2223]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 20 +---------- .../pojo/mes/model/ButtonComponentReqModel.java | 3 ++ .../mes/model/InjectionProductionControlModel.java | 42 ++++++++++++++++++++++ .../pojo/mes/model/MesWorkOrderExtendModel.java | 42 ++++++++++++++++++++++ .../i3plus/pojo/mes/model/StationResultBean.java | 4 +++ 5 files changed, 92 insertions(+), 19 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderExtendModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 0a67fe0..9cccc86 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -2,19 +2,16 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel; -import com.alibaba.fastjson.JSONObject; 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 org.springframework.util.StringUtils; import javax.persistence.*; import java.io.Serializable; import java.util.List; -import java.util.Map; /** * @Description: @@ -159,7 +156,7 @@ public class MesWorkOrder extends BaseBean implements Serializable { @Lob @Column(name = "EXTEND") @ApiParam("扩展数据") - private String extend; + public String extend; @Column(name = "RESERVED1") @ApiParam("预留字段1") @@ -273,10 +270,6 @@ public class MesWorkOrder extends BaseBean implements Serializable { public String comButtonCode; @Transient - @ApiParam(value = "扩展数据MAP") - public Map extendMap; - - @Transient @ApiParam("工单源序号") private Double srcSeq; @@ -320,15 +313,4 @@ public class MesWorkOrder extends BaseBean implements Serializable { return this.approvalStatus == null ? 0 : this.approvalStatus; } - public Map getExtendMap() { - try { - if (!StringUtils.isEmpty(this.extend)) { - return JSONObject.parseObject(this.extend, Map.class); - } else { - return null; - } - } catch (Exception e) { - return null; - } - } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java index 93e598e..979d50d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java @@ -55,4 +55,7 @@ public class ButtonComponentReqModel { @ApiParam("用户信息") private String userInfo; + @ApiParam("json数据") + private String data; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java new file mode 100644 index 0000000..5c9d2e3 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("注塑生产控制MODEL") +public class InjectionProductionControlModel { + + @ApiParam("物料号") + private String partNo; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("当前合格数量") + private String standardQtyCur; + + @ApiParam("当前合格数量") + private String completeQty; + + @ApiParam("总不合格数量") + private String scrapQty; + + @ApiParam("包装编号") + private String packageNo; + + @ApiParam("数量") + private String qty; + + @ApiParam("包装时间") + private String createDatetime; + + @ApiParam("箱条码状态") + private String printStatusName; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderExtendModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderExtendModel.java new file mode 100644 index 0000000..cf9c3a1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderExtendModel.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import org.springframework.beans.BeanUtils; +import org.springframework.util.StringUtils; + +import javax.persistence.Transient; +import java.util.HashMap; +import java.util.Map; + +/** + * @Description : 生产工单扩展 + * @Reference : + * @Author : wangjie + * @CreateDate : 2020-03-30 13:42 + * @Modify: + **/ +@Data +@Api(value="生产工单扩展",description = "生产工单扩展") +public class MesWorkOrderExtendModel extends MesWorkOrder { + + @Transient + @ApiParam(value = "扩展数据MAP") + public Map extendMap; + + public Map getExtendMap() { + try { + if (!StringUtils.isEmpty(super.extend)) { + return JSONObject.parseObject(super.extend, Map.class); + } else { + return new HashMap<>(); + } + } catch (Exception e) { + return new HashMap<>(); + } + } + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java index 46db502..f039ece 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationResultBean.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -58,4 +59,7 @@ public class StationResultBean implements Serializable { @ApiParam("特殊展示数据") private Object specialDisplayData; + + @ApiParam("工位参数") + private Map wcpcMap = new HashMap<>(); } From ad6249f412bb39236034f67df031b0ab6aeea633 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 3 Jul 2020 14:09:34 +0800 Subject: [PATCH 16/31] Finish Task #2235 Cost:8h --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 36 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/IfQueueShipping.java | 6 ++-- .../i3plus/pojo/mes/bean/MesQueueJitPlan.java | 6 +++- .../i3plus/pojo/mes/bean/MesQueueJitPlanBom.java | 4 --- .../pojo/mes/bean/MesQueueJitPlanDetail.java | 2 +- 5 files changed, 45 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 998da89..dfa6734 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -6474,4 +6474,40 @@ public class MesEnumUtil { return tmp; } } + + /** + * 客户JIT预装队列 工单类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_JIT_PLAN_WORK_ORDER_TYPE { + SPARE_PART_PRODUCTION(10, "备件生产"), + REPRODUCTION_RMS(20, "重新生产-报功"), + REPRODUCTION_NOT_RMS(30, "重新生产-不报功"); + + private Integer value; + private String description; + + QUEUE_JIT_PLAN_WORK_ORDER_TYPE(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(value)) { + tmp = values()[i].description; + } + } + return tmp; + } + } } 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 d65c83c..3088e6b 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 @@ -126,10 +126,10 @@ public class IfQueueShipping extends BaseBean implements Serializable { @Column(name = "JIT_SEQ") @ApiParam("jit排序号") - private String jitSeq; + private Double jitSeq; @Column(name = "JIT_TYPE_FLAG") - @ApiParam("jit类型标识") + @ApiParam("JIT类型标识") private String jitTypeFlag; @Column(name = "CUST_POINT_DATE") @@ -138,7 +138,7 @@ public class IfQueueShipping extends BaseBean implements Serializable { @Column(name = "CUST_PLANT_CODE") @ApiParam("客户工厂代码") - private String custPlantDate; + private String custPlantCode; @Column(name = "DOCK_NO") @ApiParam("道口") 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 0f88155..db8ee80 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 @@ -79,7 +79,7 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @Column(name = "JIT_SEQ") @ApiParam("JIT排序号") - private String jitSeq; + private Double jitSeq; @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") @@ -105,6 +105,10 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @ApiParam("解析文件路径") private String fileUrl; + @Column(name = "WORK_ORDER_TYPE") + @ApiParam("工单类型") + private Integer workOrderType; + @Transient @ApiParam("计划上线开始时间") private String planStartDate; 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 df5829a..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 @@ -54,8 +54,4 @@ public class MesQueueJitPlanBom extends BaseBean implements Serializable { @Column(name = "QTY") @ApiParam("用量") private Double qty; - - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品位置代码") - private String produceCtgyCode; } 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 402d4c6..d290454 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 @@ -44,7 +44,7 @@ public class MesQueueJitPlanDetail extends BaseBean implements Serializable { private String partNo; @Column(name = "PART_NAME") - @ApiParam("产品名称") + @ApiParam("物料名称") private String partName; @Column(name = "PRODUCE_CTGY_CODE") From 7f4c173105e34b30e98dfa62bb162f8f24611866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Fri, 3 Jul 2020 16:47:40 +0800 Subject: [PATCH 17/31] =?UTF-8?q?=E3=80=902250=20=E6=80=BB=E8=A3=85?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0,2228=2006=201.2.4.6.1.7=20?= =?UTF-8?q?=E6=80=BB=E8=A3=85=E4=B8=8A=E7=BA=BF=E5=B7=A5=E4=BD=8D=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 10 ++++++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java | 4 ++++ .../cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java | 3 +++ 3 files changed, 17 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 19f6de5..358e5d0 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -2407,6 +2407,16 @@ public class MesPcnEnumUtil { } return tmp; } + + 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; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java index a943c4a..83396d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java @@ -45,4 +45,8 @@ public class MesCustomerPart extends BaseBean implements Serializable { @Column(name = "CUSTOMER_PART_NAME") @ApiParam("客户零件描述") private String customerPartName; + + @Column(name = "CUSTOMER_CFG_CODE") + @ApiParam("客戶配置代碼") + private String customerCfgCode; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index a480700..07cadf3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -156,6 +156,9 @@ public class StationRequestBean implements Serializable { @ApiParam("状态机代码") private String smCode; + @ApiParam("区域代码") + private String areaCode; + @Override public String toString() { return "StationRequestBean{" + From 2d392825217537037126dfe1a4a7bcb7f3ec94bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Fri, 3 Jul 2020 17:14:08 +0800 Subject: [PATCH 18/31] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=82=E8=A3=85?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java index 16a9bfe..b6c5a7f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java @@ -29,7 +29,7 @@ public class PaintWorkOrderSnModel extends BaseBean { private String partNo; @ApiParam("物料名称") - private String partNameRdd; + private String partName; @ApiParam("颜色代码") private String colorCode; From 04eaa0201fb1e53d2ab6a921d58e229fc713736c Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 3 Jul 2020 19:26:19 +0800 Subject: [PATCH 19/31] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlanBom.java | 4 ---- 1 file changed, 4 deletions(-) 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 df5829a..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 @@ -54,8 +54,4 @@ public class MesQueueJitPlanBom extends BaseBean implements Serializable { @Column(name = "QTY") @ApiParam("用量") private Double qty; - - @Column(name = "PRODUCE_CTGY_CODE") - @ApiParam("产品位置代码") - private String produceCtgyCode; } From b48d38ee62589a35235ddad07fd4448c44f0ca15 Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 3 Jul 2020 19:43:43 +0800 Subject: [PATCH 20/31] Finish Task #2080 Cost:8h --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 211be8f..d298220 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1367,7 +1367,8 @@ public class WmsEnumUtil { PART_COVERAGE(110, "物料分类覆盖"), TOUCH(120, "动碰"), ZORE_STOCK(130, "零库存"), - MATERIAL_COVERAGE(140, "物料覆盖"); + MATERIAL_COVERAGE(140, "物料覆盖"), + CHECK(150, "点检"); private int value; private String description; From bcb4e5ad13425d5b42ff939fdf5ca44f843ca0c9 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 3 Jul 2020 20:53:04 +0800 Subject: [PATCH 21/31] merge test --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 697131c..1d3bb9e 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..650ee5b 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d2521de..1e17935 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index b599490..37b8a51 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index aca1465..0a44fb0 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index ae38208..6df1cc2 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index a6a0d68..ba89b61 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 04b40d4..fdcf6e3 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 6854e65..d266163 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index ac387fd..60d9861 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index bbe0ff9..54c8306 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index be533a6..190efa7 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 14e8567..5896851 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 102ab0e..aa3dd42 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 864c56a..80498fc 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index e755225..076f15a 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 194f0cb..1351ed3 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 60543fe..67b0bff 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index bdc4cab..15d36cd 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index cc8fce6..2eddf76 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 98849d3131859eeafedb5d7dc3b34fbc17ff9443 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 3 Jul 2020 21:15:42 +0800 Subject: [PATCH 22/31] =?UTF-8?q?=E8=B0=83=E6=95=B4jitseq=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitPlan.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 db8ee80..b55af50 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 @@ -79,7 +79,7 @@ public class MesQueueJitPlan extends BaseBean implements Serializable { @Column(name = "JIT_SEQ") @ApiParam("JIT排序号") - private Double jitSeq; + private String jitSeq; @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("项目代码") From 445668a9b256c24e1573c27e77f69c628fb13ef6 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Fri, 3 Jul 2020 21:26:49 +0800 Subject: [PATCH 23/31] =?UTF-8?q?=E8=B0=83=E6=95=B4jitseq=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3088e6b..ccdb194 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 @@ -126,7 +126,7 @@ public class IfQueueShipping extends BaseBean implements Serializable { @Column(name = "JIT_SEQ") @ApiParam("jit排序号") - private Double jitSeq; + private String jitSeq; @Column(name = "JIT_TYPE_FLAG") @ApiParam("JIT类型标识") From 76e3fb0811f03431e4ff6a6444ee209106e11487 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 4 Jul 2020 12:36:09 +0800 Subject: [PATCH 24/31] Finish Task #Finish Task #2236 --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 17 ++++--- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 9 +++- .../estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java | 48 ++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesJitLockCache.java | 52 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesJitOrderCache.java | 51 +++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 3 ++ .../i3plus/pojo/mes/model/JitIssueCfgModel.java | 32 +++++++++++++ .../i3plus/pojo/mes/model/PaintCheckModel.java | 3 ++ .../pojo/mes/model/PaintWorkOrderSnModel.java | 2 + .../i3plus/pojo/mes/model/QueueOrderModel.java | 4 +- .../mes/repository/MesJitIssueCfgRepository.java | 13 ++++++ .../mes/repository/MesJitLockCacheRepository.java | 13 ++++++ .../mes/repository/MesJitOrderCacheRepository.java | 13 ++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 17 +++++++ 14 files changed, 267 insertions(+), 10 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/JitIssueCfgModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitIssueCfgRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitLockCacheRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitOrderCacheRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 4eaace4..0d6e544 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3264,7 +3264,11 @@ public class MesEnumUtil { JIT_ORDER(50, "JIT工单"), STOCK_ORDER(60, "库存工单"), REPAIR(70, "返修插单"), - FICTIVE(80, "虚拟工单"); + EMERGENCY_ORDER(80, "紧急插单"), + FICTIVE(90, "虚拟工单"), + SPARE_PART_PRODUCTION(100, "备件生产"), + REPRODUCTION_RMS(110, "重新生产-报功"), + REPRODUCTION_NOT_RMS(120, "重新生产-不报功"); private int value; private String description; @@ -6486,18 +6490,17 @@ public class MesEnumUtil { } /** - * 客户JIT预装队列 工单类型 + * 客户JIT队列下达配置 缓存类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum QUEUE_JIT_PLAN_WORK_ORDER_TYPE { - SPARE_PART_PRODUCTION(10, "备件生产"), - REPRODUCTION_RMS(20, "重新生产-报功"), - REPRODUCTION_NOT_RMS(30, "重新生产-不报功"); + public enum JIT_ISSUE_CFG_TYPE { + ORDER_CACHE(10, "订单池"), + LOCK_CACHE(20, "锁定池"); private Integer value; private String description; - QUEUE_JIT_PLAN_WORK_ORDER_TYPE(Integer value, String description) { + JIT_ISSUE_CFG_TYPE(Integer value, String description) { this.value = value; this.description = description; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 358e5d0..2e23a27 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -1787,7 +1787,8 @@ public class MesPcnEnumUtil { PAUSE(40, "暂停"), CANCEL(50, "取消"), CLOSE(60, "关闭"), - COMPLETE(70, "完成"); + COMPLETE(70, "完成"), + FICTIVE(80, "虚拟工单"); private int value; private String description; @@ -1829,7 +1830,11 @@ public class MesPcnEnumUtil { JIT_ORDER(50, "JIT工单"), STOCK_ORDER(60, "库存工单"), REPAIR(70, "返修插单"), - EMERGENCY_ORDER(80, "紧急插单"); + EMERGENCY_ORDER(80, "紧急插单"), + FICTIVE(90, "虚拟工单"), + SPARE_PART_PRODUCTION(100, "备件生产"), + REPRODUCTION_RMS(110, "重新生产-报功"), + REPRODUCTION_NOT_RMS(120, "重新生产-不报功"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java new file mode 100644 index 0000000..1e6d5ad --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java @@ -0,0 +1,48 @@ +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; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/3 5:06 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_JIT_ISSUE_CFG") +@Api("MES_客户JIT队列下达配置") +public class MesJitIssueCfg extends BaseBean implements Serializable { + + private static final long serialVersionUID = 1475207048628221791L; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户工厂代码") + private String custPlantCode; + + @Column(name = "QTY") + @ApiParam("数量") + private Integer qty; + + @Column(name = "THRESHOLD_QTY") + @ApiParam("触发阈值") + private Integer thresholdQty; + + @Column(name = "CFG_TYPE") + @ApiParam("缓存类型") + private Integer cfgType; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.java new file mode 100644 index 0000000..5f98f5e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitLockCache.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; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/3 5:14 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_JIT_LOCK_CACHE") +@Api("MES_JIT队列锁定池") +public class MesJitLockCache extends BaseBean implements Serializable { + + private static final long serialVersionUID = -308930683558229105L; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户工厂代码") + private String custPlantCode; + + @Column(name = "JIT_ACTUAL_NO") + @ApiParam("队列编号") + private String jitActualNo; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "WO_TYPE") + @ApiParam("工单类型") + private Integer woType; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java new file mode 100644 index 0000000..9098643 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java @@ -0,0 +1,51 @@ +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; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/3 5:11 下午 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_JIT_ORDER_CACHE") +@Api("MES_JIT队列订单池") +public class MesJitOrderCache extends BaseBean implements Serializable { + private static final long serialVersionUID = -613326904053045367L; + + @Column(name = "CUST_PLANT_CODE") + @ApiParam("客户工厂代码") + private String custPlantCode; + + @Column(name = "JIT_ACTUAL_NO") + @ApiParam("队列编号") + private String jitActualNo; + + @Column(name = "VIN_CODE") + @ApiParam("vin") + private String vinCode; + + @Column(name = "WO_TYPE") + @ApiParam("工单类型") + private Integer woType; + + @Column(name = "STATUS") + @ApiParam("状态") + private Integer status; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 9cccc86..127afc1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; import java.io.Serializable; import java.util.List; +import java.util.Map; /** * @Description: @@ -281,6 +282,8 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("零件名称集合") private String partNameList; + private Map extendMap; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/JitIssueCfgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/JitIssueCfgModel.java new file mode 100644 index 0000000..fe57be1 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/JitIssueCfgModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/4 10:26 上午 + * @Modify: + */ +@Data +public class JitIssueCfgModel { + + @ApiParam("客户工厂代码") + private String custPlantCode; + + @ApiParam("数量") + private Integer qty; + + @ApiParam("触发阈值") + private Integer thresholdQty; + + @ApiParam("当前JIT缓存数") + private Integer currentJitCacheNum; + + @ApiParam("其他工单数") + private Integer otherWorkNum; + + @ApiParam("缓存类型") + private String cfgType; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java index 8dfadf4..b3e649b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java @@ -53,4 +53,7 @@ public class PaintCheckModel { @ApiParam("界面组件参数数据") List windowModuleParamList; + + private String defectType; + private String defectDesc; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java index b6c5a7f..808c05f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java @@ -61,4 +61,6 @@ public class PaintWorkOrderSnModel extends BaseBean { private String parentPartName; private List prodPackageList; + + private String partNameRdd; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index f128cd8..f271030 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -250,12 +250,14 @@ public class QueueOrderModel implements Serializable { this.produceCategoryCode = produceCategoryCode; } - public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode, String produceCategoryCode) { + // getQueueOrderBySerialNumber + public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode, String produceCategoryCode, String workType) { this.id = id; this.queueGroupNo = queueGroupNo; this.jitLotNo = jitLotNo; this.vinCode = vinCode; this.organizeCode = organizeCode; this.produceCategoryCode = produceCategoryCode; + this.workType = workType; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitIssueCfgRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitIssueCfgRepository.java new file mode 100644 index 0000000..7b01dcf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitIssueCfgRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesJitIssueCfg; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/3 5:21 下午 + * @Modify: + */ +public interface MesJitIssueCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitLockCacheRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitLockCacheRepository.java new file mode 100644 index 0000000..afc65a8 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitLockCacheRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesJitLockCache; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/3 5:23 下午 + * @Modify: + */ +public interface MesJitLockCacheRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitOrderCacheRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitOrderCacheRepository.java new file mode 100644 index 0000000..57d8fcf --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesJitOrderCacheRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesJitOrderCache; + +/** + * @Description: + * @Author: jokelin + * @Date: 2020/7/3 5:22 下午 + * @Modify: + */ +public interface MesJitOrderCacheRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 767ad06..b171b6d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3198,4 +3198,21 @@ public class MesHqlPack { } return packBean; } + + /** + * 客户JIT队列下达配置 + * @param jitIssueCfg + * @param organizeCode + * @return + */ + public static DdlPackBean getMesJitIssueCfg(MesJitIssueCfg jitIssueCfg, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(jitIssueCfg, organizeCode); + if (!StringUtils.isEmpty(jitIssueCfg.getCustPlantCode())) { + DdlPreparedPack.getStringLikerPack(jitIssueCfg.getCustPlantCode(), "custPlantCode", packBean); + } + if (jitIssueCfg.getCfgType() != null) { + DdlPreparedPack.getNumEqualPack(jitIssueCfg.getCfgType(), "cfgType", packBean); + } + return packBean; + } } From 12478a6251979138295f75aa20b8d87be9b40602 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 4 Jul 2020 12:41:40 +0800 Subject: [PATCH 25/31] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ccdb194..42e7bfb 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 @@ -125,7 +125,7 @@ public class IfQueueShipping extends BaseBean implements Serializable { private String itemUnit; @Column(name = "JIT_SEQ") - @ApiParam("jit排序号") + @ApiParam("JIT排序号") private String jitSeq; @Column(name = "JIT_TYPE_FLAG") From 7457e27180cf4ec2cf21c5dfdd0a9a87d55ab6c0 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 4 Jul 2020 14:10:57 +0800 Subject: [PATCH 26/31] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 127afc1..9a83d79 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -282,8 +282,6 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("零件名称集合") private String partNameList; - private Map extendMap; - public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From 315e3a266f4ff48fe62ded8db470d5320ce04bae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Sat, 4 Jul 2020 16:51:44 +0800 Subject: [PATCH 27/31] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B6=82=E8=A3=85?= =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java index 109521f..a7e233a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java @@ -31,6 +31,11 @@ import java.io.Serializable; @Api("工位投料信息") public class MesCellFeed extends BaseBean implements Serializable { private static final long serialVersionUID = 1947971369479107782L; + + @Column(name = "ORDER_NO") + @ApiParam("工单号") + private String orderNo; + @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; @@ -68,10 +73,6 @@ public class MesCellFeed extends BaseBean implements Serializable { private String supplierCode; @Transient - @ApiParam("工单号") - private String orderNo; - - @Transient @ApiParam(value = "原料类型名称") private String rawTypeName; From 44e3d667b355a05c1d5c6970e85263ff684c908a Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 4 Jul 2020 16:57:40 +0800 Subject: [PATCH 28/31] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=B1=A0=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 74 +++++++++++++++++++++- .../estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java | 9 +++ 2 files changed, 82 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 0d6e544..45e6034 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -6516,7 +6516,79 @@ public class MesEnumUtil { public static String valueOfDescription(Integer value) { String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].value.equals(value)) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * JIT队列订单池 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum JIT_ORDER_CACHE_STATUS { + CREATE(10, "创建"), + COMPLETE(20, "完成"), + CANCEL(20, "取消"); + + private Integer value; + private String description; + + JIT_ORDER_CACHE_STATUS(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * JIT队列锁定池 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum JIT_LOCK_CACHE_STATUS { + CREATE(10, "创建"), + RELEASE(20, "下达"), + ONLINE_COMPLETE(20, "上线完成"); + + private Integer value; + private String description; + + JIT_LOCK_CACHE_STATUS(Integer value, String description) { + this.value = value; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { tmp = values()[i].description; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java index 1e6d5ad..7bfc2e8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -45,4 +46,12 @@ public class MesJitIssueCfg extends BaseBean implements Serializable { @Column(name = "CFG_TYPE") @ApiParam("缓存类型") private Integer cfgType; + + @Transient + @ApiParam("当前JIT缓存数") + private Integer currentJitCacheNum; + + @Transient + @ApiParam("其他工单数") + private Integer otherWorkNum = 0; } From 4bb5dbfac57049a17bc225b76fd911ad4ed7f1e9 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 4 Jul 2020 20:02:14 +0800 Subject: [PATCH 29/31] Finish Task #2236 Cost:8h --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/model/JitIssueCfgModel.java | 2 +- 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 45e6034..990384d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -6531,7 +6531,7 @@ public class MesEnumUtil { public enum JIT_ORDER_CACHE_STATUS { CREATE(10, "创建"), COMPLETE(20, "完成"), - CANCEL(20, "取消"); + CANCEL(30, "取消"); private Integer value; private String description; @@ -6567,7 +6567,7 @@ public class MesEnumUtil { public enum JIT_LOCK_CACHE_STATUS { CREATE(10, "创建"), RELEASE(20, "下达"), - ONLINE_COMPLETE(20, "上线完成"); + ONLINE_COMPLETE(30, "上线完成"); private Integer value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java index 9098643..d764ed1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitOrderCache.java @@ -48,4 +48,8 @@ public class MesJitOrderCache extends BaseBean implements Serializable { @Column(name = "STATUS") @ApiParam("状态") private Integer status; + + @Column(name = "SEQ") + @ApiParam("序号") + private Integer seq; } 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 30cffcc..c0251f8 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 @@ -126,6 +126,10 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam("锁定标识") private Integer isLock; + @Column(name = "WO_TYPE") + @ApiParam("工单类型") + private Integer woType; + @Transient @ApiParam("客户需求开始时间") private String custPointStartDate; 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 9fc4b52..1d1c468 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 @@ -96,4 +96,8 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @Column(name = "ASSY_NO") @ApiParam("组件编号") private String assyNo; + + @Transient + @ApiParam("工单类型") + private Integer woType; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/JitIssueCfgModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/JitIssueCfgModel.java index fe57be1..0bc1fbd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/JitIssueCfgModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/JitIssueCfgModel.java @@ -25,7 +25,7 @@ public class JitIssueCfgModel { private Integer currentJitCacheNum; @ApiParam("其他工单数") - private Integer otherWorkNum; + private Integer otherWorkNum = 0; @ApiParam("缓存类型") private String cfgType; From 46261119d950f370a1c467ad1c9cae6ea5b90c81 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sun, 5 Jul 2020 01:15:26 +0800 Subject: [PATCH 30/31] mes --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java | 8 ++++++++ .../cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java | 3 --- .../i3plus/pojo/mes/model/InjectionProductionControlModel.java | 8 +++++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java index bb4cb77..8263d3e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java @@ -65,6 +65,14 @@ public class MesScrapRecord extends BaseBean implements Serializable { @ApiParam("工位") private String workCellCode; + @Column(name = "WORK_ORDER_NO") + @ApiParam("工单编号") + private String workOrderNo; + + @Column(name = "QTY") + @ApiParam("数量") + private Double qty; + @Column(name = "MEMO") @ApiParam("备注") private String memo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java index 979d50d..93e598e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ButtonComponentReqModel.java @@ -55,7 +55,4 @@ public class ButtonComponentReqModel { @ApiParam("用户信息") private String userInfo; - @ApiParam("json数据") - private String data; - } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java index 5c9d2e3..589d191 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java @@ -21,12 +21,15 @@ public class InjectionProductionControlModel { @ApiParam("当前合格数量") private String standardQtyCur; - @ApiParam("当前合格数量") + @ApiParam("总完成数量") private String completeQty; @ApiParam("总不合格数量") private String scrapQty; + @ApiParam("已打包数量") + private String packageQty; + @ApiParam("包装编号") private String packageNo; @@ -39,4 +42,7 @@ public class InjectionProductionControlModel { @ApiParam("箱条码状态") private String printStatusName; + @ApiParam("序号") + private Integer index; + } From 9b56c6d9bf4af51f13ebdf7e9a8bfb0fb19c4652 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 6 Jul 2020 09:23:47 +0800 Subject: [PATCH 31/31] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A12223=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonAlarmType.java | 4 +++ .../i3plus/pojo/andon/bean/AndonAreaAlarmType.java | 41 ++++++++++++++++++++++ .../repository/IAndonAreaAlarmTypeRepository.java | 16 +++++++++ .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 7 ++++ .../mes/model/InjectionProductionControlModel.java | 3 ++ 5 files changed, 71 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAreaAlarmTypeRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java index 83b067d..493a665 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAlarmType.java @@ -59,4 +59,8 @@ public class AndonAlarmType extends BaseBean implements Serializable { @ApiParam("安灯类型名称") private String description; + @Transient + @ApiParam("工作中心") + private String workCenterCode; + } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java new file mode 100644 index 0000000..84b7e5d --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonAreaAlarmType.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.andon.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 wangjie + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "ANDON_AREA_ALARM_TYPE") +@EqualsAndHashCode(callSuper = true) +@Api("区域安灯类型") +public class AndonAreaAlarmType extends BaseBean implements Serializable { + + private static final long serialVersionUID = -6551224785612729594L; + + @Column(name = "AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name = "ALARM_CODE") + @ApiParam("安灯类型代码") + private String alarmCode; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAreaAlarmTypeRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAreaAlarmTypeRepository.java new file mode 100644 index 0000000..60f6452 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAreaAlarmTypeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonAreaAlarmType; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-05-30 11:05 + * @Modify: + **/ +@Repository +public interface IAndonAreaAlarmTypeRepository extends BaseRepository { +} 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 b56e7c1..2ee4cc2 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 @@ -1090,4 +1090,11 @@ public class AndonHqlPack { DdlPreparedPack.getNumEqualPack(routeStatusErrorRecord.getHandleStatus(), "handleStatus", packBean); return packBean; } + + public static DdlPackBean getAndonAreaAlarmType(AndonAreaAlarmType areaAlarmType, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(areaAlarmType, organizeCode); + DdlPreparedPack.getStringLikerPack(areaAlarmType.getAreaCode(), "areaCode", packBean); + DdlPreparedPack.getStringLikerPack(areaAlarmType.getAlarmCode(), "alarmCode", packBean); + return packBean; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java index 589d191..0b33b5d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionProductionControlModel.java @@ -30,6 +30,9 @@ public class InjectionProductionControlModel { @ApiParam("已打包数量") private String packageQty; + @ApiParam("未打包数量") + private String unPackageQty; + @ApiParam("包装编号") private String packageNo;