diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 888e1bd..e97c0bb 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -35,6 +35,10 @@ com.alibaba fastjson + + com.thoughtworks.xstream + xstream + diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/XStreamCDATA.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/XStreamCDATA.java new file mode 100644 index 0000000..9ade29e --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/XStreamCDATA.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.base.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * @Description : XStream 数据转换的CDATA + * @Reference : + * @Author : wei.peng + * @CreateDate : 2019-07-23 下午5:52 + * @Modify: + **/ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface XStreamCDATA { +} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java new file mode 100644 index 0000000..76e17ee --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java @@ -0,0 +1,231 @@ +package cn.estsh.i3plus.pojo.base.common; + +import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.core.util.QuickWriter; +import com.thoughtworks.xstream.io.HierarchicalStreamWriter; +import com.thoughtworks.xstream.io.naming.NameCoder; +import com.thoughtworks.xstream.io.naming.NoNameCoder; +import com.thoughtworks.xstream.io.xml.PrettyPrintWriter; +import com.thoughtworks.xstream.io.xml.XppDomDriver; + +import java.io.Writer; +import java.lang.reflect.Field; + +/** + * @Description : Xml 工厂 + * 官方DOC: https://www.tutorialspoint.com/xstream/xstream_discussion.htm + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-7-23 下午5:58 + * @Modify: + **/ +public class XStreamFactory { + + private static final XStream xStream = XStreamFactory.getXStream(); + + public static final String CDATA_PREFIX = ""; + + public static XStream getXStream() { + final NameCoder nameCoder = new NoNameCoder(); + XStream xStream = new XStream(new XppDomDriver(nameCoder) { + @Override + public HierarchicalStreamWriter createWriter(Writer out) { + return new PrettyPrintWriter(out, nameCoder) { + boolean cdataFlag = false; + Class targetClass = null; + + @Override + public void startNode(String name, Class clazz) { + super.startNode(name, clazz); + if (targetClass == null) { + targetClass = clazz; + } + cdataFlag = isCDATA(targetClass, name); + } + + @Override + public void writeText(QuickWriter writer, String text) { + if (cdataFlag) { + writer.write(CDATA_PREFIX); + writer.write(text); + writer.write(CDATA_SUFFIX); + } else { + writer.write(text); + } + } + }; + } + }); + + xStream.autodetectAnnotations(true); + + return xStream; + } + + + private static boolean isCDATA(Class clazz, String fieldAlias) { + //检查类本身 + boolean cdataFlag = isExistCDATA(clazz, fieldAlias); + if (cdataFlag) { + return cdataFlag; + } + //继续检查父类 + Class superClazz = clazz.getSuperclass(); + while (!superClazz.equals(Object.class)) { + cdataFlag = isExistCDATA(superClazz, fieldAlias); + if (cdataFlag) { + return cdataFlag; + } + superClazz = superClazz.getClass().getSuperclass(); + } + return false; + } + + /** + * 检查是否有 @XStreamCDATA 注解 + * + * @param clazz clazz + * @param fieldAlias fieldAlias + * @return + */ + private static boolean isExistCDATA(Class clazz, String fieldAlias) { + Field[] fields = clazz.getDeclaredFields(); + for (Field field : fields) { + if (field.getAnnotation(XStreamCDATA.class) != null) { + XStreamAlias xStreamAlias = field.getAnnotation(XStreamAlias.class); + if (xStreamAlias != null && fieldAlias.equals(xStreamAlias.value())) { + return true; + } else { + if (fieldAlias.equals(field.getName())) { + return true; + } + } + } + } + return false; + } + + + + /** + * Javabean 转XML + * @param + * @return xml字符串 + */ + public static String toXml(T t) { + xStream.processAnnotations(t.getClass()); + String headLine = "\n"; + return headLine + xStream.toXML(t); + } + + /** + * XML字符串转javabean + * + * @param xmlStr xml字符串 + * @param + * @return Java对象 + */ + public static T toJavaBean(String xmlStr) { + return (T) xStream.fromXML(xmlStr); + } +// +// public static void main(String[] args) { +// User u = new User(0, "zhangsan0", "zhangsanpwd0"); +// User u1 = new User(1, "zhangsan1", "zhangsanpwd"); +// User u2 = new User(2, "zhangsan2", "zhangsanpwd"); +// User u3 = new User(3, "zhangsan3", "zhangsanpwd"); +// +// Role r1 = new Role(1, "Admin", "Admin1"); +// Role r2 = new Role(2, "Admin", "Admin2"); +// Role r3 = new Role(3, "Admin", "Admin3"); +// +// DataAdapter ad = new DataAdapter(10086L,UUID.randomUUID().toString(),"sssfwef",u1); +// u1.setRole(r1); +// +// u2.getRoleList().add(r1); +// u2.getRoleList().add(r2); +// u2.getRoleList().add(r3); +// +// u3.setRole(r1); +// u3.getRoleList().add(r2); +// u3.getRoleList().add(r3); +// +// System.out.println(toXml(u) + "\n\n "); +// System.out.println(toXml(u1) + "\n\n "); +// System.out.println(toXml(u2) + "\n\n "); +// System.out.println(toXml(u3) + "\n\n "); +// System.out.println(toXml(ad) + "\n\n "); +// +// System.out.println(JSON.toJSONString(toJavaBean(toXml(ad)))); +// +// } +} +// +//@Data +//@XStreamAlias("DataAdapter") +////对应carInfos元素 +//class DataAdapter implements Serializable { +// +// @XStreamAsAttribute +// private Long scId; +// private String key; +// @XStreamCDATA +// private String resultData; +// +// private Object auth; +// +// public DataAdapter(Long scId, String key, String resultData, Object auth) { +// this.scId = scId; +// this.key = key; +// this.resultData = resultData; +// this.auth = auth; +// } +//} +// +//@Data +//@XStreamAlias("user") +////对应carInfos元素 +//class User implements Serializable { +// private static final long serialVersionUID = -7554548655397869156L; +// +// @XStreamAsAttribute +// private Integer id; +// private String loginName; +// private String loginPwd; +// +// private Role role; +// private List roleList = new ArrayList(); +// private List roleArray; +// +// public User() { +// } +// +// public User(Integer id, String loginName, String loginPwd) { +// this.id = id; +// this.loginName = loginName; +// this.loginPwd = loginPwd; +// } +//} +// +//@Data +//@XStreamAlias("role") +////对应carInfos元素 +//class Role implements Serializable { +// private static final long serialVersionUID = -3134157833696958743L; +// @XStreamAsAttribute +// private Integer id; +// private String roleName; +// private String roleCode; +// +// public Role() { +// } +// +// public Role(Integer id, String roleName, String roleCode) { +// this.id = id; +// this.roleName = roleName; +// this.roleCode = roleCode; +// } +//} \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 5e00634..5b16871 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -957,6 +957,78 @@ public class CommonEnumUtil { } } + /** + * HTTP 请求方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum HTTP_METHOD_TYPE { + GET(1,"GET" ,"GET"), + POST(2, "POST","POST"), + DELETE(3, "DELETE","DELETE"), + PUT(4, "PUT","PUT"); + + private int value; + private String code; + private String description; + + private HTTP_METHOD_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 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; + } + + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + + 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 codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + } // 数据有效的静态常量 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 4a79b7c..8caa32b 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 @@ -766,7 +766,11 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum IS_GENERAL_TASK { - CREATE(10, "CREATE", "创建"), INIT(20, "INIT", "初始化"), IS_GENERAL(30, "IS_GENERAL", "已生成"), NO_GENERAL(40, "NO_GENERAL", "不生成"); + CREATE(10, "CREATE", "创建"), + INIT(20, "INIT", "初始化"), + IS_GENERAL(30, "IS_GENERAL", "已生成"), + NO_GENERAL(40, "NO_GENERAL", "不生成"), + CANCEL(50,"CANCEL","撤销"); private int value; private String code; @@ -2701,7 +2705,7 @@ public class WmsEnumUtil { ZMMES("ZMMES", "知明MES"), TBMES("TBMES", "MES接口"), AMP("AMP", "AMP系统"), - ZSLD("ZSLD", "直送拉动"); + DR("DR", "直送拉动"); private String value; private String description; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java new file mode 100644 index 0000000..baed2c2 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesESOP.java @@ -0,0 +1,65 @@ +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/7/30 9:30 AM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_ESOP") +@Api("作业指导书信息表(ODS)") +public class MesESOP extends BaseBean { + + @Column(name="PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name="ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name="PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name = "STEP_SEQ") + @ApiParam("工步序号") + private Integer stepSeq; + + @Column(name="SOP_NAME") + @ApiParam("SOP名称") + private String sopName; + + @Column(name="SOP_URL") + @ApiParam("SOP_URL") + private String sopUrl; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesESOPRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesESOPRepository.java new file mode 100644 index 0000000..9f76128 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesESOPRepository.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.MesESOP; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wynne.lu + * @CreateDate : 2019-07-30 + * @Modify: + **/ +@Repository +public interface MesESOPRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java new file mode 100644 index 0000000..1dbdf9f --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesESOP.java @@ -0,0 +1,65 @@ +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/7/30 9:30 AM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_ESOP") +@Api("作业指导书信息表(ODS)") +public class MesESOP extends BaseBean { + + @Column(name="PART_NO") + @ApiParam("零件号") + private String partNo; + + @Column(name="WORK_CENTER_CODE") + @ApiParam("工作中心代码") + private String workCenterCode; + + @Column(name="WORK_CELL_CODE") + @ApiParam("工作单元代码") + private String workCellCode; + + @Column(name="ROUTE_CODE") + @ApiParam("流程代码") + private String routeCode; + + @Column(name="PROCESS_CODE") + @ApiParam("工序代码") + private String processCode; + + @Column(name = "STEP_CODE") + @ApiParam("工步代码") + private String stepCode; + + @Column(name = "STEP_SEQ") + @ApiParam("工步序号") + private Integer stepSeq; + + @Column(name="SOP_NAME") + @ApiParam("SOP名称") + private String sopName; + + @Column(name="SOP_URL") + @ApiParam("SOP_URL") + private String sopUrl; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java new file mode 100644 index 0000000..367ef81 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesESOPRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesActionMethod; +import cn.estsh.i3plus.pojo.mes.bean.MesESOP; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wynne.lu + * @CreateDate : 2019-07-30 + * @Modify: + **/ +@Repository +public interface MesESOPRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/PojoAuth.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/PojoAuth.java new file mode 100644 index 0000000..80e60a2 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/PojoAuth.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +import com.thoughtworks.xstream.annotations.XStreamImplicit; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-7-25 下午3:31 + * @Modify: + **/ +@Data +@XStreamAlias("auth") +public class PojoAuth{ + + @XStreamAsAttribute + private Long id; + @XStreamAsAttribute + private Integer authType; + + @XStreamImplicit + private List params; + + private String authPath; + private String userName ="登录名称"; + private String password ="登录名称"; + private String languageCode ="登录名称"; + + // 认证令牌 + private String token; +// // 认证令牌集合(复杂认证令牌) +// private List tokenList; + // 原始认证数据 + @XStreamCDATA + private String result; + + public PojoAuth(Long id, Integer authType,String authPath, List params) { + this.id = id; + this.authType = authType; + this.authPath = authPath; + this.params = params; + } +} \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Prop.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Prop.java new file mode 100644 index 0000000..248ccd5 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Prop.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-7-25 下午5:18 + * @Modify: + **/ +@Data +@XStreamAlias("prop") +public class Prop { + + @XStreamAsAttribute + private Long id; + private String paramName; + private String paramValue; + + public Prop(Long id, String paramName, String paramValue) { + this.id = id; + this.paramName = paramName; + this.paramValue = paramValue; + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Request.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Request.java new file mode 100644 index 0000000..87ac9f0 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Request.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-7-25 下午3:31 + * @Modify: + **/ +@Data +@XStreamAlias("request") +public class Request{ + + @XStreamAsAttribute + private Long id; + @XStreamAsAttribute + private Integer requestType; + private String requestPath; + + @XStreamCDATA + private String result; + + public Request(Long id, Integer requestType,String requestPath) { + this.id = id; + this.requestType = requestType; + this.requestPath = requestPath; + } +} \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java new file mode 100644 index 0000000..38f205f --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-7-25 下午3:29 + * @Modify: + **/ +@Data +@XStreamAlias("model") +public class SuitCoreModel { + + @XStreamAsAttribute + private Long id; + @XStreamAsAttribute + private Integer caseType; + private String suitCaseStatusCode; + private String suitCaseMessage; + + private String key; + private PojoAuth auth; + private Request request; + + @XStreamCDATA + private String responseResult; + + public SuitCoreModel(Long id, Integer caseType, String suitCaseStatusCode, String key, PojoAuth auth, Request request) { + this.id = id; + this.caseType = caseType; + this.suitCaseStatusCode = suitCaseStatusCode; + this.key = key; + this.auth = auth; + this.request = request; + } +} + + + diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java index 30fe13b..25ed168 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsMoveDetailsModel.java @@ -17,5 +17,5 @@ import java.util.List; @Data public class WmsMoveDetailsModel implements Serializable { private WmsMoveDetails details; - private List moveSn; + private List moveSnList; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java index f86330b..9be97bc 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java @@ -4,7 +4,6 @@ import io.swagger.annotations.ApiParam; import lombok.Data; import java.io.Serializable; -import java.util.List; /** * @Description : 操作人对象，用于登陆，非持久化 diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDataMongoRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDataMongoRepository.java deleted file mode 100644 index 61e25a7..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDataMongoRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.platform.platrepositorymongo; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; -import cn.estsh.i3plus.pojo.platform.platbean.WmsActionLogData; - -/** - * @Description : 作业日志参数(使用Mongodb) - * @Reference : - * @Author : siliter - * @Date : 2019-04-11 12:03:00 - * @Modify : - **/ -public interface WmsActionLogDataMongoRepository extends BaseMongoRepository { -} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDetailsMongoRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDetailsMongoRepository.java deleted file mode 100644 index a87ced1..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogDetailsMongoRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.platform.platrepositorymongo; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; -import cn.estsh.i3plus.pojo.platform.platbean.WmsActionLogDetails; - -/** - * @Description : 作业日志明细(使用Mongodb) - * @Reference : - * @Author : siliter - * @Date : 2019-04-11 12:03:00 - * @Modify : - **/ -public interface WmsActionLogDetailsMongoRepository extends BaseMongoRepository { -} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogMongoRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogMongoRepository.java deleted file mode 100644 index 873ae06..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/WmsActionLogMongoRepository.java +++ /dev/null @@ -1,14 +0,0 @@ -package cn.estsh.i3plus.pojo.platform.platrepositorymongo; - -import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; -import cn.estsh.i3plus.pojo.platform.platbean.WmsActionLog; - -/** - * @Description : 作业日志(使用Mongodb) - * @Reference : - * @Author : siliter - * @Date : 2019-04-11 12:03:00 - * @Modify : - **/ -public interface WmsActionLogMongoRepository extends BaseMongoRepository { -} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java deleted file mode 100644 index f4c744c..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/WmsBsonPack.java +++ /dev/null @@ -1,80 +0,0 @@ -package cn.estsh.i3plus.pojo.platform.sqlpack; - -import cn.estsh.i3plus.pojo.base.tool.BsonPackTool; -import cn.estsh.i3plus.pojo.platform.platbean.*; -import com.mongodb.BasicDBObject; -import org.bson.conversions.Bson; - -/** - * @Description : Bson对象封装 - * @Reference : - * @Author : siliter - * @CreateDate : 2019-04-11 13:15 - * @Modify: - **/ -public class WmsBsonPack { - - /** - * 作业日志复杂查询 - * - * @param actionLog - * @return - */ - public static Bson packBsonByActionLog(WmsActionLog actionLog) { - Bson bson = new BasicDBObject(); - bson = BsonPackTool.timeBuilder(actionLog.getCreateDatetime(), "createDatetime", bson, false, false); - bson = BsonPackTool.getStringEqualPack(actionLog.getOrderNo(), "orderNo", bson); - bson = BsonPackTool.getStringEqualPack(actionLog.getTransTypeCode(), "transTypeCode", bson); - bson = BsonPackTool.getStringEqualPack(actionLog.getFixId(), "fixId", bson); - bson = BsonPackTool.getNumEqualPack(actionLog.getAgId(), "agId", bson); - bson = BsonPackTool.getNumEqualPack(actionLog.getActionStatus(), "actionStatus", bson); - bson = BsonPackTool.getStringEqualPack(actionLog.getAgNameC(), "agNameC", bson); - bson = BsonPackTool.getStringEqualPack(actionLog.getOrganizeCode(), "organizeCode", bson); - bson = BsonPackTool.getNumEqualPack(actionLog.getIsValid(), "isValid", bson); - bson = BsonPackTool.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", bson); - - if((actionLog.getStartTimeStart() != null&&actionLog.getStartTimeStart() !="") - || (actionLog.getStartTimeEnd() != null&&actionLog.getStartTimeEnd() != "")){ - bson = BsonPackTool.timeBuilder(actionLog.getStartTimeStart(), actionLog.getStartTimeEnd(), "startTime", bson, true); - } - - if((actionLog.getEndTimeStart() != null&&actionLog.getEndTimeStart() != "") - || (actionLog.getEndTimeEnd() != null&&actionLog.getEndTimeEnd() != "")){ - bson = BsonPackTool.timeBuilder(actionLog.getEndTimeStart(), actionLog.getEndTimeEnd(), "endTime", bson, true); - } - - return bson; - } - - /** - * 作业日志明细复杂查询 - * - * @param actionLogDetails - * @return - */ - public static Bson packBsonByActionLogDetails(WmsActionLogDetails actionLogDetails) { - Bson bson = new BasicDBObject(); - bson = BsonPackTool.getNumEqualPack(actionLogDetails.getAlId(), "alId", bson); - bson = BsonPackTool.getStringEqualPack(actionLogDetails.getOrganizeCode(), "organizeCode", bson); - bson = BsonPackTool.getNumEqualPack(actionLogDetails.getValueType(), "valueType", bson); - bson = BsonPackTool.getNumEqualPack(actionLogDetails.getSeq(), "seq", bson); - bson = BsonPackTool.getNumEqualPack(actionLogDetails.getIsValid(), "isValid", bson); - bson = BsonPackTool.getNumEqualPack(actionLogDetails.getIsDeleted(), "isDeleted", bson); - return bson; - } - - /** - * 调用组件日志复杂查询 - * - * @param actionLogData - * @return - */ - public static Bson packBsonByActionLogData(WmsActionLogData actionLogData) { - Bson bson = new BasicDBObject(); - bson = BsonPackTool.getNumEqualPack(actionLogData.getAldId(), "aldId", bson); - bson = BsonPackTool.getStringEqualPack(actionLogData.getOrganizeCode(), "organizeCode", bson); - bson = BsonPackTool.getNumEqualPack(actionLogData.getIsValid(), "isValid", bson); - bson = BsonPackTool.getNumEqualPack(actionLogData.getIsDeleted(), "isDeleted", bson); - return bson; - } -} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftswitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftswitchHqlPack.java index 5f721ec..9230fc5 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftswitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftswitchHqlPack.java @@ -36,7 +36,7 @@ public class SoftswitchHqlPack { StringBuffer result = new StringBuffer(); // 查询参数封装 - HqlPack.getStringLikerPack(testDataBase.getName(),"name",result); +// HqlPack.getStringLikerPack(testDataBase.getName(),"name",result); return result.toString(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java index 66fd04c..aa4d0b8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/SapBase.java @@ -61,14 +61,11 @@ public class SapBase { private String guid = UUID.randomUUID().toString(); public String getSynymdTime() { - SimpleDateFormat format = new SimpleDateFormat("YYYY-MM-DD"); - //format.format(new Date()) - return ""; + return (new SimpleDateFormat("yyyy-MM-dd")).format(new Date()); } public String getSynhmsTime() { SimpleDateFormat format = new SimpleDateFormat("HH:mm:ss"); - //format.format(new Date()) - return ""; + return format.format(new Date()); } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java similarity index 96% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLog.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java index b498c26..dffe9b6 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLog.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLog.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.platform.platbean; +package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.annotation.JsonFormat; @@ -50,7 +50,7 @@ public class WmsActionLog extends BaseBean { @ApiParam(value = "交易类型编号") public String transTypeCode; - @Transient + @Column(name="TRANS_TYPE_NAME") @ApiParam(value = "交易类型名称") public String transTypeName; @@ -68,9 +68,9 @@ public class WmsActionLog extends BaseBean { } } - @Column(name="AG_NAME_C") - @ApiParam(value = "作业流程名称") - public String agNameC; + @Column(name = "AL_NAME_RDD") + @ApiParam(value = "流程名称") + public String agNameRdd; @Column(name="ACTION_USER_NAME") @ApiParam(value = "作业人员") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java similarity index 96% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java index 8a426ea..e507653 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogData.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.platform.platbean; +package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.annotation.JsonFormat; @@ -10,7 +10,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.hibernate.annotations.Type; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java similarity index 96% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java index dd19abb..f6cc610 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/WmsActionLogDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.platform.platbean; +package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -13,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; -import javax.persistence.Transient; /** * @Description :作业记录明细表 @@ -36,9 +35,9 @@ public class WmsActionLogDetails extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) public Long alId; - @Transient + @Column(name = "AL_NAME_RDD") @ApiParam(value = "流程名称") - public String agNameC; + public String agNameRdd; @Column(name = "SEQ") @ApiParam(value = "序号", example = "1") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java index ffe7a9e..778a86d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -35,6 +34,7 @@ public class WmsActionStepCallParam extends BaseBean { @Column(name = "AGD_ID") @ApiParam(value = "流程明细编号") @JsonSerialize(using = ToStringSerializer.class) + private Long agdId; @Column(name = "SEQ") 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 23dca00..ca2a416 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 @@ -111,6 +111,10 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam("前端表格编辑使用") public Boolean isSet = false; + @Transient + @ApiParam("源单位") + public String srcUnit; + 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/WmsFix.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java new file mode 100644 index 0000000..ee108bf --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFix.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.wms.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.Index; +import javax.persistence.Table; + +/** +* @Description : WMS_设备信息 +* @Reference : +* @author: amy.liu +* @date: 2019/7/29 10:39 +* @Modify: +*/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_FIX") +@Api("WMS设备信息") +public class WmsFix extends BaseBean{ + + @Column(name = "FIX_ID") + @ApiParam("设备编号") + public String fixId; + + @Column(name = "FIX_MAC") + @ApiParam("设备mac地址") + public String fixMac; + + @Column(name = "FIX_NAME") + @ApiParam("设备名称") + public String fixName; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index ebf60a2..ad849e5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -154,11 +154,5 @@ public class WmsMoveMaster extends BaseBean { this.transQty = transQty; this.rejectQty = rejectQty; this.fixId = fixId; - } - - - - - } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index 314e492..1afc6f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -156,4 +156,7 @@ public class WmsPOMasterDetails extends BaseBean { @ApiParam("差异") private Double difference; + public Double getSnpVal() { + return snp; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index ee682ea..c78fa6e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -138,6 +138,10 @@ public class WmsPart extends BaseBean { @ApiParam("结算方式") private String outCloseType; + @Column(name = "OUT_CLOSE_VENDOR") + @ApiParam("结算供应商") + private String outCloseVendor; + @Transient @ApiParam("总数量") private Double qty; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java index 853d848..645df63 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSapOrderLock.java @@ -46,6 +46,6 @@ public class WmsSapOrderLock extends BaseBean { @Column(name = "IS_SYNC") @ApiParam("同步标识") - public Integer isSync = 10; + public Integer isSync = 2; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java index 59ed0dd..b86e93b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnit.java @@ -40,7 +40,7 @@ public class WmsUnit extends BaseBean { @ApiParam(value = "单位精度") private Integer unitPrecision; - public int getUnitPrecisionValue(){ + public Integer getUnitPrecisionValue(){ return this.unitPrecision == null?0:this.unitPrecision.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java index 615269b..2e4b9bd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsUnitConvert.java @@ -40,7 +40,7 @@ public class WmsUnitConvert extends BaseBean { @ApiParam(value = "换算率") private Double unitCoefficient; - public Double getUnitCoefficient() { + public Double getUnitCoefficientVal() { return this.unitCoefficient == null ? 0 : this.unitCoefficient.doubleValue(); } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index f526946..ff1eadc 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -103,4 +103,17 @@ public class WmsInterfaceDataMapper extends BaseBean { */ @Column(name = "BUSI_ROUTE") public String busiRoute; + + /** + * 同步频率 + */ + @Column(name = "SYNC_FREQUENCY") + public Integer syncFrequency; + + /** + * 上次同步时间 + */ + @Column(name = "LAST_SYNC_TIME") + public String lastSyncTime; + } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java new file mode 100644 index 0000000..5bba3e4 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDataRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData; + +/** + * @Description : 作业日志参数(使用Mongodb) + * @Reference : + * @Author : siliter + * @Date : 2019-04-11 12:03:00 + * @Modify : + **/ +public interface WmsActionLogDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java new file mode 100644 index 0000000..8c12573 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogDetailsRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogDetails; + +/** + * @Description : 作业日志明细(使用Mongodb) + * @Reference : + * @Author : siliter + * @Date : 2019-04-11 12:03:00 + * @Modify : + **/ +public interface WmsActionLogDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java new file mode 100644 index 0000000..8d96656 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionLog; + +/** + * @Description : 作业日志(使用Mongodb) + * @Reference : + * @Author : siliter + * @Date : 2019-04-11 12:03:00 + * @Modify : + **/ +public interface WmsActionLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFixRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFixRepository.java new file mode 100644 index 0000000..57dca6a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFixRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsFix; +import org.springframework.stereotype.Repository; + +/** +* @Description : 设备 对象持久层仓用方法控制 +* @Reference : +* @author: amy.liu +* @date: 2019/7/29 10:44 +* @Modify: +*/ +@Repository +public interface WmsFixRepository extends BaseRepository { +} 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 9be0ba8..c9fe1f4 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 @@ -48,6 +48,29 @@ public class WmsHqlPack { } /** + * + * @param wmsFix + * @return + */ + public static DdlPackBean packHqlWmsFix(WmsFix wmsFix){ + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringRightLikerPack(wmsFix.getFixId(), "fixId", result); + DdlPreparedPack.getStringRightLikerPack(wmsFix.getFixMac(), "fixMac", result); + DdlPreparedPack.getStringRightLikerPack(wmsFix.getFixName(), "fixName", result); + + if (StringUtils.isNotBlank(wmsFix.getOrganizeCode())) { + DdlPreparedPack.getStringEqualPack(wmsFix.getOrganizeCode(), "organizeCode", result); + } + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + + DdlPreparedPack.getNumEqualPack(wmsFix.getIsValid(), "isValid", result); + return result; + } + + + /** * 单位换算 分页查询 * @return */ @@ -1005,6 +1028,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); + DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getBusiTypeCode(), "busiTypeCode", result); DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getCreateUser(), "createUser", result); DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getModifyUser(), "modifyUser", result); @@ -1472,12 +1496,11 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result); - DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zones", result); + DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zoneNo", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result); DdlPreparedPack.getNumberBiggerPack(wmsStockSn.getQty(), "qty", result); - if (StringUtils.isNotBlank(wmsStockSn.getOrderByParam())) { - result.setOrderByStr(wmsStockSn.getOrderByParam()); - } + result.setOrderByStr(wmsStockSn.orderBy()); + getStringBuilderPack(wmsStockSn, result); return result; } @@ -2218,4 +2241,72 @@ public class WmsHqlPack { getStringBuilderPack(wmsStockSn, result); return result; } + + /******************************************作业记录日志HQLPACK开始************************************************/ + /** + * 作业日志复杂查询 + * + * @param actionLog + * @return + */ + public static DdlPackBean packHqlWmsActionLogByActionLog(WmsActionLog actionLog) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.timeBuilder(actionLog.getCreateDatetime(), "createDatetime", packBean, false, false); + DdlPreparedPack.getStringEqualPack(actionLog.getOrderNo(), "orderNo", packBean); + DdlPreparedPack.getStringEqualPack(actionLog.getTransTypeCode(), "transTypeCode", packBean); + DdlPreparedPack.getStringEqualPack(actionLog.getFixId(), "fixId", packBean); + DdlPreparedPack.getNumEqualPack(actionLog.getAgId(), "agId", packBean); + DdlPreparedPack.getNumEqualPack(actionLog.getActionStatus(), "actionStatus", packBean); + DdlPreparedPack.getStringEqualPack(actionLog.getAgNameRdd(), "agNameRdd", packBean); + DdlPreparedPack.getStringEqualPack(actionLog.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(actionLog.getIsValid(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", packBean); + + if((actionLog.getStartTimeStart() != null&&actionLog.getStartTimeStart() !="") + || (actionLog.getStartTimeEnd() != null&&actionLog.getStartTimeEnd() != "")){ + DdlPreparedPack.timeBuilder(actionLog.getStartTimeStart(), actionLog.getStartTimeEnd(), "startTime", packBean, true); + } + + if((actionLog.getEndTimeStart() != null&&actionLog.getEndTimeStart() != "") + || (actionLog.getEndTimeEnd() != null&&actionLog.getEndTimeEnd() != "")){ + DdlPreparedPack.timeBuilder(actionLog.getEndTimeStart(), actionLog.getEndTimeEnd(), "endTime", packBean, true); + } + + return packBean; + } + + /** + * 作业日志明细复杂查询 + * + * @param actionLogDetails + * @return + */ + public static DdlPackBean packHqlWmsActionLogByActionLogDetails(WmsActionLogDetails actionLogDetails) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getNumEqualPack(actionLogDetails.getAlId(), "alId", packBean); + DdlPreparedPack.getStringEqualPack(actionLogDetails.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(actionLogDetails.getValueType(), "valueType", packBean); + DdlPreparedPack.getNumEqualPack(actionLogDetails.getSeq(), "seq", packBean); + DdlPreparedPack.getNumEqualPack(actionLogDetails.getIsValid(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(actionLogDetails.getIsDeleted(), "isDeleted", packBean); + return packBean; + } + + /** + * 调用组件日志复杂查询 + * + * @param actionLogData + * @return + */ + public static DdlPackBean packHqlWmsActionLogByActionLogData(WmsActionLogData actionLogData) { + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getNumEqualPack(actionLogData.getAldId(), "aldId", packBean); + DdlPreparedPack.getStringEqualPack(actionLogData.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getNumEqualPack(actionLogData.getIsValid(), "isValid", packBean); + DdlPreparedPack.getNumEqualPack(actionLogData.getIsDeleted(), "isDeleted", packBean); + return packBean; + } + + + /******************************************作业记录日志HQLPACK结束************************************************/ } diff --git a/pom.xml b/pom.xml index 8975679..6c327d0 100644 --- a/pom.xml +++ b/pom.xml @@ -150,6 +150,11 @@ fastjson 1.2.49 + + com.thoughtworks.xstream + xstream + 1.4.11.1 +