From 4a78dfa4932bd4ac078f0947355a054eceb8a5bc Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 24 Sep 2019 11:18:05 +0800 Subject: [PATCH 01/19] add integration to aps --- .../cn/estsh/i3plus/pojo/aps/common/BeanInfo.java | 271 +++++++++++++++++ .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 241 ++++++++++++++++ .../i3plus/pojo/aps/common/BeanRelationUtil.java | 320 +++++++++++++++++++++ .../i3plus/pojo/aps/common/RELATION_TYPE.java | 9 + .../estsh/i3plus/pojo/aps/common/RelationInfo.java | 12 + 5 files changed, 853 insertions(+) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/RELATION_TYPE.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/RelationInfo.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java new file mode 100644 index 0000000..9a60943 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java @@ -0,0 +1,271 @@ +package cn.estsh.i3plus.pojo.aps.common; + +import cn.estsh.i3plus.pojo.aps.bean.DateDuration; +import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; + +import java.util.*; + +public class BeanInfo { + private Class cls; + private BeanInfo superBeanInfo; + private List childsBeanInfos = new ArrayList<>(); + private Map, RelationInfo> relations = new HashMap<>(); + + public BeanInfo(Class cls) { + this.cls = cls; + } + + public void initHolder(Class>> holderCls) { + Enum>[] ens = holderCls.getEnumConstants(); + for (Enum> en : ens) { + RelationInfo info = new RelationInfo(); + info.setHolder(en); + info.setBeanInfo(this); + relations.put(en, info); + } + } + + public BeanInfo getSuperBeanInfo() { return superBeanInfo; } + + public boolean validHolder(Enum holder) { + return this.relations.get(holder) != null; + } + + public Enum getHolder(String name) { + for (Enum holder : relations.keySet()) { + if (holder.name().equalsIgnoreCase(name)) { + return holder; + } + } + if (superBeanInfo != null) { + return superBeanInfo.getHolder(name); + } + + return null; + } + + public Enum getReverseHolder(Enum holder) { + RelationInfo relaInfo = getRelationInfo(holder); + if (relaInfo != null) { + return relaInfo.getReverseHolder(); + } + return null; + } + + public Enum getReverseHolder(String name) { + RelationInfo relaInfo = getRelationInfo(name); + if (relaInfo != null) { + return relaInfo.getReverseHolder(); + } + return null; + } + + public RelationInfo getRelationInfo(Enum holder) { + if (validHolder(holder)) { + return relations.get(holder); + } + if (superBeanInfo != null) { + return superBeanInfo.getRelationInfo(holder); + } + return null; + } + + public RelationInfo getRelationInfo(String name) { + Enum holder = getHolder(name); + if (holder != null) { + return getRelationInfo(holder); + } + return null; + } + + public void addRelationInfo(Enum holder, RelationInfo info) { + this.relations.put(holder, info); + } + + public Class getBeanClass() { + return (Class)cls; + } + + public BeanInfo getRelationBeanInfo(Enum holder) { + RelationInfo relaInfo = getRelationInfo(holder); + if (relaInfo != null) { + return relaInfo.getBeanInfo(); + } + return null; + } + + public BeanInfo getRelationBeanInfo(String name) { + RelationInfo relaInfo = getRelationInfo(name); + if (relaInfo != null) { + return relaInfo.getBeanInfo(); + } + + return null; + } + + public RELATION_TYPE getRelationType(Enum holder) { + RelationInfo relaInfo = getRelationInfo(holder); + if (relaInfo != null) { + return relaInfo.getType(); + } + return RELATION_TYPE.INVALID; + } + + public RELATION_TYPE getRelationType(String name) { + RelationInfo relaInfo = getRelationInfo(name); + if (relaInfo != null) { + return relaInfo.getType(); + } + + return RELATION_TYPE.INVALID; + } + + public List> getAllHolders() { + List> holders = new ArrayList<>(); + for (Map.Entry, RelationInfo> entry : relations.entrySet()) { + holders.add(entry.getKey()); + } + return holders; + } + + public List> getOwnerHolders() { + List> owners = new ArrayList<>(); + for (Map.Entry, RelationInfo> entry : relations.entrySet()) { + if (entry.getValue().isOwner()) { + owners.add(entry.getKey()); + } + } + return owners; + } + + public List> getNormalSigns() { + List> holders = new ArrayList<>(); + for (Map.Entry, RelationInfo> entry : relations.entrySet()) { + if (!entry.getValue().isOwner()) { + holders.add(entry.getKey()); + } + } + return holders; + } + + private static Map, BeanInfo> beanInfos = new HashMap<>(); + private static Map nameMapBeanInfos = new HashMap<>(); + + static { + BeanInfo beanInfo = new BeanInfo(BaseBean.class); + beanInfos.put(BaseBean.class, beanInfo); + nameMapBeanInfos.put(BaseBean.class.getSimpleName(), beanInfo); + } + + public static void register(Class cls) { + if (beanInfos.containsKey(cls)) { + return; + } + BeanInfo beanInfo = new BeanInfo(cls); + beanInfos.put(cls, beanInfo); + nameMapBeanInfos.put(cls.getSimpleName(), beanInfo); + register((Class)cls.getSuperclass()); + } + + public static void init() { + for (Map.Entry, BeanInfo> entry : beanInfos.entrySet()) { + Class superClass = (Class)entry.getKey().getSuperclass(); + BeanInfo superBeanInfo = beanInfos.get(superClass); + if (superBeanInfo != null) { + entry.getValue().superBeanInfo = superBeanInfo; + superBeanInfo.childsBeanInfos.add(entry.getValue()); + } + } + + BeanRelationUtil.initData("cn.estsh.i3plus.pojo.aps.holders"); + BeanRelationUtil.loadConfig("relations"); + } + + public static Set> getBeanClasses() { + return beanInfos.keySet(); + } + + public static BeanInfo getBeanInfo(Class cls) { + BeanInfo info = beanInfos.get(cls); + return info; + } + + public static BeanInfo getBeanInfo(String name) { + BeanInfo info = nameMapBeanInfos.get(name); + return info; + } + + public static Class getSuperClass(Class cls) { + BeanInfo superBeanInfo = getBeanInfo(cls).superBeanInfo; + if (superBeanInfo != null) { + return superBeanInfo.getBeanClass(); + } + return null; + } + + public static FIELD_TYPE getFieldType(Class cls) { + FIELD_TYPE type = null; + if (cls == Boolean.class || cls == boolean.class) { + type = FIELD_TYPE.BOOLEAN; + } else if (cls == Character.class) { + type = FIELD_TYPE.CHAR; + } else if (cls == Short.class || cls == short.class) { + type = FIELD_TYPE.SHORT; + } else if (cls == Integer.class || cls == int.class) { + type = FIELD_TYPE.INTEGER; + } else if (cls == Long.class || cls == long.class) { + type = FIELD_TYPE.LONG; + } else if (cls == Double.class || cls == Float.class || + cls == double.class || cls == float.class) { + type = FIELD_TYPE.DOUBLE; + } else if (cls == String.class) { + type = FIELD_TYPE.STRING; + } else if(cls == Date.class || cls == java.sql.Date.class) { + type = FIELD_TYPE.DATE_TIME; + } else if (cls == DateDuration.class) { + type = FIELD_TYPE.DURATION; + } else if (Enum.class.isAssignableFrom(cls)) { + type = FIELD_TYPE.ENUM; + } else if (BaseBean.class.isAssignableFrom(cls)) { + type = FIELD_TYPE.OBJECT; + } + return type; + } + + public static Class getFieldClass(FIELD_TYPE type) { + Class cls = null; + switch (type) { + case BOOLEAN: + cls = Boolean.class; + break; + case CHAR: + cls = Character.class; + break; + case SHORT: + cls = Short.class; + break; + case INTEGER: + cls = Integer.class; + break; + case LONG: + cls = Long.class; + break; + case DOUBLE: + cls = Double.class; + break; + case DATE: + case TIME: + case DATE_TIME: + cls = Date.class; + break; + case STRING: + cls = String.class; + break; + default: + break; + } + + return cls; + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java new file mode 100644 index 0000000..915391e --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -0,0 +1,241 @@ +package cn.estsh.i3plus.pojo.aps.common; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Predicate; + +public class BeanRelation { + Map, Map, List>>> caches = new HashMap<>(); + + private static Map relations = new ConcurrentHashMap<>(); + private static BeanRelation get() { + Long userId = 0l; + BeanRelation relation = relations.get(userId); + if (relation == null) { + synchronized (BeanRelation.class) { + relation = relations.get(userId); + if (relation == null) { + relation = new BeanRelation(); + relations.put(userId, relation); + } + } + } + + return relation; + } + + private static Map, List> createRelation(Class cls) { + return null; + } + + public static Map, List> get(BaseBean bean) { + Map, List> temp = get().caches.get(bean.getClass()).get(bean.getId()); + if (temp == null) { + synchronized (bean.getClass()) { + if (temp == null) { + temp = createRelation(bean.getClass()); + get().caches.get(bean.getClass()).put(bean.getId(), temp); + } + } + } + return temp; + } + + public static void init() { + + } + + public static T get(BaseBean bean, Enum holder) { + List beans = (List)get(bean).get(holder); + if (beans == null || beans.isEmpty()) { + return null; + } + return beans.get(0); + } + + public static T get(BaseBean bean, Enum holder, Enum... args) { + return get(bean, null, holder, args); + } + + public static T get(BaseBean bean, Predicate pred, Enum holder, Enum... args) { + return null; + } + + private static T getImpl(BaseBean bean, Predicate pred, Enum[] args, int index) { + if (index >= args.length) { + if (pred == null || pred.test((T)bean)) { + return (T)bean; + } + } else { + //List relaBeans = + } + + return null; + } + + public static List list(BaseBean bean, Enum holder) { + List beans = (List)get(bean).get(holder); + if (beans == null) { + return new ArrayList<>(); + } + return beans; + } + + public static List list(BaseBean bean, Enum holder, Enum... args) { + return list(bean, null, holder, args); + } + + public static List list(BaseBean bean, Predicate pred, Enum holder, Enum... args) { + List result = new ArrayList<>(); + List nextBeans = list(bean, holder); + for (BaseBean nextBean : nextBeans) { + listImpl(result, nextBean, pred, args, 0); + } + + return result; + } + + private static void listImpl(List result, BaseBean bean, Predicate pred, Enum[] holders, int index) { + if (index >= holders.length) { + if (pred == null || pred.test((T)bean)) { + result.add((T)bean); + } + } else { + List nextBeans = list(bean, holders[index]); + for (BaseBean nextBean : nextBeans) { + listImpl(result, nextBean, pred, holders, index + 1); + } + } + } + + /** + * 设值两个对象之间的关联 + * + * @param bean + * @param holder + * @param relaBean + */ + public static void set(BaseBean bean, Enum holder, BaseBean relaBean) { + if (bean == null) { + return; + } + if (relaBean == null) { + remove(bean, holder); + } else { + BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass()); + final Enum reverseHolder = beanInfo.getReverseHolder(holder); + switch (beanInfo.getRelationType(holder)) { + case MULTI_TO_MULTI: + break; + case MULTI_TO_ONE: + remove(bean, holder); + break; + case INVALID: + break; + case ONE_TO_MULTI: + remove(relaBean, reverseHolder); + break; + case ONE_TO_ONE: + remove(bean, holder); + remove(relaBean, reverseHolder); + break; + default: + break; + } + + setImpl(bean, holder, relaBean, reverseHolder); + } + } + + /** + * 建立对象之间双向引用实现 + * + * @param bean + * @param holder + * @param relaBean + * @param reverseHolder + */ + private static void setImpl(BaseBean bean, Enum holder, BaseBean relaBean, Enum reverseHolder) { + get(bean).get(holder).add(relaBean); + if (reverseHolder != null) { + get(relaBean).get(reverseHolder).add(bean); + } + } + + /** + * 移除关联 + * + * @param bean + * @param holder + */ + private static void remove(BaseBean bean, Enum holder) { + if (holder == null) { + return; + } + BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass()); + final Enum reverseHolder = beanInfo.getReverseHolder(holder); + if (reverseHolder != null) { + for (BaseBean relaBean : get(bean).get(holder)) { + if (relaBean == null) { + continue; + } + get(relaBean).get(reverseHolder).remove(bean); + } + } + get(bean).get(holder).clear(); + } + + /** + * 移除关联的指定对象 + * + * @param bean + * @param holder + * @param relaBean + */ + private static void remove(BaseBean bean, Enum holder, BaseBean relaBean) { + if (bean == null) { + return; + } + BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass()); + final Enum reverseHolder = beanInfo.getReverseHolder(holder); + if (reverseHolder != null) { + get(relaBean).get(reverseHolder).remove(bean); + } + get(bean).get(holder).remove(relaBean); + } + + /** + * 删除对象 + * + * @param bean + */ + public static void delete(BaseBean bean) { + if (bean == null) { + return; + } + BeanInfo beanInfo = BeanInfo.getBeanInfo(bean.getClass()); + List> ownerSigns = beanInfo.getOwnerHolders(); + for (Enum holder : ownerSigns) { + List relaBeans = new ArrayList<>(list(bean, holder)); + for (BaseBean relaBean : relaBeans) { + //MemoryManager.delete(relaBean); + } + } + + List> normalSigns = beanInfo.getNormalSigns(); + for (Enum holder : normalSigns) { + Enum reverseHolder = beanInfo.getReverseHolder(holder); + List relaBeans = new ArrayList<>(list(bean, holder)); + for (BaseBean relaBean : relaBeans) { + if (reverseHolder != null) { + remove(relaBean, reverseHolder, bean); + } + } + } + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java new file mode 100644 index 0000000..e2dba7e --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java @@ -0,0 +1,320 @@ +package cn.estsh.i3plus.pojo.aps.common; + +import org.xml.sax.Attributes; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.DefaultHandler; + +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; +import java.io.File; +import java.io.FileFilter; +import java.io.IOException; +import java.io.InputStream; +import java.net.JarURLConnection; +import java.net.URL; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.List; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; + +public class BeanRelationUtil { + + static class XMLReader extends DefaultHandler { + private BeanInfo firstInfo = null; + private Enum firstHolder = null; + private BeanInfo secondInfo = null; + private Enum secondHolder = null; + private RELATION_TYPE type = RELATION_TYPE.INVALID; + private boolean owner = false; + public void startElement(String uri, String localName, String nodeName, Attributes attributes) throws SAXException { + if (nodeName.equalsIgnoreCase("Class")) { + final String name = attributes.getValue("name"); + if (name == null) { + throw new SAXException("Class节点的属性name未配置"); + } + + this.firstInfo = BeanInfo.getBeanInfo(name); + if (this.firstInfo == null) { + throw new SAXException("未找到" + name + "的类定义"); + } + } else if (nodeName.equalsIgnoreCase("Relation")) { + if (this.firstInfo == null) { + throw new SAXException("未配置Class节点"); + } + + String firstSignName = attributes.getValue("field"); + if (firstSignName == null) { + throw new SAXException("Relation节点缺少field属性"); + } + this.firstHolder = this.firstInfo.getHolder(firstSignName); + if (this.firstHolder == null) { + throw new SAXException("未定义枚举标识" + firstSignName); + } + + String secondFactoryName = attributes.getValue("name"); + if (secondFactoryName == null) { + throw new SAXException("Relation节点缺少name属性"); + } + this.secondInfo = BeanInfo.getBeanInfo(secondFactoryName); + if (this.secondInfo == null) { + throw new SAXException("未找到" + secondFactoryName + "的类定义"); + } + + String secondSignName = attributes.getValue("reverse"); + if (secondSignName != null) { + this.secondHolder = this.secondInfo.getHolder(secondSignName); + if (this.secondHolder == null) { + throw new SAXException(secondFactoryName + "类未定义枚举标识" + secondSignName); + } + } else { + this.secondHolder = null; + } + + String typeName = attributes.getValue("type"); + if (typeName == null) { + throw new SAXException("Relation节点缺少type属性"); + } + this.type = RELATION_TYPE.valueOf(typeName); + + String ownerName = attributes.getValue("owner"); + if (ownerName == null) { + this.owner = false; + } else { + this.owner = ownerName.equalsIgnoreCase("true") ? true : false; + } + + RelationInfo firstData = this.getSignData(firstInfo, this.firstHolder); + firstData.setBeanInfo(this.secondInfo); + firstData.setType(this.type); + firstData.setOwner(this.owner); + firstData.setReverseHolder(this.secondHolder); + + if (this.secondHolder != null) { + RelationInfo secondData = this.getSignData(secondInfo, this.secondHolder); + secondData.setBeanInfo(this.firstInfo); + secondData.setOwner(false); + secondData.setReverseHolder(this.firstHolder); + switch (this.type) { + case MULTI_TO_MULTI: + secondData.setType(RELATION_TYPE.MULTI_TO_MULTI); + break; + case MULTI_TO_ONE: + secondData.setType(RELATION_TYPE.ONE_TO_MULTI); + break; + case INVALID: + secondData.setType(RELATION_TYPE.INVALID); + break; + case ONE_TO_MULTI: + secondData.setType(RELATION_TYPE.MULTI_TO_ONE); + break; + case ONE_TO_ONE: + secondData.setType(RELATION_TYPE.ONE_TO_ONE); + break; + default: + secondData.setType(RELATION_TYPE.INVALID); + break; + } + } + } + } + + RelationInfo getSignData(BeanInfo beanInfo, Enum holder) { + RelationInfo data = beanInfo.getRelationInfo(holder); + if (data == null) { + data = new RelationInfo(); + data.setHolder(holder); + beanInfo.addRelationInfo(holder, data); + } + + return data; + } + } + + public static void initData(String holderPackage) { + List> holderClses = loadClass(holderPackage); + for (Class enumCls : holderClses) { + if (!Enum.class.isAssignableFrom(enumCls)) { + continue; + } + String name = enumCls.getSimpleName(); + BeanInfo beanInfo = BeanInfo.getBeanInfo(name.substring(1)); + if (beanInfo == null) { + continue; + } + beanInfo.initHolder((Class>>) enumCls); + } + } + + public static void loadConfig(String packName) { + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + final String strFile = packName.replaceAll("\\.", "/"); + try { + Enumeration urls = loader.getResources(strFile); + while (urls.hasMoreElements()) { + URL url = urls.nextElement(); + if (url != null) { + String protocol = url.getProtocol(); + String filePath = url.getPath(); + if (protocol.equals("file")) { + loadFileImpl(filePath); + } else if (protocol.equals("jar")) { + loadJarImpl(packName, url); + } + } + } + } catch (IOException e) { + return; + } + } + + private static void loadFileImpl(String dirPath) { + File dir = new File(dirPath); + if (!dir.exists() || !dir.isDirectory()) { + return; + } + + File[] dirFiles = dir.listFiles(new FileFilter() { + + @Override + public boolean accept(File file) { + return file.isDirectory() || file.getName().endsWith(".xml"); + } + }); + + for (File file : dirFiles) { + if (file.isDirectory()) { + loadFileImpl(dirPath + "/" + file.getName()); + } else { + try { + loadXMLConfigure(file.getCanonicalPath()); + } catch (IOException e) { + } + } + } + } + + private static void loadJarImpl(String packName, URL url) throws IOException { + JarURLConnection jarURLConnection = (JarURLConnection) url.openConnection(); + JarFile jarFile = jarURLConnection.getJarFile(); + Enumeration jarEntries = jarFile.entries(); + while (jarEntries.hasMoreElements()) { + JarEntry jarEntry = jarEntries.nextElement(); + String jarEntryName = jarEntry.getName(); + if (jarEntryName.endsWith(".xml")) { + String packNameNew = packName.replace(".", "/"); + if (jarEntryName.contains(packNameNew)) { + InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(jarEntryName); + loadXMLConfigure(is); + } + } + } + } + + /** + * 加载本地开发环境中的xml配置文件。 + * @param xmlPath + */ + private static void loadXMLConfigure(String xmlPath) { + SAXParserFactory sf = SAXParserFactory.newInstance(); + try { + SAXParser sp = sf.newSAXParser(); + sp.parse(new InputSource(xmlPath), new XMLReader()); + } catch (ParserConfigurationException | SAXException | IOException e) { + } + } + + /** + * 加载jar中的xml配置文件。 + * @param is + */ + private static void loadXMLConfigure(InputStream is) { + SAXParserFactory sf = SAXParserFactory.newInstance(); + try { + SAXParser sp = sf.newSAXParser(); + sp.parse(new InputSource(is), new XMLReader()); + } catch (ParserConfigurationException | SAXException | IOException e) { + } + } + + /** + * 将指定包下的类加载到内存中 + * @param packName + */ + private static List> loadClass(String packName) { + List> clses = new ArrayList<>(); + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + String strFile = packName.replaceAll("\\.", "/"); + try { + Enumeration urls = loader.getResources(strFile); + while (urls.hasMoreElements()) { + URL url = urls.nextElement(); + if (url != null) { + String protocol = url.getProtocol(); + String filePath = url.getPath(); + if (protocol.equals("file")) { + loadClassImpl(packName, filePath, clses); + } else if (protocol.equals("jar")) { + loadJarImpl(packName, url, clses); + } + } + } + } catch (IOException e) { + e.printStackTrace(); + } + + return clses; + } + + private static void loadClassImpl(String packName, String dirPath, List> clses) { + File dir = new File(dirPath); + if (!dir.exists() || !dir.isDirectory()) { + return; + } + + File[] dirFiles = dir.listFiles(new FileFilter() { + + @Override + public boolean accept(File file) { + return file.isDirectory() || file.getName().endsWith(".class"); + } + }); + + for (File file : dirFiles) { + if (file.isDirectory()) { + loadClassImpl(packName + "." + file.getName(), dirPath + "/" + file.getName(), clses); + } else { + String clsName = file.getName(); + clsName = clsName.substring(0, clsName.length() - 6); + try { + clses.add(Class.forName(packName + "." + clsName)); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + } + } + } + + private static void loadJarImpl(String packName, URL url, List> clses) throws IOException { + JarURLConnection jarURLConnection = (JarURLConnection) url.openConnection(); + JarFile jarFile = jarURLConnection.getJarFile(); + Enumeration jarEntries = jarFile.entries(); + while (jarEntries.hasMoreElements()) { + JarEntry jarEntry = jarEntries.nextElement(); + final String jarEntryName = jarEntry.getName(); + if (jarEntryName.endsWith(".class")) { + String clsName = jarEntryName.replace("/", "."); + if (clsName.startsWith(packName)) { + clsName = clsName.substring(0, clsName.length() - 6); + try { + clses.add(Class.forName(clsName)); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + } + } + } + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/RELATION_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/RELATION_TYPE.java new file mode 100644 index 0000000..9b5296e --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/RELATION_TYPE.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.common; + +public enum RELATION_TYPE { + INVALID, // 无效关联 + ONE_TO_ONE, // 1对1关系 + ONE_TO_MULTI, // 1对多关系 + MULTI_TO_ONE, // 多对1关系 + MULTI_TO_MULTI,// 多对多关系 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/RelationInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/RelationInfo.java new file mode 100644 index 0000000..503afb4 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/RelationInfo.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.aps.common; + +import lombok.Data; + +@Data +public class RelationInfo { + private BeanInfo beanInfo; + private Enum holder; + private Enum reverseHolder; + private RELATION_TYPE type; + private boolean owner; +} From e5a20d47339d5dca7c4cb971f39c360b389e5d9b Mon Sep 17 00:00:00 2001 From: wangjie Date: Tue, 24 Sep 2019 13:17:45 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) 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 7fc2765..9b9d0e1 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 @@ -1230,4 +1230,25 @@ public class MesHqlPack { packBean.setOrderByStr(buttonStatus.orderBy()); return packBean; } + + /** + * 工单审批查询 + * @param mesWorkOrder + * @param organizeCode + * @return + */ + public static DdlPackBean getApprovalData(MesWorkOrder mesWorkOrder, String organizeCode) { + DdlPackBean packBean = MesHqlPack.getAllBaseData(organizeCode); + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean); + if (!org.springframework.util.StringUtils.isEmpty(mesWorkOrder.getOrderNo())) { + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); + } + if (!org.springframework.util.StringUtils.isEmpty(mesWorkOrder.getPartNo())) { + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPartNo(), "partNo", packBean); + } + DdlPreparedPack.getNumEqualPack(MesEnumUtil.WORK_ORDER_APPROVAL_STATUS.WAIT_APPROVAL.getValue(), "approvalStatus", packBean); + DdlPreparedPack.getNumEqualPack(MesEnumUtil.WORK_ORDER_STATUS.CREATE.getValue(), "workOrderStatus", packBean); + DdlPreparedPack.getOrderByPack(new String[]{String.valueOf(CommonEnumUtil.ASC_OR_DESC.ASC.getValue())}, new String[]{"startTime", "shiftCode"}, packBean); + return packBean; + } } From 704d4f209878e2c14d2132b64191c5d9accd8818 Mon Sep 17 00:00:00 2001 From: wangjie Date: Tue, 24 Sep 2019 18:51:56 +0800 Subject: [PATCH 03/19] =?UTF-8?q?mes=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 1 + 1 file changed, 1 insertion(+) 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 9b9d0e1..f9279e6 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 @@ -74,6 +74,7 @@ public class MesHqlPack { if (StringUtils.isNotEmpty(mesPlanOrder.getStatus() + "") && mesPlanOrder.getStatusVal() != 0) { DdlPreparedPack.getNumEqualPack(mesPlanOrder.getStatus(), "status", packBean); } + if (StringUtils.isNotEmpty(mesPlanOrder.getCreateUser())) { DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCreateUser(), "createUser", packBean); } From 750a216fd27f5e443ba7406c5b3a64c6aafca980 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 24 Sep 2019 21:26:05 +0800 Subject: [PATCH 04/19] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=92=8C=E6=BA=90=E5=AD=98=E5=82=A8=E5=8C=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=88=E7=9B=98=E7=82=B9=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java index dad2ec7..57f0870 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.model.wms; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; import java.io.Serializable; /** @@ -27,7 +26,6 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam("作业类型名称") public String opTypeName; - @Column(name = "TRANS_TYPE_CODE") @ApiParam(value = "交易类型代码") private String transTypeCode; @@ -37,30 +35,33 @@ public class WmsTaskInfoModel implements Serializable { @ApiParam(value = "关联单据业务类型") private String busiTypeDesc; - @Column(name = "ZDATE") @ApiParam(value = "计划日期") private String zdate; - @Column(name = "ZTIME") @ApiParam(value = "计划时间") private String ztime; - @Column(name = "CUST_NO") @ApiParam(value = "客户编号") private String custNo; - @Column(name = "VENDOR_NO") @ApiParam(value = "供应商编号") private String vendorNo; @ApiParam(value = "样式") private WmsMessageStyleModel wmsMessageStyleModel; + @ApiParam(value = "源存储区代码") + private String srcZoneNo; + + @ApiParam(value = "创建日期") + public String createDatetime; + public WmsTaskInfoModel() { } public WmsTaskInfoModel(String orderNo, Integer taskStatus, String opTypeName, String transTypeCode, String refSrc, - String busiTypeDesc, String zdate, String ztime, String custNo, String vendorNo) { + String busiTypeDesc, String zdate, String ztime, String custNo, String vendorNo, + String createDatetime, String srcZoneNo) { this.orderNo = orderNo; this.taskStatus = taskStatus; this.opTypeName = opTypeName; @@ -71,5 +72,7 @@ public class WmsTaskInfoModel implements Serializable { this.ztime = ztime; this.custNo = custNo; this.vendorNo = vendorNo; + this.createDatetime = createDatetime; + this.srcZoneNo = srcZoneNo; } } From 31b32be60d186e77f362e52bfc7003f4b5d49989 Mon Sep 17 00:00:00 2001 From: lbwgithub <你的邮箱1002117856@qq.com> Date: Wed, 25 Sep 2019 10:03:27 +0800 Subject: [PATCH 05/19] =?UTF-8?q?=E9=A2=9C=E8=89=B2=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java index 4847751..1911b04 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.ApiParam; +import io.swagger.models.auth.In; import lombok.Data; import java.io.Serializable; @@ -20,7 +21,8 @@ public class WmsMessageStyleModel implements Serializable { public Integer taskStatus; @ApiParam("单据明细状态") public Integer odStatus; - + @ApiParam("扫码明细状态") + public Integer wsStatus; @ApiParam("消息") public String message; @@ -37,7 +39,15 @@ public class WmsMessageStyleModel implements Serializable { public WmsMessageStyleModel() { } - + public WmsMessageStyleModel(String message, Integer selectQty) { + this.message = message; + if(selectQty==1){ + this.wsStatus=10; + } + if(selectQty==2){ + this.wsStatus=20; + } + } public WmsMessageStyleModel(String message) { this.message = message; } From 7c472b386a26f3a69c75f8c38a3a7bc64b708a71 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Wed, 25 Sep 2019 14:18:48 +0800 Subject: [PATCH 06/19] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 45 ++++++ .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 153 +++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesDB.java | 62 +++++++++ .../i3plus/pojo/mes/pcn/bean/MesDataObject.java | 42 ++++++ .../i3plus/pojo/mes/pcn/bean/MesObjectCfg.java | 55 ++++++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java | 54 ++++++++ .../i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java | 78 +++++++++++ .../i3plus/pojo/mes/pcn/bean/MesWcEquipment.java | 41 ++++++ .../i3plus/pojo/mes/pcn/bean/MesWorkCenter.java | 5 + .../i3plus/pojo/mes/pcn/model/ProcessBomModel.java | 29 ++++ .../i3plus/pojo/mes/pcn/model/WcCheckModel.java | 89 ++++++++++++ .../pcn/repository/MesWcCheckRecordRepository.java | 13 ++ .../mes/pcn/repository/MesWcCheckRepository.java | 13 ++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesDB.java | 62 +++++++++ .../estsh/i3plus/pojo/mes/bean/MesDataObject.java | 42 ++++++ .../estsh/i3plus/pojo/mes/bean/MesObjectCfg.java | 55 ++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java | 54 ++++++++ .../i3plus/pojo/mes/bean/MesWcCheckRecord.java | 78 +++++++++++ .../estsh/i3plus/pojo/mes/bean/MesWcEquipment.java | 42 ++++++ .../estsh/i3plus/pojo/mes/bean/MesWorkCenter.java | 4 + .../mes/repository/MesWcCheckRecordRepository.java | 13 ++ .../pojo/mes/repository/MesWcCheckRepository.java | 13 ++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 21 ++- 23 files changed, 1062 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDB.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProcessBomModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDB.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCheckRecordRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCheckRepository.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 e59a956..b955d47 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 @@ -1150,4 +1150,49 @@ public class MesEnumUtil { } } + /** + * WC_CHECK_TYPE 开线检查的模块 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WC_CHECK_TYPE { + + PERSON(10, "person", "人"), + EQUIPMENT(20, "equipment", "机"), + MATERIAL(30, "material", "料"), + ROUTE(40, "route", "法"), + ONLINE_SIGNAL(50, "onlineSignal", "开线信号"); + + private int value; + private String code; + private String description; + + WC_CHECK_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(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-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 ba4e524..f9dbb36 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 @@ -344,5 +344,158 @@ public class MesPcnEnumUtil { } } + /** + * MesWorkCenter 工作中心运行状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_CENTER_RUNNING_STATUS { + + RUNNING(1, "开线"), + STOPPED(2, "停线"); + + private int value; + private String description; + + WORK_CENTER_RUNNING_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * WC_CHECK_TYPE 开线检查的模块 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WC_CHECK_TYPE { + + PERSON(10, "person", "人"), + EQUIPMENT(20, "equipment", "机"), + MATERIAL(30, "material", "料"), + ROUTE(40, "route", "法"), + ONLINE_SIGNAL(50, "onlineSignal", "开线信号"); + + private int value; + private String code; + private String description; + + WC_CHECK_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 开线检查 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ONLINE_SIGNAL { + + CHECK(10, "检查"), + NON_CHECK(20, "不检查"); + + private int value; + private String description; + + ONLINE_SIGNAL(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 开线检查 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IS_WCCHECK_PASS { + + PASS(10, "通过"), + NON_PASS(20, "不通过"); + + private int value; + private String description; + + IS_WCCHECK_PASS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDB.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDB.java new file mode 100644 index 0000000..18cd750 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDB.java @@ -0,0 +1,62 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/24 7:17 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DB") +@Api("地址清单") +public class MesDB extends BaseBean { + + @Column(name="DS_CODE") + @ApiParam("数据源代码") + private String dsCode; + + @Column(name="DS_NAME") + @ApiParam("数据源名称") + private String dsName; + + @Column(name="DS_TYPE") + @ApiParam("数据源类型") + private String dsType; + + @Column(name="DS_HOST") + @ApiParam("主机") + private String dsHost; + + @Column(name="DS_PORT") + @ApiParam("端口") + private Integer dsPort; + + @Column(name="DS_USER") + @ApiParam("用户名") + private String dsUser; + + @Column(name="DS_PASSWORD") + @ApiParam("密码") + private String dsPassword; + + @Column(name="EQU_CODE") + @ApiParam("设备代码") + private String equCode; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java new file mode 100644 index 0000000..b964d08 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/24 7:12 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DATA_OBJECT") +@Api("数据对象") +public class MesDataObject extends BaseBean { + + @Column(name="OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + + @Column(name="OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name="DS_CODE") + @ApiParam("数据源代码") + private String dsCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java new file mode 100644 index 0000000..1dec08d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/24 7:14 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_OBJECT_CFG") +@Api("对象结构") +public class MesObjectCfg extends BaseBean { + + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "FIELD_CODE") + @ApiParam("字段代码") + private String fieldCode; + + @Column(name = "FIELD_NAME") + @ApiParam("字段名称") + private String fieldName; + + @Column(name = "FIELD_TYPE") + @ApiParam("字段类型") + private String fieldType; + + @Column(name = "FIELD_LENGTH") + @ApiParam("列长度") + private String fieldLength; + + @Column(name = "FIELD_PK") + @ApiParam("主键标记") + private String fieldPk; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java new file mode 100644 index 0000000..1d92aea --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/21 1:45 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WC_CHECK") +@Api("开线检查") +public class MesWcCheck extends BaseBean { + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name="PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name="CHECK_TYPE") + @ApiParam("检查类型") + private String checkType; + + @Column(name="CHECK_OBJ") + @ApiParam("检查对象") + private String checkObj; + + @Column(name="CHECK_ITEM") + @ApiParam("检查项") + private String checkItem; + + @Column(name="STANDARD") + @ApiParam("检查标准") + private String standard; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java new file mode 100644 index 0000000..d52c590 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java @@ -0,0 +1,78 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/21 1:57 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WC_CHECK_RECORD") +@Api("开线检查记录") +public class MesWcCheckRecord extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_ORDER") + @ApiParam("工单号") + private String workOrder; + + @Column(name = "PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name = "CHECK_TYPE") + @ApiParam("检查类型") + private String checkType; + + @Column(name = "CHECK_OBJ") + @ApiParam("检查对象") + private String checkObj; + + @Column(name = "CHECK_ITEM") + @ApiParam("检查项") + private String checkItem; + + @Column(name = "STANDARD") + @ApiParam("检查标准") + private String standard; + + @Column(name = "CHECK_RESULT") + @ApiParam("检查结果") + private String checkResult; + + @Column(name = "CHECK_VALUE") + @ApiParam("检查值") + private String checkValue; + + @Column(name = "REASON") + @ApiParam("原因") + private String reason; + + @Column(name = "GROUP_CODE") + @ApiParam("组名") + private String groupCode; + + @Column(name = "OVERALL_RESULT") + @ApiParam("总体结果") + private Integer overAllResult; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java new file mode 100644 index 0000000..11e5acd --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/24 2:31 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WC_EQUIPMENT") +@Api("工作单元设备关系表") +public class MesWcEquipment extends BaseBean { + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name="EQU_CODE") + @ApiParam("设备代码") + private String equCode; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java index d28d53b..1e447b8 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java @@ -46,4 +46,9 @@ public class MesWorkCenter extends BaseBean { @Column(name = "AREA_CODE") @ApiParam("生产区域代码") private String areaCode; + + @Column(name="RUNNING_STATUS") + @ApiParam("运行状态") + private Integer runningStatus; + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProcessBomModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProcessBomModel.java new file mode 100644 index 0000000..9708b49 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProcessBomModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProcessBom; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/21 3:11 PM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("工序BOM model") +public class ProcessBomModel extends MesProcessBom { + + @ApiParam("上料数量") + private Long cellFeedQty; + + @ApiParam("是否上料数量满足") + private Boolean isFeedSatisfied; + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java new file mode 100644 index 0000000..64151f9 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/WcCheckModel.java @@ -0,0 +1,89 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcCheckRecord; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.*; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/23 8:06 PM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("开线管控model") +public class WcCheckModel { + + @ApiParam("人") + private List people; + @ApiParam("人 列") + private Map peopleColumn; + + @ApiParam("机") + private List equipments; + @ApiParam("机 列") + private Map equipmentsColumn; + + @ApiParam("物料") + private List materials; + @ApiParam("物料 列") + private Map materialsColumn; + + @ApiParam("法") + private List routes; + @ApiParam("法 列") + private Map routesColumn; + + @ApiParam("对象list和列关系") + private Map dataColumnRelation; + + @ApiParam("开线信号") + private Integer onlineSignal; + + @ApiParam("是否通过") + private Integer isPass; + + @ApiParam("工作中心") + private String workCenterCode; + + @ApiParam("工单") + private String workOrder; + + @ApiParam("工单零件数量") + private Long qty; + + @ApiParam("产品号") + private String partNo; + + + public WcCheckModel initialWcCheckModel() { + WcCheckModel wcCheckModel = new WcCheckModel(); + wcCheckModel.setPeople(new ArrayList<>()); + wcCheckModel.setEquipments(new ArrayList<>()); + wcCheckModel.setMaterials(new ArrayList<>()); + wcCheckModel.setRoutes(new ArrayList<>()); + wcCheckModel.setPeopleColumn(new HashMap<>()); + wcCheckModel.setEquipmentsColumn(new HashMap<>()); + wcCheckModel.setMaterialsColumn(new HashMap<>()); + wcCheckModel.setRoutesColumn(new HashMap<>()); + wcCheckModel.setOnlineSignal(MesPcnEnumUtil.ONLINE_SIGNAL.NON_CHECK.getValue()); + wcCheckModel.setIsPass(MesPcnEnumUtil.IS_WCCHECK_PASS.NON_PASS.getValue()); + + Map dataColumnRelationMap = new HashMap<>(); + dataColumnRelationMap.put("people", "peopleColumn"); + dataColumnRelationMap.put("equipments", "equipmentsColumn"); + dataColumnRelationMap.put("materials", "materialsColumn"); + dataColumnRelationMap.put("routes", "routesColumn"); + wcCheckModel.setDataColumnRelation(dataColumnRelationMap); + return wcCheckModel; + } + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java new file mode 100644 index 0000000..71d7efa --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRecordRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcCheckRecord; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/23 7:30 PM + * @Description: + **/ +public interface MesWcCheckRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java new file mode 100644 index 0000000..cbf9cae --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcCheckRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcCheck; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/23 7:30 PM + * @Description: + **/ +public interface MesWcCheckRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDB.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDB.java new file mode 100644 index 0000000..2ce7819 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDB.java @@ -0,0 +1,62 @@ +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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/24 7:17 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DB") +@Api("地址清单") +public class MesDB extends BaseBean { + + @Column(name = "DS_CODE") + @ApiParam("数据源代码") + private String dsCode; + + @Column(name = "DS_NAME") + @ApiParam("数据源名称") + private String dsName; + + @Column(name = "DS_TYPE") + @ApiParam("数据源类型") + private String dsType; + + @Column(name = "DS_HOST") + @ApiParam("主机") + private String dsHost; + + @Column(name = "DS_PORT") + @ApiParam("端口") + private Integer dsPort; + + @Column(name = "DS_USER") + @ApiParam("用户名") + private String dsUser; + + @Column(name = "DS_PASSWORD") + @ApiParam("密码") + private String dsPassword; + + @Column(name = "EQU_CODE") + @ApiParam("设备代码") + private String equCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java new file mode 100644 index 0000000..4b4f28a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java @@ -0,0 +1,42 @@ +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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/24 7:12 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_DATA_OBJECT") +@Api("数据对象") +public class MesDataObject extends BaseBean { + + @Column(name="OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + + @Column(name="OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name="DS_CODE") + @ApiParam("数据源代码") + private String dsCode; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java new file mode 100644 index 0000000..d5764ed --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -0,0 +1,55 @@ +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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/24 7:14 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_OBJECT_CFG") +@Api("对象结构") +public class MesObjectCfg extends BaseBean { + + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "FIELD_CODE") + @ApiParam("字段代码") + private String fieldCode; + + @Column(name = "FIELD_NAME") + @ApiParam("字段名称") + private String fieldName; + + @Column(name = "FIELD_TYPE") + @ApiParam("字段类型") + private String fieldType; + + @Column(name = "FIELD_LENGTH") + @ApiParam("列长度") + private String fieldLength; + + @Column(name = "FIELD_PK") + @ApiParam("主键标记") + private String fieldPk; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java new file mode 100644 index 0000000..7d809e5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java @@ -0,0 +1,54 @@ +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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/21 1:45 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WC_CHECK") +@Api("开线检查") +public class MesWcCheck extends BaseBean { + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name="PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name="CHECK_TYPE") + @ApiParam("检查类型") + private String checkType; + + @Column(name="CHECK_OBJ") + @ApiParam("检查对象") + private String checkObj; + + @Column(name="CHECK_ITEM") + @ApiParam("检查项") + private String checkItem; + + @Column(name="STANDARD") + @ApiParam("检查标准") + private String standard; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java new file mode 100644 index 0000000..5aef545 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java @@ -0,0 +1,78 @@ +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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/21 1:57 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WC_CHECK_RECORD") +@Api("开线检查记录") +public class MesWcCheckRecord extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_ORDER") + @ApiParam("工单号") + private String workOrder; + + @Column(name = "PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name = "CHECK_TYPE") + @ApiParam("检查类型") + private String checkType; + + @Column(name = "CHECK_OBJ") + @ApiParam("检查对象") + private String checkObj; + + @Column(name = "CHECK_ITEM") + @ApiParam("检查项") + private String checkItem; + + @Column(name = "STANDARD") + @ApiParam("检查标准") + private String standard; + + @Column(name = "CHECK_RESULT") + @ApiParam("检查结果") + private String checkResult; + + @Column(name = "CHECK_VALUE") + @ApiParam("检查值") + private String checkValue; + + @Column(name = "REASON") + @ApiParam("原因") + private String reason; + + @Column(name = "GROUP_CODE") + @ApiParam("组名") + private String groupCode; + + @Column(name = "OVERALL_RESULT") + @ApiParam + private Integer overAllResult; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java new file mode 100644 index 0000000..d79594c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java @@ -0,0 +1,42 @@ +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; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/24 2:31 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WC_EQUIPMENT") +@Api("工作单元设备关系表") +public class MesWcEquipment extends BaseBean { + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name="EQU_CODE") + @ApiParam("设备代码") + private String equCode; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java index 6e21747..8da1f4a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -51,6 +51,10 @@ public class MesWorkCenter extends BaseBean { @ApiParam("生产区域代码") private String areaCode; + @Column(name="RUNNING_STATUS") + @ApiParam("运行状态") + private Integer runningStatus; + @Transient @ApiParam(value ="子集列表") private List childTreeList; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCheckRecordRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCheckRecordRepository.java new file mode 100644 index 0000000..c690390 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCheckRecordRepository.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.MesWcCheckRecord; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/23 7:30 PM + * @Description: + **/ +public interface MesWcCheckRecordRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCheckRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCheckRepository.java new file mode 100644 index 0000000..54fcdd5 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWcCheckRepository.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.MesWcCheck; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/23 7:30 PM + * @Description: + **/ +public interface MesWcCheckRepository 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 0ee655a..0090881 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 @@ -364,6 +364,7 @@ public class MesHqlPack { /** * MES班组信息查询条件封装 + * * @param shiftGroup * @param organizeCode * @return @@ -397,7 +398,7 @@ public class MesHqlPack { return packBean; } -/******************created by wynne*************/ + /** * MES 报废信息查询 * @@ -418,6 +419,24 @@ public class MesHqlPack { return packBean; } + + /** + * MES 开线管控 + * + * @param mesWcCheck + * @return + */ + public static DdlPackBean getMesWcCheck(MesWcCheck mesWcCheck, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesWcCheck,organizeCode); +// DdlPreparedPack.getNumEqualPack(mesWcCheck.getIsValid(),"isValid",packBean); + DdlPreparedPack.getStringLikerPack(mesWcCheck.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringLikerPack(mesWcCheck.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringEqualPack(mesWcCheck.getCheckType(), "checkType", packBean); + DdlPreparedPack.getStringLikerPack(mesWcCheck.getCheckObj(), "checkObj", packBean); + DdlPreparedPack.getStringLikerPack(mesWcCheck.getCheckItem(), "checkItem", packBean); + return packBean; + } + /** * MES PCN系统配置信息条件查询 * From bc1dea29ad9c0d911f0fa6e16a53c38670482348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Wed, 25 Sep 2019 17:39:11 +0800 Subject: [PATCH 07/19] =?UTF-8?q?po=E3=80=81asn=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 3 +++ .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 5 +++++ .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 11 +++++++++++ 3 files changed, 19 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index 64ea546..6e21241 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -176,6 +176,9 @@ public class WmsASNMaster extends BaseBean { @ApiParam("项目") private String prodCfgTypeCode; + @Transient + private List orderNoList; + public WmsASNMaster() { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index b583ee5..c9fab25 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -133,6 +133,11 @@ public class WmsCSOrderDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class,refForeignKey = "value",value = "description") public Integer differenceType; + public Integer getDifferenceType() { + return this.differenceType == null ? + -1: this.differenceType; + } + public Double getQty() { return this.qty == null ? 0 : this.qty; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 8b24b26..1477d82 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -144,6 +144,17 @@ public class WmsPOMaster extends BaseBean { @ApiParam("前端信息") private String message; + @Transient + @ApiParam("计划日期开始") + private String planDateStart; + + @Transient + @ApiParam("计划日期结束") + private String planDateEnd; + + @Transient + private List orderNoList; + public int getPoStatusVal() { return this.poStatus == null ? 0 : this.poStatus; } From 80bad03881286bb3746f52eb787a7fdc21a87d71 Mon Sep 17 00:00:00 2001 From: wangjie Date: Wed, 25 Sep 2019 19:12:42 +0800 Subject: [PATCH 08/19] =?UTF-8?q?mes-pcn=E7=94=9F=E4=BA=A7=E5=B7=A5?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/bean/MesCustProdLine.java | 38 ++++ .../i3plus/pojo/mes/pcn/bean/MesCustomer.java | 54 ++++++ .../i3plus/pojo/mes/pcn/bean/MesPlanOrder.java | 141 ++++++++++++++ .../estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java | 42 ++++ .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 60 ++++++ .../i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java | 216 +++++++++++++++++++++ .../pojo/mes/pcn/model/GenSerialNoModel.java | 69 +++++++ .../mes/pcn/model/MesWorkOrderButtonModel.java | 39 ++++ .../i3plus/pojo/mes/pcn/model/RequestModel.java | 107 ++++++++++ .../pcn/repository/MesCustProdLineRepository.java | 16 ++ .../mes/pcn/repository/MesCustomerRepository.java | 17 ++ .../pcn/repository/MesNumberRuleRepository.java | 15 ++ .../repository/MesNumberSerialnoRepository.java | 16 ++ .../mes/pcn/repository/MesPlanOrderRepository.java | 16 ++ .../mes/pcn/repository/MesProdCfgRepository.java | 16 ++ .../pcn/repository/MesShiftGroupRepository.java | 16 ++ .../pcn/repository/MesWorkOrderLogRepository.java | 16 ++ .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 56 ++++++ .../i3plus/pojo/mes/bean/MesWorkOrderLog.java | 5 - 19 files changed, 950 insertions(+), 5 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesWorkOrderButtonModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java new file mode 100644 index 0000000..465a22a --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; + +/** + * @Description :mes系统业务动作 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-12 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_CUST_PROD_LINE") +@Api("客户产线代码") +public class MesCustProdLine extends BaseBean { + @Column(name="CUST_PROD_LINE_CODE") + @ApiParam("客户产线代码") + private String custProdLineCode; + + @Column(name="CUST_PROD_LINE_NAME") + @ApiParam("客户产线名称") + private String custProdLineName; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java new file mode 100644 index 0000000..9283664 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; + +/** + * @Description :mes客户表 + * @Reference : + * @Author : crish + * @CreateDate : 2019-04-22 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_CUSTOMER") +@Api("客户产线代码") +public class MesCustomer extends BaseBean { + @Column(name="CUSTOMER_CODE") + @ApiParam("客户代码") + private String customerCode; + + @Column(name="CUSTOMER_NAME") + @ApiParam("客户名称") + private String customerName; + + @Column(name="BRIEF_TEXT") + @ApiParam("客户简称") + private String briefText; + + @Column(name="ADDRESS") + @ApiParam("客户地址") + private String address; + + @Column(name="CONTACT") + @ApiParam("客户联系人") + private String contact; + + @Column(name="TELEPHONE") + @ApiParam("客户电话") + private String telephone; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java new file mode 100644 index 0000000..b71f632 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java @@ -0,0 +1,141 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; +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 javax.persistence.Transient; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-16-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PLAN_ORDER") +@Api("生产主计划") +public class MesPlanOrder extends BaseBean { + @Column(name="ORDER_NO") + @ApiParam("生产计划单号") + private String orderNo; + + @Column(name="PO_TYPE") + @ApiParam("计划类型") + private Integer planType; + + @Column(name="PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name="PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name="PLAN_QTY") + @ApiParam("计划数量") + private Double planQty; + + @Column(name="DECOMPOSE_QTY") + @ApiParam("分解数量") + private Double decomposeQty; + + @Column(name="STATUS") + @ApiParam("状态") + private Integer status; + + @Column(name="START_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam("计划开始时间") + private String startTime; + + @Column(name="END_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam("计划结束时间") + private String endTime; + + @Column(name="DELIVERY_DATE") + @ApiParam("交货日期") + private String deliveryDate; + + @Column(name="CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name="CUST_ORDER_NO") + @ApiParam("客户订单号") + private String custOrderNo; + + @Column(name="SOURCE") + @ApiParam("计划来源") + private String source; + + @Column(name="MEMO") + @ApiParam("备注") + private String memo; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + /********************** 冗余字段 *********************************/ + + @Transient + @ApiParam(value="区域") + public String areaCode; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + public String startTimeStart; + + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + public String startTimeEnd; + + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + public String endTimeStart; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59") + public String endTimeEnd; + + public double getPlanQtyVal() { + return this.planQty == null ? 0.0d : this.planQty; + } + + public double getDecomposeQtyVal() { + return this.decomposeQty == null ? 0.0d : this.decomposeQty; + } + + public int getStatusVal() { + return this.status == null ? 0 : this.status; + } + + public int getPlanTypeVal() { + return this.planType == null ? 0 : this.planType; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java new file mode 100644 index 0000000..17322bb --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; + +/** + * @Description :产品配置 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PROD_CFG") +@Api("产品配置") +public class MesProdCfg extends BaseBean { + @Column(name="PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name="PROD_CFG_NAME") + @ApiParam("产品配置名称") + private String prodCfgName; + + @Column(name="PROD_CFG_Type_CODE") + @ApiParam("产品配置类型代码") + private String prodCfgTypeCode; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java index dd8dc61..9ff0258 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.mes.pcn.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.mes.pcn.model.MesWorkOrderButtonModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description: @@ -35,6 +37,10 @@ public class MesWorkOrder extends BaseBean { @ApiParam("物料号") private String partNo; + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + @Column(name="PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; @@ -79,6 +85,10 @@ public class MesWorkOrder extends BaseBean { @ApiParam("工作中心代码") private String workCenterCode; + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + @Column(name="WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; @@ -127,6 +137,56 @@ public class MesWorkOrder extends BaseBean { @ApiParam("客户订单号") private String custOrderNo; + /********************** 冗余字段 *********************************/ + @Transient + @ApiParam(value="工作中心名称") + public String workCenterName; + + @Transient + @ApiParam(value="工作单元名称") + public String workCellName; + + @Transient + @ApiParam(value="客户产线名称") + public String custProdLineName; + + @Transient + @ApiParam(value="班次名称") + public String shiftName; + + @Transient + @ApiParam(value="班组名称") + public String shiftGroupName; + + @Transient + @ApiParam(value="产品配置名称") + public String prodCfgName; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59") + public String startTimeStart; + + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划开始日期查询用，查询截至日期",example = "2018-12-31 23:59:59") + public String startTimeEnd; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划结束日期查询用，查询结束日期起始",example = "2018-12-31 23:59:59") + public String endTimeStart; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59") + public String endTimeEnd; + + @Transient + @ApiParam("mes生产工单页面按钮控制") + private MesWorkOrderButtonModel workOrderButtonModel; + public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java new file mode 100644 index 0000000..c8f9018 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java @@ -0,0 +1,216 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 javax.persistence.Transient; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-19-17:36 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_WORK_ORDER_LOG") +@Api("生产工单日志") +public class MesWorkOrderLog extends BaseBean { + @Column(name="ORDER_NO") + @ApiParam("工单号") + private String orderNo; + + @Column(name="PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name="PART_NAME_RDD") + @ApiParam("物料名称") + private String partNameRdd; + + @Column(name="PROD_CFG_CODE") + @ApiParam("产品配置代码") + private String prodCfgCode; + + @Column(name="QTY") + @ApiParam("数量") + private Double qty; + + @Column(name="COMPLETE_QTY") + @ApiParam("完成数量") + private Double completeQty; + + @Column(name="REPAIR_QTY") + @ApiParam("返修数量") + private Double repairQty; + + @Column(name="SCRAP_QTY") + @ApiParam("报废数量") + private Double scrapQty; + + @Column(name="SEQ") + @ApiParam("工单序号") + private Double seq; + + @Column(name="WO_STATUS") + @ApiParam("工单状态") + private Integer workOrderStatus; + + @Column(name="WO_TYPE") + @ApiParam("工单类型") + private Integer workOrderType; + + @Column(name="NEXT_ORDER") + @ApiParam("下一工单") + private String nextOrder; + + @Column(name="PLAN_ORDER_NO") + @ApiParam("生产计划单号") + private String planOrderNo; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name="AREA_CODE") + @ApiParam("区域代码") + private String areaCode; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name="SCHEDULE_DATE") + @ApiParam("排产日期") + private String scheduleDate; + + @Column(name="CUST_PROD_LINE_CODE") + @ApiParam("客户产线代码") + private String custProdLineCode; + + @Column(name="SHIFT_CODE") + @ApiParam("班次") + private String shiftCode; + + @Column(name="START_TIME") + @ApiParam("开始时间") + private String startTime; + + @Column(name="END_TIME") + @ApiParam("结束时间") + private String endTime; + + @Column(name="WO_SOURCE") + @ApiParam("工单来源") + private String workOrderSource; + + @Column(name="MEMO") + @ApiParam("备注") + private String memo; + + @Column(name="SHIFT_GROUP") + @ApiParam("班组") + private String shiftGroup; + + @Column(name="APPROVAL_STATUS") + @ApiParam("审批状态") + private Integer approvalStatus; + + @Column(name="CUST_CODE") + @ApiParam("客户代码") + private String custCode; + + @Column(name="CUST_ORDER_NO") + @ApiParam("客户订单号") + private String custOrderNo; + + /********************** 冗余字段 *********************************/ + @Transient + @ApiParam(value="工作中心名称") + public String workCenterName; + + @Transient + @ApiParam(value="工作单元名称") + public String workCellName; + + @Transient + @ApiParam(value="客户产线名称") + public String custProdLineName; + + @Transient + @ApiParam(value="班次名称") + public String shiftName; + + @Transient + @ApiParam(value="班组名称") + public String shiftGroupName; + + @Transient + @ApiParam(value="产品配置名称") + public String prodCfgName; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59") + public String startTimeStart; + + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划开始日期查询用，查询截至日期",example = "2018-12-31 23:59:59") + public String startTimeEnd; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划结束日期查询用，查询结束日期起始",example = "2018-12-31 23:59:59") + public String endTimeStart; + + @Transient +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59") + public String endTimeEnd; + + public double getQtyVal() { + return this.qty == null ? 0.0d : this.qty; + } + + public double getCompleteQtyVal() { + return this.completeQty == null ? 0.0d : this.completeQty; + } + + public double getRepairQtyVal() { + return this.repairQty == null ? 0.0d : this.repairQty; + } + + public double getScrapQtyVal() { + return this.scrapQty == null ? 0.0d : this.scrapQty; + } + + public double getSeqVal() { + return this.seq == null ? 0.0d : this.seq; + } + + public int getWorkOrderStatusVal() { + return this.workOrderStatus == null ? 0 : this.workOrderStatus; + } + + public int getWorkOrderTypeVal() { + return this.workOrderType == null ? 0 : this.workOrderType; + } + + public int getApprovalStatusVal() { + return this.approvalStatus == null ? 0 : this.approvalStatus; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java new file mode 100644 index 0000000..8f8db3d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/GenSerialNoModel.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/23 11:42 AM + * @Description: + **/ + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("生成条码模型") +public class GenSerialNoModel { + + @ApiParam("规则代码") + private String ruleCode; + + @ApiParam("规则描述") + private String ruleDesc; + + @ApiParam("物料号") + private String partNo; + + @ApiParam("客户物料号") + private String custPartNo; + + @ApiParam("客户代码") + private String custCode; + + @ApiParam("产地") + private String prodLocation; + + @ApiParam("前缀") + private String prefix; + + @ApiParam("编码规则") + private String numberRule; + + @ApiParam("序号长度") + private Integer serialnoLength; + + @ApiParam("增量") + private Integer serialnoIncrement; + + @ApiParam("最大值后循环") + private Integer isCycle; + + @ApiParam("当前编号前缀") + private String currentNumberPrefix; + + @ApiParam("当前序号") + private Integer currentSerialno; + + @ApiParam("当前编号") + private String currentNumber; + + + public GenSerialNoModel(String ruleCode){ + this.ruleCode=ruleCode; + } + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesWorkOrderButtonModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesWorkOrderButtonModel.java new file mode 100644 index 0000000..8cd2304 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/MesWorkOrderButtonModel.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Author: wangjie + * @CreateDate: 2019/8/21 9:19 AM + * @Description: + **/ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("mes生产工单页面按钮控制model") +public class MesWorkOrderButtonModel implements Serializable { + + @ApiParam("修改按钮") + private boolean updateButton; + + @ApiParam("启动按钮") + private boolean startUpButton; + + @ApiParam("暂停按钮") + private boolean suspendButton; + + @ApiParam("取消按钮") + private boolean revokeButton; + + @ApiParam("关闭按钮") + private boolean closeButton; + + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java new file mode 100644 index 0000000..9ffc448 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/RequestModel.java @@ -0,0 +1,107 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPart; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesQueueOrder; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder; + +import java.util.List; + +/** + * @Description: 生产计划，生产队列，生产工单的复杂请求数据结构的统一请求模型 + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-29-11:58 + * @Modify: + **/ +public class RequestModel { + + private List workOrderList; // 工单数据集 + + private List partList; // 物料数据集 + + private List queueOrderList; // 生产队列数据集 + + private Double currentSeq; // 生产队列中的当前序列号 + + private Double nextSeq; // 生产队列中的下一个序列号 + + private Integer srcStatus; // 源状态 + + private Integer destStatus; // 目的状态 + + public RequestModel(List queueOrderList, Double currentSeq, Double nextSeq) { + this.queueOrderList = queueOrderList; + this.currentSeq = currentSeq; + this.nextSeq = nextSeq; + } + + public RequestModel(List queueOrderList, Integer srcStatus, Integer destStatus) { + this.queueOrderList = queueOrderList; + this.srcStatus = srcStatus; + this.destStatus = destStatus; + } + + public RequestModel(List workOrderList, List partList) { + this.workOrderList = workOrderList; + this.partList = partList; + } + + public List getWorkOrderList() { + return workOrderList; + } + + public RequestModel() { + } + + public void setWorkOrderList(List workOrderList) { + this.workOrderList = workOrderList; + } + + public List getPartList() { + return partList; + } + + public void setPartList(List partList) { + this.partList = partList; + } + + public List getQueueOrderList() { + return queueOrderList; + } + + public void setQueueOrderList(List queueOrderList) { + this.queueOrderList = queueOrderList; + } + + public Double getCurrentSeq() { + return currentSeq == null ? 0.0d : currentSeq; + } + + public void setCurrentSeq(Double currentSeq) { + this.currentSeq = currentSeq; + } + + public Double getNextSeq() { + return nextSeq == null ? 0.0d : nextSeq; + } + + public void setNextSeq(Double nextSeq) { + this.nextSeq = nextSeq; + } + + public Integer getSrcStatus() { + return srcStatus == null ? 0 : srcStatus; + } + + public void setSrcStatus(Integer srcStatus) { + this.srcStatus = srcStatus; + } + + public Integer getDestStatus() { + return destStatus == null ? 0 : destStatus; + } + + public void setDestStatus(Integer destStatus) { + this.destStatus = destStatus; + } +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java new file mode 100644 index 0000000..cbca918 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustProdLineRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCustProdLine; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-19-11:15 + * @Modify: + **/ +@Repository +public interface MesCustProdLineRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java new file mode 100644 index 0000000..c006be6 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesCustomerRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCustomer; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-22-16:12 + * @Modify: + **/ +@Repository +public interface MesCustomerRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java new file mode 100644 index 0000000..d3b014d --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberRuleRepository.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesNumberRule; +import org.springframework.stereotype.Repository; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/23 1:22 PM + * @Description: + **/ +@Repository +public interface MesNumberRuleRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java new file mode 100644 index 0000000..11299b0 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesNumberSerialnoRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesNumberSerialno; +import org.springframework.stereotype.Repository; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/8/23 1:23 PM + * @Description: + **/ + +@Repository +public interface MesNumberSerialnoRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java new file mode 100644 index 0000000..c4ba8c9 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPlanOrderRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPlanOrder; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-04-17-17:08 + * @Modify: + **/ +@Repository +public interface MesPlanOrderRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java new file mode 100644 index 0000000..1413862 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProdCfgRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProdCfg; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProdCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java new file mode 100644 index 0000000..544c627 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesShiftGroupRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesShiftGroup; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-18-17:13 + * @Modify: + **/ +@Repository +public interface MesShiftGroupRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java new file mode 100644 index 0000000..fea2dfb --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkOrderLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrderLog; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: wangjie + * @CreateDate:2019-09-19-17:13 + * @Modify: + **/ +@Repository +public interface MesWorkOrderLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index 84b0dff..4e0281a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -96,5 +96,61 @@ public class MesHqlPack { return packBean; } + /** + * 生产工单查询条件封装 + * + * @param mesWorkOrder + * @return + */ + public static DdlPackBean getWorkOrderCondition(MesWorkOrder mesWorkOrder, String organizeCode) { + DdlPackBean packBean = getAllBaseData(organizeCode); + if (StringUtils.isNotEmpty(mesWorkOrder.getOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getOrderNo(), "orderNo", packBean); + } + if (StringUtils.isNotEmpty(mesWorkOrder.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPartNo(), "partNo", packBean); + } + if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderStatus() + "") && mesWorkOrder.getWorkOrderStatusVal() != 0) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderStatus(), "workOrderStatus", packBean); + } + if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCenterCode())) { + DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean); + } + if (mesWorkOrder.getApprovalStatus() != null) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getApprovalStatus(), "approvalStatus", packBean); + } + if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean); + } + if (StringUtils.isNotEmpty(mesWorkOrder.getCustOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean); + } + if (StringUtils.isNotEmpty(mesWorkOrder.getPlanOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean); + } + if (StringUtils.isNotEmpty(mesWorkOrder.getCreateUser())) { + DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCreateUser(), "createUser", packBean); + } + if (mesWorkOrder.getIsValid() != null) { + DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean); + } + + // 时间段查询 + DdlPreparedPack.timeBuilder( + mesWorkOrder.getStartTimeStart(), + mesWorkOrder.getStartTimeEnd(), + "startTime", packBean, true); + DdlPreparedPack.timeBuilder( + mesWorkOrder.getEndTimeStart(), + mesWorkOrder.getEndTimeEnd(), + "endTime", packBean, true); + DdlPreparedPack.timeBuilder( + mesWorkOrder.getCreateDateTimeStart(), + mesWorkOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); + DdlPreparedPack.getOrderDefault(mesWorkOrder); + DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean); + return packBean; + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java index e48bba7..df1dcb6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java @@ -183,11 +183,6 @@ public class MesWorkOrderLog extends BaseBean { @ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59") public String endTimeEnd; - @Transient - @ApiParam("mes生产工单页面按钮控制") - private MesWorkOrderButtonModel workOrderButtonModel; - - public double getQtyVal() { return this.qty == null ? 0.0d : this.qty; } From be30cecf13b50ea5a16d672bf3bfb03d13fef2bc Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 25 Sep 2019 20:48:10 +0800 Subject: [PATCH 09/19] add integration to aps --- .../pojo/aps/annotation/FieldAnnotation.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 31 +++++++ .../estsh/i3plus/pojo/aps/bean/ExportDetail.java | 2 + .../estsh/i3plus/pojo/aps/bean/ExportProject.java | 6 +- .../cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 4 + .../estsh/i3plus/pojo/aps/bean/ImportDetail.java | 18 ++++ .../estsh/i3plus/pojo/aps/bean/ImportProject.java | 22 +++++ .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 31 +++++++ .../cn/estsh/i3plus/pojo/aps/bean/OperInput.java | 36 ++++++++ .../cn/estsh/i3plus/pojo/aps/bean/OperOutput.java | 42 ++++++++- .../estsh/i3plus/pojo/aps/bean/OperResource.java | 36 ++++++++ .../cn/estsh/i3plus/pojo/aps/bean/Operation.java | 49 ++++++++++ .../estsh/i3plus/pojo/aps/bean/PlanFeedback.java | 19 ++++ .../estsh/i3plus/pojo/aps/bean/ProductOrder.java | 18 ++++ .../estsh/i3plus/pojo/aps/bean/ProductRouting.java | 26 ++++++ .../cn/estsh/i3plus/pojo/aps/bean/SysParam.java | 2 +- .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 41 +++++++++ .../cn/estsh/i3plus/pojo/aps/bean/WorkInput.java | 50 ++++++++++ .../cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java | 51 +++++++++++ .../estsh/i3plus/pojo/aps/bean/WorkRelation.java | 102 +++++++++++++++++++++ .../estsh/i3plus/pojo/aps/bean/WorkResource.java | 46 ++++++++++ .../cn/estsh/i3plus/pojo/aps/common/BeanInfo.java | 1 - .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 29 ++++-- .../pojo/aps/{bean => common}/DateDuration.java | 7 +- .../estsh/i3plus/pojo/aps/holders/EDayShift.java | 1 - .../i3plus/pojo/aps/holders/EImportDetail.java | 5 + .../estsh/i3plus/pojo/aps/holders/EMaterial.java | 2 +- .../i3plus/pojo/aps/holders/EResCalendar.java | 2 - .../estsh/i3plus/pojo/aps/holders/EResource.java | 2 - .../i3plus/pojo/aps/holders/EStandOperation.java | 1 - .../cn/estsh/i3plus/pojo/aps/holders/EWork.java | 2 +- .../src/main/resources/relations/ExportProject.xml | 2 +- .../src/main/resources/relations/ImportProject.xml | 2 +- .../src/main/resources/relations/Material.xml | 2 +- .../src/main/resources/relations/ResCalendar.xml | 4 - 35 files changed, 666 insertions(+), 30 deletions(-) rename modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/{bean => common}/DateDuration.java (98%) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java index f91c7b4..86caaa2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java @@ -8,7 +8,9 @@ import java.lang.annotation.Target; @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) public @interface FieldAnnotation { + boolean property() default true; boolean modify() default true; boolean display() default true; int pric() default 2; + boolean mainkey() default false; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index aa093ab..b11e5dc 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; @@ -53,7 +54,37 @@ public class BaseOrder extends BaseAPS { @ApiParam(value ="接单日期") private Date receiveDate; + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(property = false) + private Long materialId; + public List getWorks() { return BeanRelation.list(this, EBaseOrder.Works); } + + public Material getMaterial() { + return BeanRelation.get(this, EBaseOrder.Material); + } + + public void setMaterial(Material material) { + this.materialId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EBaseOrder.Material, material); + } + + public List getPrevRelations() { + return BeanRelation.list(this, EBaseOrder.PrevRelations); + } + + public List getPostRelations() { + return BeanRelation.list(this, EBaseOrder.PostRelations); + } + + public List getUpperOrders() { + return BeanRelation.list(this, EBaseOrder.UpperOrders); + } + + public List getLowerOrders() { + return BeanRelation.list(this, EBaseOrder.LowerOrders); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java index d6926c9..9343571 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EExportDetail; @@ -41,6 +42,7 @@ public class ExportDetail extends BaseAPS { @Column(name="PROJECT_ID") @ApiParam(value ="导出项目ID") + @FieldAnnotation(property = false) private Long projectId; public ExportProject getProject() { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java index 7438e17..27d70a9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java @@ -1,8 +1,10 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EExportProject; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -29,7 +31,9 @@ public class ExportProject extends BaseAPS { private String name; @Column(name="LINK_ID") - @ApiParam(value ="数据源连接") + @ApiParam(value ="数据连接对象") + @FieldAnnotation(property = false) + @JsonIgnore private Long linkId; public DataLink getLink() { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index 664b43b..aee742f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -71,6 +71,10 @@ public class FieldInfo extends BaseCode { @ApiParam(value ="位置") private String position; + @Column(name="MAIN_KEY") + @ApiParam(value ="主键标识") + private Boolean mainKey; + @JsonIgnore private transient Class clazz; @JsonIgnore diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index 102cd83..fb8b71f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -1,7 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.IMPORT_DETAIL_TYPE; +import cn.estsh.i3plus.pojo.aps.holders.EExportDetail; +import cn.estsh.i3plus.pojo.aps.holders.EImportDetail; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -33,4 +37,18 @@ public class ImportDetail extends BaseAPS { @Column(name="IN_NAME") @ApiParam(value ="内部表名") private String inName; + + @Column(name="PROJECT_ID") + @ApiParam(value ="导入项目ID") + @FieldAnnotation(property = false) + private Long projectId; + + public ImportProject getProject() { + return BeanRelation.get(this, EImportDetail.Project); + } + + public void setProject(ImportProject project) { + this.projectId = project != null ? project.getId() : 0l; + BeanRelation.set(this, EImportDetail.Project, project); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java index bb21896..731a820 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java @@ -1,6 +1,9 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EImportProject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -8,6 +11,7 @@ import lombok.Data; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :数据导入明细集合 @@ -24,4 +28,22 @@ public class ImportProject extends BaseAPS { @Column(name="NAME") @ApiParam(value ="标识名") private String name; + + @Column(name="LINK_ID") + @ApiParam(value ="数据连接对象") + @FieldAnnotation(property = false) + private Long linkId; + + public DataLink getLink() { + return BeanRelation.get(this, EImportProject.Link); + } + + public void setLink(DataLink link) { + this.linkId = link != null ? link.getId() : 0l; + BeanRelation.set(this, EImportProject.Link, link); + } + + public List getDetails() { + return BeanRelation.list(this, EImportProject.Details); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index c0ae1a0..a42d97e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -1,9 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseCode; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.MATERIAL_TYPE; import cn.estsh.i3plus.pojo.aps.enums.PREPARE_TYPE; import cn.estsh.i3plus.pojo.aps.enums.REPLENISHMENT_TYPE; +import cn.estsh.i3plus.pojo.aps.holders.EMaterial; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -11,6 +13,7 @@ import lombok.Data; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :物料 @@ -103,4 +106,32 @@ public class Material extends BaseCode { @Column(name="MAX_STOCK_COUNT") @ApiParam(value ="最大库存数量") private Double maxStockCount; + + public List getProductRoutings() { + return BeanRelation.list(this, EMaterial.ProductRoutings); + } + + public List getOperInputs() { + return BeanRelation.list(this, EMaterial.OperInputs); + } + + public List getOperOutputs() { + return BeanRelation.list(this, EMaterial.OperOutputs); + } + + public List getWorkInputs() { + return BeanRelation.list(this, EMaterial.WorkInputs); + } + + public List getWorkOutputs() { + return BeanRelation.list(this, EMaterial.WorkOutputs); + } + + public List getWorkRelations() { + return BeanRelation.list(this, EMaterial.WorkRelations); + } + + public List getOrders() { + return BeanRelation.list(this, EMaterial.Orders); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java index 1c8cdc3..1ad9690 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java @@ -1,7 +1,10 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE; +import cn.estsh.i3plus.pojo.aps.holders.EOperInput; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -9,6 +12,7 @@ import lombok.Data; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :工序输入 @@ -45,4 +49,36 @@ public class OperInput extends BaseAPS { @Column(name="MIN_SPACE_TIME") @ApiParam(value ="最小时间间隔") private String minSpaceTime; + + @Column(name="OPERATION_ID") + @ApiParam(value ="工序") + @FieldAnnotation(property = false) + private Long operationId; + + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(property = false) + private Long materialId; + + public Operation getOperation() { + return BeanRelation.get(this, EOperInput.Operation); + } + + public void setOperation(Operation oper) { + this.operationId = oper != null ? oper.getId() : 0l; + BeanRelation.set(this, EOperInput.Operation, oper); + } + + public Material getMaterial() { + return BeanRelation.get(this, EOperInput.Material); + } + + public void setMaterial(Material material) { + this.materialId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EOperInput.Material, material); + } + + public List getWorkInputs() { + return BeanRelation.list(this, EOperInput.WorkInputs); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java index 82ab4cf..41a13fa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java @@ -1,6 +1,9 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EOperOutput; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -8,6 +11,7 @@ import lombok.Data; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :工序输出 @@ -21,15 +25,47 @@ import javax.persistence.Table; @Table(name = "APS_OPER_OUTPUT") @Api("工序输出") public class OperOutput extends BaseAPS { - @Column(name="output_Count") + @Column(name="OUTPUT_COUNT") @ApiParam(value ="输出数量") private Double outputCount; - @Column(name="yield") + @Column(name="YIELD") @ApiParam(value ="成品率") private Double yield; - @Column(name="fix_Scrap_Count") + @Column(name="FIX_SCRAP_COUNT") @ApiParam(value ="固定报废数") private Double fixScrapCount; + + @Column(name="OPERATION_ID") + @ApiParam(value ="工序") + @FieldAnnotation(property = false) + private Long operationId; + + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(property = false) + private Long materialId; + + public Operation getOperation() { + return BeanRelation.get(this, EOperOutput.Operation); + } + + public void setOperation(Operation oper) { + this.operationId = oper != null ? oper.getId() : 0l; + BeanRelation.set(this, EOperOutput.Operation, oper); + } + + public Material getMaterial() { + return BeanRelation.get(this, EOperOutput.Material); + } + + public void setMaterial(Material material) { + this.materialId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EOperOutput.Material, material); + } + + public List getWorkOutputs() { + return BeanRelation.list(this, EOperOutput.WorkOutputs); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java index 4de47b0..f0859f7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java @@ -1,7 +1,10 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE; +import cn.estsh.i3plus.pojo.aps.holders.EOperResource; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -9,6 +12,7 @@ import lombok.Data; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :工序资源 @@ -53,4 +57,36 @@ public class OperResource extends BaseAPS { @Column(name="PRIORITY") @ApiParam(value ="优先级") private Integer priority; + + @Column(name="OPERATION_ID") + @ApiParam(value ="工序") + @FieldAnnotation(property = false) + private Long operationId; + + @Column(name="RESOURCE_ID") + @ApiParam(value ="资源") + @FieldAnnotation(property = false) + private Long resourceId; + + public Operation getOperation() { + return BeanRelation.get(this, EOperResource.Operation); + } + + public void setOperation(Operation oper) { + this.operationId = oper != null ? oper.getId() : 0l; + BeanRelation.set(this, EOperResource.Operation, oper); + } + + public Resource getResource() { + return BeanRelation.get(this, EOperResource.Resource); + } + + public void setResource(Resource res) { + this.resourceId = res != null ? res.getId() : 0l; + BeanRelation.set(this, EOperResource.Resource, res); + } + + public List getWorkResources() { + return BeanRelation.list(this, EOperResource.WorkResources); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index cba41d4..4f6513a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -1,15 +1,20 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE; import cn.estsh.i3plus.pojo.aps.enums.TAIL_DEAL; +import cn.estsh.i3plus.pojo.aps.holders.EOperation; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import org.springframework.context.annotation.Bean; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :工序 @@ -71,4 +76,48 @@ public class Operation extends BaseAPS { @Column(name="MIN_SPACE_TIME") @ApiParam(value ="最小时间间隔") private String minSpaceTime; + + @Column(name="PRODUCT_ROUTING_ID") + @ApiParam(value ="工艺路线") + @FieldAnnotation(property = false) + private Long productRoutingId; + + @Column(name="STAND_OPERATION_ID") + @ApiParam(value ="标准工序") + @FieldAnnotation(property = false) + private Long standOperationId; + + public ProductRouting getProductRouting() { + return BeanRelation.get(this, EOperation.ProductRouting); + } + + public void setProductRouting(ProductRouting routing) { + this.productRoutingId = routing != null ? routing.getId() : 0l; + BeanRelation.set(this, EOperation.ProductRouting, routing); + } + + public List getOperInputs() { + return BeanRelation.list(this, EOperation.OperInputs); + } + + public List getOperOutputs() { + return BeanRelation.list(this, EOperation.OperOutputs); + } + + public List getOperResources() { + return BeanRelation.list(this, EOperation.OperResources); + } + + public StandOperation getStandOperation() { + return BeanRelation.get(this, EOperation.StandOperation); + } + + public void setStandOperation(StandOperation std) { + this.standOperationId = std != null ? std.getId() : 0l; + BeanRelation.set(this, EOperation.StandOperation, std); + } + + public List getWorks() { + return BeanRelation.list(this, EOperation.Works); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java index dd7e68d..40b004b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java @@ -1,9 +1,14 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EPlanFeedback; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; @@ -19,4 +24,18 @@ import javax.persistence.Table; @Table(name = "APS_PLAN_FEEDBACK") @Api("物料") public class PlanFeedback extends BaseAPS { + + @Column(name="WORK_ID") + @ApiParam(value ="工作") + @FieldAnnotation(property = false) + private Long workId; + + public Work getWork() { + return BeanRelation.get(this, EPlanFeedback.Work); + } + + public void setWork(Work work) { + this.workId = work != null ? work.getId() : 0l; + BeanRelation.set(this, EPlanFeedback.Work, work); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index a1712da..64f17c0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -1,5 +1,9 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EProductOrder; +import cn.estsh.i3plus.pojo.aps.holders.EProductRouting; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -80,4 +84,18 @@ public class ProductOrder extends BaseOrder { @Column(name="LACK_COUNT") @ApiParam(value ="缺少量") private Double lackCount; + + @Column(name="PRODUCT_ROUTING_ID") + @ApiParam(value ="工艺路线") + @FieldAnnotation(property = false) + private Long productRoutingId; + + public ProductRouting getProductRouting() { + return BeanRelation.get(this, EProductOrder.ProductRouting); + } + + public void setProductRouting(ProductRouting routing) { + this.productRoutingId = routing != null ? routing.getId() : 0l; + BeanRelation.set(this, EProductOrder.ProductRouting, routing); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java index 88a415c..ed21d2d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java @@ -1,6 +1,9 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseCode; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EProductRouting; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -9,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import java.util.Date; +import java.util.List; /** * @Description :工艺路线 @@ -33,4 +37,26 @@ public class ProductRouting extends BaseCode { @Column(name="PRIORITY") @ApiParam(value ="优先级") private Integer priority; + + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(property = false) + private Long materialId; + + public Material getMaterial() { + return BeanRelation.get(this, EProductRouting.Material); + } + + public void setMaterial(Material material) { + this.materialId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EProductRouting.Material, material); + } + + public List getOperations() { + return BeanRelation.list(this, EProductRouting.Operations); + } + + public List getProductOrders() { + return BeanRelation.list(this, EProductRouting.ProductOrders); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index 799f34a..70f77de 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -26,7 +26,7 @@ public class SysParam extends BaseAPS { @ApiParam(value ="基准时间") private Date baseTime; - @Column(name="max_Interrupt_Count") + @Column(name="MAX_INTERRUPT_COUNT") @ApiParam(value ="最大中断次数") private Integer maxInterruptCount; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 60ca0c0..2dc7c4b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.WORK_STATUS; @@ -13,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import java.util.Date; +import java.util.List; /** * @Description :工作 @@ -96,8 +98,14 @@ public class Work extends BaseCode { @Column(name="ORDER_ID") @ApiParam(value ="订单") + @FieldAnnotation(property = false) private Long orderId; + @Column(name="OPERATION_ID") + @ApiParam(value ="工序") + @FieldAnnotation(property = false) + private Long operationId; + public BaseOrder getOrder() { return BeanRelation.get(this, EWork.Order); } @@ -106,4 +114,37 @@ public class Work extends BaseCode { this.orderId = order != null ? order.getId() : 0l; BeanRelation.set(this, EWork.Order, order); } + + public List getWorkResources() { + return BeanRelation.list(this, EWork.WorkResources); + } + + public List getWorkInputs() { + return BeanRelation.list(this, EWork.WorkInputs); + } + + public List getWorkOutputs() { + return BeanRelation.list(this, EWork.WorkOutputs); + } + + public List getWorkRelationInputs() { + return BeanRelation.list(this, EWork.WorkRelationInputs); + } + + public List getWorkRelationOutputs() { + return BeanRelation.list(this, EWork.WorkRelationOutputs); + } + + public Operation getOperation() { + return BeanRelation.get(this, EWork.Operation); + } + + public void setOperation(Operation oper) { + this.operationId = oper != null ? oper.getId() : 0l; + BeanRelation.set(this, EWork.Operation, oper); + } + + public List getPlanFeedbacks() { + return BeanRelation.list(this, EWork.PlanFeedbacks); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java index b37c70d..2a5dc70 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java @@ -1,6 +1,9 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EWorkInput; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -9,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import java.util.Date; +import java.util.List; /** * @Description :工作输入 @@ -33,4 +37,50 @@ public class WorkInput extends BaseAPS { @Column(name="SHORT_COUNT") @ApiParam(value ="短缺数量") private Double shortCount; + + @Column(name="WORK_ID") + @ApiParam(value ="工作") + @FieldAnnotation(property = false) + private Long workId; + + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(property = false) + private Long materialId; + + @Column(name="OPER_INPUT_ID") + @ApiParam(value ="工序输入") + @FieldAnnotation(property = false) + private Long operInputId; + + public Work getWork() { + return BeanRelation.get(this, EWorkInput.Work); + } + + public void setWork(Work work) { + this.workId = work != null ? work.getId() : 0l; + BeanRelation.set(this, EWorkInput.Work, work); + } + + public List getWorkRelations() { + return BeanRelation.list(this, EWorkInput.WorkRelations); + } + + public Material getMaterial() { + return BeanRelation.get(this, EWorkInput.Material); + } + + public void setMaterial(Material material) { + this.materialId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EWorkInput.Material, material); + } + + public OperInput getOperInput() { + return BeanRelation.get(this, EWorkInput.OperInput); + } + + public void setOperInput(OperInput input) { + this.operInputId = input != null ? input.getId() : 0l; + BeanRelation.set(this, EWorkInput.OperInput, input); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java index 16023ec..16ce459 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java @@ -1,14 +1,19 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EWorkOutput; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import org.springframework.context.annotation.Bean; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import java.util.Date; +import java.util.List; /** * @Description :工作输出 @@ -33,4 +38,50 @@ public class WorkOutput extends BaseAPS { @Column(name="REMAIN_COUNT") @ApiParam(value ="多余数量") private Double remainCount; + + @Column(name="WORK_ID") + @ApiParam(value ="工作") + @FieldAnnotation(property = false) + private Long workId; + + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(property = false) + private Long materialId; + + @Column(name="OPER_OUTPUT_ID") + @ApiParam(value ="工序输出") + @FieldAnnotation(property = false) + private Long operOutputId; + + public Work getWork() { + return BeanRelation.get(this, EWorkOutput.Work); + } + + public void setWork(Work work) { + this.workId = work != null ? work.getId() : 0l; + BeanRelation.set(this, EWorkOutput.Work, work); + } + + public List getWorkRelations() { + return BeanRelation.list(this, EWorkOutput.WorkRelations); + } + + public Material getMaterial() { + return BeanRelation.get(this, EWorkOutput.Material); + } + + public void setMaterial(Material material) { + this.materialId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EWorkOutput.Material, material); + } + + public OperOutput getOperOutput() { + return BeanRelation.get(this, EWorkOutput.OperOutput); + } + + public void setOperOutput(OperOutput output) { + this.operOutputId = output != null ? output.getId() : 0l; + BeanRelation.set(this, EWorkOutput.OperOutput, output); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java index 07095c3..8894581 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java @@ -1,8 +1,12 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE; import cn.estsh.i3plus.pojo.aps.enums.WORK_RELATION_TYPE; +import cn.estsh.i3plus.pojo.aps.holders.EWork; +import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -50,4 +54,102 @@ public class WorkRelation extends BaseAPS { @Column(name="FIX_COUNT") @ApiParam(value ="是否固定数量") private Boolean fixCount; + + @Column(name="WORK_INPUT_ID") + @ApiParam(value ="工作输入") + @FieldAnnotation(property = false) + private Long workInputId; + + @Column(name="WORK_OUTPUT_ID") + @ApiParam(value ="工作输出") + @FieldAnnotation(property = false) + private Long workOutputId; + + @Column(name="PREV_WORK_ID") + @ApiParam(value ="前工作") + @FieldAnnotation(property = false) + private Long prevWorkId; + + @Column(name="POST_WORK_ID") + @ApiParam(value ="后工作") + @FieldAnnotation(property = false) + private Long postWorkId; + + @Column(name="PREV_ORDER_ID") + @ApiParam(value ="前订单") + @FieldAnnotation(property = false) + private Long prevOrderId; + + @Column(name="POST_ORDER_ID") + @ApiParam(value ="后订单") + @FieldAnnotation(property = false) + private Long postOrderId; + + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(property = false) + private Long materialId; + + public WorkInput getWorkInput() { + return BeanRelation.get(this, EWorkRelation.WorkInput); + } + + public void setWorkInput(WorkInput input) { + this.workInputId = input != null ? input.getId() : 0l; + BeanRelation.set(this, EWorkRelation.WorkInput, input); + } + + public WorkOutput getWorkOutput() { + return BeanRelation.get(this, EWorkRelation.WorkOutput); + } + + public void setWorkOutput(WorkOutput output) { + this.workOutputId = output != null ? output.getId() : 0l; + BeanRelation.set(this, EWorkRelation.WorkOutput, output); + } + + public Work getPrevWork() { + return BeanRelation.get(this, EWorkRelation.PrevWork); + } + + public void setPrevWork(Work work) { + this.prevWorkId = work != null ? work.getId() : 0l; + BeanRelation.set(this, EWorkRelation.PrevWork, work); + } + + public Work getPostWork() { + return BeanRelation.get(this, EWorkRelation.PostWork); + } + + public void setPostWork(Work work) { + this.postWorkId = work != null ? work.getId() : 0l; + BeanRelation.set(this, EWorkRelation.PostWork, work); + } + + public BaseOrder getPrevOrder() { + return BeanRelation.get(this, EWorkRelation.PrevOrder); + } + + public void setPrevOrder(BaseOrder order) { + this.prevOrderId = order != null ? order.getId() : 0l; + BeanRelation.set(this, EWorkRelation.PrevOrder, order); + } + + public BaseOrder getPostOrder() { + return BeanRelation.get(this, EWorkRelation.PostOrder); + } + + public void setPostOrder(BaseOrder order) { + this.postOrderId = order != null ? order.getId() : 0l; + BeanRelation.set(this, EWorkRelation.PostOrder, order); + } + + public Material getMaterial() { + return BeanRelation.get(this, EWorkRelation.Material); + } + + public void setMaterial(Material material) { + this.materialId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EWorkRelation.Material, material); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java index 34842fb..2e9b10d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java @@ -1,7 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.USE_TYPE; +import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation; +import cn.estsh.i3plus.pojo.aps.holders.EWorkResource; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -53,4 +57,46 @@ public class WorkResource extends BaseAPS { @Column(name="MAX_POST_SD_TIME") @ApiParam(value ="最大后设置中断时间") private String maxPostSdTime; + + @Column(name="WORK_ID") + @ApiParam(value ="工作") + @FieldAnnotation(property = false) + private Long workId; + + @Column(name="RESOURCE_ID") + @ApiParam(value ="资源") + @FieldAnnotation(property = false) + private Long resourceId; + + @Column(name="OPER_RESOURCE_ID") + @ApiParam(value ="工序资源") + @FieldAnnotation(property = false) + private Long operResourceId; + + public Work getWork() { + return BeanRelation.get(this, EWorkResource.Work); + } + + public void setWork(Work work) { + this.workId = work != null ? work.getId() : 0l; + BeanRelation.set(this, EWorkResource.Work, work); + } + + public Resource getResource() { + return BeanRelation.get(this, EWorkResource.Resource); + } + + public void setResource(Resource res) { + this.resourceId = res != null ? res.getId() : 0l; + BeanRelation.set(this, EWorkResource.Resource, res); + } + + public OperResource getOperResource() { + return BeanRelation.get(this, EWorkResource.OperResource); + } + + public void setOperResource(OperResource res) { + this.operResourceId = res != null ? res.getId() : 0l; + BeanRelation.set(this, EWorkResource.OperResource, res); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java index 9a60943..016d92e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.aps.common; -import cn.estsh.i3plus.pojo.aps.bean.DateDuration; import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE; import cn.estsh.i3plus.pojo.base.bean.BaseBean; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 915391e..85b62df 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -12,6 +12,12 @@ import java.util.function.Predicate; public class BeanRelation { Map, Map, List>>> caches = new HashMap<>(); + private void init() { + for (Class cls : BeanInfo.getBeanClasses()) { + caches.put(cls, new ConcurrentHashMap<>()); + } + } + private static Map relations = new ConcurrentHashMap<>(); private static BeanRelation get() { Long userId = 0l; @@ -21,6 +27,7 @@ public class BeanRelation { relation = relations.get(userId); if (relation == null) { relation = new BeanRelation(); + relation.init(); relations.put(userId, relation); } } @@ -30,7 +37,15 @@ public class BeanRelation { } private static Map, List> createRelation(Class cls) { - return null; + Map, List> result = new HashMap<>(); + BeanInfo beanInfo = BeanInfo.getBeanInfo(cls); + if (beanInfo == null) { + return result; + } + for (Enum holder : beanInfo.getAllHolders()) { + result.put(holder, new ArrayList<>()); + } + return result; } public static Map, List> get(BaseBean bean) { @@ -46,10 +61,6 @@ public class BeanRelation { return temp; } - public static void init() { - - } - public static T get(BaseBean bean, Enum holder) { List beans = (List)get(bean).get(holder); if (beans == null || beans.isEmpty()) { @@ -72,7 +83,13 @@ public class BeanRelation { return (T)bean; } } else { - //List relaBeans = + List relaBeans = list(bean, args[index]); + for (BaseBean relaBean : relaBeans) { + T temp = getImpl(relaBean, pred, args, index + 1); + if (temp != null) { + return temp; + } + } } return null; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DateDuration.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java similarity index 98% rename from modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DateDuration.java rename to modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java index d394a8f..f68cc74 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DateDuration.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.aps.bean; +package cn.estsh.i3plus.pojo.aps.common; import java.util.AbstractMap; import java.util.ArrayList; @@ -80,7 +80,8 @@ public class DateDuration { return this.time * 1000; } - public String getString() { + @Override + public String toString() { if (this.rate > PRECISION) return this.getValue(); @@ -130,7 +131,7 @@ public class DateDuration { if (this.time >= 0) this.time /= val; this.rate /= val; - this.value = getString(); + this.value = toString(); } /** diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java index e1142a0..1c7f79e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java @@ -1,5 +1,4 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EDayShift { - ResCalendar } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java new file mode 100644 index 0000000..f78c6ac --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java @@ -0,0 +1,5 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EImportDetail { + Project +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java index d24c26a..65cc748 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EMaterial { - ProductRouting, + ProductRoutings, OperInputs, OperOutputs, WorkInputs, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java index c8e2201..86fd054 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java @@ -1,6 +1,4 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EResCalendar { - DayShifts, - Resources, } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java index 8064356..175536d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java @@ -1,6 +1,4 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EResource { - OperResources, - WorkResources } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java index 200b2a1..08ae7b4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java @@ -1,5 +1,4 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EStandOperation { - Operations } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java index 330d898..507848d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java @@ -8,5 +8,5 @@ public enum EWork { WorkRelationInputs, WorkRelationOutputs, Operation, - PlanFeedback + PlanFeedbacks } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml index 4c21b36..443516d 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ExportProject.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml index 8128db4..9f0d45d 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml index 7d7cb1e..51da8ba 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml index 30dc59a..d35accc 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml @@ -1,7 +1,3 @@ - - - - \ No newline at end of file From 87dfdc64711edc0ffd362418e52dc173e04255ee Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Thu, 26 Sep 2019 10:49:23 +0800 Subject: [PATCH 10/19] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B9=E6=B3=95notIn?= =?UTF-8?q?PackArray=EF=BC=88=EF=BC=89=EF=BC=8C=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB=20notInPack()=20notInPackString()?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index edb8348..3d97300 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -504,6 +504,19 @@ public class DdlPreparedPack { } /** + * 封装not in String查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackArray(Object[] data, String columnName, DdlPackBean packBean) { + if (data != null && data.length > 0) { + packBean.addColumnQuery(columnName," and model." + columnName + " not in (:m_" + columnName + ")", Arrays.asList(data)); + } + } + + /** * 封装in String查询语句 * * @param data @@ -559,9 +572,9 @@ public class DdlPreparedPack { data = ""; for (int i = 0; i < dataArray.length; i++) { if (i == dataArray.length - 1) { - data += "'" + dataArray[i] + "'"; + data += "" + dataArray[i] + ""; } else { - data += "'" + dataArray[i] + "',"; + data += "" + dataArray[i] + ","; } } packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data); From 49bdbacc2f70cd180552d73ce0fe45a8ad8b9b14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 26 Sep 2019 10:51:12 +0800 Subject: [PATCH 11/19] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=B7=AE=E5=BC=82?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E6=A0=B7=E5=BC=8F=E9=9C=80=E6=B1=82=EF=BC=88?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=8C=BA=EF=BC=9A=E7=BA=A2=E8=89=B2=EF=BC=9B?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=EF=BC=8C=E6=95=B0=E9=87=8F=EF=BC=9A=E9=BB=84?= =?UTF-8?q?=E8=89=B2=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java index 1911b04..ee8cdc6 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMessageStyleModel.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.ApiParam; -import io.swagger.models.auth.In; import lombok.Data; import java.io.Serializable; @@ -39,15 +38,12 @@ public class WmsMessageStyleModel implements Serializable { public WmsMessageStyleModel() { } + public WmsMessageStyleModel(String message, Integer selectQty) { this.message = message; - if(selectQty==1){ - this.wsStatus=10; - } - if(selectQty==2){ - this.wsStatus=20; - } + this.wsStatus = selectQty; } + public WmsMessageStyleModel(String message) { this.message = message; } From e42cd80b8bfbb4196807e3834ddde043bf809b74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 26 Sep 2019 16:17:25 +0800 Subject: [PATCH 12/19] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E6=B7=BB=E5=8A=A0=E5=BE=85=E9=80=80=E6=96=99?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 38 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 +-- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 17 ++++++++++ 3 files changed, 57 insertions(+), 2 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 0137da0..44b70e6 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 @@ -377,6 +377,44 @@ public class WmsEnumUtil { } /** + * 条码打印状态 （库存条码打印字段使用） + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRINT_STATUS { + PRINTED(1, "已打印"), NOPRINT(2, "未打印"), GENERATE(3, "退料生成条码"); + + private int value; + private String description; + + PRINT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** * 库位类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 43dfd15..37201b2 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -128,11 +128,11 @@ public class WmsStockSn extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description") private Integer snStatus; /** - * 1:已打印；2：未打印 + * 1:已打印；2：未打印；3：退料生成条码 */ @Column(name = "PRINTED") @ApiParam(value = "是否打印", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description") private Integer printed; @Column(name = "PDATE") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 38ae263..b6cafeb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -208,6 +208,12 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); + + // 查询计划时间在指定范围的单号，查询这些单号的数据 + if (StringUtils.isNotBlank(wmsPOMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsPOMaster.getPlanDateEnd())) { + DdlPreparedPack.getInPackList(wmsPOMaster.getOrderNoList(), "orderNo", result); + } + getStringBuilderPack(wmsPOMaster, result); return result; @@ -593,6 +599,11 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result); DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result); + // 查询计划时间在指定范围的单号，查询这些单号的数据 + if (StringUtils.isNotBlank(wmsASNMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsASNMaster.getPlanDateEnd())) { + DdlPreparedPack.getInPackList(wmsASNMaster.getOrderNoList(), "orderNo", result); + } + getStringBuilderPack(wmsASNMaster, result); return result; @@ -1529,6 +1540,12 @@ public class WmsHqlPack { DdlPreparedPack.getNumberBiggerPack(wmsStockSn.getQty(), "qty", result); result.setOrderByStr(wmsStockSn.orderBy()); + if(wmsStockSn.getPrinted()!= null){ + if(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue() == wmsStockSn.getPrinted()){ + DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue(),"printed",result); + } + } + getStringBuilderPack(wmsStockSn, result); return result; } From 8f7d3b371bdc36d9f494c9f84d17bb1f2204e92a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Thu, 26 Sep 2019 18:42:29 +0800 Subject: [PATCH 13/19] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=EF=BC=9A=E5=9B=9E=E6=98=BE=E7=BB=99=E5=89=8D=E7=AB=AF=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E6=AD=A5=E9=AA=A4=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/WmsActionResponseBean.java | 7 ++-- .../pojo/wms/bean/WmsActionGroupDetails.java | 40 ++++++++++++++++++++-- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java index 40edbf5..a5a4d10 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java @@ -35,8 +35,11 @@ public class WmsActionResponseBean implements Serializable { @ApiParam("进度") public String percent = "消息提示："; - @ApiParam("当前步骤") - public Integer currentStep; + @ApiParam("当前步骤类型名称") + public String currentStepTypeName; + + @ApiParam("当前步骤名称") + public String currentStepName; @ApiParam("总步数") public int totalStep; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index 1cdfb49..e8455c4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -84,6 +84,10 @@ public class WmsActionGroupDetails extends BaseBean { private String asName; @Transient + @ApiParam(value = "步骤类型名称") + private String atName; + + @Transient @ApiParam(value = "流程名称") private String agName; @@ -112,11 +116,13 @@ public class WmsActionGroupDetails extends BaseBean { @ApiParam(value = "是否自动开窗", example = "2") private Integer isAutoOpenWindow; + @Column(name = "SEARCH_KEY") @ApiParam(value = "搜索KEY") - public String searchKey; + private String searchKey; + @Column(name = "GROUP_KEY") @ApiParam(value = "分组KEY") - public String groupKey; + private String groupKey; public int getSeqVal() { return this.seq == null ? 0 : this.seq; @@ -153,4 +159,34 @@ public class WmsActionGroupDetails extends BaseBean { public int getLenCheckVal() { return this.lenCheck == null ? 0 : this.lenCheck; } + + public WmsActionGroupDetails() { + } + + public WmsActionGroupDetails(Long agId, Integer seq, Integer okSeq, Integer ngSeq, Integer valueType, Integer toUpper, + Integer lenCheck, String regularCheck, String regularCheckFailMsg, Long asId, Long atId, + String asName, String atName, String goToBtnCode, String goToBtnName, Integer preShow, + Long showAmId, Integer isCommitAble, Integer isAutoOpenWindow, String searchKey, String groupKey) { + this.agId = agId; + this.seq = seq; + this.okSeq = okSeq; + this.ngSeq = ngSeq; + this.valueType = valueType; + this.toUpper = toUpper; + this.lenCheck = lenCheck; + this.regularCheck = regularCheck; + this.regularCheckFailMsg = regularCheckFailMsg; + this.asId = asId; + this.atId = atId; + this.asName = asName; + this.atName = atName; + this.goToBtnCode = goToBtnCode; + this.goToBtnName = goToBtnName; + this.preShow = preShow; + this.showAmId = showAmId; + this.isCommitAble = isCommitAble; + this.isAutoOpenWindow = isAutoOpenWindow; + this.searchKey = searchKey; + this.groupKey = groupKey; + } } From 1d281da5314cdb84f80dfd2e18c79c7b7e26d6b3 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 26 Sep 2019 20:34:57 +0800 Subject: [PATCH 14/19] add order spread to aps --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java | 6 ++++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java | 6 ++++++ .../main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java | 2 +- .../i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml | 2 +- 7 files changed, 26 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index b11e5dc..cf27632 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import io.swagger.annotations.Api; @@ -21,7 +22,7 @@ import java.util.List; **/ @Data @Api("订单基类") -public class BaseOrder extends BaseAPS { +public class BaseOrder extends BaseCode { @Column(name="COUNT") @ApiParam(value ="数量") private Double count; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index aee742f..817df4a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import java.lang.reflect.Method; +import java.sql.JDBCType; /** * @Description :字段信息 @@ -75,6 +76,10 @@ public class FieldInfo extends BaseCode { @ApiParam(value ="主键标识") private Boolean mainKey; + @Column(name="JDBC_TYPE") + @ApiParam(value ="数据库类型") + private JDBCType jdbcType; + @JsonIgnore private transient Class clazz; @JsonIgnore diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java index 701ac20..54d7fc4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -36,4 +38,7 @@ public class Inventory extends BaseOrder { @ApiParam(value ="多余量") private Double excessCount; + public Work getWork() { + return BeanRelation.get(this, EBaseOrder.Works); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java index 7fe588b..b1676d8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -43,4 +45,8 @@ public class PurchaseOrder extends BaseOrder { @Column(name="EXCESS_COUNT") @ApiParam(value ="多余量") private Double excessCount; + + public Work getWork() { + return BeanRelation.get(this, EBaseOrder.Works); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index ee332b9..f5a85dd 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -40,4 +42,8 @@ public class SalesOrder extends BaseOrder { @Column(name="CALC_LEAD_TIME") @ApiParam(value ="提前期计算值") private String calcLeadTime; + + public Work getWork() { + return BeanRelation.get(this, EBaseOrder.Works); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java index e2dba7e..49e3a5f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java @@ -243,7 +243,7 @@ public class BeanRelationUtil { * 将指定包下的类加载到内存中 * @param packName */ - private static List> loadClass(String packName) { + public static List> loadClass(String packName) { List> clses = new ArrayList<>(); ClassLoader loader = Thread.currentThread().getContextClassLoader(); String strFile = packName.replaceAll("\\.", "/"); diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml index 9f0d45d..624a636 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file From cd8a5df9912699b16f584add423085d5f3057f8c Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 26 Sep 2019 21:06:05 +0800 Subject: [PATCH 15/19] =?UTF-8?q?VDA=20=E7=94=9F=E4=BA=A7=E5=BF=AB?= =?UTF-8?q?=E9=80=9F=E5=85=A5=E5=BA=93=E7=BB=84=E4=BB=B6=E5=BC=80=E5=8F=91?= 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 | 4 +++- 1 file changed, 3 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 0137da0..29d6961 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 @@ -560,7 +560,9 @@ public class WmsEnumUtil { ASN(200, "ASN", "ASN"), PO(210, "PO", "PO"), QC(220, "QC", "QC"), - AMPR(230, "AMPR", "AMPR"); + AMPR(230, "AMPR", "AMPR"), + FINISHGOODS(240, "FINISHGOODS", "VDA生产快速入库"), + VDA_REPORT(250, "VDA_REPORT", "VDA生产报工"); private int value; From 4173f0637fdb1baff6d696171474db00127f70d5 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Thu, 26 Sep 2019 21:44:31 +0800 Subject: [PATCH 16/19] =?UTF-8?q?=E5=AE=89=E7=81=AF=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 4 ++++ .../estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 7 +++++-- .../java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 2 +- .../cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 17 +++++++++++++++-- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index e03b224..a58c464 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -260,6 +260,10 @@ public class AndonManageQueue extends BaseBean { private List statusList; @Transient + @ApiParam(value = "查询条件：ANDON状态") + private List typeList; + + @Transient @ApiParam(value = "比例", example = "0") private Double proportion; 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 f89b4d0..e356a41 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 @@ -271,11 +271,13 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result); - DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getActionCode(), "actionCode", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getAndonOrderNo(), "andonOrderNo", result); DdlPreparedPack.getStringEqualPack(andonManageQueue.getShiftCode(), "shiftCode", result); + DdlPreparedPack.getInPackList(andonManageQueue.getStatusList(), "statusCode", result); // 只有安灯任务管理特殊用途 DdlPreparedPack.getInPackArray(obj, "statusCode", result); + DdlPreparedPack.getInPackList(andonManageQueue.getTypeList(), "alarmCode", result); // 只有安灯任务管理特殊用途 + DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result); if(StringUtils.isNotBlank(andonManageQueue.getCallTimeStart()) || StringUtils.isNotBlank(andonManageQueue.getCallTimeEnd())){ DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true); @@ -285,7 +287,8 @@ public class AndonHqlPack { // 根据优先级倒序，序号升序排序 // DdlPreparedPack.getOrderByPack(new Object[]{2, 1}, // new String[]{"priorityLevel", "seq"}, result); - result.setOrderByStr(andonManageQueue.orderBy()); + + result.setOrderByStr(andonManageQueue.orderBy()); return result; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 457b27d..716a027 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -134,7 +134,7 @@ public abstract class BaseBean implements Serializable { String result = ""; if (orderByParam!=null&&orderByParam.trim().length()>0) { result = " order by " + orderByParam; - if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { + if(ascOrDesc!= null && ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) { result += " asc"; }else{ result += " desc"; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 3d97300..f249d04 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -530,6 +530,19 @@ public class DdlPreparedPack { } /** + * 封装not in List查询语句 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotInPackList(List data, String columnName, DdlPackBean packBean) { + if (data != null && data.size() > 0) { + packBean.addColumnQuery(columnName," and model." + columnName + "not in (:m_" + columnName + ")", data); + } + } + + /** * 封装in String查询语句 * * @param data @@ -572,9 +585,9 @@ public class DdlPreparedPack { data = ""; for (int i = 0; i < dataArray.length; i++) { if (i == dataArray.length - 1) { - data += "" + dataArray[i] + ""; + data += "'" + dataArray[i] + "'"; } else { - data += "" + dataArray[i] + ","; + data += "'" + dataArray[i] + "',"; } } packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data); From 804574090f75703357673244300c1f82c2be1e05 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 27 Sep 2019 10:52:30 +0800 Subject: [PATCH 17/19] =?UTF-8?q?pcn=E7=94=9F=E4=BA=A7=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 478 ++++++++++++++++++++- .../i3plus/pojo/mes/pcn/bean/MesPartCategory.java | 42 ++ .../i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 4 + .../pcn/repository/MesPartCategoryRepository.java | 16 + .../i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java | 65 +++ .../estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 4 + 6 files changed, 602 insertions(+), 7 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java 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 f9dbb36..a93ebf4 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 @@ -350,14 +350,16 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_CENTER_RUNNING_STATUS { - RUNNING(1, "开线"), - STOPPED(2, "停线"); + RUNNING(1, "start", "开线"), + STOPPED(2, "stop", "停线"); private int value; + private String code; private String description; - WORK_CENTER_RUNNING_STATUS(int value, String description) { + WORK_CENTER_RUNNING_STATUS(int value, String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -365,6 +367,10 @@ public class MesPcnEnumUtil { return value; } + public String getCode() { + return code; + } + public String getDescription() { return description; } @@ -378,6 +384,16 @@ public class MesPcnEnumUtil { } return tmp; } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } } /** @@ -386,10 +402,10 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WC_CHECK_TYPE { - PERSON(10, "person", "人"), - EQUIPMENT(20, "equipment", "机"), - MATERIAL(30, "material", "料"), - ROUTE(40, "route", "法"), + PERSON(10, "people", "人"), + EQUIPMENT(20, "equipments", "设备"), + MATERIAL(30, "materials", "物料"), + ROUTE(40, "routes", "工艺"), ONLINE_SIGNAL(50, "onlineSignal", "开线信号"); private int value; @@ -423,6 +439,16 @@ public class MesPcnEnumUtil { } return tmp; } + + public static String valueOfCode(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].code; + } + } + return tmp; + } } /** @@ -498,4 +524,442 @@ public class MesPcnEnumUtil { } + /** + * 设备连接类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum EQP_CONNECT_TYPE { + + PLC(10, "PLC"), + DB(20, "DB"), + OTHER(30,"OTHER"); + + private int value; + private String description; + + EQP_CONNECT_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesPlanOrder实体对应的status值 计划状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLAN_ORDER_STATUS { + + CREATE(10, "CREATED", "创建"), + DE_COMPOSE_ING(20, "DE_COMPOSE_ING", "分解中"), + DE_COMPOSE_ED(30, "DE_COMPOSE_ED", "分解完成"), + CLOSE(40, "CLOSE", "关闭"); + + private int value; + private String code; + private String description; + + PLAN_ORDER_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesWorkOrder实体对应的workOrderStatus值 工单状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_STATUS { + + CREATE(10, "创建"), + LANDED(20, "下达"), + OPEN(30, "启动"), + PAUSE(40, "暂停"), + CANCEL(50, "取消"), + CLOSE(60, "关闭"); + + private int value; + private String description; + + WORK_ORDER_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesWorkOrder实体对应的workOrderType值 工单类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_TYPE { + + STANDARD_ORDER(10, "标准工单"), + BTS_ORDER(20, "BTS工单"), + ATTEMPT_ORDER(30, "试制工单"); + + private int value; + private String description; + + WORK_ORDER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesPlanOrder实体对应的planType值 计划类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLAN_ORDER_TYPE { + + STANDARD_ORDER(10, "标准"); + + private int value; + private String description; + + PLAN_ORDER_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(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 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; + } + } + + /** + * MesPlanOrder实体对应的source值 计划来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PALN_ORDER_SOURCE { + + MES("MES", "来源于MES"), + SAP("SAP", "来源于SAP"); + + private String value; + private String description; + + PALN_ORDER_SOURCE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesWorkOrder实体对应的source值 计划来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_SOURCE { + + MES("MES", "来源于MES"), + AMES("AMES", "来源于AMES"), + SAP("SAP", "来源于SAP"), + CREATE("CREATE", "手工新增"), + RESOLVE("RESOLVE", "计划分解"); + + private String value; + private String description; + + WORK_ORDER_SOURCE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesQueueOrder实体对应的status值 队列主表状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_ORDER_STATUS { + + NORMAL(10, "正常"), + ONLINE(20, "已上线"), + OFFLINE(30, "已下线"), + CLOSE(40, "已关闭"), + ; + + private int value; + private String description; + + QUEUE_ORDER_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesQueueOrderDetail实体对应的status值 队列详情状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QUEUE_ORDER_DETAIL_STATUS { + + NORMAL(10, "正常"), + CLOSE(20, "关闭"); + + private int value; + private String description; + + QUEUE_ORDER_DETAIL_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesPartCategory实体对应的categoryType值 条码表条码质量状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PART_CATEGORY_TYPE { + + CATEGORY_ONE("Category1", "类型1"), + CATEGORY_TWO("Category2", "类型2"), + CATEGORY_THREE("Category3", "类型3"); + + private String value; + private String description; + + PART_CATEGORY_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (val.equals(values()[i].value)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * MesWorkOrder实体对应的approvalStatus值 审批状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_ORDER_APPROVAL_STATUS { + + WAIT_APPROVAL(10, "待审批"), + COMPLETE_APPROVAL(20, "已审批"), + REJECT_APPROVAL(30, "驳回"); + + private int value; + private String description; + + WORK_ORDER_APPROVAL_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(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 valueOfDescription2(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description; + } + } + return tmp; + } + } + + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java new file mode 100644 index 0000000..77e74cb --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java @@ -0,0 +1,42 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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; + +/** + * @Description :零件种类 + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PART_CATEGORY") +@Api("零件种类") +public class MesPartCategory extends BaseBean { + @Column(name="CATEGORY_CODE") + @ApiParam("分类代码") + private String categoryCode; + + @Column(name="CATEGORY_NAME") + @ApiParam("分类名称") + private String categoryName; + + @Column(name="CATEGORY_TYPE") + @ApiParam("分类类型") + private String categoryType; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java index 9ff0258..ea9de66 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -163,6 +163,10 @@ public class MesWorkOrder extends BaseBean { public String prodCfgName; @Transient + @ApiParam("区域代码名称") + private String areaCodeName; + + @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59") public String startTimeStart; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java new file mode 100644 index 0000000..eb12a69 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPartCategoryRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPartCategory; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesPartCategoryRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java index 4e0281a..61e57f3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java @@ -33,6 +33,20 @@ public class MesHqlPack { } /** + * 通用查询条件 + * + * @param organizeCode + * @return + */ + public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + return packBean; + } + + /** * MES PCN系统配置信息条件查询 * * @param mesConfig @@ -153,4 +167,55 @@ public class MesHqlPack { return packBean; } + /** + * 物料信息查询条件封装 + * + * @param mesPart + * @return + */ + public static DdlPackBean getPartCondition(MesPart mesPart, String organizeCode) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean); + + if (StringUtils.isNotEmpty(mesPart.getPartNo())) { + DdlPreparedPack.getStringLikerPack(mesPart.getPartNo(), "partNo", packBean); + } + if (StringUtils.isNotEmpty(mesPart.getPartName())) { + DdlPreparedPack.getStringLikerPack(mesPart.getPartName(), "partName", packBean); + } + if (StringUtils.isNotEmpty(mesPart.getCategoryCode1())) { + DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode1(), "categoryCode1", packBean); + } + if (StringUtils.isNotEmpty(mesPart.getCategoryCode2())) { + DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode2(), "categoryCode2", packBean); + } + if (StringUtils.isNotEmpty(mesPart.getCategoryCode3())) { + DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean); + } + + DdlPreparedPack.getOrderDefault(mesPart); + DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPart.getOrderByParam()}, packBean); + return packBean; + } + + /** + * MES 客户信息查询条件封装 + * + * @param customer + * @return + */ + public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode); + if (StringUtils.isNotEmpty(customer.getCustomerCode())) { + DdlPreparedPack.getStringLikerPack(customer.getCustomerCode(), "customerCode", packBean); + } + if (StringUtils.isNotEmpty(customer.getCustomerName())) { + DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean); + } + + return packBean; + } + } 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 b22729f..8c0735a 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 @@ -163,6 +163,10 @@ public class MesWorkOrder extends BaseBean { public String prodCfgName; @Transient + @ApiParam("区域代码名称") + private String areaCodeName; + + @Transient // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59") public String startTimeStart; From f1f712c9978c9f3dab378c25d55a9a017c798b2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 27 Sep 2019 12:36:23 +0800 Subject: [PATCH 18/19] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6?= =?UTF-8?q?=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2=E6=B5=81=E7=A8=8B=E6=98=8E?= =?UTF-8?q?=E7=BB=86BUG=EF=BC=9A=E5=AF=BC=E8=87=B4=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=94=99=E4=B9=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index e8455c4..fc0f62b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -163,10 +163,12 @@ public class WmsActionGroupDetails extends BaseBean { public WmsActionGroupDetails() { } - public WmsActionGroupDetails(Long agId, Integer seq, Integer okSeq, Integer ngSeq, Integer valueType, Integer toUpper, + public WmsActionGroupDetails(Long id, Long agId, Integer seq, Integer okSeq, Integer ngSeq, Integer valueType, Integer toUpper, Integer lenCheck, String regularCheck, String regularCheckFailMsg, Long asId, Long atId, String asName, String atName, String goToBtnCode, String goToBtnName, Integer preShow, - Long showAmId, Integer isCommitAble, Integer isAutoOpenWindow, String searchKey, String groupKey) { + Long showAmId, Integer isCommitAble, Integer isAutoOpenWindow, String searchKey, + String groupKey, String organizeCode) { + this.id = id; this.agId = agId; this.seq = seq; this.okSeq = okSeq; @@ -188,5 +190,6 @@ public class WmsActionGroupDetails extends BaseBean { this.isAutoOpenWindow = isAutoOpenWindow; this.searchKey = searchKey; this.groupKey = groupKey; + this.organizeCode = organizeCode; } } From c2a75d96da1bbcbd63972ea1fa385b07b3abec7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Fri, 27 Sep 2019 13:23:18 +0800 Subject: [PATCH 19/19] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5get?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index c9fab25..d101b27 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -133,7 +133,7 @@ public class WmsCSOrderDetails extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.INVENTORY_DIFFERENCE_TYPE.class,refForeignKey = "value",value = "description") public Integer differenceType; - public Integer getDifferenceType() { + public Integer getDifferenceTypeVal() { return this.differenceType == null ? -1: this.differenceType; }