Merge branch 'dev' into test

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;
+        }
+    }
 
 
     // 数据有效的静态常量

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

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

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

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

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/PojoAuth.java

@@ -1,5 +1,6 @@
 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;
@@ -31,7 +32,14 @@ public class PojoAuth{
     private String userName ="登录名称";
     private String password ="登录名称";
     private String languageCode ="登录名称";
-    private String token ="登录名称";
+
+    // 认证令牌
+    private String token;
+//    // 认证令牌集合(复杂认证令牌)
+//    private List<Prop> tokenList;
+    // 原始认证数据
+    @XStreamCDATA
+    private String result;
 
     public PojoAuth(Long id, Integer authType,String authPath, List<Prop> params) {
         this.id = id;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Request.java

@@ -1,5 +1,6 @@
 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;
@@ -21,6 +22,9 @@ public class Request{
     private Integer requestType;
     private String requestPath;
 
+    @XStreamCDATA
+    private String result;
+
     public Request(Long id, Integer requestType,String requestPath) {
         this.id = id;
         this.requestType = requestType;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java

@@ -1,5 +1,6 @@
 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;
@@ -13,22 +14,26 @@ import lombok.Data;
  **/
 @Data
 @XStreamAlias("model")
-public class XmlModel {
+public class SuitCoreModel {
 
     @XStreamAsAttribute
     private Long id;
     @XStreamAsAttribute
     private Integer caseType;
-    private String suitCaseStatus;
+    private String suitCaseStatusCode;
+    private String suitCaseMessage;
 
     private String key;
     private PojoAuth auth;
     private Request request;
 
-    public XmlModel(Long id, Integer caseType,String suitCaseStatus, String key, PojoAuth auth,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.suitCaseStatus = suitCaseStatus;
+        this.suitCaseStatusCode = suitCaseStatusCode;
         this.key = key;
         this.auth = auth;
         this.request = request;

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<WmsMoveSn> moveSn;
+    private List<WmsMoveSn> moveSnList;
 }

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();
     }

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

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

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

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -48,6 +48,25 @@ 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);
+
+        getStringBuilderPack(wmsFix, result);
+
+        return result;
+    }
+
+
+    /**
      * 单位换算 分页查询
      * @return
      */