Merge branch 'test' into ext-dev

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

@@ -2847,4 +2847,61 @@ public class CommonEnumUtil {
     }
 
 
+
+    /**
+     * 用户账号类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum USER_ACCOUNT_TYPE {
+        SYSTEM("SYSTEM", "系统用户"),
+        SWEB("SWEB", "sweb用户");
+
+        private String value;
+        private String description;
+
+        USER_ACCOUNT_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equalsIgnoreCase(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static USER_ACCOUNT_TYPE valueOfEnum(String val) {
+            USER_ACCOUNT_TYPE tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equalsIgnoreCase(val)) {
+                    tmp = values()[i];
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String desc) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java

@@ -166,6 +166,11 @@ public class UserDetailModel extends BaseBean {
     @ApiParam(value = "登录平台权限")
     private String authPlatform;
 
+
+    @ApiParam(value = "账号类型")
+    private String userAccountType;
+
+
     public SysUser getSysUser(){
         SysUser user = new SysUser();
         user.setId(!StringUtils.isBlank(this.userId) ? Long.parseLong(this.userId) : null);
@@ -180,6 +185,7 @@ public class UserDetailModel extends BaseBean {
         user.setOrganizeCode(this.organizeCode);
         user.setUserLoginNum(this.userLoginNum);
         user.setAuthPlatform(this.authPlatform);
+        user.setUserAccountType(this.userAccountType);
         return user;
     }
 

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

@@ -103,6 +103,13 @@ public class SysUser extends BaseBean {
     @Column(name = "AUTH_PLATFORM")
     @ApiParam(value = "账号授权的应用列表")
     private String authPlatform;
+
+    /**
+     * 枚举类型
+     */
+    @Column(name = "USER_ACCOUNT_TYPE")
+    @ApiParam(value = "用户账号类型")
+    private String userAccountType;
     /********************************** 关系信息 ********************************/
 
     @Column(name = "DEPARTMENT_ID")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsAccountDto.java

@@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2022/3/29 14:37
+ * @Modify:
+ **/
+@ApiModel(value = "统一对账单")
+@Data
+public class WmsAccountDto {
+    @ApiModelProperty(value = "零件名称")
+    private String partName;
+    @ApiModelProperty(value = "仓库名称")
+    private String warehouseName;
+    @ApiModelProperty(value = "区域名称")
+    private String zonesName;
+
+    private BigDecimal wmsInitStockNum;
+
+    private BigDecimal sapInitStockNum;
+
+    private BigDecimal wmsAvailableNum;
+
+    private BigDecimal wmsCogi;
+
+    private BigDecimal sapAvailableNum;
+
+    private BigDecimal sapCogi;
+
+    private BigDecimal difference;
+
+}

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

@@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : Castle
+ * @CreateDate : 2022/3/29 9:51
+ * @Modify:
+ **/
+@Data
+@ApiModel(value = "集中对账单")
+public class AccountReportModel {
+    @ApiModelProperty(value = "物料号")
+    public String partNo;
+    @ApiModelProperty(value = "仓库号")
+    public String whNo;
+    @ApiModelProperty(value = "库存地")
+    public String zoneNo;
+    @ApiModelProperty(value = "wms快照时间")
+    public String wmsSnapshotTime;
+    @ApiModelProperty(value = "SAP快照时间")
+    public String sapSnapshotTime;
+}