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

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

@@ -722,20 +722,13 @@ public class CommonEnumUtil {
     }
 
     /**
-     * 客户端操作系统
+     * 客户端登录标识
-     *             return "Windows";
-     *             return "Mac";
-     *             return "Unix";
-     *             return "Android";
-     *             return "IPhone";
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum LOG_LOGIN_PLATFORM {
-        WINDOWS(1, "Windows", "Windows 操作系统"),
+        PC_IMPP_CORE(10, "PC-IMPP", "PC后台管理端"),
-        MAC(2, "Mac", "Mac 操作系统"),
+        PC_WMS_SWEB(20, "PC-SWEB", "PC SWEB后台管理端"),
-        UNIX(3, "Unix", "Linux 操作系统"),
+        Mobile_PDA(30, "Mobile-PDA", "移动设备PDA操作端");
-        ANDROID(4, "Android", "Android 操作系统"),
-        IPHONE(5, "IPhone", "IPhone 操作系统");
 
         private int value;
         private String name;
@@ -762,11 +755,11 @@ public class CommonEnumUtil {
             return name;
         }
 
-        public static String valueOf(int val) {
+        public static LOG_LOGIN_PLATFORM valueOf(int val) {
-            String tmp = null;
+            LOG_LOGIN_PLATFORM tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
-                    tmp = values()[i].getName();
+                    tmp = values()[i];
                 }
             }
             return tmp;

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

@@ -2,6 +2,12 @@ package cn.estsh.i3plus.pojo.base.enumutil;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description :
  * @Reference :
@@ -602,7 +608,10 @@ public class WmsEnumUtil {
         IN_STOCK("IN_STOCK", "入库单"),
         SHIPPING("SHIPPING", "发运单"),
         QC("QC", "质检"),
-        CS("CS", "盘点");
+        CS("CS", "盘点"),
+        DR("DR", "直送收货"),
+        AMPR("AMPR", "AMP拉动收货");
+
         private String value;
         private String description;
 
@@ -2564,7 +2573,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WMS_TRANS_QUAN_STATUS {
-        CREATE(1, "创建"), SUCCESS(10, "处理成功"),FAIL(30,"处理失败");
+        CREATE(1, "创建"), SUCCESS(10, "处理成功"), FAIL(30, "处理失败");
 
         private int value;
         private String description;
@@ -2699,4 +2708,56 @@ public class WmsEnumUtil {
             return description;
         }
     }
+
+    public static  Map<String, Object> getEnumByName(String enumName) throws Exception{
+            Class innerClazz[] = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类
+            Class<Enum> clazz;
+            Enum[] enumConstants;
+
+            Map<String, Object> enumMap;// 枚举类
+            List<Map<String, Object>> values;// 枚举实例【enumName：{“”：}，{“”：}，{“”：}】
+            Map<String, Object> value;// 枚举实例属性
+
+            Method getValue;
+            Method getCode;
+            Method getDescription;
+
+            // 遍历内部类
+            String simpleName;//内部类的类名
+            for (Class class1 : innerClazz) {
+                //获取内部内的类名
+                simpleName = class1.getSimpleName();
+                if (simpleName.equals(enumName)) {
+                    // 判断类是不是枚举类
+                    clazz = (Class<Enum>) Class.forName("cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil$" + simpleName);
+
+                    // 枚举类方法初始化
+                    getCode = null;
+                    try {
+                        getCode = clazz.getMethod("getCode");
+                    } catch (NoSuchMethodException e) {
+                    }
+                    getValue = clazz.getMethod("getValue");
+                    getDescription = clazz.getMethod("getDescription");
+
+                    // 获取所有枚举实例
+                    enumConstants = clazz.getEnumConstants();
+                    enumMap = new HashMap<>();
+                    values = new ArrayList<>();
+                    for (Enum enum1 : enumConstants) {
+                        value = new HashMap<>();
+                        value.put("value", getValue.invoke(enum1));
+                        if (getCode != null) {
+                            value.put("code", getCode.invoke(enum1));
+                        }
+                        value.put("description", getDescription.invoke(enum1));
+                        values.add(value);
+                    }
+                    enumMap.put("enumName", clazz.getSimpleName());
+                    enumMap.put("valuesList", values);
+                    return enumMap;
+                }
+            }
+            return null;
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/AdminToken.java

@@ -9,6 +9,10 @@ package cn.estsh.i3plus.pojo.base.shirotoken;
  **/
 public class AdminToken extends BaseToken {
 
+    public AdminToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) {
+        super(loginName, loginPwd, languageCode,loginPlatform);
+    }
+
     public AdminToken(String loginName, String loginPwd, String languageCode) {
         super(loginName, loginPwd, languageCode);
     }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java

