Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -830,7 +830,8 @@ public class BlockSoftSwitchEnumUtil {
     public enum SUIT_PROCESS_STATUS {
         UNPROCESSED(10, "未处理"),
         PROCESSING(20,  "处理中"),
-        PROCESS(30,  "已处理");
+        PROCESS(30,  "已处理"),
+        PROCESS_FAIL(40,  "处理失败");
 
         private int value;
         private String description;
@@ -878,7 +879,8 @@ public class BlockSoftSwitchEnumUtil {
         REQUEST_ORGIN_PARAM(20,  "请求原始参数"),
         ORIGINAL_MESSAGE(30,  "原始报文"),
         CONVERTED_MESSAGE(40,  "转换报文"),
-        SUIT_SEND_MESSAGE(50,  "适配发送报文");
+        SUIT_SEND_MESSAGE(50,  "适配发送报文"),
+        PROCESS_RESULT(60,  "处理结果");
 
         private int value;
         private String description;
@@ -919,6 +921,52 @@ public class BlockSoftSwitchEnumUtil {
     }
 
     /**
+     * ftp连接模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FTP_CONNECTION_MODE {
+        LOCAL_ACTIVE_MODE(10,  "本地主动模式"),
+        LOCAL_PASSIVE_MODE(20, "本地被动模式"),
+//        REMOTE_ACTIVE_MODE(30, "远程主动模式"),
+        REMOTE_PASSIVE_MODE(40, "远程被动模式");
+
+        private final int value;
+        private final String description;
+
+        FTP_CONNECTION_MODE(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 FTP_CONNECTION_MODE valueOf(int val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return FTP_CONNECTION_MODE.LOCAL_ACTIVE_MODE;
+        }
+    }
+
+    /**
      * 脚本类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -957,7 +1005,6 @@ public class BlockSoftSwitchEnumUtil {
         }
 
         public static BS_SCRIPT_TYPE valueOf(int val) {
-            String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
                     return values()[i];
@@ -1003,7 +1050,6 @@ public class BlockSoftSwitchEnumUtil {
         }
 
         public static BS_SCRIPT_LANGUAGE valueOf(int val) {
-            String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
                     return values()[i];
@@ -1050,7 +1096,6 @@ public class BlockSoftSwitchEnumUtil {
         }
 
         public static BS_SCRIPT_EXECUTE_METHOD valueOf(int val) {
-            String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
                     return values()[i];

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.softswitch.bean;
 
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -66,6 +67,15 @@ public class BsSuitCaseFTP extends BaseBean {
     @ApiParam(value = "ftp编码")
     private Integer encode;
 
+    @Column(name = "CONNECTION_MODE")
+    @ApiParam(value = "ftp连接模式")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.FTP_CONNECTION_MODE.class)
+    private Integer connectionMode;
+
+    public String getConnectionModeTxt(){
+        return connectionMode == null ? "无" : BlockSoftSwitchEnumUtil.FTP_CONNECTION_MODE.valueOfDescription(connectionMode);
+    }
+
     @Column(name = "IS_READ_AND_EMPTY")
     @ApiParam(value = "读取并清空")
     private Integer isReadAndEmpty;

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

@@ -138,6 +138,10 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "脚本结果")
     private String scriptResult;
 
+    @Column(name = "PROCESS_RESULT")
+    @ApiParam(value = "处理结果")
+    private String processResult;
+
     /************************************** 临时属性 ***************************************/
 
     @Transient

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java

@@ -117,6 +117,10 @@ public class SwebPurchaseOrderSn extends BaseBean {
     @ApiParam(value = "重量")
     private Double weight;
 
+    @Column(name = "VEN_PRODUCT_TIME")
+    @ApiParam(value = "供应商生产日期")
+    private String venProductTime;
+
     @Transient
     @ApiParam(value = "合同号")
     private String refNo;

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java

@@ -65,6 +65,10 @@ public class SwebVendorStock extends BaseBean {
     @ApiParam("周")
     private String countWeek;
 
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String remark;
+
     @Transient
     @ApiParam("日期")
     private String dateStart;