From da28b50c6e46e3ff674c6fcf80dde3c16bbb396a Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Tue, 16 Jul 2024 11:09:37 +0800
Subject: [PATCH 01/10] 7/16

---
 .../oms/apiadmin/aggregation/SysMenuRest.java |   2 +-
 .../aggregation/SysOrganizationRest.java      |   6 +-
 .../aggregation/SysRoleAuthorizeRest.java     |   2 +-
 .../aggregation/SysStaffinfoRest.java         | 195 +++++++++
 .../oms/apiadmin/aggregation/SysUserRest.java |  19 +
 .../oms/biz/func/sysmenu/SysMenuService.java  |   5 +-
 .../oms/biz/func/sysmenu/SysMenuTreeVo.java   |   3 +
 .../SysOrganizationService.java               |   4 +-
 .../com/yxt/oms/biz/func/sysrole/SysRole.java |   1 +
 .../yxt/oms/biz/func/sysrole/SysRoleDto.java  |   1 +
 .../yxt/oms/biz/func/sysrole/SysRoleVo.java   |   2 +
 .../sysstaffinfo/AppContactsDetailsVo.java    |  34 ++
 .../func/sysstaffinfo/PcSysStaffQuery.java    |  18 +
 .../biz/func/sysstaffinfo/PcSysStaffVo.java   |  19 +
 .../biz/func/sysstaffinfo/SysStaffQuery.java  |  30 ++
 .../biz/func/sysstaffinfo/SysStaffinfo.java   |  87 ++++
 .../SysStaffinfoAppContactsSearchVo.java      |  34 ++
 .../SysStaffinfoAppContactsVo.java            |  34 ++
 .../sysstaffinfo/SysStaffinfoDetailsVo.java   |  88 ++++
 .../func/sysstaffinfo/SysStaffinfoDto.java    | 193 +++++++++
 .../func/sysstaffinfo/SysStaffinfoMapper.java | 127 ++++++
 .../func/sysstaffinfo/SysStaffinfoMapper.xml  | 398 ++++++++++++++++++
 .../func/sysstaffinfo/SysStaffinfoQuery.java  |  42 ++
 .../sysstaffinfo/SysStaffinfoService.java     | 138 ++++++
 .../biz/func/sysstaffinfo/SysStaffinfoVo.java |  47 +++
 .../biz/func/sysstaffinfo/WxBase64Query.java  |  20 +
 .../biz/func/sysstaffinfo/WxSysInfoQuery.java |  37 ++
 .../sysstaffinfo/app/AppSysStaffQuery.java    |  30 ++
 .../func/sysstaffinfo/app/AppSysStaffVo.java  |  30 ++
 .../sysstafforg/SysStaffOrgDetailsVo.java     |  28 ++
 .../biz/func/sysstafforg/SysStaffOrgDto.java  |  42 ++
 .../oms/biz/func/sysuser/SysUserService.java  |  18 +
 .../biz/func/sysuserrole/SysUserRoleVo.java   |   1 +
 .../sysorganization/SysOrganizationFeign.java |   4 +-
 .../SysOrganizationFeignFallback.java         |   2 +-
 .../sysstaffinfo/SysStaffinfoFeign.java       | 153 +++++++
 .../feign/portal/sysuser/SysUserFeign.java    |   8 +
 .../portal/sysuser/SysUserFeignFallback.java  |  10 +
 .../oms/feign/portal/sysuser/SysUserVo.java   |  13 +-
 39 files changed, 1910 insertions(+), 15 deletions(-)
 create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffinfoRest.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/AppContactsDetailsVo.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/PcSysStaffQuery.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/PcSysStaffVo.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffQuery.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfo.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoAppContactsVo.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoDetailsVo.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoDto.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoMapper.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoMapper.xml
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoQuery.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoService.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoVo.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/WxBase64Query.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/WxSysInfoQuery.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/app/AppSysStaffQuery.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/app/AppSysStaffVo.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDetailsVo.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDto.java
 create mode 100644 oms/src/main/java/com/yxt/oms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java

diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRest.java
index d37a4e4..a563352 100644
--- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRest.java
+++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRest.java
@@ -44,7 +44,7 @@ public class SysMenuRest {
      */
     @ApiOperation("菜单列表：根据资源归类")
     @PostMapping("/listAllVoForSource")
-    public ResultBean<List<SysMenuTreeVo>> listAllVoForSource(@RequestBody SysMenuQuery query){
+    public ResultBean<List<SysMenuTreeVo>> listAllVoForSource(@RequestBody PagerQuery<SysMenuQuery> query){
         return sysMenuService.listAllVoForSource(query);
     }
 
diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysOrganizationRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysOrganizationRest.java
index 866403a..8136467 100644
--- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysOrganizationRest.java
+++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysOrganizationRest.java
@@ -58,9 +58,9 @@ public class SysOrganizationRest {
     }
 
     @ApiOperation("所有数据列表")
-    @GetMapping("/list")
-    public ResultBean<List<SysOrganizationVo>> list() {
-        return sysOrganizationService.listVo();
+    @GetMapping("/list/{orgSid}")
+    public ResultBean<List<SysOrganizationVo>> list(@PathVariable("orgSid") String orgSid) {
+        return sysOrganizationService.listVo(orgSid);
     }
 
     @ApiOperation("新增保存")
diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleAuthorizeRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleAuthorizeRest.java
index 936b140..42c766e 100644
--- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleAuthorizeRest.java
+++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleAuthorizeRest.java
@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @Api(tags = "角色授权表")
 @RestController
-@RequestMapping("apiadmin/sysrikeauthorize")
+@RequestMapping("apiadmin/sysroleauthorize")
 public class SysRoleAuthorizeRest {
     @Autowired
     SysRoleAuthorizeService sysRoleAuthorizeService;
diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffinfoRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffinfoRest.java
new file mode 100644
index 0000000..0f4eb87
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffinfoRest.java
@@ -0,0 +1,195 @@
+package com.yxt.oms.apiadmin.aggregation;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.biz.func.sysstaffinfo.*;
+import com.yxt.oms.biz.func.sysstaffinfo.app.AppSysStaffQuery;
+import com.yxt.oms.biz.func.sysstaffinfo.app.AppSysStaffVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysStaffinfoFeignFallback.java <br/>
+ * Class: com.yxt.user.biz.sysstaffinfo.SysStaffinfoRest <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
+ */
+@Api(tags = "人员基础信息表")
+@RestController
+@RequestMapping("/apiadmin/sysstaffinfo")
+public class SysStaffinfoRest {
+
+
+
+    @Autowired
+    private SysStaffinfoService sysStaffinfoService;
+
+
+
+    /**
+     * 员工管理的分页列表
+     *
+     * @param pq 查询条件
+     * @return
+     */
+    @ApiOperation("员工管理分页列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SysStaffinfoVo>> listPage(@RequestBody PagerQuery<SysStaffinfoQuery> pq) {
+        return sysStaffinfoService.pagerList(pq);
+    }
+
+    /**
+     * 员工信息的新增保存
+     *
+     * @param dto 数据传输对象
+     * @return
+     */
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody SysStaffinfoDto dto) {
+        return sysStaffinfoService.saveStaffInfo(dto);
+    }
+
+    /**
+     * 员工信息的修改保存
+     *
+     * @param dto 数据传输对象
+     * @param sid 员工信息sid
+     * @return
+     */
+    @ApiOperation("修改保存")
+    @PostMapping("/update/{sid}")
+    public ResultBean update(@RequestBody SysStaffinfoDto dto, @PathVariable("sid") String sid) {
+        return sysStaffinfoService.updateStaffInfo(dto, sid);
+    }
+    /**
+     * 进行删除操作，即设置员工类型为离职类型02的操作。
+     *
+     * @param sysStaffQuery 数据传输对象
+     * @return
+     */
+    @ApiOperation("设置离职")
+    @PostMapping("/del")
+    public ResultBean del(SysStaffQuery sysStaffQuery) {
+        return sysStaffinfoService.del(sysStaffQuery);
+    }
+
+    @ApiOperation("员工信息编辑初始化及详情")
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<SysStaffinfoDetailsVo> fetchBySid(@PathVariable("sid") String  sid) {
+        return sysStaffinfoService.selectDetailsBySid(sid);
+    }
+    /**
+     * 获取集团内全部员工姓名
+     *
+     * @param staffName 员工姓名
+     * @return
+     */
+    @ApiOperation("获取集团内全部员工姓名")
+    @GetMapping("/getStaffName")
+
+    public ResultBean<List<Map<String, String>>> getStaffName(String staffName, String deptSid) {
+        return sysStaffinfoService.getStaffName(staffName, deptSid);
+    }
+    /**
+     * 获取部门内全部员工姓名
+     *
+     * @param staffName 员工姓名
+     * @return
+     */
+    @ApiOperation("获取部门内全部员工姓名")
+    @GetMapping("/getStaffNameByDeptSid")
+
+    public ResultBean<List<Map<String, String>>> getStaffNameByDeptSid(String staffName, String deptSid) {
+        return sysStaffinfoService.getStaffNameByDeptSid(staffName, deptSid);
+    }
+
+
+    @ApiOperation("获取App通讯录")
+    @ResponseBody
+    @GetMapping("/selectAppContactsList")
+    public ResultBean<List<SysStaffinfoAppContactsVo>> selectAppContactsList(String names) {
+        return sysStaffinfoService.selectAppContactsList();
+    }
+
+    @ApiOperation("app查看通讯录详情")
+    @ResponseBody
+    @GetMapping("/selectAppContactsVO/{staffSid}")
+    public ResultBean<AppContactsDetailsVo> selectAppContactsVO(String staffSid) {
+
+        return sysStaffinfoService.selectAppContactsVO(staffSid);
+    }
+
+    @ApiOperation("App通讯录搜索")
+    @ResponseBody
+    @PostMapping("/searchAppContactsList")
+    public ResultBean<PagerVo<SysStaffinfoAppContactsSearchVo>> searchAppContactsList(PagerQuery<SysStaffinfoQuery> pq) {
+
+        return sysStaffinfoService.searchAppContactsList(pq);
+    }
+
+    @ApiOperation("App通讯录搜索2")
+    @ResponseBody
+    @PostMapping("/searchAppContactsList2")
+    public ResultBean<PagerVo<SysStaffinfoAppContactsSearchVo>> searchAppContactsList2(PagerQuery<SysStaffinfoQuery> pq) {
+        return sysStaffinfoService.searchAppContactsList2(pq);
+    }
+
+    @ApiOperation("销售订单-内部推荐人下拉框")
+    @ResponseBody
+    @GetMapping("/selectStaffList")
+    public ResultBean<List<PcSysStaffVo>> selectStaffList(PcSysStaffQuery pcSysStaffQuery) {
+        return sysStaffinfoService.selectStaffList(pcSysStaffQuery);
+    }
+
+    @ApiOperation("移动端-销售订单-内部推荐人下拉框")
+    @ResponseBody
+    @PostMapping("/getUserList")
+    public ResultBean<PagerVo<AppSysStaffVo>> getUserList(PagerQuery<AppSysStaffQuery> pagerQuery) {
+        return sysStaffinfoService.getUserList(pagerQuery);
+    }
+
+    @ApiOperation("存放地点变更-获取人员列表")
+    @ResponseBody
+    @GetMapping("/getGressionUserList/{userSid}")
+    public ResultBean<List<AppSysStaffVo>> getGressionUserList(String userSid) {
+        return sysStaffinfoService.getGressionUserList(userSid, "");
+    }
+
+    @ApiOperation("切换机构：存放地点变更-获取人员列表")
+    @ResponseBody
+    @GetMapping("/getGressionUserList")
+    public ResultBean<List<AppSysStaffVo>> getGressionUserList(String userSid, String orgPath) {
+        return sysStaffinfoService.getGressionUserList(userSid, orgPath);
+    }
+
+    @ApiOperation("获取集团所有人员")
+    @ResponseBody
+    @GetMapping("/selectStaffLists")
+    public ResultBean<List<PcSysStaffVo>> selectStaffLists() {
+        return sysStaffinfoService.selectStaffLists();
+    }
+
+    @ApiOperation("获取集团所有在职人员")
+    @ResponseBody
+    @GetMapping("/selectStaffListss")
+    public ResultBean<List<PcSysStaffVo>> selectStaffListss() {
+        return sysStaffinfoService.selectStaffListss();
+    }
+
+
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysUserRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysUserRest.java
index fbf16d2..f436a5e 100644
--- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysUserRest.java
+++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysUserRest.java
@@ -93,4 +93,23 @@ public class SysUserRest {
     public ResultBean setIsEnable(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @ApiParam(value = "isEnable", required = true) @PathVariable("isEnable") String isEnable){
         return sysUserService.setIsEnable(sid,isEnable);
     }
+    /**
+     * 初始化密码
+     *
+     * @param sid 用户sid
+     * @return ResultBean
+     */
+    @ResponseBody
+    @PostMapping("/initPwd/{sid}")
+    @ApiOperation(value = "10、用户初始化密码")
+    @ApiOperationSupport(order = 100)
+    public ResultBean
+    initPwd(@ApiParam(value = "用户sid", required = true) @PathVariable("sid") String sid) {
+        return sysUserService.initPwd(sid);
+    }
+    @ApiOperation("删除记录根据sid")
+    @GetMapping("/delBySid/{sid}")
+    public ResultBean delBySid(@PathVariable("sid") String sid){
+        return sysUserService.delBySid(sid);
+    };
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuService.java
index 2d2a120..6a13e4e 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuService.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuService.java
@@ -107,9 +107,8 @@ public class SysMenuService extends MybatisBaseService<SysMenuMapper, SysMenu> {
             }
             return sysMenuVos;
         }*/
-    public ResultBean<List<SysMenuTreeVo>>  listAllVoForSource(SysMenuQuery query) {
-
-        return sysMenuFeign.listAllVoForSource(query);
+    public ResultBean<List<SysMenuTreeVo>>  listAllVoForSource(PagerQuery<SysMenuQuery> query) {
+        return sysMenuFeign.listAllVoForSource(query.getParams());
     }
     public ResultBean<List<Map<String,String>>>  getMenusForFunction(SysMenuFunctionQuery sysMenuFunctionQuery) {
         return sysMenuFeign.getMenusForFunction(sysMenuFunctionQuery);
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuTreeVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuTreeVo.java
index af4737e..4418588 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuTreeVo.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuTreeVo.java
@@ -56,4 +56,7 @@ public class SysMenuTreeVo implements Vo {
     private String remarks;
     @ApiModelProperty("子菜单")
     private List<SysMenuTreeVo> children;
+
+    private String menuType;
+    private String isShow;
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationService.java
index f80e11c..90b565b 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationService.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationService.java
@@ -103,8 +103,8 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         return sysOrganizationFeign.listAll(query);
     }
 
-    public ResultBean<List<SysOrganizationVo>> listVo() {
-        return sysOrganizationFeign.list();
+    public ResultBean<List<SysOrganizationVo>> listVo(String orgSid) {
+        return sysOrganizationFeign.list(orgSid);
     }
 
 
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRole.java b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRole.java
index d9e8b05..9b6f00b 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRole.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRole.java
@@ -46,4 +46,5 @@ public class SysRole extends BaseEntity {
     @ApiModelProperty(value = "角色组织层级value")
     private String roleTypeValue;
     private String orgSid;
+    private String dataRuleId;
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleDto.java b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleDto.java
index 8379916..0b2d83b 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleDto.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleDto.java
@@ -49,4 +49,5 @@ public class SysRoleDto implements Dto {
     @ApiModelProperty(value = "角色组织层级value")
     private String roleTypeValue;
     private String orgSid;
+    private String dataRuleId;
 }
\ No newline at end of file
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleVo.java
index ce48d89..e83c975 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleVo.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleVo.java
@@ -44,4 +44,6 @@ public class SysRoleVo implements Vo {
     private String postName;
     @ApiModelProperty(value = "组织层级")
     private String roleTypeValue;
+    private String dataRuleId;//角色数据权限id
+    private String dataRuleValue;//
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/AppContactsDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/AppContactsDetailsVo.java
new file mode 100644
index 0000000..47d7bd5
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/AppContactsDetailsVo.java
@@ -0,0 +1,34 @@
+package com.yxt.oms.biz.func.sysstaffinfo;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2021/9/17
+ */
+@ApiModel(value = "App通讯录查看详情")
+@Data
+public class AppContactsDetailsVo implements Vo {
+
+//    @ApiModelProperty("人员sid")
+//    private String sid;
+
+    @ApiModelProperty("姓名")
+    private String name;
+
+    @ApiModelProperty("手机号")
+    private String mobile;
+
+    @ApiModelProperty("头像")
+    private String headImage;
+
+    @ApiModelProperty("部门名称（路径）")
+    private String orgNamePath;
+
+    @ApiModelProperty("职位")
+    private String position;
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/PcSysStaffQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/PcSysStaffQuery.java
new file mode 100644
index 0000000..29f4ee7
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/PcSysStaffQuery.java
@@ -0,0 +1,18 @@
+package com.yxt.oms.biz.func.sysstaffinfo;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/20 15:47
+ * @Description
+ */
+@Data
+public class PcSysStaffQuery implements Query {
+    private static final long serialVersionUID = 1858291601540877140L;
+    @ApiModelProperty(value = "业务员sid",required = false)
+    private String staffSid;
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/PcSysStaffVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/PcSysStaffVo.java
new file mode 100644
index 0000000..559f109
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/PcSysStaffVo.java
@@ -0,0 +1,19 @@
+package com.yxt.oms.biz.func.sysstaffinfo;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/20 15:44
+ * @Description
+ */
+@Data
+public class PcSysStaffVo implements Vo {
+    private static final long serialVersionUID = -9042032921079833819L;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("人员")
+    private String staffName;
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffQuery.java
new file mode 100644
index 0000000..f765bdc
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffQuery.java
@@ -0,0 +1,30 @@
+package com.yxt.oms.biz.func.sysstaffinfo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/2/15 15:22
+ * @Description
+ */
+@Data
+public class SysStaffQuery implements Query {
+    private static final long serialVersionUID = -7345786610678948794L;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "离职日期")
+    @NotNull(message = "离职日期不能为空")
+    private Date quitDate;
+    @ApiModelProperty(value = "离职原因")
+    @NotBlank(message = "离职原因不能为空")
+    private String quitReason;
+    @ApiModelProperty(value = "员工sid")
+    private String sid;
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfo.java
new file mode 100644
index 0000000..0b76c08
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfo.java
@@ -0,0 +1,87 @@
+package com.yxt.oms.biz.func.sysstaffinfo;
+
+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;
+
+import java.util.Date;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysStaffinfo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo <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_staffinfo")
+@Data
+public class SysStaffinfo extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("工号")
+    private String jobNumber;
+    @ApiModelProperty("姓名")
+    private String name;
+
+    @ApiModelProperty(value = "性别")
+    private String gender;
+    @ApiModelProperty("身份证号")
+    private String idNo;
+    @ApiModelProperty("证件有效期")
+    private String idTerm;
+    @ApiModelProperty("生日")
+    private Date birthday;
+    @ApiModelProperty("民族")
+    private String national;
+
+    @ApiModelProperty("籍贯")
+    private String nativePlace;
+
+    @ApiModelProperty("住址")
+    private String address;
+    @ApiModelProperty("手机号")
+    private String mobile;
+    @ApiModelProperty("邮箱")
+    private String email;
+
+    @ApiModelProperty("婚姻状况")
+    private String maritalStatus;
+
+    @ApiModelProperty("员工类型（无类型、全职、兼职、实习、劳务派遣、退休返聘、劳务外包）")
+    private String personType;
+
+    @ApiModelProperty("入职时间")
+    private Date joinCompnyDate;
+    @ApiModelProperty("试用期（无试用期、1个月、2个月、3个月、其他）")
+    private String probPeriod;
+
+    @ApiModelProperty("计划转正日期")
+    private Date plannedConfirmDate;
+    @ApiModelProperty("实际转正日期")
+    private Date confirmationDate;
+    @ApiModelProperty("银行卡号")
+    private String bankCardNo;
+    @ApiModelProperty("开户行")
+    private String openBank;
+    @ApiModelProperty("身份证(人像面)")
+    private String idCardA;
+    @ApiModelProperty("身份证(国徽面)")
+    private String idCardB;
+    @ApiModelProperty("学历证书")
+    private String diploma;
+    @ApiModelProperty("学位证书")
+    private String degreeCertificate;
+    @ApiModelProperty("前公司离职证明")
+    private String leaveCertificate;
+    @ApiModelProperty("员工照片")
+    private String photo;
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java
new file mode 100644
index 0000000..34636dc
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoAppContactsSearchVo.java
@@ -0,0 +1,34 @@
+package com.yxt.oms.biz.func.sysstaffinfo;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2021/9/24
+ */
+@ApiModel(value = "App通讯录（搜索）")
+@Data
+public class SysStaffinfoAppContactsSearchVo implements Vo {
+
+    @ApiModelProperty("人员sid")
+    private String sid;
+
+    @ApiModelProperty("用户头像")
+    private String headImage;
+
+    @ApiModelProperty("姓名")
+    private String name;
+
+    @ApiModelProperty("手机号")
+    private String mobile;
+
+    @ApiModelProperty("职位")
+    private String position;
+
+    @ApiModelProperty("部门名称")
+    private String orgName;
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoAppContactsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoAppContactsVo.java
new file mode 100644
index 0000000..6e203a5
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoAppContactsVo.java
@@ -0,0 +1,34 @@
+package com.yxt.oms.biz.func.sysstaffinfo;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2021/9/16
+ */
+@ApiModel(value = "App通讯录")
+@Data
+public class SysStaffinfoAppContactsVo implements Vo {
+
+    @ApiModelProperty("人员sid")
+    private String sid;
+
+    @ApiModelProperty("姓名")
+    private String name;
+
+    @ApiModelProperty("手机号")
+    private String mobile;
+
+    @ApiModelProperty("用户头像")
+    private String headImage;
+
+    @ApiModelProperty("姓名的拼音（全）")
+    private String pinYinName;
+
+    @ApiModelProperty("姓名拼音的首字母（特殊的#表示）")
+    private String firstPinYinLabel;
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoDetailsVo.java
new file mode 100644
index 0000000..8ea3143
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoDetailsVo.java
@@ -0,0 +1,88 @@
+package com.yxt.oms.biz.func.sysstaffinfo;
+
+import com.yxt.common.core.vo.Vo;
+import com.yxt.oms.biz.func.sysstafforg.SysStaffOrgDetailsVo;
+import com.yxt.oms.biz.func.sysuserrole.SysUserRoleVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/2/11 16:12
+ * @Description 员工信息的编辑初始化和详情返回数据
+ */
+@Data
+public class SysStaffinfoDetailsVo implements Vo {
+    private static final long serialVersionUID = 1232171677690215067L;
+
+    private String sid;
+    @ApiModelProperty("工号")
+    private String jobNumber;
+    @ApiModelProperty("姓名")
+    private String name;
+
+    @ApiModelProperty(value = "性别")
+    private String gender;
+    @ApiModelProperty("身份证号")
+    private String idNo;
+    @ApiModelProperty("证件有效期")
+    private String idTerm;
+    @ApiModelProperty("生日")
+    private Date birthday;
+    @ApiModelProperty("民族")
+    private String national;
+
+    @ApiModelProperty("籍贯")
+    private String nativePlace;
+
+    @ApiModelProperty("住址")
+    private String address;
+    @ApiModelProperty("手机号")
+    private String mobile;
+    @ApiModelProperty("邮箱")
+    private String email;
+
+    @ApiModelProperty("婚姻状况")
+    private String maritalStatus;
+
+    @ApiModelProperty("员工类型（无类型、全职、兼职、实习、劳务派遣、退休返聘、劳务外包）")
+    private String personType;
+
+    @ApiModelProperty("入职时间")
+    private Date joinCompnyDate;
+    @ApiModelProperty("试用期（无试用期、1个月、2个月、3个月、其他）")
+    private String probPeriod;
+
+    @ApiModelProperty("计划转正日期")
+    private Date plannedConfirmDate;
+    @ApiModelProperty("实际转正日期")
+    private Date confirmationDate;
+    @ApiModelProperty("银行卡号")
+    private String bankCardNo;
+    @ApiModelProperty("开户行")
+    private String openBank;
+    @ApiModelProperty("身份证(人像面)")
+    private String idCardA;
+    @ApiModelProperty("身份证(国徽面)")
+    private String idCardB;
+    @ApiModelProperty("学历证书")
+    private String diploma;
+    @ApiModelProperty("学位证书")
+    private String degreeCertificate;
+    @ApiModelProperty("前公司离职证明")
+    private String leaveCertificate;
+    @ApiModelProperty("员工照片")
+    private String photo;
+    @ApiModelProperty(value = "员工部门信息")
+    private SysStaffOrgDetailsVo sysStaffOrg;
+    private List<SysUserRoleVo> sysUserRoles;
+
+    private String accountType;//账号类型 1单位管理员，2操作员，0是平台管理员 3非登录账户
+    private String userType;//用户类型:1员工、2客户、3供应商
+    private String userName;
+    private String remarks;
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoDto.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoDto.java
new file mode 100644
index 0000000..00a76e9
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoDto.java
@@ -0,0 +1,193 @@
+package com.yxt.oms.biz.func.sysstaffinfo;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import com.yxt.oms.biz.func.sysstafforg.SysStaffOrgDto;
+import com.yxt.oms.biz.func.sysuserrole.SysUserRoleDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysStaffinfoDto.java <br/>
+ * Class: com.yxt.user.biz.sysstaffinfo.SysStaffinfoDto <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 SysStaffinfoDto implements Dto {
+
+    private static final long serialVersionUID = 8637516813924395044L;
+    @ApiModelProperty(value = "姓名", required = true)
+    @NotBlank(message = "姓名不能为空")
+    private String name;
+    @ApiModelProperty(value = "性别key", required = true)
+    @NotBlank(message = "性别不能为空")
+    private String genderKey;
+    @ApiModelProperty(value = "性别", required = true)
+    @NotBlank(message = "性别不能为空")
+    private String gender;
+    @ApiModelProperty(value = "员工编号")
+    private String jobNumber;
+    @ApiModelProperty(value = "身份证号", required = true)
+    @Pattern(regexp = "^[1-9]\\d{5}(18|19|([23]\\d))\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$", message = "请输入正确的身份证号")
+    @NotBlank(message = "身份证号不能为空")
+    private String idNo;
+    @ApiModelProperty(value = "证件有效期", required = true)
+    @NotBlank(message = "证件有效期不能为空")
+    private String idTerm;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty("生日")
+    private Date birthday;
+    @ApiModelProperty(value = "民族", required = true)
+    @NotBlank(message = "民族不能为空")
+    private String national;
+    @ApiModelProperty(value = "民族key", required = true)
+    @NotBlank(message = "民族不能为空")
+    private String nationalKey;
+    @ApiModelProperty(value = "籍贯", required = false)
+    private String nativePlace;
+    @ApiModelProperty(value = "省", required = false)
+    private String province;
+    @ApiModelProperty(value = "市", required = false)
+    private String city;
+    @ApiModelProperty(value = "县区", required = false)
+    private String county;
+    @ApiModelProperty(value = "省code", required = false)
+    private String provinceCode;
+    @ApiModelProperty(value = "市code", required = false)
+    private String cityCode;
+    @ApiModelProperty(value = "县区code", required = false)
+    private String countyCode;
+    @ApiModelProperty(value = "住址", required = false)
+    private String address;
+    @ApiModelProperty(value = "手机号", required = true)
+//    @Pattern(regexp = "^((13[0-9])|(14[5,7])|(15[0-3,5-9])|(17[0,3,5-8])|(18[0-9])|(19[1,3,5-9])|166|(147))\\d{8}$", message = "手机号码格式不正确")
+    @Pattern(regexp = "^[0-9]{11}$", message = "手机号码格式不正确")
+    @NotBlank(message = "手机号不能为空")
+    private String mobile;
+    @ApiModelProperty(value = "邮箱", required = false)
+    //@Pattern(regexp = "[a-zA-Z0-9]+@[a-zA-Z0-9]+\\.[a-zA-Z0-9]+", message = "邮箱格式不正确")
+    private String email;
+    @ApiModelProperty(value = "紧急联系人", required = false)
+    private String emergencyContact;
+    @ApiModelProperty(value = "紧急联系电话", required = false)
+    private String emergencyMobile;
+    @ApiModelProperty(value = "政治面貌", required = false)
+    private String poliCode;
+    @ApiModelProperty(value = "政治面貌key", required = false)
+    private String poliCodeKey;
+    @ApiModelProperty(value = "婚姻状况", required = false)
+    private String maritalStatus;
+    @ApiModelProperty(value = "婚姻状况key", required = false)
+    private String maritalStatusKey;
+    @ApiModelProperty(value = "员工类型", required = true)
+    @NotBlank(message = "员工类型不能为空")
+    private String personType;
+    @ApiModelProperty(value = "员工类型key", required = true)
+    @NotBlank(message = "员工类型不能为空")
+    private String personTypeKey;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty("入职时间")
+    private Date joinCompnyDate;
+    @ApiModelProperty("试用期（无试用期、1个月、2个月、3个月、其他）")
+    private String probPeriod;
+    @ApiModelProperty("试用期key")
+    private String probPeriodKey;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty("计划转正日期")
+    private Date plannedConfirmDate;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty("实际转正日期")
+    private Date confirmationDate;
+    @ApiModelProperty("银行卡号")
+    private String bankCardNo;
+    @ApiModelProperty("开户行")
+    private String openBank;
+    @ApiModelProperty("身份证(人像面)")
+    private String idCardA;
+    @ApiModelProperty("身份证(国徽面)")
+    private String idCardB;
+    @ApiModelProperty("学历证书")
+    private String diploma;
+    @ApiModelProperty("学位证书")
+    private String degreeCertificate;
+    @ApiModelProperty("前公司离职证明")
+    private String leaveCertificate;
+    @ApiModelProperty("员工照片")
+    private String photo;
+    @ApiModelProperty(value = "员工部门信息")
+    private SysStaffOrgDto sysStaffOrg;
+    @ApiModelProperty(value = "员工角色信息")
+    private List<SysUserRoleDto> sysUserRoles;
+    //========================================//
+    @ApiModelProperty(value = "毕业院校")
+    private String graduate;
+    @ApiModelProperty(value = "学历/专业")
+    private String education;
+    private String educationKey;
+    @ApiModelProperty(value = "职称")
+    private String title;
+    @ApiModelProperty(value = "资格认证")
+    private String qualification;
+    @ApiModelProperty(value = "驾照类型")
+    private String licenseType;
+    @ApiModelProperty(value = "驾照类型key")
+    private String licenseTypeKey;
+    @ApiModelProperty(value = "意外险参保：1是，0否")
+    private Integer isHaveInsurance;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "意外险参保时间")
+    private Date insuranceStartDate;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "意外险参保终止日期")
+    private Date insuranceEndDate;
+    @ApiModelProperty(value = "意外险参保地")
+    private String insuranceAddr;
+
+    @ApiModelProperty(value = "养老:1是，0否")
+    private Integer isHaveAged;
+    @ApiModelProperty(value = "医疗:1是，0否")
+    private Integer isHaveMedical;
+    @ApiModelProperty(value = "工伤：1是，0否")
+    private Integer isHaveInjury;
+    @ApiModelProperty(value = "失业：1是，0否")
+    private Integer isHaveUnemploy;
+    @ApiModelProperty(value = "社保参保地")
+    private String insuredPlace;
+    @ApiModelProperty(value = "纸质档案保管地")
+    private String paperPlace;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "合同起止日期")
+    private Date contractStartDate;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "合同结束日期")
+    private Date contractEndDate;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value = "离职日期")
+    private Date quitDate;
+    @ApiModelProperty(value = "离职原因")
+    private String quitReason;
+    private String accountType;//账号类型 1单位管理员，2操作员，0是平台管理员 3非登录账户
+    private String userType;//用户类型:1员工、2客户、3供应商
+    private String orgSid;
+    @Pattern(regexp = "^[0-9]{11}$", message = "账号格式不正确")
+    @NotBlank(message = "账号不能为空")
+    private String userName;
+    private String remarks;
+
+}
\ No newline at end of file
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoMapper.java
new file mode 100644
index 0000000..61485b6
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoMapper.java
@@ -0,0 +1,127 @@
+package com.yxt.oms.biz.func.sysstaffinfo;
+
+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.yxt.oms.biz.func.sysorganization.AppContactSysOrganizationVo;
+import com.yxt.oms.biz.func.sysstaffinfo.app.AppSysStaffVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysStaffinfoMapper.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoMapper <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
+ */
+@Mapper
+public interface SysStaffinfoMapper extends BaseMapper<SysStaffinfo> {
+
+    //@Update("update sys_staffinfo set name=#{msg} where id=#{id}")
+    //IPage<SysStaffinfoVo> voPage(IPage<SysStaffinfo> page, @Param(Constants.WRAPPER) QueryWrapper<SysStaffinfo> qw);
+
+    List<SysStaffinfoAppContactsVo> selectAppContactsList();
+
+    IPage<SysStaffinfoAppContactsSearchVo> searchAppContactsPageList(IPage<SysStaffinfoQuery> page, @Param("list") List<String> list,
+                                                                     @Param("chnStr") String chnStr, @Param("mobileStr") String mobileStr);
+
+    AppContactsDetailsVo selectAppContactsVO(String staffSid);
+
+    List<AppContactSysOrganizationVo> selectContactsByOrgsid(@Param("sid") String sid);
+
+    SysStaffinfo selectJobNumber();
+
+    /**
+     * 查询员工的手机号是否重复
+     *
+     * @param mobile 手机号
+     * @return
+     */
+    SysStaffinfo selectByMobile(String mobile);
+
+    /**
+     * 查询是否存在该身份证号的员工
+     *
+     * @param idNo 身份证号
+     * @return
+     */
+    SysStaffinfo selectByIdNo(String idNo);
+
+    /**
+     * 员工管理分页列表
+     *
+     * @param page 分页
+     * @param qw   查询条件
+     * @return
+     */
+    IPage<SysStaffinfoVo> pagerList(IPage<SysStaffinfoQuery> page, @Param(Constants.WRAPPER) Wrapper<SysStaffinfoVo> qw);
+
+    /**
+     * 根据员工sid和员工手机号码查询员工信息是否已存在
+     *
+     * @param mobile 手机号
+     * @param sid    员工sid
+     * @return
+     */
+    SysStaffinfo selectByMobileAndSid(@Param("mobile") String mobile, @Param("sid") String sid);
+
+    /**
+     * 根据员工sid和身份证号查询员工信息是否已存在
+     *
+     * @param idNo 身份证号
+     * @param sid  员工sid
+     * @return
+     */
+    SysStaffinfo selectByIdNoAndSid(@Param("idNo") String idNo, @Param("sid") String sid);
+
+    /**
+     * 根据员工sid查询员工信息
+     *
+     * @param sid 员工sid
+     * @return
+     */
+    SysStaffinfoDetailsVo selectDetailsBySid(@Param("sid") String sid, @Param("path") String path);
+
+    /**
+     * 根据员工sid更新信息
+     *
+     * @param personType    员工类型
+     * @param personTypeKey 员工类型key
+     * @param sid           员工sid
+     * @return
+     */
+    int updateBySid(@Param("personType") String personType, @Param("personTypeKey") String personTypeKey,
+                    @Param("sid") String sid, @Param("date") Date date, @Param("reason") String reason);
+
+    /**
+     * 查询当前分公司下的员工信息
+     *
+     * @param orgSid 分公司sid
+     * @return
+     */
+    List<PcSysStaffVo> selectStaffList(String orgSid);
+
+    List<Map<String, String>> getStaffName(@Param(Constants.WRAPPER) Wrapper<Map<String, Object>> qw);
+
+    List<Map<String, String>> getStaffNameByDeptSid(@Param(Constants.WRAPPER) Wrapper<Map<String, Object>> qw);
+
+    IPage<AppSysStaffVo> getUserList(IPage<SysStaffinfo> page, @Param(Constants.WRAPPER) QueryWrapper<AppSysStaffVo> qw, @Param("orgSid") String orgSid);
+
+    List<AppSysStaffVo> getGressionUserList(@Param("userOrgSid")String userOrgSid);
+
+    List<PcSysStaffVo> selectStaffLists();
+    List<PcSysStaffVo> selectStaffListss();
+}
\ No newline at end of file
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoMapper.xml
new file mode 100644
index 0000000..b6a97ef
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoMapper.xml
@@ -0,0 +1,398 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.oms.biz.func.sysstaffinfo.SysStaffinfoMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+
+    <select id="selectAppContactsList" parameterType="List"
+            resultType="com.yxt.oms.biz.func.sysstaffinfo.SysStaffinfoAppContactsVo">
+        SELECT staff.sid, staff.name, staff.mobile, staff.pinYinName, staff.firstPinYinLabel, user.headImage
+        FROM sys_staffinfo staff
+                 LEFT JOIN sys_user user
+                           ON staff.sid = user.staffSid
+        where staff.personTypeKey != '01'
+        ORDER BY staff.firstPinYinLabel = '#', staff.firstPinYinLabel ASC, staff.pinYinName
+    </select>
+
+    <select id="searchAppContactsPageList"
+            resultType="com.yxt.oms.biz.func.sysstaffinfo.SysStaffinfoAppContactsSearchVo">
+        SELECT staff.sid,
+               staff.name,
+               staff.mobile,
+               staff.position,
+               user.headImage,
+               GROUP_CONCAT(org.orgName SEPARATOR '/') orgName
+        FROM sys_staffinfo staff
+                 LEFT JOIN sys_staff_org org ON org.staffSid = staff.sid
+                 LEFT JOIN sys_user user ON staff.sid = user.staffSid
+        WHERE 1 = 1 and staff.personTypeKey != '01'
+        <if test="mobileStr != null and mobileStr != ''">
+            AND staff.mobile LIKE concat('%', #{mobileStr}, '%')
+        </if>
+        <if test="list.size > 0">
+            <foreach collection="list" index="index" item="item" separator=" ">
+                AND staff.pinYinName LIKE concat('%', #{item}, '%')
+            </foreach>
+        </if>
+        <if test="chnStr != '' and chnStr != null">
+            OR staff.position LIKE concat('%', #{chnStr,jdbcType=VARCHAR}, '%')
+            OR org.orgName LIKE concat('%', #{chnStr,jdbcType=VARCHAR}, '%')
+        </if>
+        GROUP BY staff.sid
+        ORDER BY staff.firstPinYinLabel = '#', staff.firstPinYinLabel ASC, staff.pinYinName
+    </select>
+
+    <select id="selectAppContactsVO" resultType="com.yxt.oms.biz.func.sysstaffinfo.AppContactsDetailsVo">
+        SELECT staff.name,
+               staff.mobile,
+               user.headImage,
+               staff.position,
+               GROUP_CONCAT(org.orgNamePath SEPARATOR '/') orgNamePath
+        FROM sys_staffinfo staff
+                 LEFT JOIN sys_user user
+                           ON staff.sid = user.staffSid
+                 LEFT JOIN sys_staff_org org ON staff.sid = org.staffSid
+        WHERE staff.sid = #{staffSid}
+        GROUP BY staff.sid
+    </select>
+
+    <select id="selectContactsByOrgsid"
+            resultType="com.yxt.oms.biz.func.sysorganization.AppContactSysOrganizationVo">
+        SELECT staff.sid,
+               staff.name,
+               staff.mobile,
+               user.headImage,
+               org.orgNamePath,
+               staff.position,
+               IFNULL(NULL, '3') AS type,
+               IFNULL(NULL, 0)   AS staffNum
+        FROM sys_staff_org org
+                 INNER JOIN sys_staffinfo staff ON org.staffSid = staff.sid
+                 LEFT JOIN sys_user user
+                           ON staff.sid = user.staffSid
+        WHERE org.orgSid = #{sid}
+          and staff.personTypeKey != '01'
+    </select>
+    <!--根据员工类型key查询员工工号的最大号-->
+    <select id="selectJobNumber" resultType="com.yxt.oms.biz.func.sysstaffinfo.SysStaffinfo">
+        select *
+        from sys_staffinfo
+        order by jobNumber desc
+        limit 1
+    </select>
+    <!--根据手机号查询员工是否重复-->
+    <select id="selectByMobile" resultType="com.yxt.oms.biz.func.sysstaffinfo.SysStaffinfo">
+        select *
+        from sys_staffinfo
+        where mobile = #{mobile}
+    </select>
+    <!--查询是否存在该身份证号的员工-->
+    <select id="selectByIdNo" resultType="com.yxt.oms.biz.func.sysstaffinfo.SysStaffinfo">
+        select *
+        from sys_staffinfo
+        where idNo = #{idNo}
+    </select>
+    <!--员工管理分页列表-->
+    <select id="pagerList" resultType="com.yxt.oms.biz.func.sysstaffinfo.SysStaffinfoVo">
+        select DISTINCT si.sid,
+        <!--员工编号-->
+        si.jobNumber,
+        <!--员工姓名-->
+        si.name,
+        <!--员工类型-->
+        si.personType,
+        <!--手机号-->
+        si.mobile,
+        <!--入职日期-->
+        DATE_FORMAT(si.joinCompnyDate, '%Y-%m-%d') AS joinCompnyDate,
+        <!--所在部门-->
+        (select GROUP_CONCAT(orgName SEPARATOR ',') orgName from sys_staff_org so where so.staffSid = si.sid) as
+            orgName,
+        <!--所在部门sid-->
+        (select GROUP_CONCAT(orgSid SEPARATOR ',') orgSid from sys_staff_org so where so.staffSid = si.sid) as
+            orgSid,
+        <!--岗位-->
+        (select GROUP_CONCAT(sp.name SEPARATOR ',') postName
+         from sys_staff_post ssp
+                  left join sys_post sp on
+                 sp.sid =
+                 ssp.postSid
+         where ssp.staffSid = si.sid
+         group by ssp.id) as postName
+        from sys_staffinfo si
+                 LEFT JOIN sys_staff_org so
+                           ON so.staffSid = si.sid
+                 LEFT JOIN sys_staff_post ssp
+                           ON ssp.staffSid = si.sid
+            ${ew.customSqlSegment}
+    </select>
+    <!--根据员工手机号和sid查询员工信息是否已存在-->
+    <select id="selectByMobileAndSid" resultType="com.yxt.oms.biz.func.sysstaffinfo.SysStaffinfo">
+        select *
+        from sys_staffinfo
+        where mobile = #{mobile}
+          and sid &lt;&gt; #{sid}
+    </select>
+    <!--根据员工sid和身份证号查询员工信息是否已存在-->
+    <select id="selectByIdNoAndSid" resultType="com.yxt.oms.biz.func.sysstaffinfo.SysStaffinfo">
+        select *
+        from sys_staffinfo
+        where idNo = #{idNo}
+          and sid &lt;&gt; #{sid}
+    </select>
+    <!--根据员工sid查询员工信息-->
+    <select id="selectDetailsBySid" resultType="com.yxt.oms.biz.func.sysstaffinfo.SysStaffinfoDetailsVo">
+        select
+        <!--工号-->
+        jobNumber,
+        <!--姓名-->
+        name,
+        <!--性别key-->
+        genderKey,
+        <!--性别-->
+        gender,
+        <!--身份证号-->
+        idNo,
+        <!--证件有效期-->
+        idTerm,
+        <!--生日-->
+        DATE_FORMAT(birthday, '%Y-%m-%d') as birthday,
+        <!--民族-->
+        national,
+        <!--民族key-->
+        nationalKey,
+        <!--籍贯-->
+        nativePlace,
+        <!--省-->
+        province,
+        <!--市-->
+        city,
+        <!--县区-->
+        county,
+        <!--省code-->
+        provinceCode,
+        <!--市code-->
+        cityCode,
+        <!--县区code-->
+        countyCode,
+        <!--住址-->
+        address,
+        <!--手机号-->
+        mobile,
+        <!--邮箱-->
+        email,
+        <!--紧急联系人-->
+        emergencyContact,
+        <!--紧急联系电话-->
+        emergencyMobile,
+        <!--政治面貌-->
+        poliCode,
+        <!--政治面貌key-->
+        poliCodeKey,
+        <!--婚姻状况-->
+        maritalStatus,
+        <!--婚姻状况key-->
+        maritalStatusKey,
+        <!--员工类型-->
+        personType,
+        <!--员工类型key-->
+        personTypeKey,
+        <!--入职时间-->
+        DATE_FORMAT(joinCompnyDate, '%Y-%m-%d') as joinCompnyDate,
+        <!--试用期-->
+        probPeriod,
+        <!--试用期key-->
+        probPeriodKey,
+        <!--计划转正日期-->
+        DATE_FORMAT(plannedConfirmDate, '%Y-%m-%d') as plannedConfirmDate,
+        <!--实际转正日期-->
+        DATE_FORMAT(confirmationDate, '%Y-%m-%d') as confirmationDate,
+        <!--银行卡号-->
+        bankCardNo,
+        <!--开户行-->
+        openBank,
+        <!--身份证(人像面)-->
+        IF(idCardA = "", idCardA, CONCAT(#{path}, idCardA)) AS idCardA,
+        <!--NULLIF(idCardA,CONCAT(#{path}, idCardA) as idCardA),-->
+        <!--when idCardA is null then idCardA else concat(#{path}, idCardA) as idCardA end,-->
+        <!--身份证(国徽面)-->
+        IF(idCardB = "", idCardB, CONCAT(#{path}, idCardB)) AS idCardB,
+        <!--NULLIF(idCardB,concat(#{path}, idCardB) as idCardB),-->
+        <!--when idCardB is null then idCardB else concat(#{path}, idCardB) as idCardB end,-->
+        <!--学历证书-->
+        IF(diploma = "", diploma, CONCAT(#{path}, diploma)) AS diploma,
+        <!--NULLIF(CONCAT(#{path}, diploma) as diploma,diploma),-->
+        <!--when diploma is null then diploma else concat(#{path}, diploma) as diploma end,-->
+        <!--学位证书-->
+        IF(degreeCertificate = "", degreeCertificate, CONCAT(#{path}, degreeCertificate)) AS degreeCertificate,
+        <!--NULLIF(CONCAT(#{path}, degreeCertificate) as degreeCertificate,degreeCertificate),-->
+        <!--when degreeCertificate is null then degreeCertificate else concat(#{path}, degreeCertificate) as degreeCertificate end,-->
+        <!--前公司离职证明-->
+        IF(leaveCertificate = "", leaveCertificate, CONCAT(#{path}, leaveCertificate)) AS leaveCertificate,
+        <!--NULLIF(CONCAT(#{path}, leaveCertificate) as leaveCertificate,leaveCertificate),-->
+        <!--when leaveCertificate is null then leaveCertificate else concat(#{path}, leaveCertificate) as leaveCertificate end,-->
+        <!--员工照片-->
+        IF(photo = "", photo, CONCAT(#{path}, photo)) AS photo,
+        <!--NULLIF(CONCAT(#{path}, photo) as photo,photo),-->
+        <!--when photo is null then photo else concat(#{path}, photo) as photo end,-->
+        <!--毕业院校-->
+        graduate,
+        <!--学历/专业-->
+        education,
+        educationKey,
+        <!--职称-->
+        title,
+        <!--资格认证-->
+        qualification,
+        <!--驾照类型-->
+        licenseType,
+        <!--驾照类型key-->
+        licenseTypeKey,
+        <!--意外险参保：1是，0否-->
+        isHaveInsurance,
+        <!--意外险参保：1是，0否-->
+        case isHaveInsurance
+            when 1 then '是'
+            when 0 then '否' end as isHaveInsuranceValue,
+        <!--意外险参保时间-->
+        DATE_FORMAT(insuranceStartDate, '%Y-%m-%d') as insuranceStartDate,
+        <!--意外险参保终止日期-->
+        DATE_FORMAT(insuranceEndDate, '%Y-%m-%d') as insuranceEndDate,
+        <!--意外险参保地-->
+        insuranceAddr,
+        <!--养老:1是，0否-->
+        isHaveAged,
+        <!--养老:1是，0否-->
+        case isHaveAged
+            when 1 then '是'
+            when 0 then '否' end as isHaveAgedValue,
+        <!--医疗:1是，0否-->
+        isHaveMedical,
+        <!--医疗:1是，0否-->
+        case isHaveMedical
+            when 1 then '是'
+            when 0 then '否' end as isHaveMedicalValue,
+        <!--工伤：1是，0否-->
+        isHaveInjury,
+        <!--工伤：1是，0否-->
+        case isHaveInjury
+            when 1 then '是'
+            when 0 then '否' end as isHaveInjuryValue,
+        <!--失业：1是，0否-->
+        isHaveUnemploy,
+        <!--失业：1是，0否-->
+        case isHaveUnemploy
+            when 1 then '是'
+            when 0 then '否' end as isHaveUnemployValue,
+        <!--社保参保地-->
+        insuredPlace,
+        <!--纸质档案保管地-->
+        paperPlace,
+        <!--合同起止日期-->
+        DATE_FORMAT(contractStartDate, '%Y-%m-%d') as contractStartDate,
+        <!--合同结束日期-->
+        DATE_FORMAT(contractEndDate, '%Y-%m-%d') as contractEndDate,
+        <!--离职日期-->
+        DATE_FORMAT(quitDate, '%Y-%m-%d') as quitDate,
+        <!--离职原因-->
+        quitReason
+        from sys_staffinfo
+        where sid = #{sid}
+    </select>
+
+    <update id="updateBySid">
+        update sys_staffinfo
+        set personType    = #{personType},
+            personTypeKey = #{personTypeKey},
+            quitDate      = #{date},
+            quitReason    = #{reason}
+        where sid = #{sid}
+    </update>
+    <!--查询当前分公司下的员工信息-->
+    <select id="selectStaffList" resultType="com.yxt.oms.biz.func.sysstaffinfo.PcSysStaffVo">
+        select su.sid userSid, si.name staffName
+        from sys_staff_org sso
+                 left join sys_staffinfo si on sso.staffSid = si.sid
+                 left join sys_user su on su.staffSid = si.sid
+        where find_in_set(#{orgSid}, replace(sso.orgSidPath, '/', ','))
+    </select>
+
+    <select id="getStaffName" resultType="java.util.Map">
+        SELECT DISTINCT ss.sid, ss.name
+        FROM sys_staffinfo ss
+                 LEFT JOIN sys_staff_org sso
+                           ON ss.`sid` = sso.`staffSid`
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="getStaffNameByDeptSid" resultType="java.util.Map">
+        SELECT DISTINCT ss.sid,
+                        ss.name
+        FROM sys_staffinfo ss
+                 LEFT JOIN sys_staff_org sso
+                           ON ss.`sid` = sso.`staffSid`
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="getUserList" resultType="com.yxt.oms.biz.func.sysstaffinfo.app.AppSysStaffVo">
+        select su.sid         userSid,
+               si.name        userName,
+               su.headImage,
+               si.mobile      userMobile,
+               sso.orgName as department,
+               sp.name
+        from sys_staff_org sso
+                 left join sys_staffinfo si on sso.staffSid = si.sid
+                 left join sys_user su on si.sid = su.staffSid
+                 left join sys_staff_post ssp on si.sid = ssp.staffSid
+                 left join sys_post sp on sp.sid = ssp.postSid
+        <where>
+            ${ew.sqlSegment}
+              and su.isAdmin is NULL
+            <if test="orgSid != null and orgSid != ''">
+                and find_in_set(#{orgSid}
+                  , replace (sso.orgSidPath
+                  , '/'
+                  , ','))
+            </if>
+        </where>
+        group by su.sid
+    </select>
+
+    <select id="getGressionUserList" resultType="com.yxt.oms.biz.func.sysstaffinfo.app.AppSysStaffVo">
+        select su.sid      as userSid,
+               si.name     as userName,
+               su.headImage,
+               si.mobile   as userMobile,
+               sso.orgName as department,
+               sp.name
+        from sys_staff_org sso
+                 left join sys_staffinfo si on sso.staffSid = si.sid
+                 left join sys_user su on si.sid = su.staffSid
+                 left join sys_staff_post ssp on si.sid = ssp.staffSid
+                 left join sys_post sp on sp.sid = ssp.postSid
+        <where>
+            1=1
+            <if test="userOrgSid != null and userOrgSid != ''">
+                and find_in_set(#{userOrgSid}
+                        , replace(sso.orgSidPath
+                                    , '/'
+                                    , ','))
+            </if>
+        </where>
+    </select>
+
+    <select id="selectStaffLists" resultType="com.yxt.oms.biz.func.sysstaffinfo.PcSysStaffVo">
+        select su.sid  userSid,
+               si.name staffName
+        from sys_user su
+                 left join sys_staffinfo si on su.staffSid = si.sid where su.isAdmin is NULL
+    </select>
+
+    <select id="selectStaffListss" resultType="com.yxt.oms.biz.func.sysstaffinfo.PcSysStaffVo">
+        select su.sid  userSid,
+               si.name staffName
+        from sys_user su
+                 left join sys_staffinfo si on su.staffSid = si.sid where su.isAdmin is NULL and si.personTypeKey != '01'
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoQuery.java
new file mode 100644
index 0000000..575da0f
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoQuery.java
@@ -0,0 +1,42 @@
+package com.yxt.oms.biz.func.sysstaffinfo;
+
+
+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: SysStaffinfoQuery.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoQuery <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 SysStaffinfoQuery implements Query {
+
+
+    private static final long serialVersionUID = 7101232842735165406L;
+    @ApiModelProperty("姓名")
+    private String name;
+    @ApiModelProperty("员工类型key")
+    private String personTypeKey;
+    @ApiModelProperty("手机号")
+    private String mobile;
+    @ApiModelProperty("入职开始日期")
+    private String joinCompnyDateStart;
+    @ApiModelProperty("入职结束日期")
+    private String joinCompnyDateEnd;
+    @ApiModelProperty(value = "所在部门sid")
+    private String orgSid;
+    @ApiModelProperty(value = "所在岗位sid")
+    private String postSid;
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoService.java
new file mode 100644
index 0000000..5d53cd3
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoService.java
@@ -0,0 +1,138 @@
+package com.yxt.oms.biz.func.sysstaffinfo;
+
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.biz.func.sysstaffinfo.app.AppSysStaffQuery;
+import com.yxt.oms.biz.func.sysstaffinfo.app.AppSysStaffVo;
+import com.yxt.oms.feign.portal.sysstaffinfo.SysStaffinfoFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysStaffinfoService.java <br/>
+ * Class: com.yxt.user.biz.sysstaffinfo.SysStaffinfoService <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
+ */
+@Service
+public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper, SysStaffinfo> {
+
+
+    @Autowired
+    private SysStaffinfoFeign sysStaffinfoFeign;
+
+
+    public ResultBean<List<SysStaffinfoAppContactsVo>> selectAppContactsList() {
+        return sysStaffinfoFeign.selectAppContactsList("");
+    }
+
+    public ResultBean<PagerVo<SysStaffinfoAppContactsSearchVo>> searchAppContactsList(PagerQuery<SysStaffinfoQuery> pagerQuery ) {
+        return sysStaffinfoFeign.searchAppContactsList(pagerQuery);
+    }
+
+    public ResultBean<PagerVo<SysStaffinfoAppContactsSearchVo>>  searchAppContactsList2(PagerQuery<SysStaffinfoQuery> pagerQuery) {
+        return sysStaffinfoFeign.searchAppContactsList2(pagerQuery);
+    }
+
+
+    public ResultBean<AppContactsDetailsVo> selectAppContactsVO(String staffSid) {
+        return sysStaffinfoFeign.selectAppContactsVO(staffSid);
+    }
+
+
+    /**
+     * 员工管理分页列表
+     *
+     * @param pagerQuery 查询条件
+     * @return
+     */
+    public ResultBean<PagerVo<SysStaffinfoVo>> pagerList(PagerQuery<SysStaffinfoQuery> pagerQuery) {
+
+        return sysStaffinfoFeign.listPage(pagerQuery);
+    }
+
+
+
+    /**
+     * 员工信息的新增保存
+     *
+     * @param dto 数据传输对象
+     * @return
+     */
+    public ResultBean saveStaffInfo(SysStaffinfoDto dto) {
+        return sysStaffinfoFeign.save(dto);
+    }
+
+
+    /**
+     * 员工信息修改保存
+     *
+     * @param dto 数据传输对象
+     * @param sid 员工信息sid
+     * @return
+     */
+    public ResultBean updateStaffInfo(SysStaffinfoDto dto, String sid) {
+        return sysStaffinfoFeign.update(dto,sid);
+    }
+
+    /**
+     * 根据员工sid查询员工信息
+     *
+     * @param sid 员工sid
+     * @return
+     */
+    public ResultBean<SysStaffinfoDetailsVo> selectDetailsBySid(String sid) {
+        return sysStaffinfoFeign.fetchBySid(sid);
+    }
+
+    /**
+     * 员工信息的删除操作，即设置员工类型为离职状态。
+     *
+     * @param sysStaffQuery 员工sid
+     * @return
+     */
+    public ResultBean del(SysStaffQuery sysStaffQuery) {
+        return sysStaffinfoFeign.del(sysStaffQuery);
+    }
+
+    public ResultBean<List<PcSysStaffVo>> selectStaffList(PcSysStaffQuery pcSysStaffQuery) {
+        return sysStaffinfoFeign.selectStaffList(pcSysStaffQuery);
+    }
+
+    public ResultBean<List<Map<String, String>>> getStaffName(String staffName,String deptSid) {
+        return sysStaffinfoFeign.getStaffName(staffName,deptSid);
+    }
+
+    public ResultBean<List<Map<String, String>>> getStaffNameByDeptSid(String staffName, String deptSid) {
+        return sysStaffinfoFeign.getStaffNameByDeptSid(staffName,deptSid);
+    }
+
+    public ResultBean<PagerVo<AppSysStaffVo>> getUserList(PagerQuery<AppSysStaffQuery> pagerQuery) {
+        return sysStaffinfoFeign.getUserList(pagerQuery);
+    }
+
+    public ResultBean<List<AppSysStaffVo>> getGressionUserList(String userSid, String orgPath) {
+        return sysStaffinfoFeign.getGressionUserList(userSid, orgPath);
+    }
+
+    public ResultBean<List<PcSysStaffVo>> selectStaffLists() {
+        return sysStaffinfoFeign.selectStaffLists();
+    }
+
+    public ResultBean<List<PcSysStaffVo>> selectStaffListss() {
+        return sysStaffinfoFeign.selectStaffListss();
+    }
+}
\ No newline at end of file
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoVo.java
new file mode 100644
index 0000000..30551f5
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/SysStaffinfoVo.java
@@ -0,0 +1,47 @@
+package com.yxt.oms.biz.func.sysstaffinfo;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysStaffinfoVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo <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 SysStaffinfoVo implements Vo {
+
+    private static final long serialVersionUID = -1250862291306247261L;
+    @ApiModelProperty(value = "员工sid")
+    private String sid;
+    @ApiModelProperty(value = "员工编号")
+    private String jobNumber;
+    @ApiModelProperty("姓名")
+    private String name;
+    @ApiModelProperty("员工类型")
+    private String personType;
+    @ApiModelProperty("手机号")
+    private String mobile;
+    @ApiModelProperty(value = "入职日期")
+    private String joinCompnyDate;
+    @ApiModelProperty(value = "部门")
+    private String orgName;
+    @ApiModelProperty(value = "岗位")
+    private String postName;
+    @ApiModelProperty(value = "部门sid")
+    private String orgSid;
+
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/WxBase64Query.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/WxBase64Query.java
new file mode 100644
index 0000000..d573b08
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/WxBase64Query.java
@@ -0,0 +1,20 @@
+package com.yxt.oms.biz.func.sysstaffinfo;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/10/6 16:58
+ * @description
+ */
+@Data
+public class WxBase64Query implements Query {
+    private static final long serialVersionUID = 4307651151043379231L;
+//    @ApiModelProperty(value = "base64")
+//    private String base64File;
+
+    @ApiModelProperty(value = "图片全路径")
+    private String imageUrl;
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/WxSysInfoQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/WxSysInfoQuery.java
new file mode 100644
index 0000000..c1e391f
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/WxSysInfoQuery.java
@@ -0,0 +1,37 @@
+package com.yxt.oms.biz.func.sysstaffinfo;
+
+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 12:08
+ * @description 客户端上传身份证
+ */
+@Data
+public class WxSysInfoQuery implements Query {
+    private static final long serialVersionUID = 7273642052588903116L;
+    @ApiModelProperty(value = "用户sid", required = true)
+    @NotBlank(message = "用户sid不能为空")
+    private String userSid;
+    @ApiModelProperty(value = "身份证(人像面)", required = true)
+    @NotBlank(message = "身份证(人像面)不能为空")
+    private String idCardA;
+    @ApiModelProperty(value = "身份证(国徽面)", required = true)
+    @NotBlank(message = "身份证(国徽面)不能为空")
+    private String idCardB;
+
+    @ApiModelProperty(value = "身份证地址", required = true)
+    @NotBlank(message = "身份证地址不能为空")
+    private String idAddrs;
+    @ApiModelProperty(value = "证件有效期", required = true)
+    @NotBlank(message = "证件有效期不能为空")
+    private String idTerm;
+    @ApiModelProperty(value = "生日")
+    private String birth;
+    @ApiModelProperty(value = "民族")
+    private String national;
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/app/AppSysStaffQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/app/AppSysStaffQuery.java
new file mode 100644
index 0000000..10bdc16
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/app/AppSysStaffQuery.java
@@ -0,0 +1,30 @@
+package com.yxt.oms.biz.func.sysstaffinfo.app;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/11 9:44
+ * @Description
+ */
+@Data
+public class AppSysStaffQuery implements Query {
+    private static final long serialVersionUID = 4724669786231817593L;
+    @ApiModelProperty(value = "用户名称")
+    private String name;
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+
+    @ApiModelProperty("已选人员sid")
+    private List<String> selectSid;
+
+    @ApiModelProperty("state：1是所有，0是本分公司")
+    private int state;
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/app/AppSysStaffVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/app/AppSysStaffVo.java
new file mode 100644
index 0000000..10aa780
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstaffinfo/app/AppSysStaffVo.java
@@ -0,0 +1,30 @@
+package com.yxt.oms.biz.func.sysstaffinfo.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/11 9:29
+ * @Description
+ */
+@Data
+public class AppSysStaffVo implements Vo {
+    private static final long serialVersionUID = -4051562700421770402L;
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+    @ApiModelProperty(value = "用户名称")
+    private String userName;
+    @ApiModelProperty(value = "头像")
+    private String userImage;
+    @ApiModelProperty(value = "电话")
+    private String userMobile;
+    @ApiModelProperty(value = "部门")
+    private String department;
+    @ApiModelProperty(value = "岗位")
+    private String position;
+
+    @ApiModelProperty(value = "头像：后端内部使用")
+    private String headImage;
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDetailsVo.java
new file mode 100644
index 0000000..9792324
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDetailsVo.java
@@ -0,0 +1,28 @@
+package com.yxt.oms.biz.func.sysstafforg;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/2/11 16:15
+ * @Description 员工部门详情信息
+ */
+@Data
+public class SysStaffOrgDetailsVo implements Vo {
+    private static final long serialVersionUID = 5354841525724609428L;
+
+    @ApiModelProperty("部门sid")
+    private String orgSid;
+    @ApiModelProperty("部门名称")
+    private String orgName;
+    @ApiModelProperty("部门路径")
+    private String orgSidPath;
+    @ApiModelProperty("部门名称路径")
+    private String orgNamePath;
+    @ApiModelProperty(value = "部门编码")
+    private String orgCode;
+    @ApiModelProperty("管理类型：1、主管。2、分管。3、员工")
+    private String manageType;
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDto.java b/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDto.java
new file mode 100644
index 0000000..04b883c
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgDto.java
@@ -0,0 +1,42 @@
+package com.yxt.oms.biz.func.sysstafforg;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysStaffOrgDto.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDto <br/>
+ * Description: 员工部门关联表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "员工部门关联表 数据传输对象", description = "员工部门关联表 数据传输对象")
+@Data
+public class SysStaffOrgDto implements Dto {
+
+    private static final long serialVersionUID = 1403491378761015027L;
+    @ApiModelProperty("部门sid")
+    private String orgSid;
+    @ApiModelProperty("部门名称")
+    @NotBlank(message = "部门名称不能为空")
+    private String orgName;
+//    @ApiModelProperty("部门路径")
+//    private String orgSidPath;
+//    @ApiModelProperty("部门名称路径")
+//    private String orgNamePath;
+    @ApiModelProperty(value = "部门编码")
+    private String orgCode;
+    @ApiModelProperty(value = "管理类型：1、主管。2、分管。3、员工", example = "3")
+    private String manageType;
+}
\ No newline at end of file
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysuser/SysUserService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysuser/SysUserService.java
index 0f14116..662065c 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysuser/SysUserService.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysuser/SysUserService.java
@@ -1,16 +1,20 @@
 package com.yxt.oms.biz.func.sysuser;
 
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.oms.feign.portal.sysuser.SysUserDto;
 import com.yxt.oms.feign.portal.sysuser.SysUserFeign;
 import com.yxt.oms.feign.portal.sysuser.SysUserQuery;
 import com.yxt.oms.feign.portal.sysuser.SysUserVo;
+import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -60,4 +64,18 @@ public class SysUserService {
     public ResultBean setIsEnable(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @ApiParam(value = "isEnable", required = true) @PathVariable("isEnable") String isEnable){
         return sysUserFeign.setIsEnable(sid, isEnable);
     }
+
+    /**
+     * 初始化密码
+     *
+     * @param sid 用户sid
+     * @return ResultBean
+     */
+    public ResultBean initPwd(String sid) {
+        return sysUserFeign.initPwd(sid);
+    }
+
+    public ResultBean delBySid(String sid) {
+        return sysUserFeign.delBySid(sid);
+    }
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleVo.java
index 497ed22..3b1f21b 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleVo.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleVo.java
@@ -29,4 +29,5 @@ public class SysUserRoleVo implements Vo {
     
 	@ApiModelProperty("角色sid")
     private String roleSid;
+    private String name;
 }
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeign.java
index f4cbd0f..b6b7247 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeign.java
+++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeign.java
@@ -45,8 +45,8 @@ public interface SysOrganizationFeign {
     public ResultBean<List<SysOrganizationVo>> listAll(@RequestBody SysOrganizationQuery query);
 
     @ApiOperation("所有数据列表")
-    @GetMapping("/list")
-    public ResultBean<List<SysOrganizationVo>> list();
+    @GetMapping("/list/{orgSid}")
+    public ResultBean<List<SysOrganizationVo>> list(@PathVariable("orgSid") String orgSid);
 
     @ApiOperation("一级组织机构列表")
     @GetMapping("/selectFirstOrgList")
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeignFallback.java
index 4f45fd6..58d8f92 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeignFallback.java
+++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysorganization/SysOrganizationFeignFallback.java
@@ -42,7 +42,7 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
     }
 
     @Override
-    public ResultBean<List<SysOrganizationVo>> list() {
+    public ResultBean<List<SysOrganizationVo>> list(String orgSid) {
         return null;
     }
 
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java
new file mode 100644
index 0000000..cae62b8
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysstaffinfo/SysStaffinfoFeign.java
@@ -0,0 +1,153 @@
+package com.yxt.oms.feign.portal.sysstaffinfo;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.biz.func.sysstaffinfo.*;
+import com.yxt.oms.biz.func.sysstaffinfo.app.AppSysStaffQuery;
+import com.yxt.oms.biz.func.sysstaffinfo.app.AppSysStaffVo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangpengfei
+ * @date 2024/7/11 13:55
+ */
+@FeignClient(
+        contextId = "ss-common-portal-sysstaffinfo",
+        name = "ss-common-portal",
+        path = "/apiadmin/sysstaffinfo")
+public interface SysStaffinfoFeign {
+
+
+    /**
+     * 员工管理分页列表
+     *
+     * @param pq 查询条件
+     * @return
+     */
+    @ApiOperation("员工管理分页列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SysStaffinfoVo>> listPage(@RequestBody PagerQuery<SysStaffinfoQuery> pq);
+
+    /**
+     * 员工信息新增保存
+     *
+     * @param dto 数据传输对象
+     * @return
+     */
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@Valid @RequestBody SysStaffinfoDto dto);
+
+    /**
+     * 员工信息修改保存
+     *
+     * @param dto 数据传输对象
+     * @param sid 员工信息sid
+     * @return
+     */
+    @ApiOperation("修改保存")
+    @PostMapping("/update/{sid}")
+    public ResultBean update(@Valid @RequestBody SysStaffinfoDto dto, @PathVariable("sid") String sid);
+
+    /**
+     * 员工信息删除操作，即离职
+     *
+     * @param sysStaffQuery 数据传输对象
+     * @return
+     */
+    @ApiOperation("设置离职")
+    @PostMapping("/del")
+    public ResultBean del(@RequestBody SysStaffQuery sysStaffQuery);
+
+    /**
+     * 员工信息编辑初始化及详情
+     *
+     * @param sid 员工sid
+     * @return
+     */
+    @ApiOperation("员工信息编辑初始化及详情")
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<SysStaffinfoDetailsVo> fetchBySid(@PathVariable("sid") String sid);
+
+    /**
+     * 获取集团内全部员工姓名
+     *
+     * @param staffName 员工姓名
+     * @return
+     */
+    @ApiOperation("获取集团内全部员工姓名")
+    @GetMapping("/getStaffName")
+    public ResultBean<List<Map<String, String>>> getStaffName(@RequestParam(value = "staffName", required = false) String staffName, @RequestParam(value = "deptSid") String deptSid);
+
+    /**
+     * 获取部门内全部员工姓名
+     *
+     * @param staffName 员工姓名
+     * @return
+     */
+    @ApiOperation("获取部门内全部员工姓名")
+    @GetMapping("/getStaffNameByDeptSid")
+    public ResultBean<List<Map<String, String>>> getStaffNameByDeptSid(@RequestParam(value = "staffName", required = false) String staffName, @RequestParam(value = "deptSid") String deptSid);
+
+
+    @ApiOperation("获取App通讯录")
+    @ResponseBody
+    @GetMapping("/selectAppContactsList")
+    public ResultBean<List<SysStaffinfoAppContactsVo>> selectAppContactsList(@RequestParam(value = "names", required = false) String names);
+
+    @ApiOperation("app查看通讯录详情")
+    @ResponseBody
+    @GetMapping("/selectAppContactsVO/{staffSid}")
+    public ResultBean<AppContactsDetailsVo> selectAppContactsVO(@PathVariable("staffSid") String staffSid);
+
+    @ApiOperation("App通讯录搜索")
+    @ResponseBody
+    @PostMapping("/searchAppContactsList")
+    public ResultBean<PagerVo<SysStaffinfoAppContactsSearchVo>> searchAppContactsList(@RequestBody PagerQuery<SysStaffinfoQuery> pq);
+
+    @ApiOperation("App通讯录搜索2")
+    @ResponseBody
+    @PostMapping("/searchAppContactsList2")
+    public ResultBean<PagerVo<SysStaffinfoAppContactsSearchVo>> searchAppContactsList2(@RequestBody PagerQuery<SysStaffinfoQuery> pq);
+
+    @ApiOperation("销售订单-内部推荐人下拉框")
+    @ResponseBody
+    @GetMapping("/selectStaffList")
+    ResultBean<List<PcSysStaffVo>> selectStaffList(@SpringQueryMap PcSysStaffQuery pcSysStaffQuery);
+
+    @ApiOperation("移动端-销售订单-内部推荐人下拉框")
+    @ResponseBody
+    @PostMapping("/getUserList")
+    ResultBean<PagerVo<AppSysStaffVo>> getUserList(@RequestBody PagerQuery<AppSysStaffQuery> pagerQuery);
+
+    @ApiOperation("存放地点变更-获取人员列表")
+    @ResponseBody
+    @GetMapping("/getGressionUserList/{userSid}")
+    ResultBean<List<AppSysStaffVo>> getGressionUserList(@PathVariable("userSid") String userSid);
+
+    @ApiOperation("切换机构：存放地点变更-获取人员列表")
+    @ResponseBody
+    @GetMapping("/getGressionUserList")
+    ResultBean<List<AppSysStaffVo>> getGressionUserList(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath);
+
+
+    @ApiOperation("获取集团所有人员")
+    @ResponseBody
+    @GetMapping("/selectStaffLists")
+    ResultBean<List<PcSysStaffVo>> selectStaffLists();
+
+    @ApiOperation("获取集团所有在职人员")
+    @ResponseBody
+    @GetMapping("/selectStaffListss")
+    ResultBean<List<PcSysStaffVo>> selectStaffListss();
+
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java
index b6e5b66..9adbaa2 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java
+++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java
@@ -83,4 +83,12 @@ public interface SysUserFeign {
     @ApiOperation("根据sid获取一条记录")
     @GetMapping("/fetchBySid/{sid}")
     public ResultBean<SysUserVo> fetchBySid(@PathVariable("sid") String sid);
+    @ResponseBody
+    @PostMapping("/initPwd/{sid}")
+    @ApiOperation(value = "10、用户初始化密码")
+    @ApiOperationSupport(order = 100)
+    public ResultBean initPwd(@ApiParam(value = "用户sid", required = true) @PathVariable("sid") String sid);
+    @ApiOperation("删除记录根据sid")
+    @GetMapping("/delBySid/{sid}")
+    public ResultBean delBySid(@PathVariable("sid") String sid);
 }
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java
index 2892004..ba0e04a 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java
+++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java
@@ -76,4 +76,14 @@ public class SysUserFeignFallback implements SysUserFeign {
     public ResultBean<SysUserVo> fetchBySid(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean initPwd(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean delBySid(String sid) {
+        return null;
+    }
 }
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserVo.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserVo.java
index c68c0bf..3cde48e 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserVo.java
+++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserVo.java
@@ -1,14 +1,17 @@
 package com.yxt.oms.feign.portal.sysuser;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
+import com.yxt.oms.biz.func.sysrole.SysRoleVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -68,8 +71,8 @@ public class SysUserVo implements Vo {
     
 	@ApiModelProperty("用户类型:1员工、2客户、3供应商")
     private String userType;
-	@ApiModelProperty("用户类型:1、2、3")
-    private String userTypeKey;
+    @ApiModelProperty("用户类型:1、2、3")
+    private String userTypeValue;
     @ApiModelProperty("用户头像")
     private String headImage;
     @ApiModelProperty("组织名称")
@@ -98,4 +101,10 @@ public class SysUserVo implements Vo {
     List<SysStaffOrgVo> sysOrganizationVos;
     private String orgSid;
     private String orgName;
+    private List<SysRoleVo> sysRoleVos;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
+    private String roles;//角色 ,分割
+    private String accountType;
+    private String accountTypeValue;
 }

From 669fc03ae54f70846ccfcd815c0d2e0dba793106 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Fri, 19 Jul 2024 17:40:54 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7=E5=8D=95=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   3 +
 .../aggregation/SmsSalesReturnRest.java       |  87 ++++++++++++++
 .../smssalesbill/SmsSalesBillDetailsVo.java   |   4 +
 .../func/smssalesbill/SmsSalesBillDto.java    |   5 +-
 .../biz/func/smssalesreturn/GoodsList.java    |  29 +++++
 .../func/smssalesreturn/SmsSalesReturn.java   | 106 ++++++++++++++++++
 .../SmsSalesReturnDetailsVo.java              |  78 +++++++++++++
 .../smssalesreturn/SmsSalesReturnDto.java     |  79 +++++++++++++
 .../smssalesreturn/SmsSalesReturnMapper.java  |  63 +++++++++++
 .../smssalesreturn/SmsSalesReturnMapper.xml   |  13 +++
 .../smssalesreturn/SmsSalesReturnQuery.java   |  99 ++++++++++++++++
 .../smssalesreturn/SmsSalesReturnService.java |  78 +++++++++++++
 .../func/smssalesreturn/SmsSalesReturnVo.java |  96 ++++++++++++++++
 .../yxt/oms/feign/portal/sysuser/SysUser.java |  72 ++++++++++++
 .../feign/portal/sysuser/SysUserFeign.java    |   4 +
 .../smssalesreturn/SmsSalesReturnFeign.java   |  82 ++++++++++++++
 .../java/com/yxt/oms/utils/FileQueryUrl.java  |  14 +++
 17 files changed, 911 insertions(+), 1 deletion(-)
 create mode 100644 .gitignore
 create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesReturnRest.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/GoodsList.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturn.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnDetailsVo.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnDto.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnMapper.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnMapper.xml
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnQuery.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnService.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnVo.java
 create mode 100644 oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUser.java
 create mode 100644 oms/src/main/java/com/yxt/oms/feign/sales/smssalesreturn/SmsSalesReturnFeign.java
 create mode 100644 oms/src/main/java/com/yxt/oms/utils/FileQueryUrl.java

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5f39bc0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/oms-biz.iml
+/gateway/gateway.iml
+/oms/oms.iml
diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesReturnRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesReturnRest.java
new file mode 100644
index 0000000..6553d44
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SmsSalesReturnRest.java
@@ -0,0 +1,87 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.apiadmin.aggregation;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.biz.func.smssalesreturn.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Delete;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: sms(销售退货) <br/>
+ * File: SmsSalesReturnFeignFallback.java <br/>
+ * Class: com.yxt.sales.apiadmin.SmsSalesReturnRest <br/>
+ * Description: 销售退货单据. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-19 16:53:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "销售退货单据")
+@RestController("com.yxt.sales.apiadmin.SmsSalesReturnRest")
+@RequestMapping("v1/smssalesreturn")
+public class SmsSalesReturnRest {
+
+    @Autowired
+    private SmsSalesReturnService smsSalesReturnService;
+
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SmsSalesReturnVo>> listPage(@RequestBody PagerQuery<SmsSalesReturnQuery> pq) {
+        return smsSalesReturnService.listPageVo(pq);
+    }
+
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody SmsSalesReturnDto dto) {
+
+        return smsSalesReturnService.saveOrUpdateDto(dto);
+    }
+
+
+    @ApiOperation("根据sid批量删除")
+    @Delete("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        return smsSalesReturnService.deleteBySids(sids);
+    }
+
+
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<SmsSalesReturnDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        return smsSalesReturnService.fetchDetailsVoBySid(sid);
+    }
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java
index 3434082..8c039e4 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java
@@ -27,10 +27,12 @@ package com.yxt.oms.biz.func.smssalesbill;
 
 
 import com.yxt.common.core.vo.Vo;
+import com.yxt.oms.utils.FileQueryUrl;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -160,5 +162,7 @@ public class SmsSalesBillDetailsVo implements Vo {
     @ApiModelProperty("结算金额")
     private String settleAmount; // 结算金额
 
+    @ApiModelProperty("付款凭证")
+    private List<FileQueryUrl> files = new ArrayList<>(); // 付款凭证
 
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java
index b9d73cb..f77dcb7 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java
@@ -27,10 +27,12 @@ package com.yxt.oms.biz.func.smssalesbill;
 
 
 import com.yxt.common.core.dto.Dto;
+import com.yxt.oms.utils.FileQueryUrl;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -160,7 +162,8 @@ public class SmsSalesBillDto implements Dto {
     @ApiModelProperty("结算金额")
     private String settleAmount; // 结算金额
 
-
+    @ApiModelProperty("付款凭证")
+    private List<FileQueryUrl> files = new ArrayList<>(); // 付款凭证
 
 
 
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/GoodsList.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/GoodsList.java
new file mode 100644
index 0000000..2e395e2
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/GoodsList.java
@@ -0,0 +1,29 @@
+package com.yxt.oms.biz.func.smssalesreturn;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/19 17:23
+ */
+@Data
+public class GoodsList {
+    private String auxiliaryUnit;
+    private String backAmount;
+    private String backCount;
+    private String discountRtate;
+    private String goodSpuSid;
+    private String goodsSkuCode;
+    private String goodsSkuOwnSpec;
+    private String goodsSkuSid;
+    private String goodsSkuTitle;
+    private String goodsSpuName;
+    private String maxPrice;
+    private String remarks;
+    private String tradePrice;
+    private String unit;
+    private String warehouseRackCode;
+    private String warehouseRackSid;
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturn.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturn.java
new file mode 100644
index 0000000..0b086d5
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturn.java
@@ -0,0 +1,106 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.smssalesreturn;
+
+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;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: sms(销售退货) <br/>
+ * File: SmsSalesReturn.java <br/>
+ * Class: com.yxt.sales.api.smssalesreturn.SmsSalesReturn <br/>
+ * Description: 销售退货单据. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-19 16:53:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售退货单据", description = "销售退货单据")
+@TableName("sms_sales_return")
+public class SmsSalesReturn extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("制单部门sid")
+    private String deptSid; // 制单部门sid
+	@ApiModelProperty("制单部门")
+    private String deptName; // 制单部门
+	@ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+	@ApiModelProperty("来源单sid（销售单sid）")
+    private String sourceBillSid; // 来源单sid（销售单sid）
+	@ApiModelProperty("来源单编号（订单编号）")
+    private String sourceBillNo; // 来源单编号（订单编号）
+	@ApiModelProperty("业务员sid")
+    private String salesUserSid; // 业务员sid
+	@ApiModelProperty("业务员姓名")
+    private String salesName; // 业务员姓名
+	@ApiModelProperty("单据类型key（销售退货等）")
+    private String billTypeKey; // 单据类型key（销售退货等）
+	@ApiModelProperty("单据类型value")
+    private String billTypeValue; // 单据类型value
+	@ApiModelProperty("物流公司")
+    private String LogisticsName; // 物流公司
+	@ApiModelProperty("快递单号")
+    private String logisticsNum; // 快递单号
+	@ApiModelProperty("客户sid")
+    private String customerSid; // 客户sid
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("退误差调整金额")
+    private BigDecimal backErrorAmount; // 退误差调整金额
+	@ApiModelProperty("退优惠金额")
+    private BigDecimal backDiscountAmount; // 退优惠金额
+	@ApiModelProperty("抵扣欠款")
+    private BigDecimal deductDebts; // 抵扣欠款
+	@ApiModelProperty("结算账户")
+    private String bankAccount; // 结算账户
+	@ApiModelProperty("抵扣单号")
+    private String deductBillNo; // 抵扣单号
+	@ApiModelProperty("是否记预收款（1是，0否）")
+    private Integer isTotoPrepayment; // 是否记预收款（1是，0否）
+	@ApiModelProperty("转入预付款")
+    private BigDecimal toPrepayment; // 转入预付款
+	@ApiModelProperty("仓库sid")
+    private String warehouseSid; // 仓库sid
+	@ApiModelProperty("仓库名称")
+    private String warehouseName; // 仓库名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnDetailsVo.java
new file mode 100644
index 0000000..8804ee7
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnDetailsVo.java
@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.smssalesreturn;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: sms(销售退货) <br/>
+ * File: SmsSalesReturnVo.java <br/>
+ * Class: com.yxt.sales.api.smssalesreturn.SmsSalesReturnVo <br/>
+ * Description: 销售退货单据 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-19 16:53:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售退货单据 视图数据详情", description = "销售退货单据 视图数据详情")
+public class SmsSalesReturnDetailsVo implements Vo {
+
+    private String amount;
+    private String billTypeKey;
+    private String billTypeValue;
+    private String createByName;
+    private String createBySid;
+    private String createOrgSid;
+    private String createTime;
+    private String customerName;
+    private String customerSid;
+    private String deliveryTypeKey;
+    private String deptName;
+    private String deptSid;
+    private List<GoodsList> goodsList;
+    private String isFirstPay;
+    private String isTotoPrepayment;
+    private String logisticsName;
+    private String logisticsNum;
+    private String remarks;
+    private String salesName;
+    private String salesUserSid;
+    private String sid;
+    private String sourceBillNo;
+    private String sourceBillSid;
+    private String useOrgSid;
+    private String warehouseName;
+    private String warehouseSid;
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnDto.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnDto.java
new file mode 100644
index 0000000..1afa871
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnDto.java
@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.smssalesreturn;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: sms(销售退货) <br/>
+ * File: SmsSalesReturnDto.java <br/>
+ * Class: com.yxt.sales.api.smssalesreturn.SmsSalesReturnDto <br/>
+ * Description: 销售退货单据 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-19 16:53:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售退货单据 数据传输对象", description = "销售退货单据 数据传输对象")
+public class SmsSalesReturnDto implements Dto {
+
+    private String amount;
+    private String billTypeKey;
+    private String billTypeValue;
+    private String createByName;
+    private String createBySid;
+    private String createOrgSid;
+    private String createTime;
+    private String customerName;
+    private String customerSid;
+    private String deliveryTypeKey;
+    private String deptName;
+    private String deptSid;
+    private List<GoodsList> goodsList;
+    private String isFirstPay;
+    private String isTotoPrepayment;
+    private String logisticsName;
+    private String logisticsNum;
+    private String remarks;
+    private String salesName;
+    private String salesUserSid;
+    private String sid;
+    private String sourceBillNo;
+    private String sourceBillSid;
+    private String useOrgSid;
+    private String warehouseName;
+    private String warehouseSid;
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnMapper.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnMapper.java
new file mode 100644
index 0000000..66b07b7
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnMapper.java
@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.smssalesreturn;
+
+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 org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * Project: sms(销售退货) <br/>
+ * File: SmsSalesReturnMapper.java <br/>
+ * Class: com.yxt.sales.biz.smssalesreturn.SmsSalesReturnMapper <br/>
+ * Description: 销售退货单据. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-19 16:53:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface SmsSalesReturnMapper extends BaseMapper<SmsSalesReturn> {
+
+	//@Update("update sms_sales_return set name=#{msg} where id=#{id}")
+	//IPage<SmsSalesReturnVo> voPage(IPage<SmsSalesReturn> page, @Param(Constants.WRAPPER) QueryWrapper<SmsSalesReturn> qw);
+
+	IPage<SmsSalesReturnVo> selectPageVo(IPage<SmsSalesReturn> page, @Param(Constants.WRAPPER) Wrapper<SmsSalesReturn> qw);
+
+	List<SmsSalesReturnVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SmsSalesReturn> qw);
+
+	@Select("select * from sms_sales_return")
+	List<SmsSalesReturnVo> selectListVo();
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnMapper.xml b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnMapper.xml
new file mode 100644
index 0000000..e7e63d7
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnMapper.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.oms.biz.func.smssalesreturn.SmsSalesReturnMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.oms.biz.func.smssalesreturn.SmsSalesReturnVo">
+		SELECT * FROM sms_sales_return <where> ${ew.sqlSegment} </where>
+	</select>
+
+	<select id="selectListAllVo" resultType="com.yxt.oms.biz.func.smssalesreturn.SmsSalesReturnVo">
+		SELECT * FROM sms_sales_return <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnQuery.java
new file mode 100644
index 0000000..fc9c83a
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnQuery.java
@@ -0,0 +1,99 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.smssalesreturn;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * Project: sms(销售退货) <br/>
+ * File: SmsSalesReturnQuery.java <br/>
+ * Class: com.yxt.sales.api.smssalesreturn.SmsSalesReturnQuery <br/>
+ * Description: 销售退货单据 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-19 16:53:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售退货单据 查询条件", description = "销售退货单据 查询条件")
+public class SmsSalesReturnQuery implements Query {
+
+    /**
+     * 单据编号
+     */
+    private String billNo;
+    /**
+     * 单据类型key
+     */
+    private String billTypeKey;
+    /**
+     * 制单人姓名
+     */
+    private String createByName;
+    /**
+     * 创建组织sid
+     */
+    private String createOrgSid;
+    /**
+     * 客户名称
+     */
+    private String customerName;
+    /**
+     * 制单部门
+     */
+    private String deptName;
+    /**
+     * 制单结束日期
+     */
+    private String endDate;
+    /**
+     * 销售姓名(业务员)
+     */
+    private String salesName;
+    /**
+     * 订单编号
+     */
+    private String sourceBillNo;
+    /**
+     * 制单开始日期
+     */
+    private String startDate;
+    /**
+     * 使用组织sid
+     */
+    private String useOrgSid;
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnService.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnService.java
new file mode 100644
index 0000000..ce7836f
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnService.java
@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.smssalesreturn;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.feign.sales.smssalesreturn.SmsSalesReturnFeign;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: sms(销售退货) <br/>
+ * File: SmsSalesReturnService.java <br/>
+ * Class: com.yxt.sales.biz.smssalesreturn.SmsSalesReturnService <br/>
+ * Description: 销售退货单据 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-19 16:53:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class SmsSalesReturnService extends MybatisBaseService<SmsSalesReturnMapper, SmsSalesReturn> {
+        @Autowired
+        private SmsSalesReturnFeign smsSalesReturnFeign;
+
+
+    public ResultBean<PagerVo<SmsSalesReturnVo>> listPageVo(PagerQuery<SmsSalesReturnQuery> pq) {
+        return smsSalesReturnFeign.listPage(pq);
+    }
+
+    public ResultBean saveOrUpdateDto(SmsSalesReturnDto dto) {
+        return smsSalesReturnFeign.save(dto);
+    }
+
+    public ResultBean deleteBySids(String[] sids) {
+        return smsSalesReturnFeign.delBySids(sids);
+    }
+
+    public ResultBean<SmsSalesReturnDetailsVo> fetchDetailsVoBySid(String sid) {
+        return smsSalesReturnFeign.fetchDetailsBySid(sid);
+    }
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnVo.java
new file mode 100644
index 0000000..1322253
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesreturn/SmsSalesReturnVo.java
@@ -0,0 +1,96 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.smssalesreturn;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * Project: sms(销售退货) <br/>
+ * File: SmsSalesReturnVo.java <br/>
+ * Class: com.yxt.sales.api.smssalesreturn.SmsSalesReturnVo <br/>
+ * Description: 销售退货单据 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-19 16:53:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售退货单据 视图数据对象", description = "销售退货单据 视图数据对象")
+public class SmsSalesReturnVo implements Vo {
+
+    /**
+     * 总金额
+     */
+    private String amount;
+    /**
+     * 单据编号
+     */
+    private String billNo;
+    /**
+     * 单据类型value
+     */
+    private String billTypeValue;
+    /**
+     * 制单人姓名
+     */
+    private String createByName;
+    /**
+     * 制单日期
+     */
+    private String createTime;
+    /**
+     * 客户名称
+     */
+    private String customerName;
+    /**
+     * 制单部门
+     */
+    private String deptName;
+    /**
+     * 物流单号
+     */
+    private String logisticsNum;
+    /**
+     * 业务员
+     */
+    private String salesName;
+    private String sid;
+    /**
+     * 订单编号
+     */
+    private String sourceBillNo;
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUser.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUser.java
new file mode 100644
index 0000000..40c74e0
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUser.java
@@ -0,0 +1,72 @@
+package com.yxt.oms.feign.portal.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;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysUser.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysuser.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;
+    @TableField(exist = false)
+    private String orgSid;
+    private String accountType;////账号类型 1单位管理员，2操作员，0是平台管理员 3非登录账户
+}
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java
index 9adbaa2..c1e2c36 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java
+++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeign.java
@@ -91,4 +91,8 @@ public interface SysUserFeign {
     @ApiOperation("删除记录根据sid")
     @GetMapping("/delBySid/{sid}")
     public ResultBean delBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("根据sid查询用户信息")
+    @PostMapping("/selectBySid")
+    public ResultBean<SysUser> selectBySid(@RequestParam("sid") String sid);
 }
diff --git a/oms/src/main/java/com/yxt/oms/feign/sales/smssalesreturn/SmsSalesReturnFeign.java b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesreturn/SmsSalesReturnFeign.java
new file mode 100644
index 0000000..8ab6cce
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/feign/sales/smssalesreturn/SmsSalesReturnFeign.java
@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.feign.sales.smssalesreturn;
+
+import com.yxt.oms.biz.func.smssalesreturn.SmsSalesReturnDetailsVo;
+import com.yxt.oms.biz.func.smssalesreturn.SmsSalesReturnDto;
+import com.yxt.oms.biz.func.smssalesreturn.SmsSalesReturnQuery;
+import com.yxt.oms.biz.func.smssalesreturn.SmsSalesReturnVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: sms(销售退货) <br/>
+ * File: SmsSalesReturnFeign.java <br/>
+ * Class: com.yxt.sales.api.smssalesreturn.SmsSalesReturnFeign <br/>
+ * Description: 销售退货单据. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-19 16:53:05 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "销售退货单据")
+@FeignClient(
+        contextId = "sms-SmsSalesReturn",
+        name = "sms",
+        path = "v1/smssalesreturn"
+      )
+public interface SmsSalesReturnFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<SmsSalesReturnVo>> listPage(@RequestBody PagerQuery<SmsSalesReturnQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody SmsSalesReturnDto dto);
+
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<SmsSalesReturnDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}
diff --git a/oms/src/main/java/com/yxt/oms/utils/FileQueryUrl.java b/oms/src/main/java/com/yxt/oms/utils/FileQueryUrl.java
new file mode 100644
index 0000000..f4d9699
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/utils/FileQueryUrl.java
@@ -0,0 +1,14 @@
+package com.yxt.oms.utils;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/19 15:06
+ */
+@Data
+public class FileQueryUrl {
+
+    private String url;
+}

From 0acc30e604dacf865368bf3faadb5c8d964bba2e Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Fri, 19 Jul 2024 17:56:48 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apiadmin/aggregation/GoodsSpuRest.java    | 37 +++++++++++
 .../biz/func/goodsspu/GoodsSpuService.java    | 31 ++++++++++
 .../biz/func/goodsspu/SalesGoodsQuery.java    | 15 +++++
 .../oms/biz/func/goodsspu/SalesGoodsVo.java   | 62 +++++++++++++++++++
 .../feign/goods/goodsSpu/GoodsSpuFeign.java   | 27 ++++++++
 5 files changed, 172 insertions(+)
 create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/GoodsSpuRest.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsQuery.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsVo.java
 create mode 100644 oms/src/main/java/com/yxt/oms/feign/goods/goodsSpu/GoodsSpuFeign.java

diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/GoodsSpuRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/GoodsSpuRest.java
new file mode 100644
index 0000000..4e7bf88
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/GoodsSpuRest.java
@@ -0,0 +1,37 @@
+package com.yxt.oms.apiadmin.aggregation;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.biz.func.goodsspu.GoodsSpuService;
+import com.yxt.oms.biz.func.goodsspu.SalesGoodsQuery;
+import com.yxt.oms.biz.func.goodsspu.SalesGoodsVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/3/7 16:58
+ */
+@Api(tags = "商品spu")
+@RestController
+@RequestMapping("/apiadmin/base/basegoodsspu")
+public class GoodsSpuRest {
+    @Autowired
+    GoodsSpuService goodsSpuService;
+
+
+    @ApiOperation("销售订单获取商品")
+    @PostMapping("/getGoodsForSales")
+    public ResultBean<PagerVo<SalesGoodsVo>> getGoodsForSales(@RequestBody PagerQuery<SalesGoodsQuery> pq) {
+        return goodsSpuService.getGoodsForSales(pq);
+    }
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java
new file mode 100644
index 0000000..f76de80
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java
@@ -0,0 +1,31 @@
+package com.yxt.oms.biz.func.goodsspu;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.feign.goods.goodsSpu.GoodsSpuFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:40
+ */
+@Service
+public class GoodsSpuService  {
+  private GoodsSpuFeign goodsSpuFeign;
+
+
+    public ResultBean<PagerVo<SalesGoodsVo>> getGoodsForSales(PagerQuery<SalesGoodsQuery> pq) {
+        return goodsSpuFeign.getGoodsForSales(pq);
+    }
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsQuery.java
new file mode 100644
index 0000000..2df5ca5
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsQuery.java
@@ -0,0 +1,15 @@
+package com.yxt.oms.biz.func.goodsspu;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/19 17:42
+ */
+@Data
+public class SalesGoodsQuery implements Query {
+    private String goodsName;
+    private String createOrgSid;
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsVo.java
new file mode 100644
index 0000000..46606c4
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsVo.java
@@ -0,0 +1,62 @@
+package com.yxt.oms.biz.func.goodsspu;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/19 17:43
+ */
+@Data
+public class SalesGoodsVo implements Vo {
+
+    /**
+     * 辅单位数量
+     */
+    private String auxiliaryUnit;
+    /**
+     * 数量
+     */
+    private String count;
+    /**
+     * 商品基础信息Sid
+     */
+    private String goodSpuSid;
+    /**
+     * 商品编码
+     */
+    private String goodsSkuCode;
+    /**
+     * 规格型号
+     */
+    private String goodsSkuOwnSpec;
+    /**
+     * 商品Skusid
+     */
+    private String goodsSkuSid;
+    /**
+     * 商品Sku名称
+     */
+    private String goodsSkuTitle;
+    /**
+     * 商品名称
+     */
+    private String goodsSpuName;
+    /**
+     * 销售单价
+     */
+    private String price;
+    /**
+     * 计量单位
+     */
+    private String unit;
+    /**
+     * 体积（立方米）
+     */
+    private String volume;
+    /**
+     * 重量（kg）
+     */
+    private String weight;
+}
diff --git a/oms/src/main/java/com/yxt/oms/feign/goods/goodsSpu/GoodsSpuFeign.java b/oms/src/main/java/com/yxt/oms/feign/goods/goodsSpu/GoodsSpuFeign.java
new file mode 100644
index 0000000..8c40793
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/feign/goods/goodsSpu/GoodsSpuFeign.java
@@ -0,0 +1,27 @@
+package com.yxt.oms.feign.goods.goodsSpu;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.biz.func.goodsspu.SalesGoodsQuery;
+import com.yxt.oms.biz.func.goodsspu.SalesGoodsVo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @description:
+ * @author: fzz
+ * @date: 2024/7/4
+ **/
+@FeignClient(
+        contextId = "ss-goods-GoodsSpu",
+        name = "ss-goods",
+        path = "/apiadmin/base/basegoodsspu")
+public interface GoodsSpuFeign {
+
+    @ApiOperation("销售订单获取商品")
+    @PostMapping("/getGoodsForSales")
+    public ResultBean<PagerVo<SalesGoodsVo>> getGoodsForSales(@RequestBody PagerQuery<SalesGoodsQuery> pq);
+}

From e695c385e6f0adcadb07326d735d6cc55ffab393 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Mon, 22 Jul 2024 09:13:38 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BB=93=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aggregation/WarehouseInfoRest.java        | 33 +++++++++++++++
 .../func/warehouseinfo/SmsOrderHouseInfo.java | 27 ++++++++++++
 .../biz/func/warehouseinfo/SmsOrderRock.java  | 23 +++++++++++
 .../warehouseinfo/WarehouseInfoService.java   | 39 ++++++++++++++++++
 .../warehouseinfo/WarehouseInfoFeign.java     | 41 +++++++++++++++++++
 5 files changed, 163 insertions(+)
 create mode 100644 oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseInfoRest.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/SmsOrderHouseInfo.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/SmsOrderRock.java
 create mode 100644 oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoService.java
 create mode 100644 oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java

diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseInfoRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseInfoRest.java
new file mode 100644
index 0000000..14719c2
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/WarehouseInfoRest.java
@@ -0,0 +1,33 @@
+package com.yxt.oms.apiadmin.aggregation;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.biz.func.warehouseinfo.SmsOrderHouseInfo;
+import com.yxt.oms.biz.func.warehouseinfo.WarehouseInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/27 16:14
+ */
+@Api(tags = "仓库信息")
+@RestController
+@RequestMapping("/apiadmin/warehouseinfo")
+public class WarehouseInfoRest {
+
+    @Autowired
+    WarehouseInfoService wmsWarehouseService;
+
+
+    @ApiOperation("订单选择仓库")
+    @PostMapping("/getWareHouse")
+    public ResultBean<List<SmsOrderHouseInfo>> getWareHouse(@RequestParam("createOrgSid") String createOrgSid) {
+        return wmsWarehouseService.getWareHouse(createOrgSid);
+    }
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/SmsOrderHouseInfo.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/SmsOrderHouseInfo.java
new file mode 100644
index 0000000..c49ef79
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/SmsOrderHouseInfo.java
@@ -0,0 +1,27 @@
+package com.yxt.oms.biz.func.warehouseinfo;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/22 8:54
+ */
+@Data
+public class SmsOrderHouseInfo {
+
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
+    /**
+     * 仓库sid
+     */
+    private String warehouseSid;
+
+
+    List<SmsOrderRock> houseRock = new ArrayList<>();
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/SmsOrderRock.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/SmsOrderRock.java
new file mode 100644
index 0000000..6aef3c2
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/SmsOrderRock.java
@@ -0,0 +1,23 @@
+package com.yxt.oms.biz.func.warehouseinfo;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/7/22 8:54
+ */
+@Data
+public class SmsOrderRock {
+
+
+    /**
+     * 货位编码
+     */
+    private String warehouseRackCode;
+    /**
+     * 货位sid
+     */
+    private String warehouseRackSid;
+
+}
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoService.java b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoService.java
new file mode 100644
index 0000000..759100a
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/biz/func/warehouseinfo/WarehouseInfoService.java
@@ -0,0 +1,39 @@
+package com.yxt.oms.biz.func.warehouseinfo;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+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;
+import com.yxt.oms.feign.warehouse.warehouseinfo.WarehouseInfoFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author wangpengfei
+ * @date 2024/2/26 13:40
+ */
+@Service
+public class WarehouseInfoService {
+
+
+    @Autowired
+    private WarehouseInfoFeign warehouseInfoFeign;
+
+
+    public ResultBean<List<SmsOrderHouseInfo>> getWareHouse(String createOrgSid) {
+        return warehouseInfoFeign.getWareHouse(createOrgSid);
+    }
+}
diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java
new file mode 100644
index 0000000..4621d05
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseinfo/WarehouseInfoFeign.java
@@ -0,0 +1,41 @@
+package com.yxt.oms.feign.warehouse.warehouseinfo;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.biz.func.warehouseinfo.SmsOrderHouseInfo;
+import com.yxt.oms.feign.warehouse.warehouseansbill.WarehouseAnsBillFeignFallback;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleFeign.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign <br/>
+ * Description: 角色. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "仓库")
+@FeignClient(
+        contextId = "ss-common-warehouse-WmsHouseInfo",
+        name = "ss-common-WmsHouseInfo",
+        path = "/apiadmin/warehouseinfo"
+      )
+public interface WarehouseInfoFeign {
+    @ApiOperation("订单选择仓库")
+    @PostMapping("/getWareHouse")
+    public ResultBean<List<SmsOrderHouseInfo>> getWareHouse(@RequestParam("createOrgSid") String createOrgSid);
+}

From 73cdb71326c20d174f2623963d051aeb8ea753a9 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Mon, 22 Jul 2024 11:31:07 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E4=BA=AB?=
 =?UTF-8?q?=E9=80=9Aoms=E7=BD=91=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gateway/src/main/resources/application.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gateway/src/main/resources/application.yml b/gateway/src/main/resources/application.yml
index 2e647a1..c6908fa 100644
--- a/gateway/src/main/resources/application.yml
+++ b/gateway/src/main/resources/application.yml
@@ -26,13 +26,13 @@ spring:
 
 ignore:
   whites:
-    - /wms/apiadmin/sysuser/login #pc端登录
-    - /wms/apiadmin/sysuser/register #pc端登录
-    - /wms/apiadmin/sysuser/sendMessageCode/** #发送验证码
-    - /wms/apiadmin/sysuser/sendMessageLogin/** #发送验证码
-    - /wms/apiadmin/sysuser/sendMessageUpdate/** #发送验证码
-    - /wms/apiadmin/sysuser/bindOrganization #绑定组织
-    - /wms/apiadmin/sysuser/selOrganization #绑定组织
+    - /oms/apiadmin/sysuser/login #pc端登录
+    - /oms/apiadmin/sysuser/register #pc端登录
+    - /oms/apiadmin/sysuser/sendMessageCode/** #发送验证码
+    - /oms/apiadmin/sysuser/sendMessageLogin/** #发送验证码
+    - /oms/apiadmin/sysuser/sendMessageUpdate/** #发送验证码
+    - /oms/apiadmin/sysuser/bindOrganization #绑定组织
+    - /oms/apiadmin/sysuser/selOrganization #绑定组织
 
 
 

From ddbbd044780b12ead38024aaf44cdc32a2853142 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Mon, 22 Jul 2024 11:36:53 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E4=BA=AB?=
 =?UTF-8?q?=E9=80=9Aoms=E7=BD=91=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java
index ba0e04a..2376ce9 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java
+++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserFeignFallback.java
@@ -86,4 +86,9 @@ public class SysUserFeignFallback implements SysUserFeign {
     public ResultBean delBySid(String sid) {
         return null;
     }
+
+    @Override
+    public ResultBean<SysUser> selectBySid(String sid) {
+        return null;
+    }
 }

From ddedea849f8188f248052c1efe91a64e55e783a2 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 22 Jul 2024 14:15:20 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gateway/pom.xml                               |  2 +-
 .../aggregation/SysOrganizationRest.java      |  4 ++-
 .../oms/apiadmin/aggregation/SysRoleRest.java |  6 ++---
 .../com/yxt/oms/biz/func/sysmenu/SysMenu.java |  1 +
 .../yxt/oms/biz/func/sysmenu/SysMenuDto.java  |  1 +
 .../oms/biz/func/sysmenu/SysMenuTreeVo.java   |  3 ++-
 .../yxt/oms/biz/func/sysmenu/SysMenuVo.java   |  1 +
 .../oms/biz/func/sysrole/SysRoleQuery.java    |  2 ++
 .../oms/biz/func/sysrole/SysRoleService.java  |  4 +--
 .../yxt/oms/biz/func/sysrole/SysRoleVo.java   |  5 ++--
 .../oms/biz/func/sysuser/SysUserService.java  |  5 ++--
 .../biz/func/sysuserrole/SysUserRoleVo.java   |  8 +++---
 .../feign/portal/sysrole/SysRoleFeign.java    |  4 +--
 .../portal/sysrole/SysRoleFeignFallback.java  |  2 +-
 .../oms/feign/portal/sysuser/SysUserVo.java   | 27 ++++++++++---------
 15 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/gateway/pom.xml b/gateway/pom.xml
index 72dc2d8..06f8d9f 100644
--- a/gateway/pom.xml
+++ b/gateway/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.yxt.gateway</groupId>
-    <artifactId>gateway</artifactId>
+    <artifactId>omsgateway</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysOrganizationRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysOrganizationRest.java
index 8136467..ffca9d3 100644
--- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysOrganizationRest.java
+++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysOrganizationRest.java
@@ -83,7 +83,9 @@ public class SysOrganizationRest {
 
 
     @Transactional(rollbackFor = Exception.class)
-    public ResultBean update(SysOrganizationDto dto, String sid){
+    @ApiOperation("修改保存")
+    @PostMapping("/update/{sid}")
+    public ResultBean update(@RequestBody SysOrganizationDto dto, @PathVariable("sid") String sid){
         return sysOrganizationService.updateBySid(dto, sid);
     }
 
diff --git a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleRest.java b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleRest.java
index f10da59..fd48698 100644
--- a/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleRest.java
+++ b/oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleRest.java
@@ -38,9 +38,9 @@ public class SysRoleRest {
 
 
 	@ApiOperation("查询所有的角色数据，并根据用户sid查询被选中的角色")
-	@PostMapping("/listAllByUserSid/{userSid}")
-	public ResultBean<List<SysRoleVo>> listAllByUserSid(@PathVariable("userSid") String userSid){
-		return sysRoleService.listAllByUserSid(userSid);
+	@PostMapping("/listAllByUserSid/{userSid}/{orgSid}")
+	public ResultBean<List<SysRoleVo>> listAllByUserSid(@PathVariable("userSid") String userSid,@PathVariable("orgSid") String orgSid){
+		return sysRoleService.listAllByUserSid(userSid,orgSid);
 	}
 
 
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenu.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenu.java
index c4e78e6..071ade3 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenu.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenu.java
@@ -48,4 +48,5 @@ public class SysMenu extends BaseEntity {
     
 	@ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）")
     private String menuType;
+    private String cid;
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuDto.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuDto.java
index 48104d3..a9b59ff 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuDto.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuDto.java
@@ -69,4 +69,5 @@ public class SysMenuDto implements Dto {
 
     @ApiModelProperty(value = "备注")
     private String remarks;
+    private String cid;
 }
\ No newline at end of file
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuTreeVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuTreeVo.java
index 4418588..e7ca20b 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuTreeVo.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuTreeVo.java
@@ -56,7 +56,8 @@ public class SysMenuTreeVo implements Vo {
     private String remarks;
     @ApiModelProperty("子菜单")
     private List<SysMenuTreeVo> children;
-
     private String menuType;
     private String isShow;
+    private String menuTypeValue;
+    private String cid;
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuVo.java
index 9207374..f7930c9 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuVo.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuVo.java
@@ -71,4 +71,5 @@ public class SysMenuVo implements Vo {
     private String checked;
     @ApiModelProperty("资源名称")
     private String sourceName;
+    private String cid;
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleQuery.java
index 4e1e277..d3d9070 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleQuery.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleQuery.java
@@ -35,4 +35,6 @@ public class SysRoleQuery implements Query {
     
 	@ApiModelProperty("1、系统管理员、2、普通角色")
     private Integer type;
+    private String orgSid;//组织
+    private String sourceSid;//资源
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleService.java
index f3de9cd..c34c80b 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleService.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleService.java
@@ -93,8 +93,8 @@ public class SysRoleService extends MybatisBaseService<SysRoleMapper, SysRole> {
         return sysRoleFeign.fetchByUserSid(userSid);
     }
 
-    public ResultBean<List<SysRoleVo>> listAllByUserSid(String userSid) {
-        return sysRoleFeign.listAllByUserSid(userSid);
+    public ResultBean<List<SysRoleVo>> listAllByUserSid(String userSid,String orgSid) {
+        return sysRoleFeign.listAllByUserSid(userSid, orgSid);
     }
 
     /**
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleVo.java
index e83c975..cc47ed5 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleVo.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleVo.java
@@ -44,6 +44,7 @@ public class SysRoleVo implements Vo {
     private String postName;
     @ApiModelProperty(value = "组织层级")
     private String roleTypeValue;
-    private String dataRuleId;//角色数据权限id
-    private String dataRuleValue;//
+    private String dataRuleId;
+    private String dataRuleValue;
+    private String orgSid;
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysuser/SysUserService.java b/oms/src/main/java/com/yxt/oms/biz/func/sysuser/SysUserService.java
index 662065c..cf66ff5 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysuser/SysUserService.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysuser/SysUserService.java
@@ -71,11 +71,12 @@ public class SysUserService {
      * @param sid 用户sid
      * @return ResultBean
      */
-    public ResultBean initPwd(String sid) {
+
+    public ResultBean initPwd(@ApiParam(value = "用户sid", required = true) @PathVariable("sid") String sid) {
         return sysUserFeign.initPwd(sid);
     }
 
-    public ResultBean delBySid(String sid) {
+    public ResultBean delBySid(@ApiParam(value = "用户sid", required = true) @PathVariable("sid") String sid) {
         return sysUserFeign.delBySid(sid);
     }
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleVo.java b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleVo.java
index 3b1f21b..dceacaa 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleVo.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleVo.java
@@ -23,11 +23,11 @@ import lombok.Data;
 @Data
 public class SysUserRoleVo implements Vo {
 
-    
-	@ApiModelProperty("用户sid")
+
+    @ApiModelProperty("用户sid")
     private String userSid;
-    
-	@ApiModelProperty("角色sid")
+
+    @ApiModelProperty("角色sid")
     private String roleSid;
     private String name;
 }
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeign.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeign.java
index e479a5d..41697ff 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeign.java
+++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeign.java
@@ -30,8 +30,8 @@ public interface SysRoleFeign {
     @PostMapping("/listAll")
     public ResultBean<List<SysRoleVo>> listAll(@RequestBody SysRoleQuery query);
     @ApiOperation("查询所有的角色数据，并根据用户sid查询被选中的角色")
-    @PostMapping("/listAllByUserSid/{userSid}")
-    public ResultBean<List<SysRoleVo>> listAllByUserSid(@PathVariable("userSid") String userSid);
+    @PostMapping("/listAllByUserSid/{userSid}/{orgSid}")
+    public ResultBean<List<SysRoleVo>> listAllByUserSid(@PathVariable("userSid") String userSid,@PathVariable("orgSid") String orgSid);
 
     @ApiOperation("根据用户sid查询用户的角色列表")
     @PostMapping("/fetchByUserSid/{userSid}")
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeignFallback.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeignFallback.java
index b6ba06d..fedc9e2 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeignFallback.java
+++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysrole/SysRoleFeignFallback.java
@@ -24,7 +24,7 @@ public class SysRoleFeignFallback implements SysRoleFeign {
 	}
 
 	@Override
-	public ResultBean<List<SysRoleVo>> listAllByUserSid(String userSid) {
+	public ResultBean<List<SysRoleVo>> listAllByUserSid(String userSid, String orgSid) {
 		return null;
 	}
 
diff --git a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserVo.java b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserVo.java
index 3cde48e..8685a84 100644
--- a/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserVo.java
+++ b/oms/src/main/java/com/yxt/oms/feign/portal/sysuser/SysUserVo.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import com.yxt.oms.biz.func.sysrole.SysRoleVo;
+import com.yxt.oms.biz.func.sysuserrole.SysUserRoleVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -34,42 +35,42 @@ public class SysUserVo implements Vo {
     private static final long serialVersionUID = 2415131854581950721L;
     @ApiModelProperty("部门sid")
     private String departmentSid;
-	@ApiModelProperty("部门名称")
+    @ApiModelProperty("部门名称")
     private String departmentName;
     @ApiModelProperty("上级部门名称-本级部门名称 岗位名称")
     @JsonProperty("pNameAndDepartmentNameAndPostName")
     private String pNameAndDepartmentNameAndPostName;
-	@ApiModelProperty("岗位名称")
+    @ApiModelProperty("岗位名称")
     private String  postName;
-	@ApiModelProperty("岗位Sid")
+    @ApiModelProperty("岗位Sid")
     private String  postSid;
     @ApiModelProperty("单位sid")
     private String organizationSid;
-	@ApiModelProperty("单位名称")
+    @ApiModelProperty("单位名称")
     private String organizationName;
-	@ApiModelProperty("用户姓名")
+    @ApiModelProperty("用户姓名")
     private String name;
-	@ApiModelProperty("登录名，登录名不能相同")
+    @ApiModelProperty("登录名，登录名不能相同")
     private String userName;
 
     @ApiModelProperty("id")
     private Integer id;
-	@ApiModelProperty("用户sid")
+    @ApiModelProperty("用户sid")
     private String sid;
     @ApiModelProperty("是否是管理员：1管理员，2一般用户，0是超级管理员,3尚无单位人员")
     private String isAdmin;
     @ApiModelProperty("角色名称")
     private String roleName;
 
-	@ApiModelProperty("关联的人员sid")
+    @ApiModelProperty("关联的人员sid")
     private String staffSid;
-    
-	@ApiModelProperty("手机号")
+
+    @ApiModelProperty("手机号")
     private String mobile;
     @ApiModelProperty(value = "禁用状态")
     private String isEnable;
-    
-	@ApiModelProperty("用户类型:1员工、2客户、3供应商")
+
+    @ApiModelProperty("用户类型:1员工、2客户、3供应商")
     private String userType;
     @ApiModelProperty("用户类型:1、2、3")
     private String userTypeValue;
@@ -101,7 +102,7 @@ public class SysUserVo implements Vo {
     List<SysStaffOrgVo> sysOrganizationVos;
     private String orgSid;
     private String orgName;
-    private List<SysRoleVo> sysRoleVos;
+    private List<SysUserRoleVo> sysRoleVos;
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createTime;
     private String roles;//角色 ,分割

From 01010a88cbc696b0cbf3186447fd4853d6cf78e4 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Mon, 22 Jul 2024 14:57:22 +0800
Subject: [PATCH 08/10] pom

---
 gateway/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gateway/pom.xml b/gateway/pom.xml
index 06f8d9f..b1c0288 100644
--- a/gateway/pom.xml
+++ b/gateway/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.yxt.gateway</groupId>
-    <artifactId>omsgateway</artifactId>
+    <artifactId>oms-gateway</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

From 57c0b7023e03d975d7ae91bed10ed30f1ea7bb4b Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Tue, 23 Jul 2024 17:36:09 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/func/goodsspu/GoodsSpuService.java    | 21 +++++++++--
 .../biz/func/goodsspu/SalesGoodsQuery.java    |  2 ++
 .../oms/biz/func/goodsspu/SalesGoodsVo.java   | 26 ++++++++++++++
 .../SmsSalesBillDetailDetailsVo.java          | 20 +++++++++++
 .../smssalesbill/SmsSalesBillDetailsVo.java   | 14 ++++++++
 .../func/smssalesbill/SmsSalesBillDto.java    | 14 +++++++-
 .../WarehouseInventoryFeign.java              | 36 +++++++++++++++++++
 7 files changed, 129 insertions(+), 4 deletions(-)
 create mode 100644 oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java

diff --git a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java
index f76de80..46d94b9 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/GoodsSpuService.java
@@ -4,6 +4,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.oms.feign.goods.goodsSpu.GoodsSpuFeign;
+import com.yxt.oms.feign.warehouse.warehouseInventory.WarehouseInventoryFeign;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -21,11 +22,25 @@ import java.util.stream.Collectors;
  * @date 2024/2/26 13:40
  */
 @Service
-public class GoodsSpuService  {
-  private GoodsSpuFeign goodsSpuFeign;
+public class GoodsSpuService {
 
+    @Autowired
+    private GoodsSpuFeign goodsSpuFeign;
+    @Autowired
+    private WarehouseInventoryFeign warehouseInventoryFeign;
 
     public ResultBean<PagerVo<SalesGoodsVo>> getGoodsForSales(PagerQuery<SalesGoodsQuery> pq) {
-        return goodsSpuFeign.getGoodsForSales(pq);
+        ResultBean<PagerVo<SalesGoodsVo>> goodsForSales = goodsSpuFeign.getGoodsForSales(pq);
+        PagerVo<SalesGoodsVo> data = goodsForSales.getData();
+        List<SalesGoodsVo> records = data.getRecords();
+        if (!records.isEmpty()) {
+            for (SalesGoodsVo record : records) {
+                String count = warehouseInventoryFeign.selInventoryCountBySkuSid(record.getGoodsSkuSid());
+                record.setInventoryCount(count);
+            }
+        }
+        data.setRecords(records);
+        goodsForSales.setData(data);
+        return goodsForSales;
     }
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsQuery.java b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsQuery.java
index 2df5ca5..dd8f403 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsQuery.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsQuery.java
@@ -12,4 +12,6 @@ import lombok.Data;
 public class SalesGoodsQuery implements Query {
     private String goodsName;
     private String createOrgSid;
+    private String goodsSkuCode;
+    private String goodsSkuOwnSpec;
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsVo.java
index 46606c4..c162fe9 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsVo.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/goodsspu/SalesGoodsVo.java
@@ -3,6 +3,9 @@ package com.yxt.oms.biz.func.goodsspu;
 import com.yxt.common.core.vo.Vo;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author Fan
  * @description
@@ -59,4 +62,27 @@ public class SalesGoodsVo implements Vo {
      * 重量（kg）
      */
     private String weight;
+
+    /**
+     * 成本均价
+     */
+    private String costPrice;
+    /**
+     * 参考进价
+     */
+    private String standardPurchasePrice;
+    /**
+     * 实际可用库存
+     */
+    private String inventoryCount;
+
+    /**
+     * 图片
+     */
+    private List<String> pic = new ArrayList<>();
+
+    private String picUrl;
+
+
+
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailDetailsVo.java
index 515d236..5ee5fb5 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailDetailsVo.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailDetailsVo.java
@@ -31,6 +31,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Project: ss-sales(ss-sales) <br/>
  * File: SmsSalesBillDetailVo.java <br/>
@@ -90,4 +93,21 @@ public class SmsSalesBillDetailDetailsVo implements Vo {
     private String inventoryCount; // 库存数量
     @ApiModelProperty("备注")
     private String remarks; // 备注
+
+    @ApiModelProperty("批次号")
+    private String batchNumber; // 批次号
+    @ApiModelProperty("税率")
+    private String taxRate; // 库存数量
+    @ApiModelProperty("税额")
+    private String taxAmount; // 税额
+    @ApiModelProperty("未含税价")
+    private String unTaxPrice; // 未含税价
+    @ApiModelProperty("总税额（未含税总额）")
+    private String taxTotalAmount; // 总税额（未含税总额）
+    @ApiModelProperty("图片")
+    private String goodsImgUrl; // 图片
+    /**
+     * 图片
+     */
+    private List<String> pic = new ArrayList<>();
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java
index 8c039e4..6052d6a 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDetailsVo.java
@@ -165,4 +165,18 @@ public class SmsSalesBillDetailsVo implements Vo {
     @ApiModelProperty("付款凭证")
     private List<FileQueryUrl> files = new ArrayList<>(); // 付款凭证
 
+
+    //-------------补充-------------
+    @ApiModelProperty("快递公司sid")
+    private String logisticsNameSid; // 快递公司sid
+    @ApiModelProperty("收货人sid")
+    private String shipperSid; // 收货人sid
+    @ApiModelProperty("固定电话")
+    private String phone; // 固定电话
+    @ApiModelProperty("店铺sid")
+    private String shopSid; // 店铺sid
+    @ApiModelProperty("店铺名称")
+    private String shopName; // 店铺名称
+    @ApiModelProperty("订单号")
+    private String billNo; // 订单号
 }
diff --git a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java
index f77dcb7..b70c1d6 100644
--- a/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java
+++ b/oms/src/main/java/com/yxt/oms/biz/func/smssalesbill/SmsSalesBillDto.java
@@ -165,7 +165,19 @@ public class SmsSalesBillDto implements Dto {
     @ApiModelProperty("付款凭证")
     private List<FileQueryUrl> files = new ArrayList<>(); // 付款凭证
 
-
+    //-------------补充-------------
+    @ApiModelProperty("快递公司sid")
+    private String logisticsNameSid; // 快递公司sid
+    @ApiModelProperty("收货人sid")
+    private String shipperSid; // 收货人sid
+    @ApiModelProperty("固定电话")
+    private String phone; // 固定电话
+    @ApiModelProperty("店铺sid")
+    private String shopSid; // 店铺sid
+    @ApiModelProperty("店铺名称")
+    private String shopName; // 店铺名称
+    @ApiModelProperty("订单号")
+    private String billNo; // 订单号
 
 
 }
diff --git a/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java
new file mode 100644
index 0000000..d251fad
--- /dev/null
+++ b/oms/src/main/java/com/yxt/oms/feign/warehouse/warehouseInventory/WarehouseInventoryFeign.java
@@ -0,0 +1,36 @@
+package com.yxt.oms.feign.warehouse.warehouseInventory;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.oms.biz.func.warehouseinfo.SmsOrderHouseInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleFeign.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign <br/>
+ * Description: 角色. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:29 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "库存")
+@FeignClient(
+        contextId = "ss-common-warehouse-WarehouseInventory",
+        name = "ss-common-WarehouseInventory",
+        path = "/apiadmin/inventory/Warehouseinventory"
+      )
+public interface WarehouseInventoryFeign {
+    @ApiOperation("根据skuSid查询商品库存")
+    @PostMapping("/selInventoryCountBySkuSid")
+    public String selInventoryCountBySkuSid(@RequestParam("skuSid") String skuSid);
+}

From d308c2207f7be25b7780231c495f46f8f7371b82 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Wed, 24 Jul 2024 08:59:38 +0800
Subject: [PATCH 10/10] .gitignore

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 5f39bc0..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/oms-biz.iml
-/gateway/gateway.iml
-/oms/oms.iml