Merge branch 'dev' into test

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

@@ -15,7 +15,7 @@ import java.lang.reflect.Field;
 
 /**
  * @Description :   Xml 工厂
- * 官方DOC: https://www.tutorialspoint.com/xstream/xstream_discussion.htm
+ *  官方DOC: https://www.tutorialspoint.com/xstream/xstream_discussion.htm
  * @Reference :
  * @Author : wei.peng
  * @CreateDate : 19-7-23 下午5:58

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java

@@ -113,14 +113,22 @@ public class BlockSoftSwitchEnumUtil {
         /* WebService */
         SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"Server IMPP 服务邮件服务"),
         SERVER_WEB_SERVICE_HELLO(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240003,"Server Hello测试服务"),
-        CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"),
+//        CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"),
         CLIENT_WEB_SERVICE_DEFAULT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140003,"Client 默认设置"),
 
         /* 数据源 */
         CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"),
 
         /* Restful */
-        CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client Impp Test");
+        CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client Impp Test"),
+
+        /* Socket */
+        SERVER_SOCKET_HELLO(SUIT_MODE.SERVER ,CASE_TYPE.SOCKET,210001,"Socket Server Hello测试服务"),
+        CLIENT_SOCKET_HELLO(SUIT_MODE.CLIENT ,CASE_TYPE.SOCKET,110001,"Socket Client Hello测试服务"),
+
+        /* MQ */
+        SERVER_MQ_RABBIT_HELLO(SUIT_MODE.SERVER ,CASE_TYPE.MQ,250001,"RabbitMQ Server Hello测试服务"),
+        CLIENT_MQ_RABBIT_HELLO(SUIT_MODE.CLIENT ,CASE_TYPE.MQ,150001,"RabbitMQ Client Hello测试服务");
 
         private int value;
         private String description;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -1868,7 +1868,8 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum COMMON_SN {
-        PO_SN("PO_SN", "PO条码");
+        PO_SN("PO_SN", "PO条码"),
+        VDA_SN("VDA_SN", "VDA条码");
 
         private String code;
         private String description;

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

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.softswitch.bean.*;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.Serializable;
 
@@ -32,6 +33,9 @@ public class BsSuitCaseModel implements Serializable {
     @ApiParam(value = "Web Service 适配套件")
     private BsSuitCaseWebService webService;
 
+    @ApiParam(value = " MQ 适配套件")
+    private BsSuitCaseMq mq;
+
     @ApiParam(value = "REST 适配套件")
     private BsSuitCaseREST bsSuitCaseREST;
 

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

@@ -11,6 +11,16 @@ import lombok.Data;
  **/
 @Data
 public class SoftswitchIocModel {
+    /* Spring Ioc Bean 名称 */
     private String beanName;
+    /* Spring Ioc 需要管理的Bean */
     private Object obj;
+    /* 需要 管理 Bean 类型 */
+    private Integer objType;
+    /* 需要 管理 Bean 状态 */
+    private Integer objStatus;
+    /* 需要 管理 Bean 唯一 */
+    private String objKey;
+    /* Bean 的描述信息 */
+    private String objDescription;
 }

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

@@ -27,6 +27,8 @@ public class SuitServerModel {
     /* 认证使用 以后使用 */
     private String token;
 
+    // 请求ID
+    private String requestId;
     // 传输单对象
     private Object obj;
     // 传输集合

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseMq.java

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.softswitch.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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 :   MQ 适配套件
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 2019/9/9 上午11:09
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "BS_SUIT_CASE_MQ")
+@Api(value = "MQ", description = "MQ 适配套件")
+public class BsSuitCaseMq extends BaseBean {
+
+    @Column(name = "SUIT_CASE_ID")
+    @ApiParam(value = "套件id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitCaseId;
+
+    @Column(name = "USER_LOGIN_NAME")
+    @ApiParam(value = "登录名称")
+    private String userLoginName;
+
+    @Column(name = "USER_LOGIN_PWD")
+    @ApiParam(value = "登录密码")
+    private String userLoginPwd;
+
+    @Column(name = "VIRTUAL_HOST")
+    @ApiParam(value = "虚拟 Host")
+    private String virtualHost;
+
+    @Column(name = "QUEUE_NAME")
+    @ApiParam(value = "队列名称")
+    private String queueName;
+
+}

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.softswitch.bean;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -26,6 +27,7 @@ import java.util.List;
 @Entity
 @DynamicInsert
 @DynamicUpdate
+@XStreamAlias("param")
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "BS_SUIT_CASE_PARAM")
 @Api(value = "适配器出入参", description = "适配器出入参")

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseMqRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.softswitch.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseMq;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 2019/9/26 下午3:25
+ * @Modify:
+ **/
+@Repository
+public interface BsSuitCaseMqRepository extends BaseRepository<BsSuitCaseMq,Long> {
+}

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

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java

@@ -147,6 +147,22 @@ public class WmsPart extends BaseBean {
     @ApiParam("保质期天数")
     private Integer qualityDays;
 
+    @Column(name = "IS_REPORT_PARTNO")
+    @ApiParam("是否报工零件")
+    private Integer isReportPartNo;
+
+    @Column(name = "REPORT_LOCATE_NO")
+    @ApiParam("报工库位")
+    private String reportLocateNo;
+
+    @Column(name = "REPORT_ZONE_NO")
+    @ApiParam("报工存储区")
+    private String reportZoneNo;
+
+    @Column(name = "PRODUCT_LINES")
+    @ApiParam("报工产线")
+    private String productLines;
+
     @Transient
     @ApiParam("总数量")
     private Double qty;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPrinterConfigure.java

@@ -0,0 +1,59 @@
+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.Table;
+
+/**
+ * @Description : 打印机配置表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-09-26 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_PRINTER_CONFIGURE")
+@Api("打印机配置表")
+public class WmsPrinterConfigure extends BaseBean{
+
+    private static final long serialVersionUID = 1234639813072592779L;
+    @Column(name="PRINTER_NO")
+    @ApiParam("打印机编号")
+    private String printerNo;
+
+    @Column(name="PRINTER_NAME")
+    @ApiParam("打印机名称")
+    private String printerName;
+
+    @Column(name="IP")
+    @ApiParam("IP")
+    private String ip;
+
+    @Column(name="PORT")
+    @ApiParam("端口")
+    private Integer port;
+
+    @Column(name="OBJECT_DESCRIPTION")
+    @ApiParam(value ="描述")
+    private String objectDescription;
+
+    @Column(name="POSITION")
+    @ApiParam("位置")
+    private String position;
+
+    @Column(name="TYPE")
+    @ApiParam("类型")
+    private Integer type;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPrinterConfigureRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPrinterConfigure;
+
+/**
+ * @Description : 打印机配置
+ * @Reference   :
+ * @Author      : jessica.chen
+ * @Date        : 2019-09-26 12:03:00
+ * @Modify      :
+ **/
+public interface WmsPrinterConfigureRepository extends BaseRepository<WmsPrinterConfigure, Long> {
+}