@@ -14,6 +14,7 @@ public class BaseToken implements AuthenticationToken {
     private String loginName;
     private String loginPwd;
     private String languageCode;
+    private Integer loginPlatform;
 
     public BaseToken(String loginName, String loginPwd, String languageCode) {
         this.loginName = loginName;
@@ -21,6 +22,13 @@ public class BaseToken implements AuthenticationToken {
         this.languageCode = languageCode;
     }
 
+    public BaseToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) {
+        this.loginName = loginName;
+        this.loginPwd = loginPwd;
+        this.languageCode = languageCode;
+        this.loginPlatform = loginPlatform;
+    }
+
     //身份
     @Override
     public Object getPrincipal() {
@@ -56,4 +64,12 @@ public class BaseToken implements AuthenticationToken {
     public void setLanguageCode(String languageCode) {
         this.languageCode = languageCode;
     }
+
+    public Integer getLoginPlatform() {
+        return loginPlatform;
+    }
+
+    public void setLoginPlatform(Integer loginPlatform) {
+        this.loginPlatform = loginPlatform;
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/SaAdminToken.java

@@ -12,4 +12,8 @@ public class SaAdminToken extends BaseToken {
     public SaAdminToken(String loginName, String loginPwd, String languageCode) {
         super(loginName, loginPwd, languageCode);
     }
+
+    public SaAdminToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) {
+        super(loginName, loginPwd, languageCode,loginPlatform);
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java

@@ -12,4 +12,8 @@ public class UserToken extends BaseToken {
     public UserToken(String loginName, String loginPwd, String languageCode) {
         super(loginName, loginPwd, languageCode);
     }
+
+    public UserToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) {
+        super(loginName, loginPwd, languageCode,loginPlatform);
+    }
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java

@@ -16,8 +16,6 @@ import java.util.List;
 @Data
 public class SessionUser implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
     @ApiParam("用户ID")
     private Long userId;
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java

@@ -43,6 +43,14 @@ public class SysFile extends BaseBean {
     @ApiParam(value ="文件所属模块")
     private Integer fileSoftType;
 
+    public int getFileSoftTypeVal(){
+        if(fileSoftType == null){
+            return 0;
+        }
+
+        return fileSoftType.intValue();
+    }
+
     @Column(name="USER_ID")
     @ApiParam(value ="用户ID" , example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -83,5 +91,4 @@ public class SysFile extends BaseBean {
     @Column(name="DOWNLOAD_NUM")
     @ApiParam(value ="下载次数" , example ="0")
     private Integer downloadNum;
-
 }

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

@@ -58,7 +58,7 @@ public class WmsDocFgDetail extends BaseBean {
     public String partNo;
 
     @Column(name="PART_NAME_RDD")
-    @ApiParam("单位")
+    @ApiParam("物料名称")
     public String partNameRdd;
 
     @Column(name="BOM_UPDATE")
@@ -123,4 +123,8 @@ public class WmsDocFgDetail extends BaseBean {
     @Column(name="IS_LOCK")
     @ApiParam(value = "是否锁定", example = "2")
     public Integer isLock;
+
+    @Column(name="REMARK")
+    @ApiParam("备注")
+    public String remark;
 }

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -136,6 +137,22 @@ public class WmsMoveToERP extends BaseBean {
     @ApiParam("关联单号")
     public String refSrc;
 
+    @Column(name = "SRC_AREA_NO")
+    @ApiParam("来源库存地")
+    public String srcAreaNo;
+
+    @Column(name = "DEST_AREA_NO")
+    @ApiParam("目标库存地")
+    public String destAreaNo;
+
+    @Column(name = "BUSI_TYPE_CODE")
+    @ApiParam("交易类型")
+    public Integer busiTypeCode;
+
+    @Column(name = "IS_SYNC", nullable = false)
+    @ApiParam("是否同步")
+    public Integer isSync = CommonEnumUtil.FALSE;
+
     @ApiParam(value = "待出库数量", example = "0")
     @Transient
     private Long waitingCounts;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java

@@ -25,21 +25,32 @@ public class WmsMoveUnfinishedOrderModel extends  BaseBean{
     @ApiParam("未完成数量")
     private Double destQty;
 
-    @ApiParam("业务类型")
+
-    private Integer busiTypeCode;
 
     @ApiParam("交易类型")
     private String transTypeCode;
 
+    @ApiParam("交易类型名称")
+    private String transTypeName;
+
     @ApiParam("关联单号")
     private String refSrc;
 
-    public WmsMoveUnfinishedOrderModel(String organizeCode, String partNo, String partNameRdd, Double destQty, Integer busiTypeCode, String transTypeCode, String refSrc) {
+    public WmsMoveUnfinishedOrderModel(String organizeCode, String partNo, String partNameRdd, Double destQty, String transTypeCode, String transTypeName, String refSrc) {
+        this.organizeCode = organizeCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.destQty = destQty;
+        this.transTypeCode = transTypeCode;
+        this.transTypeName = transTypeName;
+        this.refSrc = refSrc;
+    }
+
+    public WmsMoveUnfinishedOrderModel(String organizeCode, String partNo, String partNameRdd, Double destQty, String transTypeCode,  String refSrc) {
         this.organizeCode = organizeCode;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
         this.destQty = destQty;
-        this.busiTypeCode = busiTypeCode;
         this.transTypeCode = transTypeCode;
         this.refSrc = refSrc;
     }