增加喜相随模块

warehousing-system/project/wh-manage-xxs/pom.xml

@@ -13,11 +13,11 @@
 
     <!-- 依赖工具API-->
     <dependencies>
-        <dependency>
-            <groupId>com.wh</groupId>
-            <artifactId>wh-common</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.wh</groupId>-->
+<!--            <artifactId>wh-common</artifactId>-->
+<!--            <version>1.0</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/aop/AOPException.java

@@ -1,6 +1,6 @@
 package com.wh.aop;
 
-import com.wh.vo.SysResult;
+import com.wh.controller.purchasenewproduct.vo.SysResult;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/api/Api.java

@@ -0,0 +1,13 @@
+package com.wh.api;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class Api {
+
+    public String getTime(){
+        Date dNow = new Date( );
+        SimpleDateFormat ft = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss");
+        return ft.format(dNow);
+    }
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/RightsController.java

@@ -2,7 +2,7 @@ package com.wh.controller;
 
 import com.wh.pojo.Rights;
 import com.wh.service.RightsService;
-import com.wh.vo.SysResult;
+import com.wh.controller.purchasenewproduct.vo.SysResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/UserController.java

@@ -2,7 +2,7 @@ package com.wh.controller;
 
 import com.wh.pojo.User;
 import com.wh.service.UserService;
-import com.wh.vo.SysResult;
+import com.wh.controller.purchasenewproduct.vo.SysResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/api/input/InStoreHouseMainController.java

@@ -2,13 +2,13 @@ package com.wh.controller.api.input;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.wh.controller.purchasenewproduct.vo.SysResult;
 import com.wh.pojo.api.*;
 import com.wh.pojo.purchasenew.PurchasenewQuery;
 import com.wh.pojo.purchasenew.PurchasenewVo;
 import com.wh.service.api.instorehouse.InStorehouseMainService;
 import com.wh.service.purchasenew.PurchasenewService;
 import com.wh.service.purchasenewproduct.PurchasenewProductService;
-import com.wh.vo.SysResult;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/api/output/OutStorehouseMainController.java

@@ -5,7 +5,6 @@ import com.wh.pojo.api.*;
 import com.wh.pojo.purchasenew.Purchasenew;
 import com.wh.service.api.outstorehouse.OutStorehouseListingService;
 import com.wh.service.api.outstorehouse.OutStorehouseMainService;
-import com.wh.vo.SysResult;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/initial/LocationController.java

@@ -1,11 +1,11 @@
 package com.wh.controller.initial;
 
+import com.wh.controller.purchasenewproduct.vo.PageResult;
+import com.wh.controller.purchasenewproduct.vo.SysResult;
 import com.wh.pojo.*;
 import com.wh.pojo.shstorehouse.ShStorehouse;
 import com.wh.service.initial.LocationService;
 import com.wh.service.shstorehouse.ShStorehouseService;
-import com.wh.vo.PageResult;
-import com.wh.vo.SysResult;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/initial/ProductController.java

@@ -1,13 +1,12 @@
 package com.wh.controller.initial;
 
+import com.wh.controller.purchasenewproduct.vo.SysResult;
 import com.wh.pojo.Product;
 import com.wh.pojo.ProductQuery;
 import com.wh.pojo.Storehouse;
 import com.wh.pojo.shstorehouse.ShStorehouseQuery;
 import com.wh.pojo.shstorehouse.ShStorehouseVo;
 import com.wh.service.initial.ProductService;
-import com.wh.vo.PageResult;
-import com.wh.vo.SysResult;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/initial/StorehouseController.java

@@ -1,9 +1,9 @@
 package com.wh.controller.initial;
 
+import com.wh.controller.purchasenewproduct.vo.PageResult;
+import com.wh.controller.purchasenewproduct.vo.SysResult;
 import com.wh.pojo.Storehouse;
 import com.wh.service.initial.StorehouseService;
-import com.wh.vo.PageResult;
-import com.wh.vo.SysResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/initial/SupplierController.java

@@ -1,12 +1,11 @@
 package com.wh.controller.initial;
 
+import com.wh.controller.purchasenewproduct.vo.SysResult;
 import com.wh.pojo.Product;
 import com.wh.pojo.ProductQuery;
 import com.wh.pojo.Supplier;
 import com.wh.pojo.SupplierQuery;
 import com.wh.service.initial.SupplierService;
-import com.wh.vo.PageResult;
-import com.wh.vo.SysResult;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/instorehouse/PurchaseController.java

@@ -1,14 +1,13 @@
 package com.wh.controller.instorehouse;
 
 
-import com.wh.controller.initial.StorehouseController;
+import com.wh.controller.purchasenewproduct.vo.PageResult;
+import com.wh.controller.purchasenewproduct.vo.SysResult;
 import com.wh.pojo.Product;
 import com.wh.pojo.Purchase;
 import com.wh.pojo.Storehouse;
 import com.wh.pojo.Supplier;
 import com.wh.service.instorehouse.PurchaseService;
-import com.wh.vo.PageResult;
-import com.wh.vo.SysResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/instorehouse/ReceivingController.java

@@ -1,10 +1,10 @@
 package com.wh.controller.instorehouse;
 
+import com.wh.controller.purchasenewproduct.vo.Options;
+import com.wh.controller.purchasenewproduct.vo.PageResult;
+import com.wh.controller.purchasenewproduct.vo.SysResult;
 import com.wh.pojo.Receiving;
 import com.wh.service.instorehouse.ReceivingService;
-import com.wh.vo.Options;
-import com.wh.vo.PageResult;
-import com.wh.vo.SysResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/outstorehouse/OutStorehouseController.java

@@ -1,10 +1,10 @@
 package com.wh.controller.outstorehouse;
 
 import com.alibaba.fastjson.JSONObject;
+import com.wh.controller.purchasenewproduct.vo.PageResult;
+import com.wh.controller.purchasenewproduct.vo.SysResult;
 import com.wh.pojo.OutStorehouse;
 import com.wh.service.outstorehouse.OutStorehouseService;
-import com.wh.vo.PageResult;
-import com.wh.vo.SysResult;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/outstorehouse/PickingController.java

@@ -1,17 +1,14 @@
 package com.wh.controller.outstorehouse;
 
 import com.alibaba.fastjson.JSONObject;
+import com.wh.controller.purchasenewproduct.vo.PageResult;
+import com.wh.controller.purchasenewproduct.vo.PickingUser;
+import com.wh.controller.purchasenewproduct.vo.SysResult;
 import com.wh.pojo.Picking;
-import com.wh.pojo.api.OutStorehouseListing;
-import com.wh.pojo.api.OutStorehouseMain;
 import com.wh.pojo.api.OutStorehouseMainQuery;
 import com.wh.pojo.api.OutStorehouseVo;
-import com.wh.service.api.outstorehouse.OutStorehouseListingService;
 import com.wh.service.api.outstorehouse.OutStorehouseMainService;
 import com.wh.service.outstorehouse.PickingService;
-import com.wh.vo.PageResult;
-import com.wh.vo.PickingUser;
-import com.wh.vo.SysResult;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -19,8 +16,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.xml.transform.Result;
 import java.util.List;
 @Slf4j
 @RestController

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/purchasenew/PurchasenewController.java

@@ -3,7 +3,6 @@ package com.wh.controller.purchasenew;
 import com.alibaba.fastjson.JSONObject;
 import com.wh.pojo.purchasenew.*;
 import com.wh.service.purchasenew.PurchasenewService;
-import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/purchasenewproduct/vo/Options.java

@@ -0,0 +1,14 @@
+package com.wh.controller.purchasenewproduct.vo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class Options {
+    private String value;
+    private String label;
+    private List<Options> children;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/purchasenewproduct/vo/PageResult.java

@@ -0,0 +1,15 @@
+package com.wh.controller.purchasenewproduct.vo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class PageResult {
+    private String query;
+    private String entSid;
+    private Integer pageNum;
+    private Integer pageSize;
+    private Long total;
+    private Object rows;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/purchasenewproduct/vo/PickingUser.java

@@ -0,0 +1,11 @@
+package com.wh.controller.purchasenewproduct.vo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class PickingUser {
+    private String outStorehouseId;
+    private String user;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/purchasenewproduct/vo/QueryInfo.java

@@ -0,0 +1,13 @@
+package com.wh.controller.purchasenewproduct.vo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class QueryInfo {
+    private String barCode;
+    private String locationId;
+    private String fromLocationId;
+    private Integer count;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/purchasenewproduct/vo/SysResult.java

@@ -0,0 +1,70 @@
+package com.wh.controller.purchasenewproduct.vo;
+
+import lombok.experimental.Accessors;
+//@Builder
+//@Data
+@Accessors(chain = true)
+//@NoArgsConstructor
+//@AllArgsConstructor
+public class SysResult {
+
+    private Integer status; //状态码信息 200成功  201失败
+    private String msg;     //服务器提示信息
+    private Object data;    //服务器返回值
+
+    public SysResult(Integer status, String msg, Object data) {
+        this.status = status;
+        this.msg = msg;
+        this.data = data;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public Object getData() {
+        return data;
+    }
+
+    public void setData(Object data) {
+        this.data = data;
+    }
+
+    public static SysResult fail(){
+        return new SysResult(201,"服务器运行失败",null);
+    }
+
+    public static SysResult success(){
+        return new SysResult(200, "服务器运行成功", null);
+    }
+
+    public static SysResult noAccess(){
+        return new SysResult(202,"无访问权限",null);
+    }
+
+
+    public static SysResult notEnough(){
+        return new SysResult(203,"数量不足",null);
+    }
+
+    public static SysResult success(Object data){
+
+        return new SysResult(200, "服务器运行成功", data);
+    }
+
+    public static SysResult success(String msg, Object data){
+        return new SysResult(200, msg, data);
+    }
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/stock/StockController.java

@@ -1,9 +1,9 @@
 package com.wh.controller.stock;
 
 
+import com.wh.controller.purchasenewproduct.vo.PageResult;
+import com.wh.controller.purchasenewproduct.vo.SysResult;
 import com.wh.service.stock.StockService;
-import com.wh.vo.PageResult;
-import com.wh.vo.SysResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/storehousemanage/PutInController.java

@@ -1,10 +1,10 @@
 package com.wh.controller.storehousemanage;
 
 
+import com.wh.controller.purchasenewproduct.vo.PageResult;
+import com.wh.controller.purchasenewproduct.vo.SysResult;
 import com.wh.pojo.InStorehouse;
 import com.wh.service.instorehouse.PutInService;
-import com.wh.vo.PageResult;
-import com.wh.vo.SysResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/storehousemanage/RemoveController.java

@@ -1,9 +1,9 @@
 package com.wh.controller.storehousemanage;
 
+import com.wh.controller.purchasenewproduct.vo.PageResult;
+import com.wh.controller.purchasenewproduct.vo.SysResult;
 import com.wh.pojo.Remove;
 import com.wh.service.storehousemanage.RemoveService;
-import com.wh.vo.PageResult;
-import com.wh.vo.SysResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/storehousemanage/ShelvesController.java

@@ -1,10 +1,10 @@
 package com.wh.controller.storehousemanage;
 
+import com.wh.controller.purchasenewproduct.vo.PageResult;
+import com.wh.controller.purchasenewproduct.vo.QueryInfo;
+import com.wh.controller.purchasenewproduct.vo.SysResult;
 import com.wh.pojo.OnShelves;
 import com.wh.service.storehousemanage.ShelvesService;
-import com.wh.vo.PageResult;
-import com.wh.vo.QueryInfo;
-import com.wh.vo.SysResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/sysuser/ProjectInformationVo.java

@@ -0,0 +1,18 @@
+package com.wh.controller.sysuser;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/25 9:29
+ */
+@ApiModel(value = "项目信息 视图数据对象", description = "项目信息 视图数据对象")
+@Data
+public class ProjectInformationVo implements Vo {
+    private String sid;
+    //项目名称
+    private String  entryName;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/sysuser/SysUser.java

@@ -0,0 +1,77 @@
+package com.wh.controller.sysuser;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysUser.java <br/>
+ * Class: SysUser <br/>
+ * Description: 用户表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "用户表", description = "用户表")
+@TableName("sys_user")
+@Data
+public class SysUser extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("登录名，登录名不能相同")
+    private String userName;
+    
+	@ApiModelProperty("密码（加密或签名后）")
+    private String password;
+    
+	@ApiModelProperty("密码修改时限")
+    private String pwdDayslimit;
+    
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("最后一次密码修改时间")
+    private Date pwdModifyTime;
+    
+	@ApiModelProperty("在线状态（0为离线、1为在线）")
+    private Integer onlineState;
+    
+	@ApiModelProperty("用户登录时随机生成身份验证字符串")
+    private String token;
+    
+	@ApiModelProperty("是否是管理员：1管理员，2一般用户，0是超级管理员,3尚无单位人员")
+    private String isAdmin;
+    
+	@ApiModelProperty("手机登录唯一标识，手机与用户绑定字段")
+    private String appId;
+    
+	@ApiModelProperty("关联的人员sid")
+    private String staffSid;
+    
+	@ApiModelProperty("手机号")
+    private String mobile;
+    
+	@ApiModelProperty("用户类型:1员工、2客户、3供应商")
+    private Integer userType;
+
+	@ApiModelProperty("用户头像")
+    private String headImage;
+    private String openId;
+    private String appletOpenid;
+    @TableField(exist = false)
+    private List<String> roleNames;
+    private String unionid;
+    //d订阅状态
+    private String subscriptionStatus;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/sysuser/SysUserDto.java

@@ -0,0 +1,42 @@
+package com.wh.controller.sysuser;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysUserDto.java <br/>
+ * Class: SysUserDto <br/>
+ * Description: 用户表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "用户表 数据传输对象", description = "用户表 数据传输对象")
+@Data
+public class SysUserDto implements Dto {
+    @ApiModelProperty("手机号")
+    private String mobile;
+    @ApiModelProperty("用户类型:1员工、2客户、3供应商")
+    private Integer userType;
+    @ApiModelProperty(value = "姓名", required = true)
+    //@NotBlank(message = "姓名不能为空")
+    private String name;
+    @ApiModelProperty(value = "验证码", required = true)
+    //@NotBlank(message = "验证码不能为空")
+    private String verificationCode;
+    @ApiModelProperty(value = "部门sid")
+    private String deptSid;
+    @ApiModelProperty(value = "岗位sid")
+    private String postSid;
+    private String bankMessageSid;
+    private String openid;
+    private String sid;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/sysuser/SysUserInfoVo.java

@@ -0,0 +1,30 @@
+package com.wh.controller.sysuser;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/2/9 9:12
+ * @Description 用户组织信息
+ */
+@Data
+public class SysUserInfoVo implements Vo {
+
+    private static final long serialVersionUID = 7931121025686046432L;
+    @ApiModelProperty("关联的员工sid")
+    private String staffSid;
+
+    @ApiModelProperty("关联的员工名称")
+    private String staffName;
+
+    @ApiModelProperty("员工的组织sid（多个时为第一个）")
+    private String orgSid;
+
+    @ApiModelProperty("员工的组织名称（多个时为第一个）")
+    private String orgName;
+
+    @ApiModelProperty("员工的组织部门编码")
+    private String orgCode;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/sysuser/SysUserListVo.java

@@ -0,0 +1,19 @@
+package com.wh.controller.sysuser;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/14 15:36
+ * @Description
+ */
+@Data
+public class SysUserListVo implements Vo {
+    private static final long serialVersionUID = -3047907553025391436L;
+
+    private String name;
+
+    private String sid;
+
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/sysuser/SysUserQuery.java

@@ -0,0 +1,51 @@
+package com.wh.controller.sysuser;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysUserQuery.java <br/>
+ * Class: SysUserQuery <br/>
+ * Description: 用户表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "用户表 查询条件", description = "用户表 查询条件")
+@Data
+public class SysUserQuery implements Query {
+
+
+    @ApiModelProperty("角色sid")
+    private String roleSid;
+    @ApiModelProperty("用户名称")
+    private String userName;
+    @ApiModelProperty("姓名")
+    private String name;
+    @ApiModelProperty("部门名称")
+    private String orgName;
+
+    @ApiModelProperty("密码（加密或签名后）")
+    private String password;
+
+    @ApiModelProperty("用户登录时随机生成身份验证字符串")
+    private String token;
+    @ApiModelProperty("用户登录时随机生成的验证码字符串")
+    private String verifyCode;
+    private String uuid;
+
+    @ApiModelProperty("手机登录唯一标识，手机与用户绑定字段")
+    private String appId;
+    @ApiModelProperty("手机登录类型：1、密码登录2、验证码登录")
+    private String type;
+    @ApiModelProperty(value = "是否是测试",example = "false")
+    private Boolean isTest;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/sysuser/SysUserRest.java

@@ -3,7 +3,6 @@ package com.wh.controller.sysuser;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.wh.pojo.sysuser.*;
 import com.wh.service.sysuser.SysUserService;
 import com.yxt.common.base.config.RedisUtil;
 import com.yxt.common.base.config.component.FileUploadComponent;

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/sysuser/SysUserUpdate.java

@@ -0,0 +1,15 @@
+package com.wh.controller.sysuser;
+
+import lombok.Data;
+
+/**
+ * @author feikefei
+ * @create 2023-08-18-17:19
+ */
+@Data
+public class SysUserUpdate {
+    private String original;
+    private String password;
+    private String confirmPassword;
+    private String userSid;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/sysuser/SysUserVo.java

@@ -0,0 +1,94 @@
+package com.wh.controller.sysuser;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysUserVo.java <br/>
+ * Class: SysUserVo <br/>
+ * Description: 用户表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "用户表 视图数据对象", description = "用户表 视图数据对象")
+@Data
+@NoArgsConstructor
+public class SysUserVo implements Vo {
+    private static final long serialVersionUID = 2415131854581950721L;
+    @ApiModelProperty("部门sid")
+    private String departmentSid;
+	@ApiModelProperty("部门名称")
+    private String departmentName;
+    @ApiModelProperty("上级部门名称-本级部门名称 岗位名称")
+    @JsonProperty("pNameAndDepartmentNameAndPostName")
+    private String pNameAndDepartmentNameAndPostName;
+	@ApiModelProperty("岗位名称")
+    private String  postName;
+	@ApiModelProperty("岗位Sid")
+    private String  postSid;
+    @ApiModelProperty("单位sid")
+    private String organizationSid;
+	@ApiModelProperty("单位名称")
+    private String organizationName;
+	@ApiModelProperty("用户姓名")
+    private String name;
+	@ApiModelProperty("登录名，登录名不能相同")
+    private String userName;
+
+    @ApiModelProperty("id")
+    private Integer id;
+	@ApiModelProperty("用户sid")
+    private String sid;
+    @ApiModelProperty("是否是管理员：1管理员，2一般用户，0是超级管理员,3尚无单位人员")
+    private String isAdmin;
+    @ApiModelProperty("角色名称")
+    private String roleName;
+
+	@ApiModelProperty("关联的人员sid")
+    private String staffSid;
+    
+	@ApiModelProperty("手机号")
+    private String mobile;
+    @ApiModelProperty(value = "禁用状态")
+    private String isEnable;
+    
+	@ApiModelProperty("用户类型:1员工、2客户、3供应商")
+    private String userType;
+	@ApiModelProperty("用户类型:1、2、3")
+    private String userTypeKey;
+    @ApiModelProperty("用户头像")
+    private String headImage;
+    @ApiModelProperty("组织名称")
+    private String orgNamePath;
+    @ApiModelProperty("组织sid")
+    private String orgSidPath;
+    @ApiModelProperty(value = "token")
+    private String token;
+    @ApiModelProperty(value = "角色sids")
+    private List<String> roleSids = new ArrayList<>();
+
+    private String defaultOrgPath;
+    private String defaultOrgPathName;
+
+    @ApiModelProperty("是否需要更换密码")
+    private Boolean needResetPsd;
+    @ApiModelProperty("工号")
+    private String jobNumber;
+    private String openid;
+    @ApiModelProperty("项目sid集合")
+    private List<ProjectInformationVo> projectSidList;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/sysuser/UserQuery.java

@@ -0,0 +1,21 @@
+package com.wh.controller.sysuser;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/21 8:47
+ * @Description
+ */
+@Data
+public class UserQuery implements Query {
+
+    private static final long serialVersionUID = -3979717077029562761L;
+    @ApiModelProperty(value = "角色sid必传项")
+    private String roleSid;
+    @ApiModelProperty(value = "用户部门sid路径是必传项")
+    private String orgSidPath;
+
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/sysuser/UserRoleQuery.java

@@ -0,0 +1,19 @@
+package com.wh.controller.sysuser;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/25 8:38
+ * @Description
+ */
+@Data
+public class UserRoleQuery implements Query {
+    private static final long serialVersionUID = 1913450300189800653L;
+
+    @ApiModelProperty("角色sid")
+    private String roleSid;
+    private String orgSid;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/sysuser/app/AppMySysUserInfo.java

@@ -0,0 +1,28 @@
+package com.wh.controller.sysuser.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2021/9/14
+ */
+@ApiOperation(value = "App我的信息")
+@Data
+public class AppMySysUserInfo implements Vo {
+
+    @ApiModelProperty("id")
+    private String id;
+    @ApiModelProperty("用户姓名")
+    private String name;
+    @ApiModelProperty("用户头像")
+    private String headImage;
+
+    @ApiModelProperty("职位")
+    private String position;
+    @ApiModelProperty("部门")
+    private String department;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/sysuser/app/AppUserOrgInfoVo.java

@@ -0,0 +1,34 @@
+package com.wh.controller.sysuser.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2021/12/17
+ */
+@ApiOperation("用户组织信息")
+@Data
+public class AppUserOrgInfoVo implements Vo {
+
+    @ApiModelProperty("关联的员工sid")
+    private String staffSid;
+
+    @ApiModelProperty("关联的员工名称")
+    private String staffName;
+
+    @ApiModelProperty("员工的组织sid（多个时为第一个）")
+    private String orgSid;
+
+    @ApiModelProperty("员工的组织名称（多个时为第一个）")
+    private String orgName;
+
+    @ApiModelProperty("员工的组织部门编码")
+    private String orgCode;
+
+    @ApiModelProperty("部门路径")
+    private String orgSidPath;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/sysuser/app/MyInfoQuery.java

@@ -0,0 +1,19 @@
+package com.wh.controller.sysuser.app;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/10/22 15:24
+ * @Description
+ */
+@Data
+public class MyInfoQuery implements Query {
+    private static final long serialVersionUID = -4771501933318214145L;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/sysuser/app/OrgList.java

@@ -0,0 +1,17 @@
+package com.wh.controller.sysuser.app;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/21 9:26
+ * @Description
+ */
+@Data
+public class OrgList implements Vo {
+    private static final long serialVersionUID = -2867882982421321776L;
+
+    private String orgName;
+    private String orgPath;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/sysuser/wx/SmsVerifyCodeQuery.java

@@ -0,0 +1,15 @@
+package com.wh.controller.sysuser.wx;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SmsVerifyCodeQuery implements Query {
+    @ApiModelProperty("手机号码")
+    private String mobile;
+    @ApiModelProperty("手机验证码")
+    private String code;
+    @ApiModelProperty("调用定位")
+    String callLocation;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/sysuser/wx/SysUserLoginVo.java

@@ -0,0 +1,15 @@
+package com.wh.controller.sysuser.wx;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SysUserLoginVo implements Vo {
+    @ApiModelProperty(value = "用户Sid")
+    private String sysUserSid;
+    @ApiModelProperty(value = "用户登录时随机生成身份验证字符串")
+    private String token;
+    @ApiModelProperty(value = "是否登陆")
+    private Boolean isLogin;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/sysuser/wx/SysUserWxBindMobileDto.java

@@ -0,0 +1,18 @@
+package com.wh.controller.sysuser.wx;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SysUserWxBindMobileDto implements Dto {
+    @ApiModelProperty(value = "用户登陆授权Sid")
+    private String sysUserWxAuthSid;
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
+    @ApiModelProperty(value = "验证码")
+    private String code;
+    //微信id
+    private String openid;
+    private String unionid;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/sysuser/wx/WxHomePageVo.java

@@ -0,0 +1,27 @@
+package com.wh.controller.sysuser.wx;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/10/12 10:53
+ * @description
+ */
+@Data
+public class WxHomePageVo implements Vo {
+    private static final long serialVersionUID = 2116719971434282451L;
+    @ApiModelProperty(value = "头像")
+    private String headImage;
+
+    @ApiModelProperty(value = "提醒")
+    private String message;
+
+    @ApiModelProperty(value = "身份证有效期")
+    private String idTerm;
+    @ApiModelProperty(value = "是否有提示")
+    private Boolean isHave;
+    @ApiModelProperty(value = "客户sid")
+    private String staffSid;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/sysuser/wx/WxMySysUserInfoVo.java

@@ -0,0 +1,23 @@
+package com.wh.controller.sysuser.wx;
+
+import com.yxt.common.core.utils.desensitized.Sensitive;
+import com.yxt.common.core.utils.desensitized.SensitiveTypeEnum;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/10/6 9:12
+ * @description 客户端我的页面
+ */
+@Data
+public class WxMySysUserInfoVo implements Vo {
+    private static final long serialVersionUID = 6495105262502269503L;
+
+    @ApiModelProperty(value = "姓名")
+    @Sensitive(type = SensitiveTypeEnum.CHINESE_NAME)
+    private String name;
+    @ApiModelProperty(value = "头像")
+    private String headImage;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/sysuser/wx/WxSysUserDto.java

@@ -0,0 +1,33 @@
+package com.wh.controller.sysuser.wx;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+
+/**
+ * @author dimengzhe
+ * @date 2021/10/5 13:31
+ * @description
+ */
+@Data
+public class WxSysUserDto implements Dto {
+    private static final long serialVersionUID = -3446342255009165324L;
+
+    @ApiModelProperty(value = "手机号", required = true)
+    @NotBlank(message = "手机号不能为空")
+    @Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|166|198|199|(147))\\d{8}$", message = "手机号码格式不正确")
+    private String mobile;
+    @ApiModelProperty(value = "验证码", required = true)
+    @NotBlank(message = "验证码不能为空")
+    private String verificationCode;
+    @ApiModelProperty(value = "姓名", required = true)
+    @NotBlank(message = "姓名不能为空")
+    private String name;
+    @ApiModelProperty(value = "身份证号", required = true)
+    @NotBlank(message = "身份证号不能为空")
+    private String idNo;
+
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/sysuser/wx/WxSysUserLoginQuery.java

@@ -0,0 +1,29 @@
+package com.wh.controller.sysuser.wx;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author dimengzhe
+ * @date 2021/10/6 14:31
+ * @description
+ */
+@Data
+public class WxSysUserLoginQuery implements Query {
+    private static final long serialVersionUID = -3754864114501469472L;
+    @ApiModelProperty(value = "用户名或手机号", required = true)
+    @NotBlank(message = "用户名不能为空")
+    private String userName;
+    @ApiModelProperty(value = "手机登录类型：1、密码登录，2、验证码登录", required = true)
+    @NotBlank(message = "手机登录类型不能为空")
+    private String type;
+
+    @ApiModelProperty(value = "密码")
+    private String password;
+
+    @ApiModelProperty(value = "验证码")
+    private String verifyCode;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/controller/sysuser/wx/WxSysUserVo.java

@@ -0,0 +1,38 @@
+package com.wh.controller.sysuser.wx;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/10/6 14:52
+ * @description
+ */
+@Data
+public class WxSysUserVo implements Vo {
+    private static final long serialVersionUID = 1700823767702299465L;
+    /*若为员工，则为人员sid。若为客户，则为客户sid。若为供应厂商，则为供应厂商的sid*/
+    @ApiModelProperty(value = "关联的客户sid")
+    private String staffSid;
+
+    @ApiModelProperty(value = "手机号")
+    private String mobile;
+
+    @ApiModelProperty(value = "用户类型:1员工、2客户、3供应商")
+    private String userType;
+
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+
+    @ApiModelProperty(value = "登录名，登录名不能相同")
+    private String userName;
+    @ApiModelProperty(value = "用户姓名")
+    private String name;
+
+    @ApiModelProperty(value = "token")
+    private String token;
+
+    @ApiModelProperty(value = "未读数量",example = "1")
+    private String num;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/mapper/api/instorehouse/InStorehouseListingMapper.java

@@ -2,7 +2,6 @@ package com.wh.mapper.api.instorehouse;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.wh.pojo.api.InStorehouseListing;
-import com.wh.pojo.api.InStorehouseMain;
 
 
 public interface InStorehouseListingMapper extends BaseMapper<InStorehouseListing> {

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/mapper/api/instorehouse/InStorehouseMainMapper.java

@@ -1,11 +1,9 @@
 package com.wh.mapper.api.instorehouse;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.wh.pojo.InStorehouse;
 import com.wh.pojo.api.InStoreHouseMainVo;
 import com.wh.pojo.api.InStorehouseMain;
 import org.apache.ibatis.annotations.Mapper;

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/mapper/api/outstorehouse/OutStorehouseListingMapper.java

@@ -1,7 +1,6 @@
 package com.wh.mapper.api.outstorehouse;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.wh.pojo.api.InStorehouseListing;
 import com.wh.pojo.api.OutStorehouseListing;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Param;

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/mapper/api/outstorehouse/OutStorehouseMainMapper.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.wh.pojo.api.InStoreHouseMainVo;
-import com.wh.pojo.api.InStorehouseMain;
 import com.wh.pojo.api.OutStorehouseMain;
 import com.wh.pojo.api.OutStorehouseVo;
 import org.apache.ibatis.annotations.Mapper;

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/mapper/initial/LocationMapper.java

@@ -3,10 +3,11 @@ package com.wh.mapper.initial;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.wh.pojo.Location;
 import com.wh.pojo.LocationVo;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
-
+@Mapper
 public interface LocationMapper extends BaseMapper<Location> {
     @Select("select * from location ")
     List<Location> listAll();

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/mapper/sysuser/SysUserMapper.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.wh.pojo.sysuser.SysUser;
-import com.wh.pojo.sysuser.SysUserInfoVo;
-import com.wh.pojo.sysuser.SysUserVo;
+import com.wh.controller.sysuser.SysUser;
+import com.wh.controller.sysuser.SysUserInfoVo;
+import com.wh.controller.sysuser.SysUserVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/BasePojo.java

@@ -0,0 +1,19 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+//pojo基类，完成2个任务，2个日期，实现序列化
+@Data
+@Accessors(chain=true)
+public class BasePojo implements Serializable{
+	@TableField(fill = FieldFill.INSERT)
+	private Date created;	//表示入库时需要赋值
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+	private Date updated;	//表示入库/更新时赋值.
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/InStorehouse.java

@@ -0,0 +1,22 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@TableName("in_storehouse")
+public class InStorehouse {
+    @TableId("in_storehouse_id")
+    private String inStorehouseId;      //入库单号
+    private String receivingId;         //接货单号
+    private String locationId;          //货位编码
+    private String createPerson;        //创建者
+    private String createTime;          //创建时间
+    private String checkPerson;         //审批人id
+    private String checkTime;           //审批时间
+    private String status;              //状态
+    private String remarks;             //备注
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/Location.java

@@ -0,0 +1,22 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@TableName("location")
+public class Location {
+
+    private String name;            //货位名称
+    @TableId(type = IdType.AUTO)
+    private int id;
+    private String locationId;      //货位编号
+    private String type;            //货位类型
+    private String status;          //货位状态
+    private String storehouse;      //所属仓库
+    private String storehouseid;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/LocationQuery.java

@@ -0,0 +1,21 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class LocationQuery implements Query {
+
+    private String name;            //货位名称
+    @TableId(type = IdType.AUTO)
+    private int id;
+    private String locationId;      //货位编号
+    private String type;            //货位类型
+    private String status;          //货位状态
+    private String storehouse;      //所属仓库
+    private String storehouseid;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/LocationType.java

@@ -0,0 +1,13 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@TableName("location_type")
+public class LocationType {
+    private Integer id;     //类型序号
+    private String type;    //类型
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/LocationVo.java

@@ -0,0 +1,16 @@
+package com.wh.pojo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class LocationVo {
+
+    private String name;            //货位名称
+    private String locationId;      //货位编号
+    private String type;            //货位类型
+    private String status;          //货位状态
+    private String storehouse;      //所属仓库
+    private String storehouseid;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/OnShelves.java

@@ -0,0 +1,29 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@TableName("on_shelves")
+@ToString
+public class OnShelves {
+    @TableId("shelves_id")
+    private String shelvesId;               //上架单号
+    private String barCode;                 //商品编码
+    private String productName;             //商品名称
+    private String locationId;              //货位编号
+    private String locationName;            //货位名称
+    private String fromLocationId;          //源货位编号
+    private String fromLocationName;        //源货位名称
+    private Integer count;                  //数量
+    private String status;                  //状态
+    private String createPerson;           //创建人
+    private String createTime;                //创建时间
+    private String checkPerson;             //审核人
+    private String checkTime;                 //审核时间
+
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/OutStorehouse.java

@@ -0,0 +1,29 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+
+@Data
+@Accessors(chain = true)
+@TableName("out_storehouse")
+public class OutStorehouse {
+    @TableId("out_storehouse_id")
+    private String outStorehouseId;     //出库单号
+    private String pickingId;           //拣货单号
+    private String barCode;             //商品条码
+    private String productName;         //商品名
+    private Integer count;              //数量
+    private String locationId;          //货位id
+    private String status;              //状态
+    private String receivePerson;       //收件人
+    private String addr;                //地址
+    private String outTime;             //出库时间
+    private String createPerson;        //创建人
+    private String createTime;          //创建时间
+    private String checkPerson;         //审核人
+    private String checkTime;           //审核时间
+
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/Picking.java

@@ -0,0 +1,20 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@TableName("picking")
+public class Picking {
+    @TableId("picking_id")
+    private String pickingId;           //拣货单号
+    private String outStorehouseId;     //出库单号
+    private String status;              //状态
+    private String recipientPerson;     //领取人
+    private String recipientTime;       //领取时间
+    private String createPerson;        //创建人
+    private String createTime;          //创建时间
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/Product.java

@@ -0,0 +1,26 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@TableName("product")
+@Data
+@Accessors(chain = true)
+@ToString
+public class Product {
+    @TableId(type = IdType.AUTO)
+    private int id;
+    private String barCode;             //条码
+    private String name;                //商品名
+    private String anotherName;         //别名
+    private Double value;               //价值
+    private Double netWeight;           //净重
+    private Double roughWeight;         //毛重
+    private Integer effectiveDays;      //有效天数
+    private String warehouse;           //所属仓库
+    private String remarks;             //备注
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/ProductQuery.java

@@ -0,0 +1,25 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@ToString
+public class ProductQuery implements Query {
+    @TableId(type = IdType.AUTO)
+    private int id;
+    private String barCode;             //条码
+    private String name;                //商品名
+    private String anotherName;         //别名
+    private Double value;               //价值
+    private Double netWeight;           //净重
+    private Double roughWeight;         //毛重
+    private Integer effectiveDays;      //有效天数
+    private String warehouse;           //所属仓库
+    private String remarks;             //备注
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/Purchase.java

@@ -0,0 +1,23 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@TableName("purchase")
+@ToString
+public class Purchase {
+    @TableId("purchase_id")
+    private String purchaseId;      //订单编号
+    private String product;         //商品
+    private String barCode;         //条码
+    private String supplier;        //供应商名称
+    private Integer count;          //数量
+    private String storehouse;       //仓库名称
+    private String status;          //状态
+
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/Receiving.java

@@ -0,0 +1,22 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@TableName("receiving")
+public class Receiving {
+    @TableId("receiving_id")
+    private String receivingId;             //接货单编号
+    private String purchaseId;              //采购单编号
+    private String removeId;                //调拨编号
+    private String remarks;                 //备注
+    private String receivingPerson;         //接货人id
+    private String receivingTime;             //接货时间
+    private String checkPerson;             //审批人id
+    private String checkTime;                 //审批时间
+    private String status;                  //状态
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/Remove.java

@@ -0,0 +1,25 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@TableName("remove")
+public class Remove {
+    @TableId
+    private String removeId;                //序号
+    private String barCode;                 //商品编码
+    private String productName;             //商品名称
+    private String locationId;              //货位编号
+    private String fromLocationId;          //源货位编号
+    private Integer count;                  //数量
+    private String status;                  //状态
+    private String createPerson;           //创建人
+    private String createTime;                //创建时间
+    private String checkPerson;             //审核人
+    private String checkTime;                 //审核时间
+
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/Rights.java

@@ -0,0 +1,22 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@TableName("rights")
+@Data
+@Accessors(chain = true)
+public class Rights extends BasePojo {
+    private Integer id;                 //序号
+    private String name;                //选项名
+    private Integer parentId;           //父id
+    private String path;                //url路径
+    private Integer level;              //选项等级
+    @TableField(exist = false)
+    private List<Rights> children; //不是表格固有属性
+}
+

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/Stock.java

@@ -0,0 +1,20 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class Stock {
+    private String inStorehouseId;
+    @TableId("location_id")
+    private String locationId;
+    private String locationName;
+    private String barCode;
+    private String productName;
+    private Integer totalQuantity;
+    private Integer availableQuantity;
+    private Integer lockedQuantity;
+    private String status;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/Storehouse.java

@@ -0,0 +1,19 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@TableName("storehouse")
+public class Storehouse {
+    @TableId("id")
+    private int id;
+    private String name;            //仓库名称
+    private String simpleName;      //仓库简称
+    private String addr;            //仓库地址
+    private String remarks;         //备注
+    private String entSid;//企业sid
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/Supplier.java

@@ -0,0 +1,19 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@TableName("supplier")
+public class Supplier {
+    @TableId(type = IdType.AUTO)
+    private int id;
+    private String name;        //供应商名称
+    private String contacts;    //联系人
+    private String number;      //电话
+    private String remarks;     //备注
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/SupplierQuery.java

@@ -0,0 +1,18 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class SupplierQuery implements Query {
+    @TableId(type = IdType.AUTO)
+    private int id;
+    private String name;        //供应商名称
+    private String contacts;    //联系人
+    private String number;      //电话
+    private String remarks;     //备注
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/User.java

@@ -0,0 +1,20 @@
+package com.wh.pojo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+
+@Data
+@Accessors(chain = true)
+@TableName("user")
+public class User {
+    @TableId("id")
+    private String id;
+    private String username;
+    private String password;
+    private String phone;
+    private String email;
+    private String status;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/api/InStoreHouseMainDetailVo.java

@@ -0,0 +1,22 @@
+package com.wh.pojo.api;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class InStoreHouseMainDetailVo implements Vo {
+    private String no;      	//varchar	50					编号
+    private String applicationDate;      	//date	50					制单日期
+    private String creatorName;      ///	varchar	50					制单人姓名
+    private String custerName;     // 	varchar	100					客户名称（企业）
+    private String storeHouseName;   //   	varchar	100					仓库名称
+    private String auditorName;     // 	varchar	50					审核人姓名
+    private String state;     // 	varchar	50					审核状态
+    private String approvedDate;   //   varchar	50					审核日期
+    private List<InStorehouseListing> list;
+    private String purchaseSid;//采购申请单的sid
+    private String locationName; //货位名称
+    private String locationId;//货位id
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/api/InStoreHouseMainDto.java

@@ -0,0 +1,163 @@
+package com.wh.pojo.api;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+public class InStoreHouseMainDto {
+    @NotBlank(message = "编号不能为空")
+    private String no;      	//varchar	50					编号
+    @NotBlank(message = "制单日期不能为空")
+    private String applicationDate;      	//date	50					制单日期
+    private String creatorSid;      	//varchar	64					制单人Sid
+    private String creatorName;      ///	varchar	50					制单人姓名
+    @NotBlank(message = "客户Sid不能为空")
+    private String custerSid;      	//varchar	64					客户Sid（企业）
+    @NotBlank(message = "客户名称不能为空")
+    private String custerName;     // 	varchar	100					客户名称（企业）
+    private String storeHouseSid;   //   	varchar	64					仓库Sid
+    private String storeHouseName;   //   	varchar	100					仓库名称
+    private String auditorSid;      	//varchar	64					审核人Sid
+    private String auditorName;     // 	varchar	50					审核人姓名
+    private String state;     // 	varchar	50					审核状态
+    private String approvedDate;   //   varchar	50					审核日期
+    private String approvedRemark;    //  varchar	50
+    private List<InStorehouseListing> list;
+    private String purchaseSid;//采购申请单的sid
+    private String locationId;
+    private String locationName; //货位名称
+
+    public String getLocationName() {
+        return locationName;
+    }
+
+    public void setLocationName(String locationName) {
+        this.locationName = locationName;
+    }
+
+    public String getLocationId() {
+        return locationId;
+    }
+
+    public void setLocationId(String locationId) {
+        this.locationId = locationId;
+    }
+
+    public String getNo() {
+        return no;
+    }
+
+    public void setNo(String no) {
+        this.no = no;
+    }
+
+    public String getApplicationDate() {
+        return applicationDate;
+    }
+
+    public void setApplicationDate(String applicationDate) {
+        this.applicationDate = applicationDate;
+    }
+
+    public String getCreatorSid() {
+        return creatorSid;
+    }
+
+    public void setCreatorSid(String creatorSid) {
+        this.creatorSid = creatorSid;
+    }
+
+    public String getCreatorName() {
+        return creatorName;
+    }
+
+    public void setCreatorName(String creatorName) {
+        this.creatorName = creatorName;
+    }
+
+    public String getCusterSid() {
+        return custerSid;
+    }
+
+    public void setCusterSid(String custerSid) {
+        this.custerSid = custerSid;
+    }
+
+    public String getCusterName() {
+        return custerName;
+    }
+
+    public void setCusterName(String custerName) {
+        this.custerName = custerName;
+    }
+
+    public String getStoreHouseSid() {
+        return storeHouseSid;
+    }
+
+    public void setStoreHouseSid(String storeHouseSid) {
+        this.storeHouseSid = storeHouseSid;
+    }
+
+    public String getStoreHouseName() {
+        return storeHouseName;
+    }
+
+    public void setStoreHouseName(String storeHouseName) {
+        this.storeHouseName = storeHouseName;
+    }
+
+    public String getAuditorSid() {
+        return auditorSid;
+    }
+
+    public void setAuditorSid(String auditorSid) {
+        this.auditorSid = auditorSid;
+    }
+
+    public String getAuditorName() {
+        return auditorName;
+    }
+
+    public void setAuditorName(String auditorName) {
+        this.auditorName = auditorName;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getApprovedDate() {
+        return approvedDate;
+    }
+
+    public void setApprovedDate(String approvedDate) {
+        this.approvedDate = approvedDate;
+    }
+
+    public String getApprovedRemark() {
+        return approvedRemark;
+    }
+
+    public void setApprovedRemark(String approvedRemark) {
+        this.approvedRemark = approvedRemark;
+    }
+
+    public List<InStorehouseListing> getList() {
+        return list;
+    }
+
+    public void setList(List<InStorehouseListing> list) {
+        this.list = list;
+    }
+
+    public String getPurchaseSid() {
+        return purchaseSid;
+    }
+
+    public void setPurchaseSid(String purchaseSid) {
+        this.purchaseSid = purchaseSid;
+    }
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/api/InStoreHouseMainVo.java

@@ -0,0 +1,22 @@
+package com.wh.pojo.api;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+@Data
+public class InStoreHouseMainVo implements Vo {
+    private String sid;
+    private String no;      	//varchar	50					编号
+    private String applicationDate;      	//date	50					制单日期
+    private String creatorName;      ///	varchar	50					制单人姓名
+    private String custerName;     // 	varchar	100					客户名称（企业）
+    private String storeHouseName;   //   	varchar	100					仓库名称
+    private String auditorName;     // 	varchar	50					审核人姓名
+    private String state;     // 	varchar	50					审核状态
+    private String approvedDate;   //   varchar	50					审核日期
+    private String prodNum;   //   varchar	50					商品数量
+    private String purchaseSid;//采购申请单的sid
+    private String locationName; //货位名称
+    private String locationId;//货位id
+    private String createTime;//入库日期
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/api/InStorehouseListing.java

@@ -0,0 +1,210 @@
+package com.wh.pojo.api;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Positive;
+
+@Accessors(chain = true)
+@TableName("in_storehouse_listing")
+public class InStorehouseListing extends BaseEntity {
+    /*@TableId(type = IdType.AUTO)
+    private Integer id;*/
+    private String custerSid;//	varchar	64					客户Sid（企业）
+    private String custerName	;//varchar	100					客户名称（企业）
+    private String storeHouseSid	;//varchar	64					仓库Sid
+    private String storeHouseName	;//varchar	100					仓库名称
+    @NotBlank(message = "质物名称不能为空")
+    private String proName;//	varchar	50					质物名称
+    @NotBlank(message = "质物名称不能为空")
+    private String proSid;//	varchar	50					质物名称
+    @NotBlank(message = "规格（型号）不能为空")
+    private String proModel	;//varchar	50					规格（型号）
+    private String proUnit	;//varchar	50					规格单位
+    private String manufacturer;//	varchar	50					生成厂家（产地）
+    @Positive(message ="数量必须为一个正数" )
+    private String num	;//varchar	10					数量
+    private String weight	;//varchar	50					重量
+    @NotBlank(message = "质权人确认的单价不能为空")
+    private String confirmedPrice;//	decime	50	2				质权人确认的单价
+    @NotBlank(message = "核算的价值不能为空")
+    private String calculatedValue	;//decime	50	2				核算的价值
+    private String locationNumber	;//varchar	10					货位号
+    private String locationId	;//varchar	10					货位号id
+    private String mainSid	;//varchar	50					申请单的sid
+    private String purchaseSid;//采购申请单的sid
+    private String brandInfoName;//品牌名称
+    private String brandInfoKey;//品牌名称
+    private String productTypeName;//分类名称
+    private String productTypeKey;//分类key
+
+    public String getLocationId() {
+        return locationId;
+    }
+
+    public void setLocationId(String locationId) {
+        this.locationId = locationId;
+    }
+
+    public String getCusterSid() {
+        return custerSid;
+    }
+
+    public void setCusterSid(String custerSid) {
+        this.custerSid = custerSid;
+    }
+
+    public String getCusterName() {
+        return custerName;
+    }
+
+    public void setCusterName(String custerName) {
+        this.custerName = custerName;
+    }
+
+    public String getStoreHouseSid() {
+        return storeHouseSid;
+    }
+
+    public void setStoreHouseSid(String storeHouseSid) {
+        this.storeHouseSid = storeHouseSid;
+    }
+
+    public String getStoreHouseName() {
+        return storeHouseName;
+    }
+
+    public void setStoreHouseName(String storeHouseName) {
+        this.storeHouseName = storeHouseName;
+    }
+
+    public String getProName() {
+        return proName;
+    }
+
+    public void setProName(String proName) {
+        this.proName = proName;
+    }
+
+    public String getProSid() {
+        return proSid;
+    }
+
+    public void setProSid(String proSid) {
+        this.proSid = proSid;
+    }
+
+    public String getProModel() {
+        return proModel;
+    }
+
+    public void setProModel(String proModel) {
+        this.proModel = proModel;
+    }
+
+    public String getProUnit() {
+        return proUnit;
+    }
+
+    public void setProUnit(String proUnit) {
+        this.proUnit = proUnit;
+    }
+
+    public String getManufacturer() {
+        return manufacturer;
+    }
+
+    public void setManufacturer(String manufacturer) {
+        this.manufacturer = manufacturer;
+    }
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getWeight() {
+        return weight;
+    }
+
+    public void setWeight(String weight) {
+        this.weight = weight;
+    }
+
+    public String getConfirmedPrice() {
+        return confirmedPrice;
+    }
+
+    public void setConfirmedPrice(String confirmedPrice) {
+        this.confirmedPrice = confirmedPrice;
+    }
+
+    public String getCalculatedValue() {
+        return calculatedValue;
+    }
+
+    public void setCalculatedValue(String calculatedValue) {
+        this.calculatedValue = calculatedValue;
+    }
+
+    public String getLocationNumber() {
+        return locationNumber;
+    }
+
+    public void setLocationNumber(String locationNumber) {
+        this.locationNumber = locationNumber;
+    }
+
+    public String getMainSid() {
+        return mainSid;
+    }
+
+    public void setMainSid(String mainSid) {
+        this.mainSid = mainSid;
+    }
+
+    public String getPurchaseSid() {
+        return purchaseSid;
+    }
+
+    public void setPurchaseSid(String purchaseSid) {
+        this.purchaseSid = purchaseSid;
+    }
+
+    public String getBrandInfoName() {
+        return brandInfoName;
+    }
+
+    public void setBrandInfoName(String brandInfoName) {
+        this.brandInfoName = brandInfoName;
+    }
+
+    public String getBrandInfoKey() {
+        return brandInfoKey;
+    }
+
+    public void setBrandInfoKey(String brandInfoKey) {
+        this.brandInfoKey = brandInfoKey;
+    }
+
+    public String getProductTypeName() {
+        return productTypeName;
+    }
+
+    public void setProductTypeName(String productTypeName) {
+        this.productTypeName = productTypeName;
+    }
+
+    public String getProductTypeKey() {
+        return productTypeKey;
+    }
+
+    public void setProductTypeKey(String productTypeKey) {
+        this.productTypeKey = productTypeKey;
+    }
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/api/InStorehouseMain.java

@@ -0,0 +1,147 @@
+package com.wh.pojo.api;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.experimental.Accessors;
+
+@Accessors(chain = true)
+@TableName("in_storehouse_main")
+public class InStorehouseMain extends BaseEntity {
+//    @TableId(type = IdType.AUTO)
+//    private Integer id;
+    private String no;      	//varchar	50					编号
+    private String applicationDate;      	//date	50					制单日期
+    private String creatorSid;      	//varchar	64					制单人Sid
+    private String creatorName;      ///	varchar	50					制单人姓名
+    private String custerSid;      	//varchar	64					客户Sid（企业）
+    private String custerName;     // 	varchar	100					客户名称（企业）
+    private String storeHouseSid;   //   	varchar	64					仓库Sid
+    private String storeHouseName;   //   	varchar	100					仓库名称
+    private String auditorSid;      	//varchar	64					审核人Sid
+    private String auditorName;     // 	varchar	50					审核人姓名
+    private String approvedDate;   //   varchar	50					审核日期
+    private String approvedRemark;    //  varchar	50					审核备注
+    private String purchaseSid;//采购申请单的sid
+    private String locationName; //货位名称
+    private String locationId;//货位id
+
+    public String getLocationName() {
+        return locationName;
+    }
+
+    public void setLocationName(String locationName) {
+        this.locationName = locationName;
+    }
+
+    public String getLocationId() {
+        return locationId;
+    }
+
+    public void setLocationId(String locationId) {
+        this.locationId = locationId;
+    }
+
+    public String getNo() {
+        return no;
+    }
+
+    public void setNo(String no) {
+        this.no = no;
+    }
+
+    public String getApplicationDate() {
+        return applicationDate;
+    }
+
+    public void setApplicationDate(String applicationDate) {
+        this.applicationDate = applicationDate;
+    }
+
+    public String getCreatorSid() {
+        return creatorSid;
+    }
+
+    public void setCreatorSid(String creatorSid) {
+        this.creatorSid = creatorSid;
+    }
+
+    public String getCreatorName() {
+        return creatorName;
+    }
+
+    public void setCreatorName(String creatorName) {
+        this.creatorName = creatorName;
+    }
+
+    public String getCusterSid() {
+        return custerSid;
+    }
+
+    public void setCusterSid(String custerSid) {
+        this.custerSid = custerSid;
+    }
+
+    public String getCusterName() {
+        return custerName;
+    }
+
+    public void setCusterName(String custerName) {
+        this.custerName = custerName;
+    }
+
+    public String getStoreHouseSid() {
+        return storeHouseSid;
+    }
+
+    public void setStoreHouseSid(String storeHouseSid) {
+        this.storeHouseSid = storeHouseSid;
+    }
+
+    public String getStoreHouseName() {
+        return storeHouseName;
+    }
+
+    public void setStoreHouseName(String storeHouseName) {
+        this.storeHouseName = storeHouseName;
+    }
+
+    public String getAuditorSid() {
+        return auditorSid;
+    }
+
+    public void setAuditorSid(String auditorSid) {
+        this.auditorSid = auditorSid;
+    }
+
+    public String getAuditorName() {
+        return auditorName;
+    }
+
+    public void setAuditorName(String auditorName) {
+        this.auditorName = auditorName;
+    }
+
+    public String getApprovedDate() {
+        return approvedDate;
+    }
+
+    public void setApprovedDate(String approvedDate) {
+        this.approvedDate = approvedDate;
+    }
+
+    public String getApprovedRemark() {
+        return approvedRemark;
+    }
+
+    public void setApprovedRemark(String approvedRemark) {
+        this.approvedRemark = approvedRemark;
+    }
+
+    public String getPurchaseSid() {
+        return purchaseSid;
+    }
+
+    public void setPurchaseSid(String purchaseSid) {
+        this.purchaseSid = purchaseSid;
+    }
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/api/InStorehouseMainQuery.java

@@ -0,0 +1,161 @@
+package com.wh.pojo.api;
+
+import com.yxt.common.core.query.Query;
+import lombok.experimental.Accessors;
+
+@Accessors(chain = true)
+public class InStorehouseMainQuery implements Query {
+    private String sid;
+    private String no;      	//varchar	50					编号
+    private String applicationDateStart;      	//date	50					制单日期开始
+    private String applicationDateEnd;      	//date	50					制单日期结束
+    private String creatorSid;      	//varchar	64					制单人Sid
+    private String creatorName;      ///	varchar	50					制单人姓名
+    private String custerSid;      	//varchar	64					客户Sid（企业）
+    private String custerName;     // 	varchar	100					客户名称（企业）
+    private String storeHouseSid;   //   	varchar	64					仓库Sid
+    private String storeHouseName;   //   	varchar	100					仓库名称
+    private String auditorSid;      	//varchar	64					审核人Sid
+    private String auditorName;     // 	varchar	50					审核人姓名
+    private String approvedDate;   //   varchar	50					审核日期
+    private String approvedRemark;    //  varchar	50					审核备注
+    private String purchaseSid;//采购申请单的sid
+    private String locationName; //货位名称
+    private String locationId;//货位id
+
+    public String getLocationName() {
+        return locationName;
+    }
+
+    public void setLocationName(String locationName) {
+        this.locationName = locationName;
+    }
+
+    public String getLocationId() {
+        return locationId;
+    }
+
+    public void setLocationId(String locationId) {
+        this.locationId = locationId;
+    }
+
+    public String getSid() {
+        return sid;
+    }
+
+    public void setSid(String sid) {
+        this.sid = sid;
+    }
+
+    public String getNo() {
+        return no;
+    }
+
+    public void setNo(String no) {
+        this.no = no;
+    }
+
+    public String getApplicationDateStart() {
+        return applicationDateStart;
+    }
+
+    public void setApplicationDateStart(String applicationDateStart) {
+        this.applicationDateStart = applicationDateStart;
+    }
+
+    public String getApplicationDateEnd() {
+        return applicationDateEnd;
+    }
+
+    public void setApplicationDateEnd(String applicationDateEnd) {
+        this.applicationDateEnd = applicationDateEnd;
+    }
+
+    public String getCreatorSid() {
+        return creatorSid;
+    }
+
+    public void setCreatorSid(String creatorSid) {
+        this.creatorSid = creatorSid;
+    }
+
+    public String getCreatorName() {
+        return creatorName;
+    }
+
+    public void setCreatorName(String creatorName) {
+        this.creatorName = creatorName;
+    }
+
+    public String getCusterSid() {
+        return custerSid;
+    }
+
+    public void setCusterSid(String custerSid) {
+        this.custerSid = custerSid;
+    }
+
+    public String getCusterName() {
+        return custerName;
+    }
+
+    public void setCusterName(String custerName) {
+        this.custerName = custerName;
+    }
+
+    public String getStoreHouseSid() {
+        return storeHouseSid;
+    }
+
+    public void setStoreHouseSid(String storeHouseSid) {
+        this.storeHouseSid = storeHouseSid;
+    }
+
+    public String getStoreHouseName() {
+        return storeHouseName;
+    }
+
+    public void setStoreHouseName(String storeHouseName) {
+        this.storeHouseName = storeHouseName;
+    }
+
+    public String getAuditorSid() {
+        return auditorSid;
+    }
+
+    public void setAuditorSid(String auditorSid) {
+        this.auditorSid = auditorSid;
+    }
+
+    public String getAuditorName() {
+        return auditorName;
+    }
+
+    public void setAuditorName(String auditorName) {
+        this.auditorName = auditorName;
+    }
+
+    public String getApprovedDate() {
+        return approvedDate;
+    }
+
+    public void setApprovedDate(String approvedDate) {
+        this.approvedDate = approvedDate;
+    }
+
+    public String getApprovedRemark() {
+        return approvedRemark;
+    }
+
+    public void setApprovedRemark(String approvedRemark) {
+        this.approvedRemark = approvedRemark;
+    }
+
+    public String getPurchaseSid() {
+        return purchaseSid;
+    }
+
+    public void setPurchaseSid(String purchaseSid) {
+        this.purchaseSid = purchaseSid;
+    }
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/api/OutStorehouseDetailVo.java

@@ -0,0 +1,24 @@
+package com.wh.pojo.api;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+
+@Data
+@Accessors(chain = true)
+public class OutStorehouseDetailVo implements Vo {
+    private String sid;
+    private String no;      	//varchar	50					编号
+    private String applicationDate;      	//date	50					制单日期
+    private String outDate;      	//date	50					制单日期
+    private String creatorName;      ///	varchar	50					制单人姓名
+    private String custerName;     // 	varchar	100					客户名称（企业）
+    private String storeHouseName;   //   	varchar	100					仓库名称
+    private String storeHouseSid;   //   	varchar	100					仓库名称
+    private String auditorName;     // 	varchar	50					审核人姓名
+    private String approvedDate;   //   varchar	50					审核日期
+    private List<OutStorehouseListing> list;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/api/OutStorehouseListing.java

@@ -0,0 +1,46 @@
+package com.wh.pojo.api;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Positive;
+
+@Data
+@Accessors(chain = true)
+@TableName("out_storehouse_listing")
+public class OutStorehouseListing extends BaseEntity {
+//    @TableId(type = IdType.AUTO)
+//    private Integer id;
+    private String custerSid;//	varchar	64					客户Sid（企业）
+    private String custerName	;//varchar	100					客户名称（企业）
+    private String storeHouseSid	;//varchar	64					仓库Sid
+    private String storeHouseName	;//varchar	100					仓库名称
+    @NotBlank(message = "质物名称不能为空")
+    private String proName;//	varchar	50					质物名称
+    @NotBlank(message = "质物名称不能为空")
+    private String proSid;//	varchar	50					质物sid
+    @NotBlank(message = "规格（型号）不能为空")
+    private String proModel	;//varchar	50					规格（型号）
+    private String proUnit	;//varchar	50					规格单位
+    private String manufacturer;//	varchar	50					生成厂家（产地）
+    @Positive(message ="数量必须为一个正数" )
+    private String estimateNum	;//varchar	10					预计数量
+    private String estimateWeight	;//varchar	50					预计重量
+    @NotBlank(message = "预计质权人确认的单价不能空")
+    private String estimateConfirmedPrice;//	decime	50	2				质权人确认的单价
+    @NotBlank(message = "预计核算的价值不能空")
+    private String estimateCalculatedValue	;//decime	50	2				核算的价值
+    @Positive(message ="数量必须为一个正数" )
+    private String realityNum	;//varchar	10					实际数量
+    private String realityWeight	;//varchar	50					实际重量
+    @NotBlank(message = "实际质权人确认的单价不能空")
+    private String realityConfirmedPrice;//	decime	50	2				实际质权人确认
+    @NotBlank(message = "实际核算的价值不能空")
+    private String realityCalculatedValue	;//decime	50	2				实际核算的价值
+    private String locationNumber	;//varchar	10					货位号
+    private String locationId	;//varchar	10					货位号id
+    private String mainSid	;//varchar	50					申请单的sid
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/api/OutStorehouseMain.java

@@ -0,0 +1,28 @@
+package com.wh.pojo.api;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+
+@Data
+@Accessors(chain = true)
+@TableName("out_storehouse_main")
+public class OutStorehouseMain extends BaseEntity {
+//    @TableId(type = IdType.AUTO)
+//    private Integer id;
+    private String no;      	//varchar	50					编号
+    private String applicationDate;      	//date	50					制单日期
+    private String creatorSid;      	//varchar	64					制单人Sid
+    private String creatorName;      ///	varchar	50					制单人姓名
+    private String custerSid;      	//varchar	64					客户Sid（企业）
+    private String custerName;     // 	varchar	100					客户名称（企业）
+    private String storeHouseSid;   //   	varchar	64					仓库Sid
+    private String storeHouseName;   //   	varchar	100					仓库名称
+    private String auditorSid;      	//varchar	64					审核人Sid
+    private String auditorName;     // 	varchar	50					审核人姓名
+    private String approvedDate;   //   varchar	50					审核日期
+    private String approvedRemark;    //  varchar	50					审核备注
+    private String outDate;  //出库日期
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/api/OutStorehouseMainDto.java

@@ -0,0 +1,27 @@
+package com.wh.pojo.api;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+
+@Data
+@Accessors(chain = true)
+public class OutStorehouseMainDto {
+    private String sid;
+    private String no;      	//varchar	50					编号
+    private String applicationDate;      	//date	50					制单日期
+    private String creatorSid;      	//varchar	64					制单人Sid
+    private String creatorName;      ///	varchar	50					制单人姓名
+    private String custerSid;      	//varchar	64					客户Sid（企业）
+    private String custerName;     // 	varchar	100					客户名称（企业）
+    private String storeHouseSid;   //   	varchar	64					仓库Sid
+    private String storeHouseName;   //   	varchar	100					仓库名称
+    private String auditorSid;      	//varchar	64					审核人Sid
+    private String auditorName;     // 	varchar	50					审核人姓名
+    private String approvedDate;   //   varchar	50					审核日期
+    private String approvedRemark;    //  varchar	50					审核备注
+    private List<OutStorehouseListing> list;
+    private String outDate;  //出库日期
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/api/OutStorehouseMainQuery.java

@@ -0,0 +1,20 @@
+package com.wh.pojo.api;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+
+@Data
+@Accessors(chain = true)
+public class OutStorehouseMainQuery implements Query {
+    private String sid;
+    private String no;      	//varchar	50					编号
+    private String applicationDateEnd;      	//date	50					制单日期
+    private String applicationDateStart;      	//date	50					制单日期
+    private String creatorName;      ///	varchar	50					制单人姓名
+    private String custerName;     // 	varchar	100					客户名称（企业）
+    private String custerSid;
+    private String mainSid;     // 	varchar	100					mainSid
+    private String state;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/api/OutStorehouseVo.java

@@ -0,0 +1,24 @@
+package com.wh.pojo.api;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+
+@Data
+@Accessors(chain = true)
+public class OutStorehouseVo implements Vo {
+    private String sid;
+    private String no;      	//varchar	50					编号
+    private String applicationDate;      	//date	50					制单日期
+    private String creatorName;      ///	varchar	50					制单人姓名
+    private String custerName;     // 	varchar	100					客户名称（企业）
+    private String storeHouseName;   //   	varchar	100					仓库名称
+    private String storeHouseSid;   //   	varchar	100					仓库名称
+    private String auditorName;     // 	varchar	50					审核人姓名
+    private String approvedDate;   //   varchar	50					审核日期
+    private String prodNum;   //   varchar	50					商品数量
+    private String modifyTime; //修改日期
+    private String state;
+    private String outDate;  //出库日期
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/api/ProdStock.java

@@ -0,0 +1,185 @@
+package com.wh.pojo.api;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@TableName("prod_stock")
+public class ProdStock extends BaseEntity {
+//    @TableId(type = IdType.AUTO)
+//    private Integer id;
+    private String proName;//	varchar	50					质物名称
+    private String proSid;//质物sid
+    private String proModel;//	varchar	50					规格（型号）
+    private String  manufacturer;//	varchar	50					生成厂家（产地）
+    private String num;//	varchar	10					数量
+    private String weight;//	varchar	50					重量
+    private String confirmedPrice;//	decime	50	2				质权人确认的单价
+    private String calculatedValue;//	decime	50	2				核算的价值
+    private String locationNumber;//	varchar	10					货位号
+    private String custerName;//	varchar	50					客户名称（企业）
+    private String proUnit;//	varchar	50					规格单位
+    private String custerSid;//	varchar	64					客户Sid（企业）
+    private String storeHouseSid;//	varchar	64					仓库Sid
+    private String storeHouseName;//	varchar	100					仓库名称
+    private String brandInfoName;//品牌名称
+    private String brandInfoKey;//品牌名称
+    private String productTypeName;//分类名称
+    private String productTypeKey;//分类key
+    private String locationId;//货位号id
+
+    public String getLocationId() {
+        return locationId;
+    }
+
+    public void setLocationId(String locationId) {
+        this.locationId = locationId;
+    }
+
+    public String getProName() {
+        return proName;
+    }
+
+    public void setProName(String proName) {
+        this.proName = proName;
+    }
+
+    public String getProSid() {
+        return proSid;
+    }
+
+    public void setProSid(String proSid) {
+        this.proSid = proSid;
+    }
+
+    public String getProModel() {
+        return proModel;
+    }
+
+    public void setProModel(String proModel) {
+        this.proModel = proModel;
+    }
+
+    public String getManufacturer() {
+        return manufacturer;
+    }
+
+    public void setManufacturer(String manufacturer) {
+        this.manufacturer = manufacturer;
+    }
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getWeight() {
+        return weight;
+    }
+
+    public void setWeight(String weight) {
+        this.weight = weight;
+    }
+
+    public String getConfirmedPrice() {
+        return confirmedPrice;
+    }
+
+    public void setConfirmedPrice(String confirmedPrice) {
+        this.confirmedPrice = confirmedPrice;
+    }
+
+    public String getCalculatedValue() {
+        return calculatedValue;
+    }
+
+    public void setCalculatedValue(String calculatedValue) {
+        this.calculatedValue = calculatedValue;
+    }
+
+    public String getLocationNumber() {
+        return locationNumber;
+    }
+
+    public void setLocationNumber(String locationNumber) {
+        this.locationNumber = locationNumber;
+    }
+
+    public String getCusterName() {
+        return custerName;
+    }
+
+    public void setCusterName(String custerName) {
+        this.custerName = custerName;
+    }
+
+    public String getProUnit() {
+        return proUnit;
+    }
+
+    public void setProUnit(String proUnit) {
+        this.proUnit = proUnit;
+    }
+
+    public String getCusterSid() {
+        return custerSid;
+    }
+
+    public void setCusterSid(String custerSid) {
+        this.custerSid = custerSid;
+    }
+
+    public String getStoreHouseSid() {
+        return storeHouseSid;
+    }
+
+    public void setStoreHouseSid(String storeHouseSid) {
+        this.storeHouseSid = storeHouseSid;
+    }
+
+    public String getStoreHouseName() {
+        return storeHouseName;
+    }
+
+    public void setStoreHouseName(String storeHouseName) {
+        this.storeHouseName = storeHouseName;
+    }
+
+    public String getBrandInfoName() {
+        return brandInfoName;
+    }
+
+    public void setBrandInfoName(String brandInfoName) {
+        this.brandInfoName = brandInfoName;
+    }
+
+    public String getBrandInfoKey() {
+        return brandInfoKey;
+    }
+
+    public void setBrandInfoKey(String brandInfoKey) {
+        this.brandInfoKey = brandInfoKey;
+    }
+
+    public String getProductTypeName() {
+        return productTypeName;
+    }
+
+    public void setProductTypeName(String productTypeName) {
+        this.productTypeName = productTypeName;
+    }
+
+    public String getProductTypeKey() {
+        return productTypeKey;
+    }
+
+    public void setProductTypeKey(String productTypeKey) {
+        this.productTypeKey = productTypeKey;
+    }
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/api/ProdStockDto.java

@@ -0,0 +1,29 @@
+package com.wh.pojo.api;
+
+import com.yxt.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class ProdStockDto extends BaseEntity {
+    private String proName;//	varchar	50					质物名称
+    private String proSid;//质物sid
+    private String proModel;//	varchar	50					规格（型号）
+    private String  manufacturer;//	varchar	50					生成厂家（产地）
+    private String num;//	varchar	10					数量
+    private String weight;//	varchar	50					重量
+    private String confirmedPrice;//	decime	50	2				质权人确认的单价
+    private String calculatedValue;//	decime	50	2				核算的价值
+    private String locationNumber;//	varchar	10					货位号
+    private String custerName;//	varchar	50					客户名称（企业）
+    private String proUnit;//	varchar	50					规格单位
+    private String custerSid;//	varchar	64					客户Sid（企业）
+    private String storeHouseSid;//	varchar	64					仓库Sid
+    private String storeHouseName;//	varchar	100					仓库名称
+    private String brandInfoName;//品牌名称
+    private String brandInfoKey;//品牌名称
+    private String productTypeName;//分类名称
+    private String productTypeKey;//分类key
+    private String locationId;//货位号id
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/api/ProdStockQuery.java

@@ -0,0 +1,176 @@
+package com.wh.pojo.api;
+
+import com.yxt.common.core.query.Query;
+
+public class ProdStockQuery implements Query {
+    private String proName;//	varchar	50					质物名称
+    private String proSid;//质物sid
+    private String proModel;//	varchar	50					规格（型号）
+    private String  manufacturer;//	varchar	50					生成厂家（产地）
+    private String num;//	varchar	10					数量
+    private String weight;//	varchar	50					重量
+    private String confirmedPrice;//	decime	50	2				质权人确认的单价
+    private String calculatedValue;//	decime	50	2				核算的价值
+    private String locationNumber;//	varchar	10					货位号
+    private String custerName;//	varchar	50					客户名称（企业）
+    private String proUnit;//	varchar	50					规格单位
+    private String custerSid;//	varchar	64					客户Sid（企业）
+    private String storeHouseSid;//	varchar	64					仓库Sid
+    private String storeHouseName;//	varchar	100					仓库名称
+    private String brandInfoName;//品牌名称
+    private String brandInfoKey;//品牌名称
+    private String productTypeName;//分类名称
+    private String productTypeKey;//分类key
+    private String locationId;//货位号id
+
+    public String getLocationId() {
+        return locationId;
+    }
+
+    public void setLocationId(String locationId) {
+        this.locationId = locationId;
+    }
+    public String getProName() {
+        return proName;
+    }
+
+    public void setProName(String proName) {
+        this.proName = proName;
+    }
+
+    public String getProSid() {
+        return proSid;
+    }
+
+    public void setProSid(String proSid) {
+        this.proSid = proSid;
+    }
+
+    public String getProModel() {
+        return proModel;
+    }
+
+    public void setProModel(String proModel) {
+        this.proModel = proModel;
+    }
+
+    public String getManufacturer() {
+        return manufacturer;
+    }
+
+    public void setManufacturer(String manufacturer) {
+        this.manufacturer = manufacturer;
+    }
+
+    public String getNum() {
+        return num;
+    }
+
+    public void setNum(String num) {
+        this.num = num;
+    }
+
+    public String getWeight() {
+        return weight;
+    }
+
+    public void setWeight(String weight) {
+        this.weight = weight;
+    }
+
+    public String getConfirmedPrice() {
+        return confirmedPrice;
+    }
+
+    public void setConfirmedPrice(String confirmedPrice) {
+        this.confirmedPrice = confirmedPrice;
+    }
+
+    public String getCalculatedValue() {
+        return calculatedValue;
+    }
+
+    public void setCalculatedValue(String calculatedValue) {
+        this.calculatedValue = calculatedValue;
+    }
+
+    public String getLocationNumber() {
+        return locationNumber;
+    }
+
+    public void setLocationNumber(String locationNumber) {
+        this.locationNumber = locationNumber;
+    }
+
+    public String getCusterName() {
+        return custerName;
+    }
+
+    public void setCusterName(String custerName) {
+        this.custerName = custerName;
+    }
+
+    public String getProUnit() {
+        return proUnit;
+    }
+
+    public void setProUnit(String proUnit) {
+        this.proUnit = proUnit;
+    }
+
+    public String getCusterSid() {
+        return custerSid;
+    }
+
+    public void setCusterSid(String custerSid) {
+        this.custerSid = custerSid;
+    }
+
+    public String getStoreHouseSid() {
+        return storeHouseSid;
+    }
+
+    public void setStoreHouseSid(String storeHouseSid) {
+        this.storeHouseSid = storeHouseSid;
+    }
+
+    public String getStoreHouseName() {
+        return storeHouseName;
+    }
+
+    public void setStoreHouseName(String storeHouseName) {
+        this.storeHouseName = storeHouseName;
+    }
+
+    public String getBrandInfoName() {
+        return brandInfoName;
+    }
+
+    public void setBrandInfoName(String brandInfoName) {
+        this.brandInfoName = brandInfoName;
+    }
+
+    public String getBrandInfoKey() {
+        return brandInfoKey;
+    }
+
+    public void setBrandInfoKey(String brandInfoKey) {
+        this.brandInfoKey = brandInfoKey;
+    }
+
+    public String getProductTypeName() {
+        return productTypeName;
+    }
+
+    public void setProductTypeName(String productTypeName) {
+        this.productTypeName = productTypeName;
+    }
+
+    public String getProductTypeKey() {
+        return productTypeKey;
+    }
+
+    public void setProductTypeKey(String productTypeKey) {
+        this.productTypeKey = productTypeKey;
+    }
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/api/ProdStockVo.java

@@ -0,0 +1,24 @@
+package com.wh.pojo.api;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+@Data
+public class ProdStockVo implements Vo {
+    private String proName;//	varchar	50					质物名称
+    private String proSid;//质物sid
+    private String proModel;//	varchar	50					规格（型号）
+    private String  manufacturer;//	varchar	50					生成厂家（产地）
+    private String num;//	varchar	10					数量
+    private String weight;//	varchar	50					重量
+    private String confirmedPrice;//	decime	50	2				质权人确认的单价
+    private String calculatedValue;//	decime	50	2				核算的价值
+    private String locationNumber;//	varchar	10					货位号
+    private String custerName;//	varchar	50					客户名称（企业）
+    private String proUnit;//	varchar	50					规格单位
+    private String custerSid;//	varchar	64					客户Sid（企业）
+    private String storeHouseSid;//	varchar	64					仓库Sid
+    private String storeHouseName;//	varchar	100					仓库名称
+    private String locationId;//货位号id
+
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/api/ProdStocks.java

@@ -0,0 +1,20 @@
+package com.wh.pojo.api;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+public class ProdStocks   {
+    private List<ProdStock> list;
+
+    public List<ProdStock> getList() {
+        return list;
+    }
+
+    public void setList(List<ProdStock> list) {
+        this.list = list;
+    }
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/api/PurchaseInStoreHouseParams.java

@@ -0,0 +1,23 @@
+package com.wh.pojo.api;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class PurchaseInStoreHouseParams {
+    //仓库id
+    private String storeHouseSid;
+    //仓库id
+    private String storeHouseName;
+    //采购订单sid
+    private String purchaseSid;
+    //采购订单编号
+    private String purchaseNo;
+    //客户sid
+    private String custerSid;
+    //用户sid
+    private String userSid;
+    //用户sid
+    private String userName;
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/brandinfo/BrandInfo.java

@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.brandinfo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: BrandInfo.java <br/>
+ * Class: com.supervise.api.brandinfo.BrandInfo <br/>
+ * Description: 品牌信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:28 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "品牌信息", description = "品牌信息")
+@TableName("brand_info")
+public class BrandInfo extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("代码")
+    private String code; // 代码
+	@ApiModelProperty("名称")
+    private String name; // 名称
+
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/brandinfo/BrandInfoDetailsVo.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.brandinfo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: BrandInfoVo.java <br/>
+ * Class: com.supervise.api.brandinfo.BrandInfoVo <br/>
+ * Description: 品牌信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:28 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "品牌信息 视图数据详情", description = "品牌信息 视图数据详情")
+public class BrandInfoDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("记录版本，锁")
+    private String lock_version; // 记录版本，锁
+	@ApiModelProperty("创建者")
+    private String create_sid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modify_sid; // 更新者
+	@ApiModelProperty("记录是否可用，1:可用，0:不可用")
+    private String is_enable; // 记录是否可用，1:可用，0:不可用
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录创建时间")
+    private Date create_timeStart; // 记录创建时间
+    private Date create_timeEnd; // 记录创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录最后修改时间")
+    private Date modify_timeStart; // 记录最后修改时间
+    private Date modify_timeEnd; // 记录最后修改时间
+	@ApiModelProperty("记录是否被删除，0:未删除，1:已经删除")
+    private String is_delete; // 记录是否被删除，0:未删除，1:已经删除
+	@ApiModelProperty("代码")
+    private String code; // 代码
+	@ApiModelProperty("名称")
+    private String name; // 名称
+
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/brandinfo/BrandInfoDto.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.brandinfo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: BrandInfoDto.java <br/>
+ * Class: com.supervise.api.brandinfo.BrandInfoDto <br/>
+ * Description: 品牌信息 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:28 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "品牌信息 数据传输对象", description = "品牌信息 数据传输对象")
+public class BrandInfoDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("记录版本，锁")
+    private String lock_version; // 记录版本，锁
+	@ApiModelProperty("创建者")
+    private String create_sid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modify_sid; // 更新者
+	@ApiModelProperty("记录是否可用，1:可用，0:不可用")
+    private String is_enable; // 记录是否可用，1:可用，0:不可用
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录创建时间")
+    private Date create_timeStart; // 记录创建时间
+    private Date create_timeEnd; // 记录创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录最后修改时间")
+    private Date modify_timeStart; // 记录最后修改时间
+    private Date modify_timeEnd; // 记录最后修改时间
+	@ApiModelProperty("记录是否被删除，0:未删除，1:已经删除")
+    private String is_delete; // 记录是否被删除，0:未删除，1:已经删除
+	@ApiModelProperty("代码")
+    private String code; // 代码
+	@ApiModelProperty("名称")
+    private String name; // 名称
+
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/brandinfo/BrandInfoQuery.java

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.brandinfo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: BrandInfoQuery.java <br/>
+ * Class: com.supervise.api.brandinfo.BrandInfoQuery <br/>
+ * Description: 品牌信息 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:28 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "品牌信息 查询条件", description = "品牌信息 查询条件")
+public class BrandInfoQuery implements Query {
+
+	@ApiModelProperty("记录版本，锁")
+    private String lock_version; // 记录版本，锁
+	@ApiModelProperty("创建者")
+    private String create_sid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modify_sid; // 更新者
+	@ApiModelProperty("记录是否可用，1:可用，0:不可用")
+    private String is_enable; // 记录是否可用，1:可用，0:不可用
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录创建时间")
+    private Date create_timeStart; // 记录创建时间
+    private Date create_timeEnd; // 记录创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录最后修改时间")
+    private Date modify_timeStart; // 记录最后修改时间
+    private Date modify_timeEnd; // 记录最后修改时间
+	@ApiModelProperty("记录是否被删除，0:未删除，1:已经删除")
+    private String is_delete; // 记录是否被删除，0:未删除，1:已经删除
+	@ApiModelProperty("代码")
+    private String code; // 代码
+	@ApiModelProperty("名称")
+    private String name; // 名称
+
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/brandinfo/BrandInfoVo.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.brandinfo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: BrandInfoVo.java <br/>
+ * Class: com.supervise.api.brandinfo.BrandInfoVo <br/>
+ * Description: 品牌信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:28 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "品牌信息 视图数据对象", description = "品牌信息 视图数据对象")
+public class BrandInfoVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("记录版本，锁")
+    private String lock_version; // 记录版本，锁
+	@ApiModelProperty("创建者")
+    private String create_sid; // 创建者
+	@ApiModelProperty("更新者")
+    private String modify_sid; // 更新者
+	@ApiModelProperty("记录是否可用，1:可用，0:不可用")
+    private String is_enable; // 记录是否可用，1:可用，0:不可用
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录创建时间")
+    private Date create_timeStart; // 记录创建时间
+    private Date create_timeEnd; // 记录创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("记录最后修改时间")
+    private Date modify_timeStart; // 记录最后修改时间
+    private Date modify_timeEnd; // 记录最后修改时间
+	@ApiModelProperty("记录是否被删除，0:未删除，1:已经删除")
+    private String is_delete; // 记录是否被删除，0:未删除，1:已经删除
+	@ApiModelProperty("代码")
+    private String code; // 代码
+	@ApiModelProperty("名称")
+    private String name; // 名称
+
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/dictcommon/DictCommon.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.dictcommon;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: DictCommon.java <br/>
+ * Class: com.supervise.api.dictcommon.DictCommon <br/>
+ * Description: 数据字典——数据项. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:28 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据项", description = "数据字典——数据项")
+@TableName("dict_common")
+public class DictCommon extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("类型code")
+    private String dictType; // 类型code
+	@ApiModelProperty("key值")
+    private String dictKey; // key值
+	@ApiModelProperty("value值")
+    private String dictValue; // value值
+	@ApiModelProperty("路径")
+    private String sidPath; // 路径
+	@ApiModelProperty("父级sid")
+    private String parentSid; // 父级sid
+	@ApiModelProperty("分组名称")
+    private String groupName; // 分组名称
+
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/dictcommon/DictCommonDetailsVo.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.dictcommon;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: DictCommonVo.java <br/>
+ * Class: com.supervise.api.dictcommon.DictCommonVo <br/>
+ * Description: 数据字典——数据项 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:29 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据项 视图数据详情", description = "数据字典——数据项 视图数据详情")
+public class DictCommonDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("类型code")
+    private String dictType; // 类型code
+	@ApiModelProperty("key值")
+    private String dictKey; // key值
+	@ApiModelProperty("value值")
+    private String dictValue; // value值
+	@ApiModelProperty("路径")
+    private String sidPath; // 路径
+	@ApiModelProperty("父级sid")
+    private String parentSid; // 父级sid
+	@ApiModelProperty("分组名称")
+    private String groupName; // 分组名称
+
+}

warehousing-system/project/wh-manage-xxs/src/main/java/com/wh/pojo/dictcommon/DictCommonDto.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.wh.pojo.dictcommon;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt_supervise(宇信通监管) <br/>
+ * File: DictCommonDto.java <br/>
+ * Class: com.supervise.api.dictcommon.DictCommonDto <br/>
+ * Description: 数据字典——数据项 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-11 11:40:28 <br/>
+ *
+ * @author dongjianzhao
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "数据字典——数据项 数据传输对象", description = "数据字典——数据项 数据传输对象")
+public class DictCommonDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("类型code")
+    private String dictType; // 类型code
+	@ApiModelProperty("key值")
+    private String dictKey; // key值
+	@ApiModelProperty("value值")
+    private String dictValue; // value值
+	@ApiModelProperty("路径")
+    private String sidPath; // 路径
+	@ApiModelProperty("父级sid")
+    private String parentSid; // 父级sid
+	@ApiModelProperty("分组名称")
+    private String groupName; // 分组名称
+
+}