oms采购单、采购退货单

oms/src/main/java/com/yxt/oms/apiadmin/aggregation/PurchaseBillRest.java

@@ -0,0 +1,68 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _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.purchasebill.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = "采购单")
+@RestController
+@RequestMapping("/apiadmin/purchasebill")
+public class PurchaseBillRest {
+
+	@Autowired
+	private PurchaseBillService purchaseBillService;
+
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<PurchaseBillVo>> listPage(@RequestBody PagerQuery<PurchaseBillQuery> pq){
+		return purchaseBillService.listPageVo(pq);
+	}
+
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean<String> save(@RequestBody PurchaseBillDto dto){
+		return purchaseBillService.saveOrUpdateDto(dto);
+	}
+
+	@ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		return purchaseBillService.delAll(sids);
+	}
+
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<PurchaseBillDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		return purchaseBillService.fetchDetailsVoBySid(sid);
+	}
+}

oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRest.java

@@ -0,0 +1,172 @@
+package com.yxt.oms.apiadmin.aggregation;
+
+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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project: anrui_wms(门户建设) <br/>
+ * File: SysMenuFeignFallback.java <br/>
+ * Class: com.yxt.user.biz.sysmenu.SysMenuRest <br/>
+ * Description: 菜单表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "菜单表")
+@RestController
+@RequestMapping("apiadmin/sysmenu")
+public class SysMenuRest {
+
+    @Autowired
+    SysMenuService sysMenuService;
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SysMenuVo>> listPage(@RequestBody PagerQuery<SysMenuQuery> pq) {
+
+        return sysMenuService.listPageVo(pq);
+    }
+
+  /*  @Override
+    public ResultBean<List<SysMenuVo>> listAll(@RequestBody SysMenuQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        List<SysMenuVo> list = sysMenuService.listAllVo(query);
+        return rb.success().setData(list);
+    }*/
+
+    /**
+     * 菜单列表：根据资源归类
+     *
+     * @param query
+     * @return
+     */
+    @ApiOperation("菜单列表：根据资源归类")
+    @PostMapping("/listAllVoForSource")
+    public ResultBean<List<SysMenuTreeVo>> listAllVoForSource(@RequestBody SysMenuQuery query){
+        return sysMenuService.listAllVoForSource(query);
+    }
+
+    /**
+     * 菜单列表：根据资源归类 设置功能的url用
+     * @return
+     */
+    @ApiOperation("菜单列表：根据资源归类 设置功能的url用")
+    @PostMapping("/getMenusForFunction")
+    public ResultBean<List<Map<String,String>>> getMenusForFunction(@RequestBody SysMenuFunctionQuery sysMenuFunctionQuery) {
+        return sysMenuService.getMenusForFunction(sysMenuFunctionQuery);
+    }
+    private void makeMenuListForChildren(SysMenuTreeVo s, List<Map<String,String>> l){
+        List<SysMenuTreeVo> children = s.getChildren();
+        int size = children.size();
+        for (int i=0;i<size;i++){
+            makeMenuListForChildren( children.get(i), l) ;
+        }
+        String menuUrl = s.getMenuUrl();
+        if(StringUtils.isNotBlank(menuUrl)){
+            Map<String,String> m=new HashMap<>();
+            m.put("name",s.getName());
+            m.put("url",s.getMenuUrl());
+            m.put("sid",s.getSid());
+            l.add(m);
+        }
+
+    }
+    @ApiOperation("根据用户sid查询所有数据列表 ")
+    @PostMapping("/sourceMenuTreeByUserSid")
+    public ResultBean<List<Map<String, Object>>> sourceMenuTreeByUserSid(@RequestBody SysMenuQuery query){
+        return sysMenuService.sourceMenuTreeByUserSid(query);
+    }
+    @ApiOperation("根据资源sid查询所有数据列表 ")
+    @PostMapping("/sourcemenutree")
+    public ResultBean<List<Map<String, Object>>> sourcemenutree(@RequestBody SysMenuQuery query) {
+
+        return sysMenuService.sourcemenutree(query);
+    }
+
+    @ApiOperation("根据角色sid条件查询所有数据列表")
+    @PostMapping("/listAllByRoleSid")
+    public ResultBean<List<SysMenuVo>> listAllByRoleSid(@RequestBody SysMenuQuery query) {
+        return sysMenuService.listAllByRoleSid(query);
+    }
+
+
+    public ResultBean<List<SysMenuVo>> list() {
+        ResultBean rb = ResultBean.fireFail();
+        return sysMenuService.listVo();
+    }
+
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@Valid @RequestBody SysMenuDto dto) {
+        return sysMenuService.saveMenu(dto);
+    }
+
+    @ApiOperation("修改保存")
+    @PostMapping("/update/{sid}")
+    public ResultBean update(@Valid @RequestBody SysMenuDto dto, @PathVariable("sid") String sid){
+        return sysMenuService.updateBySid(dto, sid);
+    }
+
+    /**
+     * 修改是否可用的状态
+     *
+     * @param sid      菜单sid或资源sid
+     * @param isEnable 是否可用的状态：1可用，0不可用
+     * @return
+     */
+    @ApiOperation("修改是否可用的状态 ")
+    @PostMapping("/updateIsEnable/{sid}/{isEnable}")
+    public ResultBean updateIsEnable(@PathVariable("sid") String sid, @PathVariable("isEnable") Integer isEnable) {
+        return sysMenuService.updateIsEnable(sid,isEnable);
+    }
+
+ /*   @Override
+    public ResultBean del(String ids) {
+        ResultBean rb = ResultBean.fireFail();
+        sysMenuService.delByIds(ids);
+        return rb.success();
+    }*/
+    /**
+     * 根据当前行sid删除菜单
+     *
+     * @param sid 菜单sid
+     * @return
+     */
+    @ApiOperation("删除记录 根据sid")
+    @GetMapping("/delBySids/{sid}")
+    public ResultBean delBySids(@PathVariable("sid") String sid) {
+        return sysMenuService.delBySids(sid);
+    }
+
+ /*   @Override
+    public ResultBean<SysMenuVo> fetch(String id) {
+        ResultBean rb = ResultBean.fireFail();
+        SysMenuVo vo = sysMenuService.fetchByIdVo(id);
+        return rb.success().setData(vo);
+    }
+
+
+    public ResultBean<SysMenuVo> fetchBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        SysMenu sysMenu = sysMenuService.fetchBySid(sid);
+        SysMenuVo vo = new SysMenuVo();
+        BeanUtil.copyProperties(sysMenu, vo);
+        return rb.success().setData(vo);
+    }*/
+}

oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysMenuRoleRest.java

@@ -0,0 +1,115 @@
+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.wms.biz.func.sysrole.SysRoleService;
+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;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysmenurole.SysMenuRoleRest <br/>
+ * Description: 菜单与角色关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "菜单与角色关联表")
+@RestController
+@RequestMapping("apiadmin/sysmenurole")
+public class SysMenuRoleRest {
+    @Autowired
+    private SysMenuRoleService sysMenuRoleService;
+    @Autowired
+    private SysRoleService sysRoleService;
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SysMenuRoleVo>> listPage(@RequestBody PagerQuery<SysMenuRoleQuery> pq){
+        return sysMenuRoleService.listPageVo(pq);
+    }
+
+
+    @ApiOperation("根据条件查询所有数据列表")
+    @PostMapping("/listAll")
+    public ResultBean<List<SysMenuRoleVo>> listAll(@RequestBody SysMenuRoleQuery query){
+        return sysMenuRoleService.listAllVo(query);
+    }
+
+    @ApiOperation("根据角色查询授权的菜单列表(PC)")
+    @PostMapping("/selMenuByRole")
+    public ResultBean<List<SysMenuRoleDataVo>> selMenuByRole(@RequestBody SysMenuRoleDataQuery query) {
+        return sysMenuRoleService.selMenuByRole(query);
+    }
+
+    @ApiOperation("根据角色查询授权的菜单列表(APP)")
+    @PostMapping("/selMenuByRoleApp")
+    public ResultBean<List<SysMenuRoleDataVo>> selMenuByRoleApp(@RequestBody SysMenuRoleDataQuery query) {
+        return sysMenuRoleService.selMenuByRoleApp(query);
+    }
+
+    @ApiOperation("修改角色菜单的数据权限（PC）")
+    @PostMapping("/updateDataByRoleMenu")
+    public ResultBean updateDataByRoleMenu(@RequestBody List<SysMenuRoleDataDto> dtos) {
+        return sysMenuRoleService.updateDataByRoleMenu(dtos);
+    }
+
+    @ApiOperation("修改角色菜单的数据权限（移动端）")
+    @PostMapping("/updateDataByRoleMenuApp")
+    public ResultBean updateDataByRoleMenuApp(@RequestBody List<SysMenuRoleDataDto> dtos) {
+        return sysMenuRoleService.updateDataByRoleMenuApp(dtos);
+    }
+
+
+    @ApiOperation("所有数据列表")
+    @GetMapping("/list")
+    public ResultBean<List<SysMenuRoleVo>> list(){
+        return sysMenuRoleService.listVo();
+    }
+
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody SysMenuRoleDto dto){
+        return sysMenuRoleService.saveOrUpdateDto(dto);
+    }
+
+    @ApiOperation("修改保存")
+    @PostMapping("/update/{sid}")
+    public ResultBean update(@RequestBody SysMenuRoleDto dto,@PathVariable("sid") String sid){
+        ResultBean rb = ResultBean.fireFail();
+        return sysMenuRoleService.updateBySid(dto,sid);
+    }
+
+
+    @ApiOperation("修改角色的菜单配置")
+    @PostMapping("/updateRoleAndMenu")
+    public ResultBean updateRoleAndMenu(@RequestBody SysMenuRoleDto dto) {
+
+        return sysMenuRoleService.updateRoleAndMenu(dto);
+    }
+
+
+    @ApiOperation("删除记录")
+    @GetMapping("/del/{ids}")
+    public ResultBean del(@PathVariable("ids") String ids){
+        return sysMenuRoleService.del(ids);
+    }
+
+
+    @ApiOperation("获取一条记录")
+    @GetMapping("/fetch/{id}")
+    public ResultBean<SysMenuRoleVo> fetch(@PathVariable("id") String id){
+        return sysMenuRoleService.fetchByIdVo(id);
+    }
+}

oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysOrganizationRest.java

@@ -0,0 +1,267 @@
+package com.yxt.oms.apiadmin.aggregation;
+
+import com.yxt.common.base.config.RedisUtil;
+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.sysorganization.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysOrganizationFeignFallback.java <br/>
+ * Class: SysOrganizationRest <br/>
+ * Description: 组织机构表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "组织机构表")
+@RestController
+@RequestMapping("apiadmin/sysorganization")
+public class SysOrganizationRest {
+
+    @Autowired
+    private SysOrganizationService sysOrganizationService;
+
+    @Autowired
+    private RedisUtil redisUtil;
+
+    @PostMapping("/saveSysOrg")
+    public ResultBean saveOrg(@RequestBody SysOrganizationDto dto){
+        return sysOrganizationService.saveOrg(dto);
+    }
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SysOrganizationVo>> listPage(@RequestBody PagerQuery<SysOrganizationQuery> pq) {
+        return sysOrganizationService.listPageVo(pq);
+    }
+
+    @ApiOperation("根据条件查询所有数据列表")
+    @PostMapping("/listAll")
+    public ResultBean<List<SysOrganizationVo>> listAll(@RequestBody SysOrganizationQuery query) {
+        return sysOrganizationService.listAllVo(query);
+    }
+
+    @ApiOperation("所有数据列表")
+    @GetMapping("/list")
+    public ResultBean<List<SysOrganizationVo>> list() {
+        return sysOrganizationService.listVo();
+    }
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody SysOrganizationDto dto) {
+        return sysOrganizationService.saveOrUpdateDto(dto);
+    }
+
+    @ApiOperation("一级组织机构列表")
+    @GetMapping("/selectFirstOrgList")
+    public ResultBean<List<SysOrganizationVo>> selectFirstOrgList(){
+        return sysOrganizationService.selectFirstOrgList();
+    }
+
+    @ApiOperation("根据父级sid查询子集列表")
+    @GetMapping("/selectChildrenListBySid/{sid}")
+    public ResultBean<List<SysOrganizationVo>> selectChildrenListBySid(@PathVariable("sid") String sid) {
+        return sysOrganizationService.selectChildrenListBySid(sid);
+    }
+
+
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean update(SysOrganizationDto dto, String sid){
+        return sysOrganizationService.updateBySid(dto, sid);
+    }
+
+    @ApiOperation("删除记录")
+    @GetMapping("/del/{ids}")
+    public ResultBean del(@PathVariable("ids") String ids){
+        return sysOrganizationService.del(ids);
+    }
+
+    @ApiOperation("删除记录 根据sid")
+    @GetMapping("/delBySid/{sid}")
+    public ResultBean delBySid(@PathVariable("sid") String sid){
+
+        return sysOrganizationService.deIds(sid);
+    }
+
+    @ApiOperation("获取一条记录")
+    @GetMapping("/fetch/{id}")
+    public ResultBean<SysOrganizationVo> fetch(@PathVariable("id") String id){
+        return sysOrganizationService.fetchByIdVo(id);
+    }
+
+    @ApiOperation("获取一条记录 根据sid")
+    @ResponseBody
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<SysOrganizationVo> fetchBySid(@PathVariable("sid") String sid){
+        ResultBean rb = ResultBean.fireFail();
+
+        return sysOrganizationService.fetchBySidVo(sid);
+    }
+
+    @ApiOperation("手机获取组织架构")
+    @ResponseBody
+    @GetMapping("/selectAppOrganization")
+    public ResultBean<Map<String, Object>> selectAppOrganization(@RequestParam(value = "sid", required = false) String sid) {
+        return sysOrganizationService.selectAppOrganization(sid);
+    }
+
+
+    @ApiOperation("组织架构")
+    @ResponseBody
+    @GetMapping("/selectListOrg")
+    ResultBean<List<SysOrgVo>> selectListOrg(){
+        return sysOrganizationService.treeList();
+    }
+
+
+    @ApiOperation("获取到分公司")
+    @ResponseBody
+    @GetMapping("/getListOrg")
+    ResultBean<List<SysOrgVo>> getListOrg(){
+        return sysOrganizationService.getListOrg();
+    }
+
+    @ApiOperation("获取同品牌下分公司")
+    @ResponseBody
+    @GetMapping("/getListOrgByBrand/{orgSid}")
+    ResultBean<List<SysOrgVo>> getListOrgByBrand(@PathVariable(value = "orgSid") String orgSid){
+        return null;//sysOrganizationService.getListOrgByBrand(orgSid);
+    }
+
+    @ApiOperation("获取指定品牌下分公司(已筛选本分公司)")
+    @ResponseBody
+    @GetMapping("/getListOrgByBrandSid/{orgSid}/{brandSid}")
+    ResultBean<List<SysOrgVo>> getListOrgByBrandSid(@PathVariable(value = "orgSid") String orgSid,@PathVariable(value = "brandSid") String brandSid){
+        return null;//sysOrganizationService.getListOrgByBrandSid(orgSid,brandSid);
+    }
+
+    @ApiOperation("获取指定品牌下分公司(未筛选本分公司)")
+    @ResponseBody
+    @GetMapping("/getListOrgByBrandSidNo/{orgSid}/{brandSid}")
+    ResultBean<List<SysOrgVo>> getListOrgByBrandSidNo(@PathVariable(value = "orgSid") String orgSid,@PathVariable(value = "brandSid") String brandSid){
+        return null;//sysOrganizationService.getListOrgByBrandSidNo(orgSid,brandSid);
+    }
+
+    @ApiOperation("获取指定分公司下部门信息")
+    @ResponseBody
+    @GetMapping("/getListDeptByOrgSid/{orgSid}")
+    ResultBean<List<SysOrgVo>> getListDeptByOrgSid(@PathVariable(value = "orgSid") String orgSid){
+        return sysOrganizationService.getListDeptByOrgSid(orgSid);
+    }
+
+
+    @ApiOperation("根据业务员sid获取到分公司")
+    @ResponseBody
+    @GetMapping("/getUseOrgByUserSid")
+    ResultBean<SysOrganizationVo> getUseOrgByUserSid(@RequestParam("userSid") String userSid){
+        ResultBean<SysOrganizationVo> rb = ResultBean.fireFail();
+        SysOrganizationVo vo = sysOrganizationService.getUseOrgByUserSid(userSid);
+        return rb.success().setData(vo);
+    }
+
+
+    @ApiOperation("根据部门sid查询组织信息")
+    @ResponseBody
+    @GetMapping("/selectBySid")
+    ResultBean<SysOrganization> selectBySid(@RequestParam("sid") String sid){
+        return sysOrganizationService.selectBySid(sid);
+    }
+
+
+    @ApiOperation("根据组织架构sid查询组织下所有分公司")
+    @ResponseBody
+    @GetMapping("/selectUseOrgSidBySid")
+    ResultBean<List<Map<String, String>>> selectUseOrgSidBySid(@RequestParam("sid") String sid){
+        return sysOrganizationService.selectUseOrgSidBySid(sid);
+    }
+
+    /**
+     * 查询公司所有的部门
+     *
+     * @return
+     */
+    @ApiOperation("所在部门下拉")
+    @ResponseBody
+    @GetMapping("/selectListOne")
+    ResultBean<List<SysOrgListVo>> selectListOne(){
+        return sysOrganizationService.selectListOne();
+    }
+
+    @PostMapping("/getQrCode/{sid}")
+    @ResponseBody
+    @ApiOperation("查看二维码")
+    public ResultBean<QrCodeVo> getQrCode(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid) {
+        return sysOrganizationService.getQrCode(sid);
+    }
+
+
+    @GetMapping("/getOrgSid/{sid}")
+    @ResponseBody
+    @ApiOperation("根据当前用户的所在组织获取当前用户所在的分公司")
+    ResultBean<String> getOrgSid(@PathVariable(value = "sid") String sid){
+        return sysOrganizationService.getOrgSid(sid);
+    }
+
+    @GetMapping("/selectOrgList")
+    @ResponseBody
+    @ApiOperation("当前分公司销售部门及部门人员")
+    ResultBean<List<SysOrganizationListVo>> selectOrgList(@SpringQueryMap SysOrganizationListQuery query){
+        return sysOrganizationService.selectOrgList(query);
+    }
+
+
+    @GetMapping("/selectOrgLists")
+    @ResponseBody
+    @ApiOperation("当前分公司下所有部门")
+    ResultBean<List<SysOrganizationListsVo>> selectOrgLists(@SpringQueryMap SysOrganizationListQuery query){
+        return sysOrganizationService.selectOrgLists(query);
+    }
+
+
+    @GetMapping("/selectByPSid")
+    @ResponseBody
+    @ApiOperation("查询分公司下的销售支持部")
+    ResultBean<SysOrganizationVo> selectByPSid(@RequestParam("sid") String sid, @RequestParam("name") String name){
+        return sysOrganizationService.selectByPSid(sid,name);
+    }
+
+    @GetMapping("/selectOrgSidList")
+    @ResponseBody
+    @ApiOperation("所有分公司sid")
+    ResultBean<List<SysOrganizationVo>> selectOrgSidList() {
+        return sysOrganizationService.selectOrgSidList();
+    }
+
+
+    @GetMapping("/selectOrgByPSid")
+    @ResponseBody
+    @ApiOperation("查询事业部下所有分公司")
+    ResultBean<List<SysOrganizationVo>> selectOrgByPSid(@RequestParam("psid") String psid){
+        return sysOrganizationService.selectOrgByPSid(psid);
+    }
+
+
+    @GetMapping("/selectByOrgSidPath")
+    @ResponseBody
+    @ApiOperation("组织层级分页查询")
+    ResultBean<SysOrganizationVo> selectByOrgSidPath(@RequestParam("orgSidPath") String orgSidPath){
+        return sysOrganizationService.selectByOrgSidPath(orgSidPath);
+    }
+}

oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysPostRest.java

@@ -0,0 +1,118 @@
+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 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;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysPostFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.biz.syspost.SysPostRest <br/>
+ * Description: 岗位. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "岗位")
+@RestController
+@RequestMapping("apiadmin/syspost")
+public class SysPostRest {
+
+    @Autowired
+    private SysPostService sysPostService;
+
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SysPostVo>> listPage(@RequestBody PagerQuery<SysPostQuery> pq) {
+        return sysPostService.listPageVo(pq);
+    }
+
+    @ApiOperation("根据条件查询所有数据列表")
+    @PostMapping("/listAll")
+    public ResultBean<List<SysPostVo>> listAll(@RequestBody SysPostQuery query){
+        return sysPostService.listAllVo(query);
+    }
+
+
+    @ApiOperation("所有数据列表")
+    @GetMapping("/list")
+    public ResultBean<List<SysPostVo>> list() {
+        return sysPostService.listVo();
+    }
+
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody SysPostDto dto){
+        return sysPostService.saveOrUpdateDto(dto);
+    }
+
+
+    @ApiOperation("修改保存")
+    @PostMapping("/update/{sid}")
+    public ResultBean update(@RequestBody SysPostDto dto, @PathVariable("sid") String sid){
+        return sysPostService.updateBySid(dto, sid);
+    }
+
+    @ApiOperation("删除记录")
+    @GetMapping("/del/{ids}")
+    public ResultBean del(@PathVariable("ids") String ids){
+        return sysPostService.del(ids);
+    }
+
+
+    @ApiOperation("删除记录")
+    @GetMapping("/delBySids/{sids}")
+    public ResultBean delBySids(@PathVariable("sids") String sids){
+        return sysPostService.delBySids(sids);
+    }
+
+
+    @ApiOperation("获取一条记录")
+    @GetMapping("/fetch/{id}")
+    public ResultBean<SysPostVo> fetch(@PathVariable("id") String id){
+        return sysPostService.fetchByIdVo(id);
+    }
+
+
+    @ApiOperation("获取一条记录")
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<SysPostVo> fetchBySid(@PathVariable("sid") String sid){
+        return sysPostService.fetchBySidVo(sid);
+    }
+
+
+    @ApiOperation("根据部门sid获取岗位列表")
+    @GetMapping("/fetchByOrgSid/{orgSid}")
+    public ResultBean<List<SysPostVo>> fetchByOrgSid(@PathVariable("orgSid") String orgSid){
+        return sysPostService.fetchByOrgSid(orgSid);
+    }
+
+    @ApiOperation("根据部门sid获取岗位编号")
+    @GetMapping("/fetchByOrgSidPostCode/{orgSid}")
+    public ResultBean<String> fetchByOrgSidPostCode(){
+        return sysPostService.fetchByOrgSidPostCode();
+    }
+
+    /**
+     * 查询岗位列表
+     *
+     * @return
+     */
+    @ApiOperation("查询岗位列表")
+    @GetMapping("/selectList")
+    public ResultBean<List<SysPostListVo>> selectList() {
+        return sysPostService.selectList();
+    }
+}

oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleAuthorizeRest.java

@@ -0,0 +1,29 @@
+package com.yxt.oms.apiadmin.aggregation;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.wms.biz.func.sysroleauthorize.SysRoleAuthorizeDto;
+import com.yxt.wms.biz.func.sysroleauthorize.SysRoleAuthorizeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author wangpengfei
+ * @date 2024/5/15 16:00
+ */
+@Api(tags = "角色授权表")
+@RestController
+@RequestMapping("apiadmin/sysrikeauthorize")
+public class SysRoleAuthorizeRest {
+    @Autowired
+    SysRoleAuthorizeService sysRoleAuthorizeService;
+    @ApiOperation("修改角色的菜单配置")
+    @PostMapping("/updateRoleAndMenu")
+    public ResultBean updateRoleAndMenu(@RequestBody SysRoleAuthorizeDto dto){
+        return sysRoleAuthorizeService.updateRoleAndMenu(dto);
+    }
+}

oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysRoleRest.java

@@ -0,0 +1,117 @@
+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.wms.biz.func.sysrole.SysRoleDto;
+import com.yxt.wms.biz.func.sysrole.SysRoleQuery;
+import com.yxt.wms.biz.func.sysrole.SysRoleService;
+import com.yxt.wms.biz.func.sysrole.SysRoleVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysrole.SysRoleRest <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 = "角色")
+@RestController
+@RequestMapping("apiadmin/sysrole")
+public class SysRoleRest {
+
+	@Autowired
+	private SysRoleService sysRoleService;
+
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<SysRoleVo>> listPage(@RequestBody PagerQuery<SysRoleQuery> pq){
+		return sysRoleService.listPageVo(pq);
+	}
+
+
+	@ApiOperation("根据条件查询所有数据列表")
+	@PostMapping("/listAll")
+	public ResultBean<List<SysRoleVo>> listAll(@RequestBody SysRoleQuery query){
+		return sysRoleService.listAllVo(query);
+	}
+
+
+	@ApiOperation("查询所有的角色数据，并根据用户sid查询被选中的角色")
+	@PostMapping("/listAllByUserSid/{userSid}")
+	public ResultBean<List<SysRoleVo>> listAllByUserSid(@PathVariable("userSid") String userSid){
+		return sysRoleService.listAllByUserSid(userSid);
+	}
+
+
+	@ApiOperation("根据用户sid查询用户的角色列表")
+	@PostMapping("/fetchByUserSid/{userSid}")
+	public ResultBean<List<SysRoleVo>> fetchByUserSid(@PathVariable("userSid") String userSid){
+		return sysRoleService.fetchByUserSid(userSid);
+	}
+
+
+	public ResultBean<List<SysRoleVo>> list(){
+		return sysRoleService.listVo();
+	}
+
+
+	@ApiOperation("新增保存")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody SysRoleDto dto){
+		return sysRoleService.saveOrUpdateDto(dto);
+	}
+
+
+	@ApiOperation("修改保存")
+	@PostMapping("/update/{sid}")
+	public ResultBean update(@RequestBody SysRoleDto dto,@PathVariable("sid") String sid){
+		return sysRoleService.updateBySid(dto,sid);
+	}
+
+
+	@ApiOperation("删除记录")
+	@GetMapping("/del/{ids}")
+	public ResultBean del(@PathVariable("ids") String ids){
+		return sysRoleService.del(ids);
+	}
+
+	@ApiOperation("删除记录根据sids")
+	@GetMapping("/delBySids/{sids}")
+	public ResultBean delBySids(@PathVariable("sids") String sids){
+		return sysRoleService.delBySid(sids);
+	}
+
+	@ApiOperation("获取一条记录")
+	@GetMapping("/fetch/{id}")
+	public ResultBean<SysRoleVo> fetch(@PathVariable("id") String id){
+		return sysRoleService.fetchByIdVo(id);
+	}
+
+	@ApiOperation("获取一条记录根据sid")
+	@GetMapping("/fetchBySid/{sid}")
+	public ResultBean<SysRoleVo> fetchBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return sysRoleService.fetchBySidVo(sid);
+	}
+
+	@PostMapping("/setIsEnable/{sid}/{isEnable}")
+	@ResponseBody
+	@ApiOperation(value = "设置是否可用：isEnable：1可用，0不可用")
+	public ResultBean setIsEnable(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @ApiParam(value = "isEnable", required = true) @PathVariable("isEnable") String isEnable){
+		return sysRoleService.updateIsEnable(sid, isEnable);
+	}
+}

oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysStaffOrgRest.java

@@ -0,0 +1,22 @@
+package com.yxt.oms.apiadmin.aggregation;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.wms.biz.func.sysstafforg.SysStaffOrgService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/apiadmin/sysstafforg")
+public class SysStaffOrgRest {
+
+    @Autowired
+    private SysStaffOrgService sysStaffOrgService;
+
+    @GetMapping("/getOrgSidByPath")
+    @ResponseBody
+    @ApiOperation("根据用户组织全路径获取用户的分公司sid")
+    ResultBean<String> getOrgSidByPath(@RequestParam("orgPath") String orgPath){
+        return sysStaffOrgService.getOrgSidByPath(orgPath);
+    };
+}

oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysUserRest.java

@@ -0,0 +1,96 @@
+package com.yxt.oms.apiadmin.aggregation;
+
+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.biz.func.sysuser.SysUserService;
+import com.yxt.oms.feign.portal.sysuser.SysUserDto;
+import com.yxt.oms.feign.portal.sysuser.SysUserQuery;
+import com.yxt.oms.feign.portal.sysuser.SysUserVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author wangpengfei
+ * @date 2024/5/6 10:29
+ */
+@Api(tags = "用户信息")
+@RestController
+@RequestMapping("/apiadmin/sysuser")
+public class SysUserRest {
+    @Autowired
+    SysUserService sysUserService;
+
+
+    @PostMapping("/login")
+    @ResponseBody
+    @ApiOperation(value = "3、登录")
+    @ApiOperationSupport(order = 30)
+    public ResultBean<SysUserVo> login(@RequestBody SysUserQuery userQuery){
+        return sysUserService.login(userQuery);
+    }
+    @PostMapping("/register")
+    @ResponseBody
+    @ApiOperation(value = "3、注册")
+    @ApiOperationSupport(order = 30)
+    public ResultBean register(@RequestBody SysUserDto dto){
+        return sysUserService.register(dto);
+    }
+    @PostMapping("/loginDetails")
+    @ResponseBody
+    @ApiOperation(value = "获取登录人")
+    @ApiOperationSupport(order = 30)
+    public ResultBean<SysUserVo> loginDetails(HttpServletRequest httpServletRequest){
+        return sysUserService.loginDetails(httpServletRequest);
+    }
+    @PostMapping("/sendMessageCode")
+    @ResponseBody
+    @ApiOperation(value = "3、获取注册码")
+    public ResultBean sendMessageCode(@RequestParam("mobile") String mobile){
+        return sysUserService.sendMessageCode(mobile);
+    }
+    @PostMapping("/sendMessageLogin")
+    @ResponseBody
+    @ApiOperation(value = "3、获取登录码")
+    public ResultBean sendMessageLogin(@RequestParam("mobile") String mobile){
+        return sysUserService.sendMessageLogin(mobile);
+    }
+    @PostMapping("/sendMessageUpdate")
+    @ResponseBody
+    @ApiOperation(value = "3、获取修改码")
+    public ResultBean sendMessageUpdate(@RequestParam("mobile") String mobile){
+        return sysUserService.sendMessageUpdate(mobile);
+    }
+
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean listPage(@RequestBody PagerQuery<SysUserQuery> pq){
+        return sysUserService.listPage(pq);
+    }
+
+    @PostMapping("/bindOrganization")
+    @ResponseBody
+    @ApiOperation(value = "绑定组织")
+    @ApiOperationSupport(order = 30)
+    public ResultBean bindOrganization(@RequestBody SysUserDto dto){
+        return  sysUserService.bindOrganization(dto);
+    }
+    @PostMapping("/selOrganization")
+    @ResponseBody
+    @ApiOperation(value = "选择所登录的组织")
+    @ApiOperationSupport(order = 30)
+    public ResultBean selOrganization(@RequestBody SysUserDto dto){
+        return  sysUserService.selOrganization(dto);
+    }
+    @PostMapping("/setIsEnable/{sid}/{isEnable}")
+    @ResponseBody
+    @ApiOperation(value = "设置是否可用：isEnable：1可用，0不可用")
+    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);
+    }
+}

oms/src/main/java/com/yxt/oms/apiadmin/aggregation/SysUserRoleRest.java

@@ -0,0 +1,91 @@
+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.sysuserrole.SysUserRoleDto;
+import com.yxt.oms.biz.func.sysuserrole.SysUserRoleQuery;
+import com.yxt.oms.biz.func.sysuserrole.SysUserRoleService;
+import com.yxt.oms.biz.func.sysuserrole.SysUserRoleVo;
+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;
+
+@Api(tags = "用户与角色关联表")
+@RestController
+@RequestMapping("apiadmin/sysuserrole")
+public class SysUserRoleRest {
+
+    @Autowired
+    private SysUserRoleService sysUserRoleService;
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<SysUserRoleVo>> listPage(@RequestBody PagerQuery<SysUserRoleQuery> pq){
+        return sysUserRoleService.listPageVo(pq);
+    }
+
+    @ApiOperation("根据条件查询所有数据列表")
+    @PostMapping("/listAll")
+    public ResultBean<List<SysUserRoleVo>> listAll(@RequestBody SysUserRoleQuery query){
+        return sysUserRoleService.listAllVo(query);
+    }
+
+    @ApiOperation("所有数据列表")
+    @GetMapping("/list")
+    public ResultBean<List<SysUserRoleVo>> list(){
+        return sysUserRoleService.listVo();
+    }
+
+    @ApiOperation("新增保存")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody SysUserRoleDto dto){
+        return sysUserRoleService.saveOrUpdateDto(dto);
+    }
+
+    @ApiOperation("修改保存")
+    @PostMapping("/update")
+    public ResultBean update(@RequestBody SysUserRoleDto dto){
+        return sysUserRoleService.saveOrUpdate(dto);
+    }
+
+    @ApiOperation("删除记录")
+    @GetMapping("/del/{ids}")
+    public ResultBean del(@PathVariable("ids") String ids){
+        return sysUserRoleService.del(ids);
+    }
+
+    @ApiOperation("根据用户sid和角色sid删除记录")
+    @GetMapping("/delByUserSidAndRoleSid/{userSid}/{roleSid}")
+    public ResultBean delByUserSidAndRoleSid(@PathVariable("userSid")String userSid,
+                                             @PathVariable("roleSid")String roleSid) {
+        return sysUserRoleService.delByUserSidAndRoleSid(userSid,roleSid);
+    }
+
+    @ApiOperation("获取一条记录")
+    @GetMapping("/fetch/{id}")
+    public ResultBean<SysUserRoleVo> fetch(@PathVariable("id") String id){
+        return sysUserRoleService.fetchByIdVo(id);
+    }
+
+    @ApiOperation("根据用户sid查询用户角色sid列表")
+    @GetMapping("/getUserRoleSidByUserSid/{userSid}")
+    public ResultBean<List<String>> getUserRoleSidByUserSid(@PathVariable("userSid") String userSid) {
+        return sysUserRoleService.getUserRoleSidByUserSid(userSid);
+    }
+
+    @ApiOperation("根据角色sid查询用户id列表")
+    @GetMapping("/getUserIdListByRoleSid")
+    public ResultBean<List<String>> getUserIdListByRoleSid(@RequestParam("roleList") List<String> roleList) {
+        return sysUserRoleService.getUserIdListByRoleSid(roleList);
+    }
+
+    @ApiOperation("查询用户的角色")
+    @GetMapping("/selectByUserSid")
+    ResultBean<List<String>> selectByUserSid(@RequestParam("userSid") String userSid) {
+        return sysUserRoleService.selectByUserSids(userSid);
+    }
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBill.java

@@ -0,0 +1,102 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebill;
+
+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: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBill.java <br/>
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBill <br/>
+ * Description: 采购单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单", description = "采购单")
+@TableName("purchase_bill")
+public class PurchaseBill extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+    @ApiModelProperty("来源单sid（工单sid）")
+    private String sourceBillSid; // 来源单sid（工单sid）
+    @ApiModelProperty("来源单编号/外部编号")
+    private String sourceBillNo; // 来源单编号/外部编号
+    @ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+    @ApiModelProperty("采购类型Key")
+    private String purchaseTypeKey; // 采购类型Key
+    @ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
+    private String purchaseTypeValue; // 采购类型Value（厂家采购、外采、其他）
+    @ApiModelProperty("采购原因key")
+    private String purchaseReasonKey; // 采购原因key
+    @ApiModelProperty("采购原因（储备/客户订单/在修车辆）")
+    private String purchaseReasonValue; // 采购原因（储备/客户订单/在修车辆）
+    @ApiModelProperty("付款方式key")
+    private String payTypeKey; // 付款方式key
+    @ApiModelProperty("付款方式value（预付款/月结/单笔付款）")
+    private String payTypeValue; // 付款方式value（预付款/月结/单笔付款）
+    @ApiModelProperty("供应商sid")
+    private String supplierSid; // 供应商sid
+    @ApiModelProperty("供应商名称")
+    private String supplierName; // 供应商名称
+    @ApiModelProperty("供应商联系电话")
+    private String supplierPhone; // 供应商联系电话
+    @ApiModelProperty("采购员sid（单选）")
+    private String purchaserSid; // 采购员sid（单选）
+    @ApiModelProperty("采购员姓名")
+    private String purchaserName; // 采购员姓名
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("预计到货日期")
+    private Date deliveryDate; // 预计到货日期
+    @ApiModelProperty("仓库sid")
+    private String wareHouseSid;
+    @ApiModelProperty("仓库名称")
+    private String wareHouseName;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+    @ApiModelProperty("创建部门sid")
+    private String deptSid;
+    @ApiModelProperty("创建部门")
+    private String deptName;
+
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDetailsVo.java

@@ -0,0 +1,103 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebill;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import com.yxt.oms.biz.func.purchasebillamount.PurchaseBillAmountDetailsVo;
+import com.yxt.oms.biz.func.purchasebilldetail.PurchaseBillDetailDetailsVo;
+import com.yxt.oms.biz.func.purchasebillextend.PurchaseBillExtendDetailsVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@ApiModel(value = "采购单 视图数据详情", description = "采购单 视图数据详情")
+public class PurchaseBillDetailsVo implements Vo {
+
+    private String sid;
+
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("制单人sid")
+    private String createBySid;
+    @ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+    @ApiModelProperty("来源单sid（工单sid）")
+    private String sourceBillSid; // 来源单sid（工单sid）
+    @ApiModelProperty("来源单编号/外部编号")
+    private String sourceBillNo; // 来源单编号/外部编号
+    @ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+    @ApiModelProperty("采购类型Key")
+    private String purchaseTypeKey; // 采购类型Key
+    @ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
+    private String purchaseTypeValue; // 采购类型Value（厂家采购、外采、其他）
+    @ApiModelProperty("采购原因key")
+    private String purchaseReasonKey; // 采购原因key
+    @ApiModelProperty("采购原因（储备/客户订单/在修车辆）")
+    private String purchaseReasonValue; // 采购原因（储备/客户订单/在修车辆）
+    @ApiModelProperty("付款方式key")
+    private String payTypeKey; // 付款方式key
+    @ApiModelProperty("付款方式value（预付款/月结/单笔付款）")
+    private String payTypeValue; // 付款方式value（预付款/月结/单笔付款）
+    @ApiModelProperty("供应商sid")
+    private String supplierSid; // 供应商sid
+    @ApiModelProperty("供应商名称")
+    private String supplierName; // 供应商名称
+    @ApiModelProperty("供应商联系电话")
+    private String supplierPhone; // 供应商联系电话
+    @ApiModelProperty("采购员sid（单选）")
+    private String purchaserSid; // 采购员sid（单选）
+    @ApiModelProperty("采购员姓名")
+    private String purchaserName; // 采购员姓名
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("预计到货日期")
+    private Date deliveryDate; // 预计到货日期
+    @ApiModelProperty("仓库sid")
+    private String wareHouseSid;
+    @ApiModelProperty("仓库名称")
+    private String wareHouseName;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+    @ApiModelProperty("创建部门sid")
+    private String deptSid;
+    @ApiModelProperty("创建部门")
+    private String deptName;
+
+    @ApiModelProperty("采购单费用/预付款")
+    private PurchaseBillAmountDetailsVo purchaseBillAmount;
+    @ApiModelProperty("采购单扩展")
+    private PurchaseBillExtendDetailsVo purchaseBillExtend;
+    @ApiModelProperty("采购单商品明细")
+    private List<PurchaseBillDetailDetailsVo> purchaseBillDetailList;
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillDto.java

@@ -0,0 +1,105 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebill;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import com.yxt.oms.biz.func.purchasebillamount.PurchaseBillAmountDto;
+import com.yxt.oms.biz.func.purchasebilldetail.PurchaseBillDetailDto;
+import com.yxt.oms.biz.func.purchasebillextend.PurchaseBillExtendDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@ApiModel(value = "采购单 数据传输对象", description = "采购单 数据传输对象")
+public class PurchaseBillDto implements Dto {
+
+    private String sid;
+
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("制单人sid")
+    private String createBySid;
+    @ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+    @ApiModelProperty("来源单sid（工单sid）")
+    private String sourceBillSid; // 来源单sid（工单sid）
+    @ApiModelProperty("来源单编号/外部编号")
+    private String sourceBillNo; // 来源单编号/外部编号
+    @ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+    @ApiModelProperty("采购类型Key")
+    private String purchaseTypeKey; // 采购类型Key
+    @ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
+    private String purchaseTypeValue; // 采购类型Value（厂家采购、外采、其他）
+    @ApiModelProperty("采购原因key")
+    private String purchaseReasonKey; // 采购原因key
+    @ApiModelProperty("采购原因（储备/客户订单/在修车辆）")
+    private String purchaseReasonValue; // 采购原因（储备/客户订单/在修车辆）
+    @ApiModelProperty("付款方式key")
+    private String payTypeKey; // 付款方式key
+    @ApiModelProperty("付款方式value（预付款/月结/单笔付款）")
+    private String payTypeValue; // 付款方式value（预付款/月结/单笔付款）
+    @ApiModelProperty("供应商sid")
+    private String supplierSid; // 供应商sid
+    @ApiModelProperty("供应商名称")
+    private String supplierName; // 供应商名称
+    @ApiModelProperty("供应商联系电话")
+    private String supplierPhone; // 供应商联系电话
+    @ApiModelProperty("采购员sid（单选）")
+    private String purchaserSid; // 采购员sid（单选）
+    @ApiModelProperty("采购员姓名")
+    private String purchaserName; // 采购员姓名
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("预计到货日期")
+    private Date deliveryDate; // 预计到货日期
+    @ApiModelProperty("仓库sid")
+    private String wareHouseSid;
+    @ApiModelProperty("仓库名称")
+    private String wareHouseName;
+    @ApiModelProperty("使用组织sid")
+    private String useOrgSid;
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid;
+    @ApiModelProperty("创建部门sid")
+    private String deptSid;
+    @ApiModelProperty("创建部门")
+    private String deptName;
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
+
+    @ApiModelProperty("采购单费用/预付款")
+    private PurchaseBillAmountDto purchaseBillAmount;
+    @ApiModelProperty("采购单扩展")
+    private PurchaseBillExtendDto purchaseBillExtend;
+    @ApiModelProperty("采购单商品明细")
+    private List<PurchaseBillDetailDto> purchaseBillDetailList;
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.java

@@ -0,0 +1,48 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebill;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBillMapper.java <br/>
+ * Class: com.yxt.pms.biz.purchasebill.PmsPurchaseBillMapper <br/>
+ * Description: 采购单. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface PurchaseBillMapper extends BaseMapper<PurchaseBill> {
+
+    String selectNum(String billNo);
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillMapper.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.purchasebill.PurchaseBillMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectNum" resultType="java.lang.String">
+		select RIGHT (billNo, 4)
+		from pms_purchase_bill
+		where billNo LIKE concat(#{billNo}, '%')
+		order by billNo desc
+				limit 1
+	</select>
+</mapper>

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillQuery.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebill;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBillQuery.java <br/>
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillQuery <br/>
+ * Description: 采购单 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单 查询条件", description = "采购单 查询条件")
+public class PurchaseBillQuery implements Query {
+
+    @ApiModelProperty("供应商名称")
+    private String supplierName;
+    @ApiModelProperty("仓库名称")
+    private String wareHouseName;
+    @ApiModelProperty("收货状态key")
+    private String receiveStateKey;
+    @ApiModelProperty("物流单号")
+    private String logisticsNum;
+    @ApiModelProperty("发货状态key")
+    private String deliveryStateKey;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("采购员姓名")
+    private String purchaserName;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("创建开始日期")
+    private String createStartTime;
+    @ApiModelProperty("创建结束日期")
+    private String createEndTime;
+
+    private String orgLevelKey;
+    @ApiModelProperty("菜单路由")
+    private String menuUrl;
+    @ApiModelProperty("组织全路径sid")
+    private String orgPath;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillService.java

@@ -0,0 +1,122 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebill;
+
+import cn.hutool.core.date.DateUtil;
+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.sysorganization.SysOrganizationVo;
+import com.yxt.oms.feign.portal.privilege.PrivilegeQuery;
+import com.yxt.oms.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.oms.feign.portal.sysstafforg.SysStaffOrgFeign;
+import com.yxt.oms.feign.portal.sysuser.SysUserFeign;
+import com.yxt.oms.feign.purchase.purchasebill.PurchaseBillFeign;
+import com.yxt.oms.utils.Rule;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+@Service
+public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper, PurchaseBill> {
+
+    @Autowired
+    private PurchaseBillFeign purchaseBillFeign;
+    @Resource
+    private SysUserFeign sysUserFeign;
+    @Resource
+    private SysOrganizationFeign sysOrganizationFeign;
+    @Resource
+    private SysStaffOrgFeign sysStaffOrgFeign;
+
+    public ResultBean<PagerVo<PurchaseBillVo>> listPageVo(PagerQuery<PurchaseBillQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PurchaseBillQuery query = pq.getParams();
+        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        privilegeQuery.setOrgPath(query.getOrgPath());
+        privilegeQuery.setMenuUrl(query.getMenuUrl());
+        privilegeQuery.setUserSid(query.getUserSid());
+        ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+        pq.getParams().setOrgLevelKey(defaultIdReltBean.getData());
+        PagerVo<PurchaseBillVo> p = purchaseBillFeign.listPage(pq).getData();
+        return rb.success().setData(p);
+    }
+
+    public ResultBean<String> saveOrUpdateDto(PurchaseBillDto dto) {
+        String orgPath = dto.getOrgPath();
+        if (StringUtils.isBlank(dto.getSid())) {
+            String deptName = "";
+            String deptSid = "";
+            String createOrgSid = "";
+            if (StringUtils.isNotBlank(orgPath)) {
+                List<String> split = Arrays.asList(orgPath.split("/"));
+                if (split.size() > 1) {
+                    //获取本级sid获取本级部门信息
+                    SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+                    deptName = sysOrganization.getName();
+                    deptSid = sysOrganization.getSid();
+                } else {
+                    SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+                    deptName = sysOrganization.getName();
+                    deptSid = sysOrganization.getSid();
+                }
+                dto.setDeptSid(deptSid);
+                dto.setDeptName(deptName);
+                createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+                //创建组织使用组织
+                ResultBean<SysOrganizationVo> organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid);
+                if (organizationResultBean.getData() != null) {
+                    dto.setCreateOrgSid(createOrgSid);
+                    dto.setUseOrgSid(createOrgSid);
+                    //生成单据编号
+                    String billNo = "";
+                    String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+                    billNo = "CGD" + organizationResultBean.getData().getOrgCode() + date;
+                    String i = baseMapper.selectNum(billNo);
+                    if (StringUtils.isNotBlank(i)) {
+                        billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
+                    } else {
+                        billNo = Rule.getBillNo(billNo, 0);
+                    }
+                    dto.setBillNo(billNo);
+                }
+            }
+        }
+        return purchaseBillFeign.save(dto);
+    }
+
+    public ResultBean<PurchaseBillDetailsVo> fetchDetailsVoBySid(String sid) {
+        return purchaseBillFeign.fetchDetailsBySid(sid);
+    }
+
+    public ResultBean delAll(String[] sids) {
+        return purchaseBillFeign.delBySids(sids);
+    }
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseBillVo.java

@@ -0,0 +1,90 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebill;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBillVo.java <br/>
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillVo <br/>
+ * Description: 采购单 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单 视图数据对象", description = "采购单 视图数据对象")
+public class PurchaseBillVo implements Vo {
+
+    private String sid; // sid
+
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("业务日期")
+    private Date createTime;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("供应商名称")
+    private String supplierName;
+    @ApiModelProperty("采购员姓名")
+    private String purchaserName;
+    @ApiModelProperty("仓库名称")
+    private String wareHouseName;
+    @ApiModelProperty("收货状态value")
+    private Integer receiveStateValue;
+    @ApiModelProperty("商品总额")
+    private String amountTotal;
+    @ApiModelProperty("采购运费")
+    private BigDecimal freight;
+    @ApiModelProperty("其它费用")
+    private BigDecimal otherAmount;
+    @ApiModelProperty("预付金额")
+    private BigDecimal prepayment;
+    @ApiModelProperty("物流单号")
+    private String logisticsNum;
+    @ApiModelProperty("生产进度")
+    private String productProgress;
+    @ApiModelProperty("总采购数量")
+    private String countTotal;
+    @ApiModelProperty("发货状态value")
+    private Integer deliveryStateValue;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("制单人姓名")
+    private String createByName;
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseChoiceBillDetailsVo.java

@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebill;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBillVo.java <br/>
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillVo <br/>
+ * Description: 采购单 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单 视图数据对象", description = "采购单 视图数据对象")
+public class PurchaseChoiceBillDetailsVo implements Vo {
+
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("单据日期")
+    private Date createTime;
+    @ApiModelProperty("采购员姓名")
+    private String purchaserName;
+    @ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
+    private String purchaseTypeValue;
+    @ApiModelProperty("采购原因（储备/客户订单/在修车辆）")
+    private String purchaseReasonValue;
+    @ApiModelProperty("付款方式value（预付款/月结/单笔付款）")
+    private String payTypeValue;
+    @ApiModelProperty("供应商名称")
+    private String supplierName;
+    @ApiModelProperty("是否需要开发票（是1，否0）")
+    private String isInvoicing;
+    @ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)")
+    private String billType;
+    @ApiModelProperty("税率")
+    private BigDecimal taxRate;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("采购金额合计")
+    private BigDecimal amountCount;
+    @ApiModelProperty("运费")
+    private BigDecimal freight;
+    @ApiModelProperty("优惠金额")
+    private BigDecimal discountAmount;
+    @ApiModelProperty("误差调整金额")
+    private BigDecimal errorAmount;
+
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseChoiceBillQuery.java

@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebill;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBillQuery.java <br/>
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillQuery <br/>
+ * Description: 采购单 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单原单 查询条件", description = "采购单 查询条件")
+public class PurchaseChoiceBillQuery implements Query {
+
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+    @ApiModelProperty("申请人")
+    private String createByName;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("创建开始日期")
+    private String createStartTime;
+    @ApiModelProperty("创建结束日期")
+    private String createEndTime;
+    @ApiModelProperty("办结开始日期")
+    private String finishStartTime;
+    @ApiModelProperty("办结结束日期")
+    private String finishEndTime;
+    @ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
+    private String purchaseTypeValue;
+    @ApiModelProperty("采购原因（储备/客户订单/在修车辆）")
+    private String purchaseReasonValue;
+    @ApiModelProperty("付款方式value（预付款/月结/单笔付款）")
+    private String payTypeValue;
+    @ApiModelProperty("供应商名称")
+    private String supplierName;
+    @ApiModelProperty("是否需要开发票（是1，否0）")
+    private String isInvoicing;
+
+    private String createOrgSid;
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebill/PurchaseChoiceBillVo.java

@@ -0,0 +1,105 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebill;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailDetailsVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBillVo.java <br/>
+ * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillVo <br/>
+ * Description: 采购单 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单 视图数据对象", description = "采购单 视图数据对象")
+public class PurchaseChoiceBillVo implements Vo {
+
+    private String sid; // sid
+
+    /*仅页面展示*/
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("办结时间")
+    private Date finishTime;
+
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("单据日期")
+    private Date createTime;
+    @ApiModelProperty("采购员姓名")
+    private String purchaserName;
+    @ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
+    private String purchaseTypeValue;
+    @ApiModelProperty("采购原因（储备/客户订单/在修车辆）")
+    private String purchaseReasonValue;
+    @ApiModelProperty("付款方式value（预付款/月结/单笔付款）")
+    private String payTypeValue;
+    @ApiModelProperty("供应商名称")
+    private String supplierName;
+    @ApiModelProperty("是否需要开发票（是1，否0）")
+    private String isInvoicing;
+    @ApiModelProperty("票据类型(不含税、增值税、普通税、已含增值税)")
+    private String billType;
+    @ApiModelProperty("税率")
+    private BigDecimal taxRate;
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    @ApiModelProperty("采购金额合计")
+    private BigDecimal amountCount;
+    @ApiModelProperty("运费")
+    private BigDecimal freight;
+    @ApiModelProperty("优惠金额")
+    private BigDecimal discountAmount;
+    @ApiModelProperty("误差调整金额")
+    private BigDecimal errorAmount;
+    @ApiModelProperty("应付金额（=采购金额+运费-优惠金额）")
+    private BigDecimal payableAmount;
+
+    @ApiModelProperty("采购单商品明细")
+    private List<PmsPurchaseBillDetailDetailsVo> pmsPurchaseBillDetailList;
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmount.java

@@ -0,0 +1,82 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebillamount;
+
+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.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "采购单-费用/预付款", description = "采购单-费用/预付款")
+@TableName("purchase_bill_amount")
+public class PurchaseBillAmount extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("采购单sid")
+    private String billSid; // 采购单sid
+	@ApiModelProperty("误差调整金额")
+    private BigDecimal errorAmount; // 误差调整金额
+	@ApiModelProperty("优惠金额")
+    private BigDecimal discountAmount; // 优惠金额
+	@ApiModelProperty("应付金额")
+    private BigDecimal payableAmount; // 应付金额
+	@ApiModelProperty("采购运费")
+    private BigDecimal freight; // 采购运费
+	@ApiModelProperty("运费分摊方式Key")
+    private String freightShareTypeKey; // 运费分摊方式Key
+	@ApiModelProperty("运费分摊方式Value")
+    private String freightShareTypeValue; // 运费分摊方式Value
+	@ApiModelProperty("其它费用")
+    private BigDecimal otherAmount; // 其它费用
+	@ApiModelProperty("其他费用分摊方式Key")
+    private String otherShareTypeKey; // 其他费用分摊方式Key
+	@ApiModelProperty("其他费用分摊方式Value")
+    private String otherShareTypeValue; // 其他费用分摊方式Value
+	@ApiModelProperty("结算账户")
+    private String settleAccount; // 结算账户
+	@ApiModelProperty("预付金额")
+    private BigDecimal prepayment; // 预付金额
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("付款期限")
+    private Date paymentTerm; // 付款期限
+	@ApiModelProperty("收款开户行")
+    private String bankName; // 收款开户行
+	@ApiModelProperty("收款账户")
+    private String bankAccountName; // 收款账户
+	@ApiModelProperty("收款银行账号")
+    private String bankAccount; // 收款银行账号
+	@ApiModelProperty("币种")
+    private String currency; // 币种
+
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountDetailsVo.java

@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebillamount;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * Project: caigou(采购) <br/>
+ * File: PurchaseBillAmountVo.java <br/>
+ * Class: com.yxt.purchase.api.purchasebillamount.PurchaseBillAmountVo <br/>
+ * Description: 采购单-费用/预付款 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-03 14:44:55 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单-费用/预付款 视图数据详情", description = "采购单-费用/预付款 视图数据详情")
+public class PurchaseBillAmountDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("采购单sid")
+    private String billSid; // 采购单sid
+	@ApiModelProperty("误差调整金额")
+    private BigDecimal errorAmount; // 误差调整金额
+	@ApiModelProperty("优惠金额")
+    private BigDecimal discountAmount; // 优惠金额
+	@ApiModelProperty("应付金额")
+    private BigDecimal payableAmount; // 应付金额
+	@ApiModelProperty("采购运费")
+    private BigDecimal freight; // 采购运费
+	@ApiModelProperty("运费分摊方式Key")
+    private String freightShareTypeKey; // 运费分摊方式Key
+	@ApiModelProperty("运费分摊方式Value")
+    private String freightShareTypeValue; // 运费分摊方式Value
+	@ApiModelProperty("其它费用")
+    private BigDecimal otherAmount; // 其它费用
+	@ApiModelProperty("其他费用分摊方式Key")
+    private String otherShareTypeKey; // 其他费用分摊方式Key
+	@ApiModelProperty("其他费用分摊方式Value")
+    private String otherShareTypeValue; // 其他费用分摊方式Value
+	@ApiModelProperty("结算账户")
+    private String settleAccount; // 结算账户
+	@ApiModelProperty("预付金额")
+    private BigDecimal prepayment; // 预付金额
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("付款期限")
+    private Date paymentTermStart; // 付款期限
+    private Date paymentTermEnd; // 付款期限
+	@ApiModelProperty("收款开户行")
+    private String bankName; // 收款开户行
+	@ApiModelProperty("收款账户")
+    private String bankAccountName; // 收款账户
+	@ApiModelProperty("收款银行账号")
+    private String bankAccount; // 收款银行账号
+	@ApiModelProperty("币种")
+    private String currency; // 币种
+
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountDto.java

@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebillamount;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * Project: caigou(采购) <br/>
+ * File: PurchaseBillAmountDto.java <br/>
+ * Class: com.yxt.purchase.api.purchasebillamount.PurchaseBillAmountDto <br/>
+ * Description: 采购单-费用/预付款 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-07-03 14:44:55 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单-费用/预付款 数据传输对象", description = "采购单-费用/预付款 数据传输对象")
+public class PurchaseBillAmountDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("采购单sid")
+    private String billSid; // 采购单sid
+	@ApiModelProperty("误差调整金额")
+    private BigDecimal errorAmount; // 误差调整金额
+	@ApiModelProperty("优惠金额")
+    private BigDecimal discountAmount; // 优惠金额
+	@ApiModelProperty("应付金额")
+    private BigDecimal payableAmount; // 应付金额
+	@ApiModelProperty("采购运费")
+    private BigDecimal freight; // 采购运费
+	@ApiModelProperty("运费分摊方式Key")
+    private String freightShareTypeKey; // 运费分摊方式Key
+	@ApiModelProperty("运费分摊方式Value")
+    private String freightShareTypeValue; // 运费分摊方式Value
+	@ApiModelProperty("其它费用")
+    private BigDecimal otherAmount; // 其它费用
+	@ApiModelProperty("其他费用分摊方式Key")
+    private String otherShareTypeKey; // 其他费用分摊方式Key
+	@ApiModelProperty("其他费用分摊方式Value")
+    private String otherShareTypeValue; // 其他费用分摊方式Value
+	@ApiModelProperty("结算账户")
+    private String settleAccount; // 结算账户
+	@ApiModelProperty("预付金额")
+    private BigDecimal prepayment; // 预付金额
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("付款期限")
+    private Date paymentTermStart; // 付款期限
+    private Date paymentTermEnd; // 付款期限
+	@ApiModelProperty("收款开户行")
+    private String bankName; // 收款开户行
+	@ApiModelProperty("收款账户")
+    private String bankAccountName; // 收款账户
+	@ApiModelProperty("收款银行账号")
+    private String bankAccount; // 收款银行账号
+	@ApiModelProperty("币种")
+    private String currency; // 币种
+
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountMapper.java

@@ -0,0 +1,41 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebillamount;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface PurchaseBillAmountMapper extends BaseMapper<PurchaseBillAmount> {
+
+	@Delete("delete from purchase_bill_amount where billSid = #{dtoSid}")
+	void delByMainSid(String dtoSid);
+
+	@Select("select * from purchase_bill_amount where billSid = #{billSid}")
+	PurchaseBillAmountDetailsVo selByMainSid(String billSid);
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountMapper.xml

@@ -0,0 +1,6 @@
+<?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.purchasebillamount.PurchaseBillAmountMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+</mapper>

oms/src/main/java/com/yxt/oms/biz/func/purchasebillamount/PurchaseBillAmountService.java

@@ -0,0 +1,48 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebillamount;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class PurchaseBillAmountService{
+	
+	public void insertByDto(PurchaseBillAmountDto dto){
+		PurchaseBillAmount entity = new PurchaseBillAmount();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+
+	public void delByMainSid(String dtoSid) {
+		baseMapper.delByMainSid(dtoSid);
+	}
+
+	public PurchaseBillAmountDetailsVo selByMainSid(String billSid) {
+		return baseMapper.selByMainSid(billSid);
+	}
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetail.java

@@ -0,0 +1,102 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebilldetail;
+
+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.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBillDetail.java <br/>
+ * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetail <br/>
+ * Description: 采购单据明细. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单据明细", description = "采购单据明细")
+@TableName("purchase_bill_detail")
+public class PurchaseBillDetail extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+    @ApiModelProperty("单据sid")
+    private String billSid; // 单据sid
+    @ApiModelProperty("商品基础信息Sid")
+    private String goodsSpuSid; // 商品基础信息Sid
+    @ApiModelProperty("商品名称")
+    private String goodsSpuName; // 商品名称
+    @ApiModelProperty("商品Skusid")
+    private String goodsSkuSid; // 商品Skusid
+    @ApiModelProperty("商品Sku名称")
+    private String goodsSkuTitle; // 商品Sku名称
+    @ApiModelProperty("商品编码")
+    private String goodsSkuCode; // 商品编码
+    @ApiModelProperty("商品条码")
+    private String goodsSN; // 商品条码
+    @ApiModelProperty("货号")
+    private String goodsNum; // 货号
+    @ApiModelProperty("规格型号")
+    private String goodsSkuOwnSpec; // 规格型号
+    @ApiModelProperty("计量单位")
+    private String unit; // 计量单位
+    @ApiModelProperty("单价")
+    private BigDecimal cost; // 单价
+    @ApiModelProperty("采购数量")
+    private BigDecimal count; // 采购数量
+    @ApiModelProperty("折扣率")
+    private BigDecimal discountRate; // 折扣率
+    @ApiModelProperty("折后单价")
+    private BigDecimal discountPrice; // 折后单价
+    @ApiModelProperty("分摊金额")
+    private BigDecimal shareAmount; // 分摊金额
+    @ApiModelProperty("分配比例")
+    private BigDecimal shareRate; // 分配比例
+    @ApiModelProperty("采购金额")
+    private BigDecimal amount; // 采购金额
+    @ApiModelProperty("采购周期")
+    private Integer cycle; // 采购周期
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("预期到货日期")
+    private Date deliveryDate; // 预期到货日期
+    @ApiModelProperty("税额")
+    private BigDecimal taxAmount; // 税额
+    @ApiModelProperty("含税价")
+    private BigDecimal taxPrice; // 含税价
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDetailsVo.java

@@ -0,0 +1,102 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebilldetail;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBillDetailVo.java <br/>
+ * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailVo <br/>
+ * Description: 采购单据明细 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单据明细 视图数据详情", description = "采购单据明细 视图数据详情")
+public class PurchaseBillDetailDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("单据sid")
+    private String billSid; // 单据sid
+    @ApiModelProperty("商品基础信息Sid")
+    private String goodsSpuSid; // 商品基础信息Sid
+    @ApiModelProperty("商品名称")
+    private String goodsSpuName; // 商品名称
+    @ApiModelProperty("商品Skusid")
+    private String goodsSkuSid; // 商品Skusid
+    @ApiModelProperty("商品Sku名称")
+    private String goodsSkuTitle; // 商品Sku名称
+    @ApiModelProperty("商品编码")
+    private String goodsSkuCode; // 商品编码
+    @ApiModelProperty("商品条码")
+    private String goodsSN; // 商品条码
+    @ApiModelProperty("货号")
+    private String goodsNum; // 货号
+    @ApiModelProperty("规格型号")
+    private String goodsSkuOwnSpec; // 规格型号
+    @ApiModelProperty("计量单位")
+    private String unit; // 计量单位
+    @ApiModelProperty("单价")
+    private BigDecimal cost; // 单价
+    @ApiModelProperty("采购数量")
+    private BigDecimal count; // 采购数量
+    @ApiModelProperty("折扣率")
+    private BigDecimal discountRate; // 折扣率
+    @ApiModelProperty("折后单价")
+    private BigDecimal discountPrice; // 折后单价
+    @ApiModelProperty("分摊金额")
+    private BigDecimal shareAmount; // 分摊金额
+    @ApiModelProperty("分配比例")
+    private BigDecimal shareRate; // 分配比例
+    @ApiModelProperty("采购金额")
+    private BigDecimal amount; // 采购金额
+    @ApiModelProperty("采购周期")
+    private Integer cycle; // 采购周期
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("预期到货日期")
+    private Date deliveryDate; // 预期到货日期
+    @ApiModelProperty("税额")
+    private BigDecimal taxAmount; // 税额
+    @ApiModelProperty("含税价")
+    private BigDecimal taxPrice; // 含税价
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailDto.java

@@ -0,0 +1,102 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebilldetail;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBillDetailDto.java <br/>
+ * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailDto <br/>
+ * Description: 采购单据明细 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单据明细 数据传输对象", description = "采购单据明细 数据传输对象")
+public class PurchaseBillDetailDto implements Dto {
+
+    private String sid; // sid
+
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("单据sid")
+    private String billSid; // 单据sid
+    @ApiModelProperty("商品基础信息Sid")
+    private String goodsSpuSid; // 商品基础信息Sid
+    @ApiModelProperty("商品名称")
+    private String goodsSpuName; // 商品名称
+    @ApiModelProperty("商品Skusid")
+    private String goodsSkuSid; // 商品Skusid
+    @ApiModelProperty("商品Sku名称")
+    private String goodsSkuTitle; // 商品Sku名称
+    @ApiModelProperty("商品编码")
+    private String goodsSkuCode; // 商品编码
+    @ApiModelProperty("商品条码")
+    private String goodsSN; // 商品条码
+    @ApiModelProperty("货号")
+    private String goodsNum; // 货号
+    @ApiModelProperty("规格型号")
+    private String goodsSkuOwnSpec; // 规格型号
+    @ApiModelProperty("计量单位")
+    private String unit; // 计量单位
+    @ApiModelProperty("单价")
+    private BigDecimal cost; // 单价
+    @ApiModelProperty("采购数量")
+    private BigDecimal count; // 采购数量
+    @ApiModelProperty("折扣率")
+    private BigDecimal discountRate; // 折扣率
+    @ApiModelProperty("折后单价")
+    private BigDecimal discountPrice; // 折后单价
+    @ApiModelProperty("分摊金额")
+    private BigDecimal shareAmount; // 分摊金额
+    @ApiModelProperty("分配比例")
+    private BigDecimal shareRate; // 分配比例
+    @ApiModelProperty("采购金额")
+    private BigDecimal amount; // 采购金额
+    @ApiModelProperty("采购周期")
+    private Integer cycle; // 采购周期
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("预期到货日期")
+    private Date deliveryDate; // 预期到货日期
+    @ApiModelProperty("税额")
+    private BigDecimal taxAmount; // 税额
+    @ApiModelProperty("含税价")
+    private BigDecimal taxPrice; // 含税价
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailMapper.java

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebilldetail;
+
+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 org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBillDetailMapper.java <br/>
+ * Class: com.yxt.pms.biz.purchasebilldetail.PmsPurchaseBillDetailMapper <br/>
+ * Description: 采购单据明细. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface PurchaseBillDetailMapper extends BaseMapper<PurchaseBillDetail> {
+
+	@Delete("delete from purchase_bill_detail where billSid = #{dtoSid}")
+    void delByMainSid(String dtoSid);
+
+	@Select("select * from purchase_bill_detail where billSid = #{billSid}")
+	List<PurchaseBillDetailDetailsVo> selByMainSid(String billSid);
+
+    IPage<PurchaseBillDetailReportVo> purDetailReForm(IPage<PurchaseBillDetail> page, @Param(Constants.WRAPPER) QueryWrapper<PurchaseBillDetail> qw);
+
+	IPage<PurchaseBillDetailSumVo> purSumReForm(IPage<PurchaseBillDetail> page, @Param(Constants.WRAPPER) QueryWrapper<PurchaseBillDetail> qw);
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailMapper.xml

@@ -0,0 +1,46 @@
+<?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.purchase.biz.purchasebilldetail.PurchaseBillDetailMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+
+	<select id="purDetailReForm" resultType="com.yxt.purchase.biz.purchasebilldetail.PurchaseBillDetailReportVo">
+		SELECT
+				pdd.goodsSpuName,
+				pdd.goodsSkuCode,
+				pdd.cost,
+				pdd.cost * pdd.count AS costCount,
+				pdd.taxAmount,
+				pdd.taxAmount * pdd.count AS taxAmountCount,
+				pdd.taxPrice,
+				pdd.count,
+				IFNULL(ppd.backCount,0) AS retreatCount,
+				pdd.amount,
+				pdd.warehouseName,
+				pdd.unit
+		FROM pms_purchase_bill_detail pdd
+					 LEFT JOIN pms_purchaseback_bill ppb
+				ON pdd.billSid = ppb.sourceBillSid
+					 LEFT JOIN pms_purchaseback_detail ppd
+				ON ppb.sid = ppd.billSid
+		<where> ${ew.sqlSegment} </where>
+    </select>
+
+	<select id="purSumReForm" resultType="com.yxt.purchase.biz.purchasebilldetail.PurchaseBillDetailSumVo">
+		SELECT
+				pdd.goodsSpuName,
+				pdd.goodsSkuCode,
+				pdd.unit,
+				pdd.goodsSkuOwnSpec,
+				pdd.count,
+				pdd.amount,
+				IFNULL(ppd.backCount,0) AS retreatCount,
+				ppd.backAmount
+		FROM pms_purchase_bill_detail pdd
+					 LEFT JOIN pms_purchaseback_bill ppb
+				ON pdd.billSid = ppb.sourceBillSid
+					 LEFT JOIN pms_purchaseback_detail ppd
+				ON ppb.sid = ppd.billSid
+		<where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailQuery.java

@@ -0,0 +1,93 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebilldetail;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBillDetailQuery.java <br/>
+ * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailQuery <br/>
+ * Description: 采购单据明细 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单据明细 查询条件", description = "采购单据明细 查询条件")
+public class PurchaseBillDetailQuery implements Query {
+
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("单据sid")
+    private String billSid; // 单据sid
+	@ApiModelProperty("商品基础信息Sid")
+    private String goodSpuSid; // 商品基础信息Sid
+	@ApiModelProperty("商品名称")
+    private String goodsSpuName; // 商品名称
+	@ApiModelProperty("商品Skusid")
+    private String goodsSkuSid; // 商品Skusid
+	@ApiModelProperty("商品Sku名称")
+    private String goodsSkuTitle; // 商品Sku名称
+	@ApiModelProperty("商品编码（图号）")
+    private String goodsSkuCode; // 商品编码（图号）
+	@ApiModelProperty("规格型号")
+    private String goodsSkuOwnSpec; // 规格型号
+	@ApiModelProperty("采购前库存数量")
+    private BigDecimal currentCount; // 采购前库存数量
+	@ApiModelProperty("仓库sid")
+    private String warehouseSid; // 仓库sid
+	@ApiModelProperty("仓库名称")
+    private String warehouseName; // 仓库名称
+	@ApiModelProperty("库区/货位sid")
+    private String warehouseAreaSid; // 库区/货位sid
+	@ApiModelProperty("库区名称")
+    private String warehouseAreaName; // 库区名称
+	@ApiModelProperty("货架sid")
+    private String warehouseRackSid; // 货架sid
+	@ApiModelProperty("货架名称")
+    private String warehouseRackName; // 货架名称
+	@ApiModelProperty("单位成本（进货价）")
+    private BigDecimal cost; // 单位成本（进货价）
+	@ApiModelProperty("采购数量")
+    private BigDecimal count; // 采购数量
+	@ApiModelProperty("税额")
+    private BigDecimal taxAmount; // 税额
+	@ApiModelProperty("含税价")
+    private BigDecimal taxPrice; // 含税价
+	@ApiModelProperty("采购金额")
+    private BigDecimal amount; // 采购金额
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailReportQuery.java

@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebilldetail;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBillDetailVo.java <br/>
+ * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailVo <br/>
+ * Description: 采购单据明细 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单据明细 视图数据对象", description = "采购单据明细 视图数据对象")
+public class PurchaseBillDetailReportQuery implements Query {
+
+    @ApiModelProperty("仓库名称")
+    private String warehouseName;
+    @ApiModelProperty("商品编码（图号）")
+    private String goodsSkuCode;
+    @ApiModelProperty("规格")
+    private String goodsSkuOwnSpec;
+    @ApiModelProperty("商品名称")
+    private String goodsSpuName;
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailReportVo.java

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebilldetail;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBillDetailVo.java <br/>
+ * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailVo <br/>
+ * Description: 采购单据明细 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单据明细 视图数据对象", description = "采购单据明细 视图数据对象")
+public class PurchaseBillDetailReportVo implements Vo {
+
+	@ApiModelProperty("商品名称")
+    private String goodsSpuName;
+	@ApiModelProperty("商品编码（图号）")
+    private String goodsSkuCode;
+    @ApiModelProperty("单位成本（进货价）")
+    private BigDecimal cost;
+    @ApiModelProperty("总体单位成本（进货价）")
+    private BigDecimal costCount;
+    @ApiModelProperty("税额")
+    private BigDecimal taxAmount;
+    @ApiModelProperty("税额合计")
+    private BigDecimal taxAmountCount;
+    @ApiModelProperty("含税价")
+    private BigDecimal taxPrice;
+    @ApiModelProperty("采购数量")
+    private BigDecimal count;
+    @ApiModelProperty("退货数量")
+    private BigDecimal retreatCount;
+    @ApiModelProperty("采购金额")
+    private BigDecimal amount;
+    @ApiModelProperty("仓库名称")
+    private String warehouseName;
+    @ApiModelProperty("单位")
+    private String unit;
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailService.java

@@ -0,0 +1,113 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebilldetail;
+
+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.vo.PagerVo;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBillDetailService.java <br/>
+ * Class: com.yxt.pms.biz.purchasebilldetail.PmsPurchaseBillDetailService <br/>
+ * Description: 采购单据明细 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class PurchaseBillDetailService extends MybatisBaseService<PurchaseBillDetailMapper, PurchaseBillDetail> {
+
+    public void insertByDto(PurchaseBillDetailDto dto) {
+        PurchaseBillDetail entity = new PurchaseBillDetail();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void delByMainSid(String dtoSid) {
+        baseMapper.delByMainSid(dtoSid);
+    }
+
+    public List<PurchaseBillDetailDetailsVo> selByMainSid(String billSid) {
+        return baseMapper.selByMainSid(billSid);
+    }
+
+    public PagerVo<PurchaseBillDetailReportVo> purDetailReForm(PagerQuery<PurchaseBillDetailReportQuery> pq) {
+        PurchaseBillDetailReportQuery query = pq.getParams();
+        QueryWrapper<PurchaseBillDetail> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getWarehouseName())) {
+            qw.like("pdd.warehouseName", query.getWarehouseName());
+        }
+        if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
+            qw.like("pdd.goodsSkuCode", query.getGoodsSkuCode());
+        }
+        if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())) {
+            qw.like("pdd.goodsSkuOwnSpec", query.getGoodsSkuOwnSpec());
+        }
+        if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
+            qw.like("pdd.goodsSpuName", query.getGoodsSpuName());
+        }
+        IPage<PurchaseBillDetail> page = PagerUtil.queryToPage(pq);
+        IPage<PurchaseBillDetailReportVo> pagging = baseMapper.purDetailReForm(page, qw);
+        PagerVo<PurchaseBillDetailReportVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public PagerVo<PurchaseBillDetailSumVo> purSumReForm(PagerQuery<PurchaseBillDetailReportQuery> pq) {
+        PurchaseBillDetailReportQuery query = pq.getParams();
+        QueryWrapper<PurchaseBillDetail> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getWarehouseName())) {
+            qw.like("pdd.warehouseName", query.getWarehouseName());
+        }
+        if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
+            qw.like("pdd.goodsSkuCode", query.getGoodsSkuCode());
+        }
+        if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())) {
+            qw.like("pdd.goodsSkuOwnSpec", query.getGoodsSkuOwnSpec());
+        }
+        if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
+            qw.like("pdd.goodsSpuName", query.getGoodsSpuName());
+        }
+        qw.eq("pdd.isDelete",0);
+        qw.groupBy("pdd.goodsSkuCode");
+        IPage<PurchaseBillDetail> page = PagerUtil.queryToPage(pq);
+        IPage<PurchaseBillDetailSumVo> pagging = baseMapper.purSumReForm(page, qw);
+        PagerVo<PurchaseBillDetailSumVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailSumVo.java

@@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebilldetail;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBillDetailVo.java <br/>
+ * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailVo <br/>
+ * Description: 采购单据明细 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单据明细 视图数据对象", description = "采购单据明细 视图数据对象")
+public class PurchaseBillDetailSumVo implements Vo {
+
+	@ApiModelProperty("商品名称")
+    private String goodsSpuName;
+	@ApiModelProperty("商品编码（图号）")
+    private String goodsSkuCode;
+    @ApiModelProperty("单位")
+    private String unit;
+    @ApiModelProperty("规格")
+    private String goodsSkuOwnSpec;
+    @ApiModelProperty("采购数量")
+    private BigDecimal count;
+    @ApiModelProperty("采购金额")
+    private BigDecimal amount;
+    @ApiModelProperty("退货数量")
+    private BigDecimal retreatCount;
+    @ApiModelProperty("退货金额")
+    private BigDecimal backAmount;
+    @ApiModelProperty("门店")
+    private String useOrgName;
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebilldetail/PurchaseBillDetailVo.java

@@ -0,0 +1,96 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebilldetail;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBillDetailVo.java <br/>
+ * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailVo <br/>
+ * Description: 采购单据明细 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单据明细 视图数据对象", description = "采购单据明细 视图数据对象")
+public class PurchaseBillDetailVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("单据sid")
+    private String billSid; // 单据sid
+	@ApiModelProperty("商品基础信息Sid")
+    private String goodSpuSid; // 商品基础信息Sid
+	@ApiModelProperty("商品名称")
+    private String goodsSpuName; // 商品名称
+	@ApiModelProperty("商品Skusid")
+    private String goodsSkuSid; // 商品Skusid
+	@ApiModelProperty("商品Sku名称")
+    private String goodsSkuTitle; // 商品Sku名称
+	@ApiModelProperty("商品编码（图号）")
+    private String goodsSkuCode; // 商品编码（图号）
+	@ApiModelProperty("规格型号")
+    private String goodsSkuOwnSpec; // 规格型号
+	@ApiModelProperty("采购前库存数量")
+    private BigDecimal currentCount; // 采购前库存数量
+	@ApiModelProperty("仓库sid")
+    private String warehouseSid; // 仓库sid
+	@ApiModelProperty("仓库名称")
+    private String warehouseName; // 仓库名称
+	@ApiModelProperty("库区/货位sid")
+    private String warehouseAreaSid; // 库区/货位sid
+	@ApiModelProperty("库区名称")
+    private String warehouseAreaName; // 库区名称
+	@ApiModelProperty("货架sid")
+    private String warehouseRackSid; // 货架sid
+	@ApiModelProperty("货架名称")
+    private String warehouseRackName; // 货架名称
+	@ApiModelProperty("单位成本（进货价）")
+    private BigDecimal cost; // 单位成本（进货价）
+	@ApiModelProperty("采购数量")
+    private BigDecimal count; // 采购数量
+	@ApiModelProperty("税额")
+    private BigDecimal taxAmount; // 税额
+	@ApiModelProperty("含税价")
+    private BigDecimal taxPrice; // 含税价
+	@ApiModelProperty("采购金额")
+    private BigDecimal amount; // 采购金额
+
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtend.java

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebillextend;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBillExtend.java <br/>
+ * Class: com.yxt.pms.api.purchasebillextend.PmsPurchaseBillExtend <br/>
+ * Description: 采购单扩展. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单扩展", description = "采购单扩展")
+@TableName("purchase_bill_extend")
+public class PurchaseBillExtend extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+    @ApiModelProperty("采购单sid")
+    private String billSid; // 采购单sid
+    @ApiModelProperty("物流单号")
+    private String logisticsNum; // 物流单号
+    @ApiModelProperty("生产进度")
+    private String productProgress; // 生产进度
+    @ApiModelProperty("收货状态key")
+    private String receiveStateKey; // 收货状态
+    @ApiModelProperty("收货状态value")
+    private String receiveStateValue;
+    @ApiModelProperty("发货状态key")
+    private String deliveryStateKey; // 发货状态
+    @ApiModelProperty("发货状态value")
+    private String deliveryStateValue;
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendDetailsVo.java

@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebillextend;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBillExtendVo.java <br/>
+ * Class: com.yxt.pms.api.purchasebillextend.PmsPurchaseBillExtendVo <br/>
+ * Description: 采购单扩展 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单扩展 视图数据详情", description = "采购单扩展 视图数据详情")
+public class PurchaseBillExtendDetailsVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("采购单sid")
+    private String billSid; // 采购单sid
+    @ApiModelProperty("物流单号")
+    private String logisticsNum; // 物流单号
+    @ApiModelProperty("生产进度")
+    private String productProgress; // 生产进度
+    @ApiModelProperty("收货状态key")
+    private String receiveStateKey; // 收货状态
+    @ApiModelProperty("收货状态value")
+    private String receiveStateValue;
+    @ApiModelProperty("发货状态key")
+    private String deliveryStateKey; // 发货状态
+    @ApiModelProperty("发货状态value")
+    private String deliveryStateValue;
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendDto.java

@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebillextend;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBillExtendDto.java <br/>
+ * Class: com.yxt.pms.api.purchasebillextend.PmsPurchaseBillExtendDto <br/>
+ * Description: 采购单扩展 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单扩展 数据传输对象", description = "采购单扩展 数据传输对象")
+public class PurchaseBillExtendDto implements Dto {
+
+    private String sid; // sid
+
+    @ApiModelProperty("采购单sid")
+    private String billSid; // 采购单sid
+    @ApiModelProperty("物流单号")
+    private String logisticsNum; // 物流单号
+    @ApiModelProperty("生产进度")
+    private String productProgress; // 生产进度
+    @ApiModelProperty("收货状态key")
+    private String receiveStateKey; // 收货状态
+    @ApiModelProperty("收货状态value")
+    private String receiveStateValue;
+    @ApiModelProperty("发货状态key")
+    private String deliveryStateKey; // 发货状态
+    @ApiModelProperty("发货状态value")
+    private String deliveryStateValue;
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendMapper.java

@@ -0,0 +1,54 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebillextend;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBillExtendMapper.java <br/>
+ * Class: com.yxt.pms.biz.purchasebillextend.PmsPurchaseBillExtendMapper <br/>
+ * Description: 采购单扩展. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface PurchaseBillExtendMapper extends BaseMapper<PurchaseBillExtend> {
+
+	@Delete("delete from purchase_bill_extend where billSid = #{dtoSid}")
+    void delByMainSid(String dtoSid);
+
+	@Select("select * from purchase_bill_extend where billSid = #{billSid}")
+	PurchaseBillExtendDetailsVo selByMainSid(String billSid);
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendMapper.xml

@@ -0,0 +1,6 @@
+<?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.purchase.biz.purchasebillextend.PurchaseBillExtendMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+</mapper>

oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendQuery.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebillextend;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBillExtendQuery.java <br/>
+ * Class: com.yxt.pms.api.purchasebillextend.PmsPurchaseBillExtendQuery <br/>
+ * Description: 采购单扩展 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单扩展 查询条件", description = "采购单扩展 查询条件")
+public class PurchaseBillExtendQuery implements Query {
+
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("采购单sid")
+    private String purchaseBillSid; // 采购单sid
+	@ApiModelProperty("加价方式（统一加价率、区间加价率、仓库加价率）")
+    private String markupType; // 加价方式（统一加价率、区间加价率、仓库加价率）
+	@ApiModelProperty("进价不同时的价格策略（加权平均、分别计价）")
+    private String priceStrategy; // 进价不同时的价格策略（加权平均、分别计价）
+	@ApiModelProperty("临时加价率")
+    private Integer tempMarkupRate; // 临时加价率
+	@ApiModelProperty("发货人姓名")
+    private String shipperName; // 发货人姓名
+	@ApiModelProperty("发货人手机")
+    private String shipperMob; // 发货人手机
+	@ApiModelProperty("发货省市区sid")
+    private String deliveryAreaSid; // 发货省市区sid
+	@ApiModelProperty("发货详细地址")
+    private String deliveryAddress; // 发货详细地址
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("到货日期")
+    private Date arrivalDateStart; // 到货日期
+    private Date arrivalDateEnd; // 到货日期
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("付款期限")
+    private Date paymentTermStart; // 付款期限
+    private Date paymentTermEnd; // 付款期限
+	@ApiModelProperty("仓库sid")
+    private String wareHouseSid; // 仓库sid
+
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendService.java

@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebillextend;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBillExtendService.java <br/>
+ * Class: com.yxt.pms.biz.purchasebillextend.PmsPurchaseBillExtendService <br/>
+ * Description: 采购单扩展 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class PurchaseBillExtendService extends MybatisBaseService<PurchaseBillExtendMapper, PurchaseBillExtend> {
+	
+	public void insertByDto(PurchaseBillExtendDto dto){
+		PurchaseBillExtend entity = new PurchaseBillExtend();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+
+	public void delByMainSid(String dtoSid) {
+		baseMapper.delByMainSid(dtoSid);
+	}
+
+	public PurchaseBillExtendDetailsVo selByMainSid(String billSid) {
+		return baseMapper.selByMainSid(billSid);
+	}
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasebillextend/PurchaseBillExtendVo.java

@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.oms.biz.func.purchasebillextend;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: yxt-pms(采购) <br/>
+ * File: PmsPurchaseBillExtendVo.java <br/>
+ * Class: com.yxt.pms.api.purchasebillextend.PmsPurchaseBillExtendVo <br/>
+ * Description: 采购单扩展 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-19 13:51:46 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购单扩展 视图数据对象", description = "采购单扩展 视图数据对象")
+public class PurchaseBillExtendVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("制单人姓名")
+    private String createByName; // 制单人姓名
+	@ApiModelProperty("采购单sid")
+    private String purchaseBillSid; // 采购单sid
+	@ApiModelProperty("加价方式（统一加价率、区间加价率、仓库加价率）")
+    private String markupType; // 加价方式（统一加价率、区间加价率、仓库加价率）
+	@ApiModelProperty("进价不同时的价格策略（加权平均、分别计价）")
+    private String priceStrategy; // 进价不同时的价格策略（加权平均、分别计价）
+	@ApiModelProperty("临时加价率")
+    private Integer tempMarkupRate; // 临时加价率
+	@ApiModelProperty("发货人姓名")
+    private String shipperName; // 发货人姓名
+	@ApiModelProperty("发货人手机")
+    private String shipperMob; // 发货人手机
+	@ApiModelProperty("发货省市区sid")
+    private String deliveryAreaSid; // 发货省市区sid
+	@ApiModelProperty("发货详细地址")
+    private String deliveryAddress; // 发货详细地址
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("到货日期")
+    private Date arrivalDateStart; // 到货日期
+    private Date arrivalDateEnd; // 到货日期
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("付款期限")
+    private Date paymentTermStart; // 付款期限
+    private Date paymentTermEnd; // 付款期限
+	@ApiModelProperty("仓库sid")
+    private String wareHouseSid; // 仓库sid
+
+}

oms/src/main/java/com/yxt/oms/biz/func/purchasereceiptbill/PurchaseReceiptBillMapper.java

@@ -1,18 +0,0 @@
-package com.yxt.oms.biz.func.purchasereceiptbill;
-
-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 org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * @author wangpengfei
- * @date 2024/2/26 13:40
- */
-@Mapper
-public interface PurchaseReceiptBillMapper extends BaseMapper<PurchaseReceiptBill> {
-
-    IPage<PurchaseReceiptBillVo> listPage(IPage<PurchaseReceiptBill> page, @Param(Constants.WRAPPER) QueryWrapper<PurchaseReceiptBill> qw);
-}

oms/src/main/java/com/yxt/oms/biz/func/purchasereceiptbill/PurchaseReceiptBillMapper.xml

@@ -1,15 +0,0 @@
-<?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.purchasereceiptbill.PurchaseReceiptBillMapper">
-    <!--    <where> ${ew.sqlSegment} </where>-->
-    <!--    ${ew.customSqlSegment} -->
-
-    <select id="listPage" resultType="com.yxt.oms.biz.func.purchasereceiptbill.PurchaseReceiptBillVo">
-        select
-            *
-        from base_brand_info
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-</mapper>

oms/src/main/java/com/yxt/oms/biz/func/purchasereceiptbill/PurchaseReceiptBillService.java

@@ -14,6 +14,7 @@ import com.yxt.oms.utils.OrgPathQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -23,18 +24,19 @@ import java.util.List;
  * @date 2024/2/26 13:40
  */
 @Service
-public class PurchaseReceiptBillService extends MybatisBaseService<PurchaseReceiptBillMapper, PurchaseReceiptBill> {
+public class PurchaseReceiptBillService {
     @Autowired
     private FileUploadComponent fileUploadComponent;
-    @Autowired
+    @Resource
     PurchaseReceiptBillFeign purchaseReceiptBillFeign;
-    @Autowired
+    @Resource
     WarehouseAnsBillFeign warehouseAnsBillFeignl;
 
     public ResultBean<PagerVo<PurchaseReceiptBillVo>> listPage(PagerQuery<PurchaseReceiptBillQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         return purchaseReceiptBillFeign.listPage(pq);
     }
+
     public ResultBean<List<PurchaseReceiptBill>> listAll(OrgPathQuery query) {
     ResultBean rb = ResultBean.fireFail();
 

oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenu.java

@@ -0,0 +1,64 @@
+package com.yxt.oms.biz.func.sysmenu;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenu.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenu <br/>
+ * Description: 菜单表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单表", description = "菜单表")
+@TableName("sys_menu")
+@Data
+public class SysMenu extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("菜单名称")
+    private String name;
+    
+	@ApiModelProperty("菜单路由路径(VUE)")
+    private String menuUrl;
+    
+	@ApiModelProperty("菜单对应的前端页面路径")
+    private String pageUrl;
+    
+	@ApiModelProperty("菜单图标地址")
+    private String iconUrl;
+    
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+    
+	@ApiModelProperty("是否显示,默认为1显示，0为不显示")
+    private String isShow;
+    
+	@ApiModelProperty("排序号")
+    private Integer sortNo;
+    
+	@ApiModelProperty("上级sid")
+    private String pSid;
+    
+	@ApiModelProperty("前端页面路径重定向")
+    private Integer pageUrlRedirect;
+    
+	@ApiModelProperty("前端页面名称（vue组件名）")
+    private String pageName;
+    
+	@ApiModelProperty("前端页面别名")
+    private String pageAliasName;
+    
+	@ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）")
+    private String menuType;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuDto.java

@@ -0,0 +1,72 @@
+package com.yxt.oms.biz.func.sysmenu;
+
+
+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: SysMenuDto.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuDto <br/>
+ * Description: 菜单表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单表 数据传输对象", description = "菜单表 数据传输对象")
+@Data
+public class SysMenuDto implements Dto {
+
+
+    private static final long serialVersionUID = -8143707488992909267L;
+    @ApiModelProperty(value = "菜单名称", required = true)
+    @NotBlank(message = "菜单名称不能为空")
+    private String name;
+
+    @ApiModelProperty("菜单路由路径(VUE)")
+    private String menuUrl;
+
+    @ApiModelProperty("菜单对应的前端页面路径")
+    private String pageUrl;
+
+    @ApiModelProperty("菜单图标地址")
+    private String iconUrl;
+
+    @ApiModelProperty(value = "资源sid", required = true)
+    @NotBlank(message = "资源不能为空")
+    private String sourceSid;
+
+    @ApiModelProperty(value = "是否显示,默认为1显示，0为不显示", required = true)
+    @NotBlank(message = "是否显示不能为空")
+    private String isShow;
+
+    @ApiModelProperty("排序号")
+    private Integer sortNo;
+
+    @ApiModelProperty(value = "上级sid", example = "0", required = true)
+    @NotBlank(message = "上级菜单不能为空")
+    private String pSid;
+
+    @ApiModelProperty(value = "前端页面路径重定向", required = false)
+    private Integer pageUrlRedirect;
+
+    @ApiModelProperty("前端页面名称（vue组件名）")
+    private String pageName;
+
+    @ApiModelProperty(value = "前端页面别名", required = false)
+    private String pageAliasName;
+
+    @ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）")
+    private String menuType;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuFunctionQuery.java

@@ -0,0 +1,30 @@
+package com.yxt.oms.biz.func.sysmenu;
+
+
+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: SysMenuQuery.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuQuery <br/>
+ * Description: 菜单表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单表 查询条件 功能菜单设置查询用", description = "菜单表 查询条件 功能菜单设置查询用")
+@Data
+public class SysMenuFunctionQuery implements Query {
+
+
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+
+}

oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuMapper.java

@@ -0,0 +1,82 @@
+package com.yxt.oms.biz.func.sysmenu;
+
+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 org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuMapper.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysmenu.SysMenuMapper <br/>
+ * Description: 菜单表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface SysMenuMapper extends BaseMapper<SysMenu> {
+
+	//@Update("update sys_menu set name=#{msg} where id=#{id}")
+	//IPage<SysMenuVo> voPage(IPage<SysMenu> page, @Param(Constants.WRAPPER) QueryWrapper<SysMenu> qw);
+
+	IPage<SysMenuVo> selectPageVo(IPage<SysMenu> page, @Param(Constants.WRAPPER) Wrapper<SysMenu> qw);
+
+	List<SysMenuVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SysMenu> qw);
+
+	@Select("select * from sys_menu")
+	List<SysMenuVo> selectListVo();
+
+	List<SysMenuVo> listAllParentByRoleSid(String roleSid, String sid, @Param("sourceSid") String sourceSid);
+
+	@Select("SELECT menu.*,sourceMenu.`sourceSid` FROM  sys_menu menu  " +
+			"LEFT JOIN sys_source_menu sourceMenu  ON menu.sid=sourceMenu.menuSid where menu.sid=#{sid}")
+	SysMenu fetchBySid(@Param("sid") String sid);
+
+	List<SysMenuTreeVo> getChildrensForMenuTree(@Param(Constants.WRAPPER) QueryWrapper<SysMenuTreeVo> qw);
+
+	/**
+	 * 将该资源下的所有菜单设置是否可用
+	 *
+	 * @param sid      资源sid
+	 * @param isEnable 是否可用：1可用，0不可用
+	 * @return
+	 */
+	int updateBySourceSid(@Param("sid") String sid, @Param("isEnable") Integer isEnable);
+
+	/**
+	 * 根据上级sid查询菜单的子集菜单
+	 *
+	 * @param sid 菜单sid
+	 * @return
+	 */
+	List<SysMenuTreeVo> selectChildernList(String sid);
+
+	/**
+	 * 查询该资源下是否有可用的菜单
+	 *
+	 * @param isEnable
+	 * @return
+	 */
+	int selectBySourceSid(@Param("isEnable") int isEnable, @Param("sourceSid") String sourceSid);
+
+    List<SysMenu> selectByMenuUrl(String menuUrl);
+
+	/**
+	 * 查询该资源下一级菜单列表
+	 *
+	 * @param sourceSid 资源sid
+	 * @return
+	 */
+	List<SysMenuTreeVo> fetchRootMenuBySourceSid(@Param("sourceSid") String sourceSid);
+}

oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuMapper.xml

@@ -0,0 +1,88 @@
+<?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.wms.biz.func.sysmenu.SysMenuMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.wms.biz.func.sysmenu.SysMenuVo">
+        SELECT *
+        FROM sys_menu
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="selectListAllVo" resultType="com.yxt.wms.biz.func.sysmenu.SysMenuVo">
+        SELECT menu.*, source.sourceName, pmenu.name as pName
+        FROM sys_menu menu
+                     left join sys_menu pmenu on pmenu.sid = menu.psid
+                     left join sys_source_menu sourceMenu on sourceMenu.menuSid = menu.sid
+                     left join sys_source source on source.sid = sourceMenu.sourceSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="listAllParentByRoleSid" resultType="com.yxt.wms.biz.func.sysmenu.SysMenuVo">
+        SELECT menu.*, ISNULL(menuRole.sid) as checked
+        FROM sys_menu menu
+                     left join sys_menu_role menuRole on menu.sid = menuRole.menuSid AND menuRole.roleSid = #{param1}
+                where menu.pSid = #{param2}
+        <if test="sourceSid != null">
+            and menu.sourceSid = #{sourceSid}
+        </if>
+    </select>
+    <select id="getChildrensForMenuTree" resultType="com.yxt.wms.biz.func.sysmenu.SysMenuTreeVo">
+        SELECT menu.*, source.sourceName, sourceMenu.menuRootSid as menuRootSid
+        FROM sys_menu menu
+                     left join sys_source_menu sourceMenu on sourceMenu.menuSid = menu.sid
+                     left join sys_source source on source.sid = sourceMenu.sourceSid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <!--将该资源下的所有菜单设置为是否可用-->
+    <update id="updateBySourceSid">
+        update sys_menu
+        set isEnable = #{isEnable}
+        where sourceSid = #{sid}
+    </update>
+
+    <select id="selectChildernList" resultType="com.yxt.wms.biz.func.sysmenu.SysMenuTreeVo">
+        SELECT menu.*, source.sourceName, menu.pSid as menuRootSid
+        FROM sys_menu menu
+                     left join sys_source source on source.sid = menu.sourceSid
+        where menu.pSid = #{sid}
+        ORDER BY menu.sortNo ASC
+    </select>
+
+    <select id="selectBySourceSid" resultType="int">
+        select count(*)
+        from sys_menu
+        where isEnable = #{isEnable}
+          and sourceSid = #{sourceSid}
+    </select>
+
+    <select id="selectByMenuUrl" resultType="com.yxt.wms.biz.func.sysmenu.SysMenu">
+        select * from sys_menu where menuUrl = #{menuUrl}
+    </select>
+    <!--将该资源下的所有一级菜单列表-->
+    <select id="fetchRootMenuBySourceSid"  resultType="com.yxt.wms.biz.func.sysmenu.SysMenuTreeVo">
+        SELECT menu.NAME              AS NAME,
+        menu.sid               AS sid,
+        menu.sid               AS sid,
+        source.sid   AS sourceSid,
+        menu.sortNo            AS sortNo,
+        menu.pSid              AS pSid,
+        source.sourceName      AS sourceName,
+        menu.sid AS menuRootSid,
+        menu.menuUrl           AS menuUrl,
+        menu.iconUrl           AS iconUrl,
+        menu.pageName          AS pageName,
+        menu.pageUrlRedirect   AS pageUrlRedirect,
+        menu.pageUrl           AS pageUrl,
+        menu.remarks,
+        menu.isEnable
+        FROM sys_menu menu
+        LEFT JOIN sys_source source ON menu.sourceSid = source.sid
+        WHERE source.sid = #{sourceSid} AND menu.psid='0' and menu.isDelete!=1
+        ORDER BY menu.sortNo ASC
+    </select>
+</mapper>

oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuQuery.java

@@ -0,0 +1,68 @@
+package com.yxt.oms.biz.func.sysmenu;
+
+
+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: SysMenuQuery.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuQuery <br/>
+ * Description: 菜单表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单表 查询条件", description = "菜单表 查询条件")
+@Data
+public class SysMenuQuery implements Query {
+
+    
+	@ApiModelProperty("菜单名称")
+    private String name;
+
+	@ApiModelProperty("菜单路由路径(VUE)")
+    private String menuUrl;
+    
+	@ApiModelProperty("菜单对应的前端页面路径")
+    private String pageUrl;
+    
+	@ApiModelProperty("菜单图标地址")
+    private String iconUrl;
+    
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+	@ApiModelProperty("用户sid")
+    private String userSid;
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+
+	@ApiModelProperty("是否显示,默认为1显示，0为不显示")
+    private String isShow;
+    
+	@ApiModelProperty("排序号")
+    private Integer sortNo;
+    
+	@ApiModelProperty("上级sid")
+    private String pSid;
+    
+	@ApiModelProperty("前端页面路径重定向")
+    private Integer pageUrlRedirect;
+    
+	@ApiModelProperty("前端页面名称（vue组件名）")
+    private String pageName;
+    
+	@ApiModelProperty("前端页面别名")
+    private String pageAliasName;
+    
+	@ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）")
+    private String menuType;
+    private String orgSid;//部门
+
+}

oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuService.java

@@ -0,0 +1,407 @@
+package com.yxt.oms.biz.func.sysmenu;
+
+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.wms.biz.func.sysmenurole.SysMenuRoleVo;
+import com.yxt.wms.feign.portal.sysmenu.SysMenuFeign;
+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.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuService.java <br/>
+ * Class: com.yxt.user.biz.sysmenu.SysMenuService <br/>
+ * Description: 菜单表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class SysMenuService extends MybatisBaseService<SysMenuMapper, SysMenu> {
+    @Autowired
+    SysMenuFeign sysMenuFeign;
+
+
+
+    public PagerVo<SysMenu> listPage(PagerQuery<SysMenuQuery> pq) {
+        SysMenuQuery query = pq.getParams();
+        QueryWrapper<SysMenu> qw = createQueryWrapper(query);
+        IPage<SysMenu> page = PagerUtil.queryToPage(pq);
+        IPage<SysMenu> pagging = baseMapper.selectPage(page, qw);
+        PagerVo<SysMenu> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    @Override
+    public SysMenu fetchBySid(String sid) {
+        return baseMapper.fetchBySid(sid);
+    }
+
+    public List<SysMenu> listAll(SysMenuQuery query) {
+        QueryWrapper<SysMenu> qw = createQueryWrapper(query);
+        return baseMapper.selectList(qw);
+    }
+
+    private QueryWrapper<SysMenu> createQueryWrapper(SysMenuQuery query) {
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<SysMenu> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.eq("name", query.getName());
+        }
+        if (StringUtils.isNotBlank(query.getMenuUrl())) {
+            qw.eq("menuUrl", query.getMenuUrl());
+        }
+        if (StringUtils.isNotBlank(query.getPageUrl())) {
+            qw.eq("pageUrl", query.getPageUrl());
+        }
+        if (StringUtils.isNotBlank(query.getIconUrl())) {
+            qw.eq("iconUrl", query.getIconUrl());
+        }
+        if (query.getSourceSid() != null) {
+            qw.eq("sourceSid", query.getSourceSid());
+        }
+        if (StringUtils.isNotBlank(query.getIsShow())) {
+            qw.eq("isShow", query.getIsShow());
+        }
+
+        if (query.getSortNo() != null) {
+            qw.eq("sortNo", query.getSortNo());
+        }
+
+        if (StringUtils.isNotBlank(query.getPSid())) {
+            qw.eq("pSid", query.getPSid());
+        }
+
+        if (query.getPageUrlRedirect() != null) {
+            qw.eq("pageUrlRedirect", query.getPageUrlRedirect());
+        }
+
+        if (StringUtils.isNotBlank(query.getPageName())) {
+            qw.eq("pageName", query.getPageName());
+        }
+
+        if (StringUtils.isNotBlank(query.getPageAliasName())) {
+            qw.eq("pageAliasName", query.getPageAliasName());
+        }
+
+        if (StringUtils.isNotBlank(query.getMenuType())) {
+            qw.eq("menuType", query.getMenuType());
+        }
+        return qw;
+    }
+
+    public ResultBean<PagerVo<SysMenuVo>> listPageVo(PagerQuery<SysMenuQuery> pq) {
+        return sysMenuFeign.listPage(pq);
+    }
+
+    /*	public List<SysMenuVo> listAllVo(SysMenuQuery query) {
+            QueryWrapper<SysMenu> qw = new QueryWrapper<>();
+            qw.eq("menu.pSid", "0");
+            List<SysMenuVo> sysMenuVos = baseMapper.selectListAllVo(qw);
+            for(SysMenuVo s:sysMenuVos){
+                getChildrens(s);
+            }
+            return sysMenuVos;
+        }*/
+    public ResultBean<List<SysMenuTreeVo>>  listAllVoForSource(SysMenuQuery query) {
+
+        return sysMenuFeign.listAllVoForSource(query);
+    }
+    public ResultBean<List<Map<String,String>>>  getMenusForFunction(SysMenuFunctionQuery sysMenuFunctionQuery) {
+        return sysMenuFeign.getMenusForFunction(sysMenuFunctionQuery);
+    }
+    public ResultBean<List<Map<String, Object>>>  sourceMenuTreeByUserSid(SysMenuQuery query) {
+        return sysMenuFeign.sourceMenuTreeByUserSid(query);
+    }
+
+    public ResultBean<List<Map<String, Object>>>  sourcemenutree(SysMenuQuery query) {
+        return sysMenuFeign.sourcemenutree(query);
+    }
+
+    public void getChildList(List<SysMenuTreeVo> list) {
+        list.forEach(str -> {
+            String sid = str.getSid();
+            List<SysMenuTreeVo> listChildren = baseMapper.selectChildernList(sid);
+            str.setChildren(listChildren);
+            getChildList(listChildren);
+        });
+    }
+
+    /*暂时废弃*/
+	/*private List<SysMenuTreeVo> getChildrensForMenuTree(List<SysMenuTreeVo> sysMenuVoList) {
+		List<SysMenuTreeVo> list = new ArrayList<>();
+		for (SysMenuTreeVo s : sysMenuVoList) {
+			SysMenu sysMenu = sysMenuService.fetchBySid(s.getMenuRootSid());
+			SysMenuTreeVo sysMenuTreeVo = new SysMenuTreeVo();
+			BeanUtil.copyProperties(sysMenu, sysMenuTreeVo);
+			list.add(sysMenuTreeVo);
+		}
+		for (SysMenuTreeVo s : list) {
+			getChildrensForMenuTree(s, s.getSid());
+		}
+		return list;
+	}
+	private void getChildrensForMenuTree(SysMenuTreeVo s,String sid){
+		QueryWrapper<SysMenuTreeVo> qw = new QueryWrapper<>();
+		if (StringUtils.isNotBlank(sid)) {
+			qw.eq("menu.pSid", sid);
+		}
+		List<SysMenuTreeVo> sysMenuVos = baseMapper.getChildrensForMenuTree(qw);
+		if(!sysMenuVos.isEmpty()){
+			for(SysMenuTreeVo smv:sysMenuVos){
+				getChildrensForMenuTree(smv,smv.getSid());
+			}
+		}
+		s.setChildren(sysMenuVos);
+	}
+	private void getChildrens(SysMenuVo s){
+		String sid = s.getSid();
+		QueryWrapper<SysMenu> qw = new QueryWrapper<>();
+		if (StringUtils.isNotBlank(sid)) {
+			qw.eq("menu.pSid", sid);
+		}
+		List<SysMenuVo> sysMenuVos = baseMapper.selectListAllVo(qw);
+		if(!sysMenuVos.isEmpty()){
+			for(SysMenuVo smv:sysMenuVos){
+				getChildrens(smv);
+			}
+		}
+		s.setChildren(sysMenuVos);
+	}*/
+    public ResultBean<List<SysMenuVo>> listVo() {
+        return sysMenuFeign.list();
+    }
+
+   /* public void saveOrUpdateDto(SysMenuDto dto) {
+        SysMenu entity = new SysMenu();
+        dto.fillEntity(entity);
+        SysSourceMenu sysSourceMenu = new SysSourceMenu();
+        sysSourceMenu.setMenuSid(entity.getSid());
+        sysSourceMenu.setSourceSid(dto.getSourceSid());
+        setRootSid(entity, sysSourceMenu);
+        sysSourceMenuService.save(sysSourceMenu);
+        this.saveOrUpdate(entity);
+    }*/
+
+//    private void setRootSid(SysMenu entity, SysSourceMenu sysSourceMenu) {
+//        String pSid = entity.getPSid();
+//        if ("0".equals(pSid)) {
+//            sysSourceMenu.setMenuRootSid(entity.getSid());
+//        } else {
+//            SysMenu sysMenu = sysMenuService.fetchBySid(pSid);
+//            String pSid1 = sysMenu.getPSid();
+//            if ("0".equals(pSid1)) {
+//                sysSourceMenu.setMenuRootSid(sysMenu.getSid());
+//            }
+//            setRootSid(sysMenu, sysSourceMenu);
+//        }
+//    }
+
+    public SysMenuVo fetchByIdVo(String id) {
+        SysMenu entity = this.fetchById(id);
+        SysMenuVo vo = new SysMenuVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public ResultBean<List<SysMenuVo>> listAllByRoleSid(SysMenuQuery query) {
+
+        return sysMenuFeign.listAllByRoleSid(query);
+    }
+
+    private void getChildrensByRoleSid(SysMenuVo s, String roleSid, String sourceSid) {
+        String sid = s.getSid();
+        List<SysMenuVo> sysMenuVos = baseMapper.listAllParentByRoleSid(roleSid, sid, sourceSid);
+        if (!sysMenuVos.isEmpty()) {
+            for (SysMenuVo smv : sysMenuVos) {
+                getChildrensByRoleSid(smv, roleSid, sourceSid);
+            }
+        }
+        s.setChildren(sysMenuVos);
+    }
+
+	/*public List<SysMenuTreeVo> listAllVoBySourceSId(SysMenuQuery query) {
+		SysSource sysSource = sysSourceService.fetchBySid(query.getSourceSid());
+		List<SysMenuTreeVo> sysSourceVos = new ArrayList<>();//sysSourceService.listAllVoBySourceSId(query.getSourceSid());
+		SysMenuTreeVo smtv=new SysMenuTreeVo();
+		smtv.setName(sysSource.getSourceName());
+		smtv.setSid(sysSource.getSid());
+		smtv.setSourceSid(sysSource.getSid());
+		sysSourceVos.add(smtv);
+		for(SysMenuTreeVo s:sysSourceVos){
+			List<SysMenuTreeVo> sysMenuVoList=sysSourceMenuService.fetchRootMenuBySourceSid(s.getSourceSid());
+			if(!sysMenuVoList.isEmpty()){
+				sysMenuVoList = getChildrensForMenuTree(sysMenuVoList);
+			}
+			s.setChildren(sysMenuVoList);
+		}
+		return sysSourceVos;
+	}*/
+
+    /**
+     * 资源菜单树形列表
+     *
+     * @return 资源菜单树形列表（第一级一级菜单 第二级二级菜单）
+     */
+    public List<Map<String, Object>> getSourceMenuTree(List<SysMenuRoleVo> list_menu, Map<String, Object> map_selectMenus) {
+
+        //获取当前资源的菜单列表
+        List<Map<String, Object>> list_menus_map = new ArrayList<Map<String, Object>>();
+
+
+        //获取资源第一级菜单列表
+        List<SysMenuRoleVo> list_firstLevel_menu = list_menu.stream().filter(s -> s.getPSid().equals("0")).collect(Collectors.toList());
+
+        //遍历资源的第一级菜单
+        for (int i = 0; i < list_firstLevel_menu.size(); i++) {
+            Map<String, Object> map_firstLevel_menu = getMenuTreeFromStream(list_firstLevel_menu.get(i).getSid(), list_menu, map_selectMenus);
+            //把该菜单挂在当前菜单列表中
+            if (null != map_firstLevel_menu)
+                list_menus_map.add(map_firstLevel_menu);
+        }
+        return list_menus_map;
+
+    }
+
+    /**
+     * 递归把list转换成菜单树形列表
+     *
+     * @param psid
+     * @param list_menu
+     * @return
+     */
+    private Map<String, Object> getMenuTreeFromStream(String psid, List<SysMenuRoleVo> list_menu, Map<String, Object> map_selectMenus) {
+        //获取当前菜单
+        List<SysMenuRoleVo> list_current_menu = list_menu.stream().filter(s -> s.getSid().equals(psid)).collect(Collectors.toList());
+        if (null == list_current_menu || 0 == list_current_menu.size())
+            return null;
+
+        Map<String, Object> map_menu = getMenuMap(list_current_menu.get(0), map_selectMenus);
+
+        //2.获取菜单的子菜单列表
+        //存储最终子菜单列表结果
+        List<Map<String, Object>> list_child = new ArrayList<Map<String, Object>>();
+
+        //获取子菜单列表
+        List<SysMenuRoleVo> list_child_menu = list_menu.stream().filter(s -> s.getPSid().equals(psid)).collect(Collectors.toList());
+        for (int i = 0; i < list_child_menu.size(); i++) {
+            //获取该菜单子菜单列表
+            Map<String, Object> map_child_menu = getMenuTreeFromStream(list_child_menu.get(i).getSid(), list_menu, map_selectMenus);
+            //把该菜单挂在当前菜单列表中
+            if (null != map_child_menu)
+                list_child.add(map_child_menu);
+        }
+        //把该菜单列表放到父菜单的childMenus中
+        map_menu.put("children", list_child);
+
+        return map_menu;
+
+    }
+
+    /**
+     * 构造菜单的结果map
+     *
+     * @return
+     */
+    private Map<String, Object> getMenuMap(SysMenuRoleVo menuVo, Map<String, Object> map_selectMenus) {
+        Map<String, Object> map_menu = new HashMap<String, Object>();
+
+        if (null != map_selectMenus) {
+            //角色授权时，菜单列表
+            map_menu.put("sid", menuVo.getSid());
+            map_menu.put("menuName", menuVo.getMenuName() + (StringUtils.isNotBlank(menuVo.getRemarks()) ? "(" + menuVo.getRemarks() + ")" : ""));
+            map_menu.put("menuUrl", menuVo.getMenuUrl());
+            map_menu.put("pageUrl", menuVo.getPageUrl());
+            map_menu.put("iconUrl", menuVo.getIconUrl());
+            map_menu.put("isShow", menuVo.getIsShow());
+            if (menuVo.getAlwaysShow() == 0) {
+                map_menu.put("alwaysShow", false);
+            } else if (menuVo.getAlwaysShow() == 1) {
+                map_menu.put("alwaysShow", true);
+            }
+
+            //如果角色已有的菜单，则设置选中，并移除map中的项；否则设置不选中
+            if (map_selectMenus.containsKey(menuVo.getSid())) {
+                map_menu.put("isCheck", 1);
+                map_selectMenus.remove(menuVo.getSid());
+            } else {
+                map_menu.put("isCheck", 0);
+            }
+        } else {
+            //左侧菜单列表
+            Map<String, Object> map_meta = new HashMap<String, Object>();
+            map_meta.put("title", menuVo.getMenuName());
+            map_meta.put("icon", menuVo.getIconUrl());
+            map_menu.put("meta", map_meta);
+
+            map_menu.put("redirect", menuVo.getPageUrlRedirect());
+            //路径
+            map_menu.put("path", menuVo.getPageUrl() != null && !menuVo.getPageUrl().equals("") ? menuVo.getPageUrl() : "/" + menuVo.getPageName());
+            map_menu.put("name", menuVo.getPageAliasName() != null && !menuVo.getPageAliasName().equals("") ? menuVo.getPageAliasName() : menuVo.getPageUrl());
+            //组件名
+            map_menu.put("component", menuVo.getPageName());
+            if (menuVo.getAlwaysShow() == 0) {
+                map_menu.put("alwaysShow", false);
+            } else if (menuVo.getAlwaysShow() == 1) {
+                map_menu.put("alwaysShow", true);
+            }
+        }
+        return map_menu;
+    }
+
+    /**
+     * 将该资源下的所有菜单设置为是否可用
+     *
+     * @param sid      资源sid
+     * @param isEnable 是否可用：1可用，0不可用
+     * @return
+     */
+    public int updateBySourceSid(String sid, Integer isEnable) {
+        return baseMapper.updateBySourceSid(sid, isEnable);
+    }
+
+    public ResultBean saveMenu(SysMenuDto dto) {
+        return sysMenuFeign.save(dto);
+    }
+    public ResultBean updateBySid( SysMenuDto dto, String sid) {
+        return sysMenuFeign.update(dto,sid);
+    }
+    public ResultBean updateIsEnable( String sid,  Integer isEnable) {
+        return sysMenuFeign.updateIsEnable(sid,isEnable);
+    }
+    public ResultBean delBySids( String sid) {
+        return sysMenuFeign.delBySids(sid);
+    }
+
+    public List<SysMenu> selectByMenuUrl(String menuUrl) {
+        return baseMapper.selectByMenuUrl(menuUrl);
+    }
+
+    /**
+     * 根据资源sid查询该资源下的一级菜单列表（yxt_mtl 2024-01-31）
+     *
+     * @param sid 资源sid
+     * @return
+     */
+    public List<SysMenuTreeVo> fetchRootMenuBySourceSid(String sid) {
+        return baseMapper.fetchRootMenuBySourceSid(sid);
+    }
+
+}

oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuTreeVo.java

@@ -0,0 +1,59 @@
+package com.yxt.oms.biz.func.sysmenu;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuVo <br/>
+ * Description: 菜单表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单表 视图数据对象", description = "菜单表 视图数据对象")
+@Data
+public class SysMenuTreeVo implements Vo {
+	@ApiModelProperty("菜单名称")
+    private String name;
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+	@ApiModelProperty("排序号")
+    private Integer sortNo;
+	@ApiModelProperty("上级sid")
+    private String pSid;
+	@ApiModelProperty("上级菜单名称")
+    private String pName;
+	@ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("资源名称")
+    private String sourceName;
+    @ApiModelProperty("菜单根路径sid")
+    private String menuRootSid;
+    @ApiModelProperty("pageUrl")
+    private String pageUrl;
+    @ApiModelProperty("menuUrl")
+    private String menuUrl;
+    @ApiModelProperty("menuUrl")
+    private String pageName;
+    @ApiModelProperty("iconUrl")
+    private String iconUrl;
+    @ApiModelProperty("菜单列表用，是否是资源层级1是，0不是")
+    private String isSource = "0";
+    @ApiModelProperty("是否可用")
+    private String isEnable;
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+    @ApiModelProperty("子菜单")
+    private List<SysMenuTreeVo> children;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysmenu/SysMenuVo.java

@@ -0,0 +1,74 @@
+package com.yxt.oms.biz.func.sysmenu;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenu.SysMenuVo <br/>
+ * Description: 菜单表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单表 视图数据对象", description = "菜单表 视图数据对象")
+@Data
+public class SysMenuVo implements Vo {
+
+    
+	@ApiModelProperty("菜单名称")
+    private String name;
+    
+	@ApiModelProperty("菜单路由路径(VUE)")
+    private String menuUrl;
+    
+	@ApiModelProperty("菜单对应的前端页面路径")
+    private String pageUrl;
+    
+	@ApiModelProperty("菜单图标地址")
+    private String iconUrl;
+    
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+    
+	@ApiModelProperty("是否显示,默认为1显示，0为不显示")
+    private String isShow;
+    
+	@ApiModelProperty("排序号")
+    private Integer sortNo;
+    
+	@ApiModelProperty("上级sid")
+    private String pSid;
+	@ApiModelProperty("上级名称")
+    private String pName;
+	@ApiModelProperty("sid")
+    private String sid;
+
+	@ApiModelProperty("前端页面路径重定向")
+    private Integer pageUrlRedirect;
+    
+	@ApiModelProperty("前端页面名称（vue组件名）")
+    private String pageName;
+    
+	@ApiModelProperty("前端页面别名")
+    private String pageAliasName;
+    
+	@ApiModelProperty("菜单类型（0左侧当行菜单，1页面中功能）")
+    private String menuType;
+    @ApiModelProperty("子菜单")
+	private List<SysMenuVo> children;
+    @ApiModelProperty("是否选中，1：未选中,0：选中")
+    private String checked;
+    @ApiModelProperty("资源名称")
+    private String sourceName;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/MenuRoleVo.java

@@ -0,0 +1,19 @@
+package com.yxt.oms.biz.func.sysmenurole;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 菜单和角色临时存储
+ * @author: dimengzhe
+ * @date: 2023/6/1
+ **/
+@Data
+public class MenuRoleVo {
+
+
+    @ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)")
+    private String dataRuleId;
+    @ApiModelProperty("菜单sid")
+    private String menuSid;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRole.java

@@ -0,0 +1,37 @@
+package com.yxt.oms.biz.func.sysmenurole;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRole.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRole <br/>
+ * Description: 菜单与角色关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与角色关联表", description = "菜单与角色关联表")
+@TableName("sys_menu_role")
+@Data
+public class SysMenuRole extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("菜单sid")
+    private String menuSid;
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+
+    @ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)")
+    private String dataRuleId;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleDataDto.java

@@ -0,0 +1,30 @@
+package com.yxt.oms.biz.func.sysmenurole;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleDto.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleDto <br/>
+ * Description: 菜单与角色关联表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与角色关联表 数据传输对象", description = "菜单与角色关联表 数据传输对象")
+@Data
+public class SysMenuRoleDataDto implements Dto {
+
+    @ApiModelProperty("菜单与角色关联表sid")
+    private String sid;
+    @ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)")
+    private String dataRuleId;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleDataQuery.java

@@ -0,0 +1,30 @@
+package com.yxt.oms.biz.func.sysmenurole;
+
+
+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: SysMenuRoleQuery.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleQuery <br/>
+ * Description: 菜单与角色关联表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与角色关联表 查询条件", description = "菜单与角色关联表 查询条件")
+@Data
+public class SysMenuRoleDataQuery implements Query {
+
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+	@ApiModelProperty("菜单名称")
+    private String menuName;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleDataVo.java

@@ -0,0 +1,32 @@
+package com.yxt.oms.biz.func.sysmenurole;
+
+
+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: SysMenuRoleVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo <br/>
+ * Description: 菜单与角色关联表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与角色关联表 视图数据对象", description = "菜单与角色关联表 视图数据对象")
+@Data
+public class SysMenuRoleDataVo implements Vo {
+
+    @ApiModelProperty("菜单与角色关联表sid")
+    private String sid;
+	@ApiModelProperty("菜单名称")
+    private String name;
+    @ApiModelProperty("数据权限ID(1集团、2事业部、3分公司、4部门、5个人)")
+    private String dataRuleId;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleDto.java

@@ -0,0 +1,31 @@
+package com.yxt.oms.biz.func.sysmenurole;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleDto.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleDto <br/>
+ * Description: 菜单与角色关联表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与角色关联表 数据传输对象", description = "菜单与角色关联表 数据传输对象")
+@Data
+public class SysMenuRoleDto implements Dto {
+
+    
+	@ApiModelProperty("菜单sid")
+    private String menuSid;
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleMapper.java

@@ -0,0 +1,56 @@
+package com.yxt.oms.biz.func.sysmenurole;
+
+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 org.apache.ibatis.annotations.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleMapper.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysmenurole.SysMenuRoleMapper <br/>
+ * Description: 菜单与角色关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface SysMenuRoleMapper extends BaseMapper<SysMenuRole> {
+
+    //@Update("update sys_menu_role set name=#{msg} where id=#{id}")
+    //IPage<SysMenuRoleVo> voPage(IPage<SysMenuRole> page, @Param(Constants.WRAPPER) QueryWrapper<SysMenuRole> qw);
+
+    IPage<SysMenuRoleVo> selectPageVo(IPage<SysMenuRole> page, @Param(Constants.WRAPPER) Wrapper<SysMenuRole> qw);
+
+    List<SysMenuRoleVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SysMenuRole> qw);
+
+    @Select("select * from sys_menu_role")
+    List<SysMenuRoleVo> selectListVo();
+
+    @Delete("delete from sys_menu_role where roleSid=#{roleSid}")
+    void delByRoleSid(@Param("roleSid") String roleSid);
+
+    List<SysMenuRoleVo> list(@Param(Constants.WRAPPER) QueryWrapper<SysMenuRoleVo> qw);
+
+    List<MenuRoleVo> selectByRoleSid(String roleSid);
+
+    List<SysMenuRoleDataVo> selMenuByRole(@Param(Constants.WRAPPER) QueryWrapper qw);
+
+    List<SysMenuRoleDataVo> selMenuByRoleApp(@Param(Constants.WRAPPER) QueryWrapper qw);
+
+    @Update("update sys_menu_role set dataRuleId = #{dataRuleId} where sid = #{sid}")
+    void updateDataByRoleMenu(@Param("sid") String sid,@Param("dataRuleId") String dataRuleId);
+
+    @Update("update sys_mobile_menu_role set dataRuleId = #{dataRuleId} where sid = #{sid}")
+    void updateDataByRoleMenuApp(@Param("sid") String sid,@Param("dataRuleId") String dataRuleId);
+
+
+}

oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleMapper.xml

@@ -0,0 +1,74 @@
+<?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.wms.biz.func.sysmenurole.SysMenuRoleMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.wms.biz.func.sysmenurole.SysMenuRoleVo">
+        SELECT * FROM sys_menu_role
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.wms.biz.func.sysmenurole.SysMenuRoleVo">
+        SELECT * FROM sys_menu_role
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="list" parameterType="com.yxt.wms.biz.func.sysmenurole.SysMenuRoleQuery"
+            resultType="com.yxt.wms.biz.func.sysmenurole.SysMenuRoleVo">
+        SELECT distinct rm.menuSid as sid,
+                        m.name     as menuName,
+                        m.menuUrl,
+                        m.pageUrl,
+                        m.pageName,
+                        m.pageUrlRedirect,
+                        m.pageAliasName,
+                        m.iconUrl,
+                        m.sourceSid,
+                        m.isShow,
+                        m.pSid,
+                        m.sortNo,
+                        m.remarks,
+                        1          as alwaysShow
+        FROM sys_menu_role rm
+                     LEFT JOIN sys_menu m ON rm.menuSid = m.sid
+                ${ew.customSqlSegment}
+    </select>
+
+    <select id="selectByRoleSid" resultType="com.yxt.wms.biz.func.sysmenurole.MenuRoleVo">
+        select menuSid, dataRuleId
+        from sys_menu_role
+        where roleSid = #{roleSid}
+    </select>
+
+    <select id="selMenuByRole" resultType="com.yxt.wms.biz.func.sysmenurole.SysMenuRoleDataVo">
+        SELECT
+        smr.sid,
+        sm.`name`,
+        smr.`dataRuleId`
+        FROM
+        sys_menu sm
+        LEFT JOIN sys_menu_role smr
+        ON smr.`menuSid` = sm.`sid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selMenuByRoleApp" resultType="com.yxt.wms.biz.func.sysmenurole.SysMenuRoleDataVo">
+        SELECT
+        smmr.sid,
+        smm.`name`,
+        smmr.`dataRuleId`
+        FROM
+        sys_mobile_menu smm
+        LEFT JOIN sys_mobile_menu_role smmr
+        ON smmr.`menuSid` = smm.`sid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+</mapper>

oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleQuery.java

@@ -0,0 +1,40 @@
+package com.yxt.oms.biz.func.sysmenurole;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleQuery.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleQuery <br/>
+ * Description: 菜单与角色关联表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与角色关联表 查询条件", description = "菜单与角色关联表 查询条件")
+@Data
+public class SysMenuRoleQuery implements Query {
+
+    
+	@ApiModelProperty("菜单sid")
+    private String menuSid;
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+	@ApiModelProperty("多个角色sid计集合")
+    private List<String> roleSids;
+	@ApiModelProperty("资源sid")
+    private String sourceSid;
+    @ApiModelProperty("是否是系统管理员")
+    private String isAdmin;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleService.java

@@ -0,0 +1,210 @@
+package com.yxt.oms.biz.func.sysmenurole;
+
+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.wms.biz.func.sysmenu.SysMenuService;
+import com.yxt.wms.feign.portal.sysmenurole.SysMenuRoleFeign;
+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;
+import java.util.Map;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleService.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysmenurole.SysMenuRoleService <br/>
+ * Description: 菜单与角色关联表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class SysMenuRoleService extends MybatisBaseService<SysMenuRoleMapper, SysMenuRole> {
+
+    @Autowired
+    SysMenuRoleFeign sysMenuRoleFeign;
+    @Autowired
+    SysMenuService sysMenuService;
+
+    public PagerVo<SysMenuRole> listPage(PagerQuery<SysMenuRoleQuery> pq) {
+        SysMenuRoleQuery query = pq.getParams();
+        QueryWrapper<SysMenuRole> qw = createQueryWrapper(query);
+        IPage<SysMenuRole> page = PagerUtil.queryToPage(pq);
+        IPage<SysMenuRole> pagging = baseMapper.selectPage(page, qw);
+        PagerVo<SysMenuRole> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public List<SysMenuRole> listAll(SysMenuRoleQuery query) {
+        QueryWrapper<SysMenuRole> qw = createQueryWrapper(query);
+        return baseMapper.selectList(qw);
+    }
+
+    private QueryWrapper<SysMenuRole> createQueryWrapper(SysMenuRoleQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<SysMenuRole> qw = new QueryWrapper<>();
+
+
+        if (StringUtils.isNotBlank(query.getMenuSid())) {
+            qw.eq("menuSid", query.getMenuSid());
+        }
+
+        if (StringUtils.isNotBlank(query.getRoleSid())) {
+            qw.eq("roleSid", query.getRoleSid());
+        }
+        return qw;
+    }
+
+    public ResultBean<PagerVo<SysMenuRoleVo>> listPageVo(PagerQuery<SysMenuRoleQuery> pq) {
+        return sysMenuRoleFeign.listPage(pq);
+    }
+
+    public ResultBean<List<SysMenuRoleVo>> listAllVo(SysMenuRoleQuery query) {
+        QueryWrapper<SysMenuRole> qw = createQueryWrapper(query);
+        return sysMenuRoleFeign.listAll(query);
+    }
+
+    public ResultBean<List<SysMenuRoleVo>> listVo() {
+        return sysMenuRoleFeign.list();
+    }
+
+    public ResultBean saveOrUpdateDto(SysMenuRoleDto dto) {
+        return sysMenuRoleFeign.save(dto);
+    }
+    public ResultBean updateBySid(SysMenuRoleDto dto,String sid) {
+        return sysMenuRoleFeign.update(dto,sid);
+    }
+    public ResultBean updateRoleAndMenu(SysMenuRoleDto dto) {
+        return sysMenuRoleFeign.updateRoleAndMenu(dto);
+    }
+    public ResultBean del(String sid) {
+        return sysMenuRoleFeign.del(sid);
+    }
+
+    public ResultBean<SysMenuRoleVo> fetchByIdVo(String id) {
+        return sysMenuRoleFeign.fetch(id);
+    }
+
+    public void delByRoleSid(String roleSid) {
+        baseMapper.delByRoleSid(roleSid);
+    }
+
+    // 不分页列表
+    public List<SysMenuRoleVo> list(SysMenuRoleQuery query) {
+        // mybits所用的查询条件封装类
+        QueryWrapper<SysMenuRoleVo> qw = buildQueryWrapper(query);
+        return baseMapper.list(qw);
+    }
+
+    /**
+     * 解析和组装查询条件，封装在qw中
+     *
+     * @param query
+     * @return
+     */
+    private QueryWrapper<SysMenuRoleVo> buildQueryWrapper(SysMenuRoleQuery query) {
+        QueryWrapper<SysMenuRoleVo> qw = new QueryWrapper<>();
+        if (query != null) {
+            if (StringUtils.isNotBlank(query.getSourceSid())) {
+                qw.eq("m.sourceSid", query.getSourceSid());
+            }
+			/*if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getRoleSid())) {
+				qw.in("rm.roleSid", query.getRoleSid());
+			}*/
+            if (StringUtils.isNotBlank(query.getIsAdmin())) {
+                if (!query.getIsAdmin().equals("1")){
+                    qw.eq("m.isEnable", 1);
+                }
+            }
+
+            if (query.getRoleSids() != null && query.getRoleSids().size() > 0) {
+                qw.in("rm.roleSid", query.getRoleSids());
+            }
+            qw.eq("m.isShow", 1);
+            qw.orderByAsc("m.sortNo");
+        }
+
+        return qw;
+
+    }
+
+    /**
+     * 资源菜单树形列表
+     *
+     * @param query:roleSids,sourceSid
+     * @return 资源菜单树形列表（第一级一级菜单 第二级二级菜单）
+     */
+    public List<Map<String, Object>> getSourceMenuTreeOfRoles(SysMenuRoleQuery query, Map<String, Object> map_rolemenus) {
+
+        //获取当前资源的菜单列表
+        List<Map<String, Object>> list_menus_map = new ArrayList<Map<String, Object>>();
+        if (null == query)
+            return list_menus_map;
+
+        //角色s的某个资源的所有菜单列表
+        List<SysMenuRoleVo> list_menu = list(query);
+        list_menus_map = sysMenuService.getSourceMenuTree(list_menu, map_rolemenus);
+
+        return list_menus_map;
+
+    }
+
+    public List<MenuRoleVo> selectByRoleSid(String roleSid) {
+        return baseMapper.selectByRoleSid(roleSid);
+    }
+
+    public ResultBean<List<SysMenuRoleDataVo>> selMenuByRole(SysMenuRoleDataQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        QueryWrapper qw = new QueryWrapper<>();
+        qw.eq("smr.roleSid",query.getRoleSid());
+        if (StringUtils.isNotBlank(query.getMenuName())){
+            qw.like("sm.name",query.getMenuName());
+        }
+        List<SysMenuRoleDataVo> sysMenuRoleDataVos = baseMapper.selMenuByRole(qw);
+        return rb.success().setData(sysMenuRoleDataVos);
+    }
+
+    public ResultBean<List<SysMenuRoleDataVo>> selMenuByRoleApp(SysMenuRoleDataQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        QueryWrapper qw = new QueryWrapper<>();
+        qw.eq("smmr.roleSid",query.getRoleSid());
+        if (StringUtils.isNotBlank(query.getMenuName())){
+            qw.like("smm.name",query.getMenuName());
+        }
+        List<SysMenuRoleDataVo> sysMenuRoleDataVos = baseMapper.selMenuByRoleApp(qw);
+        return rb.success().setData(sysMenuRoleDataVos);
+    }
+
+    public ResultBean updateDataByRoleMenu(List<SysMenuRoleDataDto> dtos) {
+        ResultBean rb = ResultBean.fireFail();
+        for (SysMenuRoleDataDto dto : dtos) {
+            if (StringUtils.isNotBlank(dto.getDataRuleId())){
+                baseMapper.updateDataByRoleMenu(dto.getSid(),dto.getDataRuleId());
+            }
+        }
+        return rb.success();
+    }
+
+    public ResultBean updateDataByRoleMenuApp(List<SysMenuRoleDataDto> dtos) {
+        ResultBean rb = ResultBean.fireFail();
+        for (SysMenuRoleDataDto dto : dtos) {
+            if (StringUtils.isNotBlank(dto.getDataRuleId())){
+                baseMapper.updateDataByRoleMenuApp(dto.getSid(),dto.getDataRuleId());
+            }
+        }
+        return rb.success();
+    }
+}

oms/src/main/java/com/yxt/oms/biz/func/sysmenurole/SysMenuRoleVo.java

@@ -0,0 +1,56 @@
+package com.yxt.oms.biz.func.sysmenurole;
+
+
+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: SysMenuRoleVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo <br/>
+ * Description: 菜单与角色关联表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "菜单与角色关联表 视图数据对象", description = "菜单与角色关联表 视图数据对象")
+@Data
+public class SysMenuRoleVo implements Vo {
+
+    
+	@ApiModelProperty("菜单sid")
+    private String menuSid;
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+	@ApiModelProperty("菜单父级sid")
+    private String pSid;
+	@ApiModelProperty("menusid")
+    private String sid;
+	@ApiModelProperty("menuUrl")
+    private String menuUrl;
+    @ApiModelProperty("menuName")
+    private String menuName;
+    @ApiModelProperty("pageUrl")
+    private String pageUrl;
+    @ApiModelProperty("iconUrl")
+    private String iconUrl;
+    @ApiModelProperty("isShow")
+    private String isShow;
+    @ApiModelProperty("alwaysShow")
+    private Integer alwaysShow;
+    @ApiModelProperty("pageUrlRedirect")
+    private String pageUrlRedirect;
+    @ApiModelProperty("pageAliasName")
+    private String pageAliasName;
+    @ApiModelProperty("pageName")
+    private String pageName;
+    @ApiModelProperty("remarks")
+    private String remarks;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysorganization/AppContactSysOrganizationVo.java

@@ -0,0 +1,40 @@
+package com.yxt.oms.biz.func.sysorganization;
+
+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 AppContactSysOrganizationVo implements Vo {
+
+    @ApiModelProperty("部门/组织sid")
+    private String sid;
+
+    @ApiModelProperty("部门/组织名称|员工姓名")
+    private String name;
+
+    @ApiModelProperty("员工数量")
+    private int staffNum;
+
+    @ApiModelProperty("跳转类型：1、部门2、员工列表")
+    private Integer type;
+
+    @ApiModelProperty("员工电话")
+    private String mobile;
+
+    @ApiModelProperty("员工头像")
+    private String headImage;
+
+    @ApiModelProperty("员工所在部门名称（路径）")
+    private String orgNamePath;
+
+    @ApiModelProperty("员工职位")
+    private String position;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysorganization/QrCodeVo.java

@@ -0,0 +1,23 @@
+package com.yxt.oms.biz.func.sysorganization;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2020/11/3 16:19
+ * @description
+ */
+@Data
+public class QrCodeVo {
+    @ApiModelProperty("部门名称")
+    private String departmentName;
+    @ApiModelProperty("单位名称")
+    private String organizationName;
+    @ApiModelProperty("部门地址")
+    private String address;
+    @ApiModelProperty("二维码图片地址")
+    private String qrFilePath;
+    @ApiModelProperty(value = "部门sid")
+    private String sid;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrgListVo.java

@@ -0,0 +1,29 @@
+package com.yxt.oms.biz.func.sysorganization;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/2/14 11:45
+ * @Description 员工所在部门下拉列表
+ */
+@Data
+public class SysOrgListVo implements Vo {
+    private static final long serialVersionUID = -3558876605554852892L;
+
+    @ApiModelProperty(value = "组织名称")
+    private String name;
+    @ApiModelProperty(value = "部门编码")
+    private String orgCode;
+    @ApiModelProperty(value = "sid")
+    private String sid;
+    @ApiModelProperty(value = "上级sid")
+    private String psid;
+    @ApiModelProperty(value = "orgSidPath")
+    private String orgSidPath;
+    private List<SysOrgVo> children;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrgStaffVo.java

@@ -0,0 +1,17 @@
+package com.yxt.oms.biz.func.sysorganization;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/26 11:48
+ * @Description
+ */
+@Data
+public class SysOrgStaffVo implements Vo {
+    private static final long serialVersionUID = -4311553944345419092L;
+
+    private String staffName;
+    private String staffSid;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrgVo.java

@@ -0,0 +1,31 @@
+package com.yxt.oms.biz.func.sysorganization;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/10/12 20:55
+ * @description
+ */
+@Data
+public class SysOrgVo implements Vo {
+    private static final long serialVersionUID = 2983637708030419942L;
+    @ApiModelProperty(value = "组织名称")
+    private String name;
+    @ApiModelProperty(value = "sid")
+    private String sid;
+    @ApiModelProperty(value = "psid")
+    private String psid;
+    @ApiModelProperty(value = "id")
+    private String id;
+    @ApiModelProperty(value = "orgSidPath")
+    private String orgSidPath;
+    @ApiModelProperty(value = "部门编码")
+    private String orgCode;
+
+    private List<SysOrgVo> children;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganization.java

@@ -0,0 +1,87 @@
+package com.yxt.oms.biz.func.sysorganization;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysOrganization.java <br/>
+ * Class: SysOrganization <br/>
+ * Description: 组织机构表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "组织机构表", description = "组织机构表")
+@TableName("sys_organization")
+@Data
+public class SysOrganization extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+
+	@ApiModelProperty("部门/组织名称")
+    private String name;
+
+	@ApiModelProperty("父(部门/组织) sid")
+    private String psid;
+
+	@ApiModelProperty("联系电话")
+    private String linkPhone;
+	@ApiModelProperty("联系人")
+    private String linkPerson;
+
+	@ApiModelProperty("部门sid全路径")
+    private String orgSidPath;
+
+	@ApiModelProperty("排序")
+    private Integer sort;
+
+	@ApiModelProperty("地址")
+    private String addrs;
+
+	@ApiModelProperty("地理位置经纬度")
+    private String jwd;
+
+	@ApiModelProperty("二维码")
+    private String qrText;
+
+	@ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己")
+    private Integer limitOrgMember;
+
+	@ApiModelProperty("部门编码")
+    private String orgCode;
+
+//    @ApiModelProperty("部门简称（地区简称+门店名称首字母（遇到首字母重复时用2个字母））")
+//    private String orgShortName;
+
+    @ApiModelProperty("销售区域划分(本店终端销售：0,门店对应业务区域划分销售：1至9,具体编号划分各门店报备确定)")
+    private String regionDivision;
+
+    @ApiModelProperty("是否是部门(0否，1是)")
+    private Integer isDept;
+
+    @ApiModelProperty("组织简称")
+    private String orgAbbre;
+
+    @ApiModelProperty("组织属性key")
+    private String orgAttributeKey;
+
+    @ApiModelProperty("组织属性value")
+    private String orgAttributeValue;
+
+    @ApiModelProperty("管理层级key")
+    private String orgLevelKey;
+
+    @ApiModelProperty("管理层级value")
+    private String orgLevelValue;
+
+    @ApiModelProperty("其他编码")
+    private String otherCode;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationDto.java

@@ -0,0 +1,91 @@
+package com.yxt.oms.biz.func.sysorganization;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysOrganizationDto.java <br/>
+ * Class: SysOrganizationDto <br/>
+ * Description: 组织机构表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "组织机构表 数据传输对象", description = "组织机构表 数据传输对象")
+@Data
+public class SysOrganizationDto implements Dto {
+
+    
+	@ApiModelProperty("部门/组织名称")
+    private String name;
+    
+	@ApiModelProperty("父(部门/组织) sid")
+    private String psid;
+    
+	@ApiModelProperty("联系电话")
+    private String linkPhone;
+	@ApiModelProperty("联系人")
+    private String linkPerson;
+
+	@ApiModelProperty("部门sid全路径")
+    private String orgSidPath;
+    
+	@ApiModelProperty("排序")
+    private Integer sort;
+    
+	@ApiModelProperty("地址")
+    private String addrs;
+    
+	@ApiModelProperty("地理位置经纬度")
+    private String jwd;
+    
+	@ApiModelProperty("二维码")
+    private String qrText;
+    
+	@ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己")
+    private Integer limitOrgMember;
+    
+	@ApiModelProperty("部门编码")
+    private String orgCode;
+
+    @ApiModelProperty("部门简称（地区简称+门店名称首字母（遇到首字母重复时用2个字母））")
+    private String orgShortName;
+
+    @ApiModelProperty("销售区域划分(本店终端销售：0,门店对应业务区域划分销售：1至9,具体编号划分各门店报备确定)")
+    private String regionDivision;
+
+	@ApiModelProperty("主管人员sid")
+    private String zgStaffSid;
+
+	@ApiModelProperty("分管人员sid")
+    private String fgStaffSid;
+
+    @ApiModelProperty("组织简称")
+    private String orgAbbre;
+
+    @ApiModelProperty("是否是部门(0否，1是)")
+    private Integer isDept;
+
+    @ApiModelProperty("组织属性key")
+    private String orgAttributeKey;
+
+    @ApiModelProperty("组织属性value")
+    private String orgAttributeValue;
+
+    @ApiModelProperty("管理层级key")
+    private String orgLevelKey;
+
+    @ApiModelProperty("管理层级value")
+    private String orgLevelValue;
+
+    @ApiModelProperty("其他编码")
+    private String otherCode;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationListQuery.java

@@ -0,0 +1,16 @@
+package com.yxt.oms.biz.func.sysorganization;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/26 11:49
+ * @Description
+ */
+@Data
+public class SysOrganizationListQuery implements Query {
+    private static final long serialVersionUID = 8657016527420117948L;
+
+    private String userSid;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationListVo.java

@@ -0,0 +1,23 @@
+package com.yxt.oms.biz.func.sysorganization;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/26 11:42
+ * @Description
+ */
+@Data
+public class SysOrganizationListVo implements Vo {
+    private static final long serialVersionUID = -3709239161608411765L;
+
+    private String orgDeptSid;
+    private String orgDeptName;
+
+    private List<SysOrgStaffVo> staffinfoVoList;
+
+
+}

oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationListsVo.java

@@ -0,0 +1,17 @@
+package com.yxt.oms.biz.func.sysorganization;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/30 11:28
+ * @Description
+ */
+@Data
+public class SysOrganizationListsVo implements Vo {
+    private static final long serialVersionUID = -7021974833444298712L;
+
+    private String orgDeptSid;
+    private String orgDeptName;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationMapper.java

@@ -0,0 +1,121 @@
+package com.yxt.oms.biz.func.sysorganization;
+
+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;
+import java.util.Map;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysOrganizationMapper.java <br/>
+ * Class: SysOrganizationMapper <br/>
+ * Description: 组织机构表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
+
+    //@Update("update sys_organization set name=#{msg} where id=#{id}")
+    //IPage<SysOrganizationVo> voPage(IPage<SysOrganization> page, @Param(Constants.WRAPPER) QueryWrapper<SysOrganization> qw);
+
+    IPage<SysOrganizationVo> selectPageVo(IPage<SysOrganization> page, @Param(Constants.WRAPPER) Wrapper<SysOrganization> qw);
+
+    List<SysOrganizationVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SysOrganization> qw);
+
+    List<SysOrganizationVo> selectFirstOrgList();
+
+    List<SysOrganizationVo> selectChildrenListByPsid(@Param("psid") String psid);
+
+    @Select("SELECT * FROM sys_organization")
+    List<SysOrganizationVo> selectListVo();
+
+    @Select("SELECT name FROM sys_organization WHERE sid=#{sid}")
+    String selectOrgnameBySid(@Param("sid") String sid);
+
+    String selectOrgSidPath(@Param("sid") String sid);
+
+    List<AppContactSysOrganizationVo> selectAppOrganization();
+
+    List<AppContactSysOrganizationVo> selectAppOrganizationByPsid(@Param("psid") String psid);
+
+    List<SysOrgVo> treeList(String psid);
+
+    SysOrganization selectOrgCode();
+
+    List<SysOrgVo> getListOrg();
+
+    SysOrganization selectOrgCodeByPsid();
+
+    /**
+     * 根据上级sid查询组织的部门
+     *
+     * @param psid 上级sid
+     * @return
+     */
+    List<SysOrgListVo> selectTreeList(String psid);
+
+    /**
+     * 根据部门编码查询部门信息
+     *
+     * @param substring 部门编码
+     * @return
+     */
+    SysOrganization selectByOrgCode(String substring);
+
+    List<SysOrganizationVo> selectChildernList(String sid);
+
+//    /**
+//     * 根据业务员sid获取到分公司
+//     *
+//     * @param staffSid 业务员sid
+//     * @return
+//     */
+//    SysStaffOrgVo getUseOrgByUserSid(@Param("staffSid") String staffSid);
+
+    /**
+     * 根据sid判断是否是分公司并获取公司名称
+     *
+     * @param sid
+     * @return
+     */
+    SysOrganizationVo getUseOrgBySid(@Param("sid")String sid);
+
+    int updateQrCodePath(@Param("sid") String sid, @Param("path") String path);
+
+    QrCodeVo getQrCodeVo(@Param("sid") String sid);
+
+    @Select("select * from sys_organization WHERE staffSid=#{sid}")
+    SysOrganizationVo getUseOrgByStaffSid(String sid);
+
+    List<Map<String, String>> selectUseOrgSidBySid(String psid);
+
+    SysOrgVo getListOrgByBrand(String sid);
+
+    List<SysOrganizationListVo> selectOrgList(String orgSid);
+    List<SysOrganizationListsVo> selectOrgLists(String orgSid);
+
+    List<SysOrgStaffVo> selectByOrgDeptSid(String orgDeptSid);
+
+    SysOrganizationVo selectByPSid(@Param("sid") String sid, @Param("name") String name);
+
+    List<SysOrganizationVo> selectOrgSidList();
+
+    @Select("select * from sys_organization where orgSidPath = #{orgSidPath}")
+    SysOrganizationVo selectByOrgSidPath(String orgSidPath);
+
+    List<SysOrgVo> getListDeptByOrgSid(String orgSid);
+
+    List<SysOrganizationVo> selectOrgByPSid(String psid);
+}

oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationMapper.xml

@@ -0,0 +1,220 @@
+<?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.wms.biz.func.sysorganization.SysOrganizationMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+        SELECT so.*,
+               (SELECT GROUP_CONCAT(ss.name)
+                FROM `sys_staff_org` sso
+                         LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
+                WHERE so.`sid` = sso.`orgSid`
+                  AND sso.manageType = '1') zgNames,
+               (SELECT GROUP_CONCAT(ss.sid)
+                FROM `sys_staff_org` sso
+                         LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
+                WHERE so.`sid` = sso.`orgSid`
+                  AND sso.manageType = '1') zgSids,
+               (SELECT GROUP_CONCAT(ss.name)
+                FROM `sys_staff_org` sso
+                         LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
+                WHERE so.`sid` = sso.`orgSid`
+                  AND sso.manageType = '2') fgNames,
+               (SELECT GROUP_CONCAT(ss.sid)
+                FROM `sys_staff_org` sso
+                         LEFT JOIN `sys_staffinfo` ss ON sso.`staffSid` = ss.`sid`
+                WHERE so.`sid` = sso.`orgSid`
+                  AND sso.manageType = '2') fgSids
+        FROM sys_organization so
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        GROUP BY so.`name`
+        ORDER BY so.sort
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+        SELECT *
+        FROM sys_organization
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectFirstOrgList" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+        SELECT sid, name, psid, orgCode
+        FROM sys_organization
+        WHERE psid = '0'
+    </select>
+
+    <select id="selectChildrenListByPsid" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+        SELECT sid, name, psid, orgCode
+        FROM sys_organization
+        WHERE psid = #{psid}
+        ORDER BY sort ASC
+    </select>
+
+    <select id="selectOrgSidPath" resultType="java.lang.String">
+        SELECT orgSidPath
+        FROM sys_organization WHERE 1 = 1
+        <choose>
+            <when test="sid != null and sid != ''">
+                AND sid = #{sid,jdbcType=VARCHAR}
+            </when>
+            <otherwise>
+                AND psid = '0'
+            </otherwise>
+        </choose>
+    </select>
+
+    <select id="selectAppOrganization"
+            resultType="com.yxt.wms.biz.func.sysorganization.AppContactSysOrganizationVo">
+        SELECT sid,
+               name,
+               (SELECT count(1) FROM sys_staff_org WHERE orgSid = org.sid)                    staffNum,
+               IF((SELECT count(1) FROM sys_organization WHERE psid = org.sid) = 0, '2', '1') type
+        FROM sys_organization org
+        WHERE org.psid = (SELECT sid FROM sys_organization WHERE psid = '0')
+    </select>
+
+    <select id="selectAppOrganizationByPsid"
+            resultType="com.yxt.wms.biz.func.sysorganization.AppContactSysOrganizationVo">
+        SELECT org.sid,
+               org.name,
+               (SELECT count(1) FROM sys_staff_org WHERE orgSid = org.sid)                    staffNum,
+               IF((SELECT count(1) FROM sys_organization WHERE psid = org.sid) = 0, '2', '1') type
+        FROM sys_organization org
+        WHERE org.psid = #{psid}
+    </select>
+
+    <select id="treeList" resultType="com.yxt.wms.biz.func.sysorganization.SysOrgVo">
+        SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath, so.orgCode
+        FROM sys_organization so
+        WHERE psid = #{psid}
+    </select>
+
+    <select id="selectOrgCode" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganization">
+        SELECT *
+        FROM sys_organization
+        WHERE psid = '0'
+    </select>
+
+    <select id="getListOrg" resultType="com.yxt.wms.biz.func.sysorganization.SysOrgVo">
+        SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath
+        FROM sys_organization so
+        WHERE isDept = 0
+        ORDER BY psid
+    </select>
+
+    <select id="selectOrgCodeByPsid" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganization">
+        SELECT *
+        FROM sys_organization
+        LIMIT 0,1
+    </select>
+
+    <select id="selectTreeList" resultType="com.yxt.wms.biz.func.sysorganization.SysOrgListVo">
+        SELECT so.name, so.psid, so.sid, so.orgSidPath, so.orgCode
+        FROM sys_organization so
+        WHERE psid = #{psid}
+    </select>
+    <!--根据部门编码查询部门信息-->
+    <select id="selectByOrgCode" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganization">
+        select *
+        from sys_organization
+        where orgCode = #{substring}
+    </select>
+
+    <select id="selectChildernList" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+        SELECT so.name, so.psid, so.sid, so.orgSidPath, so.orgCode
+        FROM sys_organization so
+        WHERE psid = #{psid}
+        ORDER BY so.sort ASC
+    </select>
+
+<!--    <select id="getUseOrgByUserSid" resultType="com.yxt.wms.biz.func.sysstafforg.SysStaffOrgVo">-->
+<!--        select orgSidPath-->
+<!--        from sys_staff_org-->
+<!--        where staffSid = #{staffSid}-->
+<!--    </select>-->
+
+    <select id="getUseOrgBySid" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+        SELECT so.name, so.psid, so.sid, so.orgSidPath, so.orgCode
+        FROM sys_organization so
+        WHERE sid = #{sid}
+          And isDept = 0
+    </select>
+
+    <update id="updateQrCodePath">
+        UPDATE sys_organization
+        SET qrText = #{path}
+        WHERE sid = #{sid}
+    </update>
+
+    <select id="getQrCodeVo" resultType="com.yxt.wms.biz.func.sysorganization.QrCodeVo">
+        SELECT so.name departmentName, so.qrText qrFilePath, so.addrs address, so.sid
+        FROM sys_organization so
+        WHERE so.sid = #{sid}
+        ORDER BY so.sort ASC
+    </select>
+
+    <select id="selectUseOrgSidBySid" resultType="java.util.Map">
+        SELECT sid,
+               name
+        FROM sys_organization
+        WHERE psid = #{psid}
+          AND isDelete = 0
+          AND isDept = 0
+    </select>
+
+    <select id="getListOrgByBrand" resultType="com.yxt.wms.biz.func.sysorganization.SysOrgVo">
+        SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath
+        FROM sys_organization so
+        WHERE isDept = 0
+          AND so.sid = #{sid}
+        ORDER BY psid
+    </select>
+
+    <select id="selectOrgList" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationListVo">
+        select so.name orgDeptName, so.sid orgDeptSid
+        from sys_organization so
+        where so.psid = #{orgSid}
+          and orgAttributeKey = 'DP03_SYS'
+    </select>
+
+    <select id="selectOrgLists" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationListsVo">
+        select so.name orgDeptName, so.sid orgDeptSid
+        from sys_organization so
+        where so.psid = #{orgSid}
+    </select>
+
+    <select id="selectByOrgDeptSid" resultType="com.yxt.wms.biz.func.sysorganization.SysOrgStaffVo">
+        select distinct si.name staffName, si.sid staffSid
+        from sys_staff_org so
+                 left join sys_staffinfo si on so.staffSid = si.sid
+        where so.orgSid = #{orgDeptSid}
+    </select>
+
+    <select id="selectByPSid" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+        select *
+        from sys_organization
+        where psid = #{sid}
+          and name = #{name}
+    </select>
+
+    <select id="selectOrgSidList" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+        select sid,name,orgCode from sys_organization so where so.isDept = 0
+    </select>
+
+    <select id="getListDeptByOrgSid" resultType="com.yxt.wms.biz.func.sysorganization.SysOrgVo">
+        SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath
+        FROM sys_organization so
+        WHERE isDept = 1
+          AND so.psid = #{orgSid}
+    </select>
+
+    <select id="selectOrgByPSid" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+        SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath
+        FROM sys_organization so
+        WHERE isDept = 0 AND so.psid = #{psid}
+    </select>
+</mapper>

oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationQuery.java

@@ -0,0 +1,58 @@
+package com.yxt.oms.biz.func.sysorganization;
+
+
+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: SysOrganizationQuery.java <br/>
+ * Class: SysOrganizationQuery <br/>
+ * Description: 组织机构表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "组织机构表 查询条件", description = "组织机构表 查询条件")
+@Data
+public class SysOrganizationQuery implements Query {
+
+    
+	@ApiModelProperty("部门/组织名称")
+    private String name;
+    
+	@ApiModelProperty("父(部门/组织) sid")
+    private String psid;
+    
+	@ApiModelProperty("联系电话")
+    private String linkPhone;
+	@ApiModelProperty("联系人")
+    private String linkPerson;
+
+	@ApiModelProperty("部门sid全路径")
+    private String orgSidPath;
+    
+	@ApiModelProperty("排序")
+    private Integer sort;
+    
+	@ApiModelProperty("地址")
+    private String addrs;
+    
+	@ApiModelProperty("地理位置经纬度")
+    private String jwd;
+    
+	@ApiModelProperty("二维码")
+    private String qrText;
+    
+	@ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己")
+    private Integer limitOrgMember;
+    
+	@ApiModelProperty("部门编码")
+    private String orgCode;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationService.java

@@ -0,0 +1,238 @@
+package com.yxt.oms.biz.func.sysorganization;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.config.RedisUtil;
+import com.yxt.common.base.config.component.FileUploadComponent;
+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.portal.sysorganization.SysOrganizationFeign;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class SysOrganizationService extends MybatisBaseService<SysOrganizationMapper, SysOrganization> {
+
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+    @Resource
+    private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private RedisUtil redisUtil;
+
+    public ResultBean saveOrg(SysOrganizationDto dto){
+        return sysOrganizationFeign.saveOrg(dto);
+    }
+
+    public PagerVo<SysOrganization> listPage(PagerQuery<SysOrganizationQuery> pq) {
+        SysOrganizationQuery query = pq.getParams();
+        QueryWrapper<SysOrganization> qw = createQueryWrapper(query);
+        IPage<SysOrganization> page = PagerUtil.queryToPage(pq);
+        IPage<SysOrganization> pagging = baseMapper.selectPage(page, qw);
+        PagerVo<SysOrganization> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public List<SysOrganization> listAll(SysOrganizationQuery query) {
+        QueryWrapper<SysOrganization> qw = createQueryWrapper(query);
+        return baseMapper.selectList(qw);
+    }
+
+    private QueryWrapper<SysOrganization> createQueryWrapper(SysOrganizationQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<SysOrganization> qw = new QueryWrapper<>();
+
+
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.eq("name", query.getName());
+        }
+
+        if (StringUtils.isNotBlank(query.getPsid())) {
+            qw.eq("psid", query.getPsid());
+        }
+
+        if (StringUtils.isNotBlank(query.getLinkPhone())) {
+            qw.eq("linkPhone", query.getLinkPhone());
+        }
+
+        if (StringUtils.isNotBlank(query.getOrgSidPath())) {
+            qw.eq("orgSidPath", query.getOrgSidPath());
+        }
+
+        if (query.getSort() != null) {
+            qw.eq("sort", query.getSort());
+        }
+
+        if (StringUtils.isNotBlank(query.getAddrs())) {
+            qw.eq("addrs", query.getAddrs());
+        }
+
+        if (StringUtils.isNotBlank(query.getJwd())) {
+            qw.eq("jwd", query.getJwd());
+        }
+
+        if (StringUtils.isNotBlank(query.getQrText())) {
+            qw.eq("qrText", query.getQrText());
+        }
+
+        if (query.getLimitOrgMember() != null) {
+            qw.eq("limitOrgMember", query.getLimitOrgMember());
+        }
+
+        if (StringUtils.isNotBlank(query.getOrgCode())) {
+            qw.eq("orgCode", query.getOrgCode());
+        }
+        return qw;
+    }
+
+    public ResultBean<PagerVo<SysOrganizationVo>> listPageVo(PagerQuery<SysOrganizationQuery> pq) {
+        return sysOrganizationFeign.listPage(pq);
+    }
+
+    public ResultBean<List<SysOrganizationVo>> listAllVo(SysOrganizationQuery query) {
+
+        return sysOrganizationFeign.listAll(query);
+    }
+
+    public ResultBean<List<SysOrganizationVo>> listVo() {
+        return sysOrganizationFeign.list();
+    }
+
+
+    public ResultBean<List<SysOrganizationVo>> selectFirstOrgList() {
+        return sysOrganizationFeign.selectFirstOrgList();
+    }
+
+    public ResultBean<List<SysOrganizationVo>> selectChildrenListBySid(String sid) {
+        return sysOrganizationFeign.selectChildrenListBySid(sid);
+    }
+    public ResultBean updateBySid(SysOrganizationDto dto, String sid) {
+        return sysOrganizationFeign.update(dto, sid);
+    }
+    public ResultBean del(String sid) {
+        return sysOrganizationFeign.del(sid);
+    }
+    public ResultBean deIds(String sid) {
+        return sysOrganizationFeign.delBySid(sid);
+    }
+
+
+    public ResultBean saveOrUpdateDto(SysOrganizationDto dto) {
+        return sysOrganizationFeign.save(dto);
+    }
+
+    public ResultBean<SysOrganizationVo> fetchByIdVo(String id) {
+        return sysOrganizationFeign.fetch(id);
+    }
+    public ResultBean<SysOrganizationVo> fetchBySidVo(String id) {
+        return sysOrganizationFeign.fetchBySid(id);
+    }
+
+
+
+    public ResultBean<Map<String, Object>> selectAppOrganization(String sid) {
+        return sysOrganizationFeign.selectAppOrganization(sid);
+    }
+
+
+
+
+
+    /**
+     * @param
+     * @description: 获取组织架构即使用组织下拉框
+     * @return:
+     * @Author: dimengzhe
+     * @Date: 2021/10/12 21:47
+     */
+    public ResultBean<List<SysOrgVo>> treeList() {
+        return sysOrganizationFeign.selectListOrg();
+    }
+
+
+
+    public ResultBean<List<SysOrgVo>> getListOrg() {
+        return sysOrganizationFeign.getListOrg();
+    }
+
+
+    /**
+     * 查询所有部门列表
+     *
+     * @return
+     */
+    public ResultBean<List<SysOrgListVo>> selectListOne() {
+
+        return sysOrganizationFeign.selectListOne();
+
+    }
+
+    /**
+     * 根据业务员sid获取到分公司
+     *
+     * @param userSid 业务员sid
+     * @return
+     */
+    public SysOrganizationVo getUseOrgByUserSid(String userSid) {
+
+        return new SysOrganizationVo();
+    }
+    public ResultBean<SysOrganization> selectBySid(String userSid) {
+        return sysOrganizationFeign.selectBySid(userSid);
+    }
+
+
+    public ResultBean<QrCodeVo> getQrCode(String sid) {
+        return sysOrganizationFeign.getQrCode(sid);
+    }
+
+
+
+    public ResultBean<List<Map<String, String>>> selectUseOrgSidBySid(String sid) {
+        return sysOrganizationFeign.selectUseOrgSidBySid(sid);
+    }
+
+    public ResultBean<String> getOrgSid(String sid) {
+        return sysOrganizationFeign.getOrgSid(sid);
+    }
+
+    public ResultBean<List<SysOrganizationListVo>> selectOrgList(SysOrganizationListQuery query) {
+        return sysOrganizationFeign.selectOrgList(query);
+    }
+
+    public ResultBean<List<SysOrganizationListsVo>> selectOrgLists(SysOrganizationListQuery query) {
+        return sysOrganizationFeign.selectOrgLists(query);
+
+    }
+
+    public ResultBean<SysOrganizationVo> selectByPSid(String sid, String name) {
+
+        return sysOrganizationFeign.selectByPSid(sid, name);
+    }
+
+    public ResultBean<List<SysOrganizationVo>> selectOrgSidList() {
+        return sysOrganizationFeign.selectOrgSidList();
+    }
+
+    public ResultBean<SysOrganizationVo> selectByOrgSidPath(String orgSidPath) {
+        return sysOrganizationFeign.selectByOrgSidPath(orgSidPath);
+    }
+
+    public ResultBean<List<SysOrgVo>> getListDeptByOrgSid(String orgSid) {
+        return sysOrganizationFeign.getListDeptByOrgSid(orgSid);
+    }
+
+    public ResultBean<List<SysOrganizationVo>> selectOrgByPSid(String psid) {
+
+        return sysOrganizationFeign.selectOrgByPSid(psid);
+    }
+}

oms/src/main/java/com/yxt/oms/biz/func/sysorganization/SysOrganizationVo.java

@@ -0,0 +1,86 @@
+package com.yxt.oms.biz.func.sysorganization;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysOrganizationVo.java <br/>
+ * Class: SysOrganizationVo <br/>
+ * Description: 组织机构表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "组织机构表 视图数据对象", description = "组织机构表 视图数据对象")
+@Data
+public class SysOrganizationVo implements Vo {
+    @ApiModelProperty("部门/组织名称")
+    private String name;
+    
+	@ApiModelProperty("父(部门/组织) sid")
+    private String psid;
+    
+	@ApiModelProperty("联系电话")
+    private String linkPhone;
+
+	@ApiModelProperty("联系人")
+    private String linkPerson;
+
+	@ApiModelProperty("部门sid全路径")
+    private String orgSidPath;
+    
+	@ApiModelProperty("排序")
+    private Integer sort;
+    
+	@ApiModelProperty("地址")
+    private String addrs;
+    
+	@ApiModelProperty("地理位置经纬度")
+    private String jwd;
+    
+	@ApiModelProperty("二维码")
+    private String qrText;
+    
+	@ApiModelProperty("限制本部门成员查看通讯录:限制开启后，本部门成员只能看到限定范围内的通讯录不能看到所有通讯录，仅可见自己")
+    private Integer limitOrgMember;
+    
+	@ApiModelProperty("部门编码")
+    private String orgCode;
+	@ApiModelProperty("sid")
+    private String sid;
+    @ApiModelProperty("子集")
+	private List<SysOrganizationVo> children = new ArrayList<>();
+    @ApiModelProperty("主管人员名称")
+    private String zgNames;
+    @ApiModelProperty("分管人员名称")
+    private String fgNames;
+    @ApiModelProperty("主管人员sid")
+    private String zgStaffSid;
+    @ApiModelProperty("分管人员sid")
+    private String fgStaffSid;
+    @ApiModelProperty("组织简称")
+    private String orgAbbre;
+    @ApiModelProperty("是否是部门(0否，1是)")
+    private Integer isDept;
+    @ApiModelProperty("组织属性key")
+    private String orgAttributeKey;
+    @ApiModelProperty("组织属性value")
+    private String orgAttributeValue;
+    @ApiModelProperty("管理层级key")
+    private String orgLevelKey;
+    @ApiModelProperty("管理层级value")
+    private String orgLevelValue;
+    @ApiModelProperty("其他编码")
+    private String otherCode;
+}

oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPost.java

@@ -0,0 +1,46 @@
+package com.yxt.oms.biz.func.syspost;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysPost.java <br/>
+ * Class: com.yxt.anrui.portal.api.syspost.SysPost <br/>
+ * Description: 岗位. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "岗位", description = "岗位")
+@TableName("sys_post")
+@Data
+public class SysPost extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty("岗位名称")
+    private String name;
+
+    @ApiModelProperty("职级key")
+    private String postLevelKey;
+
+    @ApiModelProperty("职级")
+    private String postLevel;
+
+    @ApiModelProperty("岗位编码")
+    private String postCode;
+
+//    @ApiModelProperty("所属部门sid")
+//    private String orgSid;
+
+    @ApiModelProperty(value = "父级sid")
+    private String parentSid;
+}

oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostDto.java

@@ -0,0 +1,44 @@
+package com.yxt.oms.biz.func.syspost;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysPostDto.java <br/>
+ * Class: com.yxt.anrui.portal.api.syspost.SysPostDto <br/>
+ * Description: 岗位 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "岗位 数据传输对象", description = "岗位 数据传输对象")
+@Data
+public class SysPostDto implements Dto {
+
+    private static final long serialVersionUID = 863876947510030464L;
+    @ApiModelProperty("岗位名称")
+    private String name;
+
+    @ApiModelProperty("职级key")
+    private String postLevelKey;
+
+    @ApiModelProperty("职级")
+    private String postLevel;
+
+    @ApiModelProperty("岗位编码")
+    private String postCode;
+
+//    @ApiModelProperty("所属部门sid")
+//    private String orgSid;
+
+    @ApiModelProperty(value = "父级sid", example = "0")
+    private String parentSid;
+}

oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostListVo.java

@@ -0,0 +1,22 @@
+package com.yxt.oms.biz.func.syspost;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/2/14 13:49
+ * @Description 部门下的岗位信息
+ */
+@Data
+public class SysPostListVo implements Vo {
+    private static final long serialVersionUID = -8060032905868283959L;
+
+    @ApiModelProperty("岗位名称")
+    private String name;
+    @ApiModelProperty("岗位编码")
+    private String postCode;
+    @ApiModelProperty("岗位sid")
+    private String sid;
+}

oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostMapper.java

@@ -0,0 +1,65 @@
+package com.yxt.oms.biz.func.syspost;
+
+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: anrui_portal(门户建设) <br/>
+ * File: SysPostMapper.java <br/>
+ * Class: com.yxt.anrui.portal.biz.syspost.SysPostMapper <br/>
+ * Description: 岗位. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface SysPostMapper extends BaseMapper<SysPost> {
+
+    //@Update("update sys_post set name=#{msg} where id=#{id}")
+    //IPage<SysPostVo> voPage(IPage<SysPost> page, @Param(Constants.WRAPPER) QueryWrapper<SysPost> qw);
+
+    IPage<SysPostVo> selectPageVo(IPage<SysPost> page, @Param(Constants.WRAPPER) Wrapper<SysPost> qw);
+
+    List<SysPostVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SysPost> qw);
+
+    @Select("select * from sys_post")
+    List<SysPostVo> selectListVo();
+
+    @Select("select * from sys_post where sid=#{sid} ")
+    SysPost fetchBySid(@Param("sid") String sid);
+
+    @Select("select * from sys_post where orgSid=#{orgSid} ")
+    List<SysPostVo> fetchByOrgSid(@Param("orgSid") String orgSid);
+
+    @Select("select postCode,`name` from sys_post")
+    List<SysPostVo> fetchByOrgSidPostCode();
+
+    /**
+     * 查询所有岗位列表
+     *
+     * @return
+     */
+    List<SysPostListVo> selectListOne();
+
+    /**
+     * 根据岗位编码查询岗位信息
+     *
+     * @param substring 岗位编码
+     * @return
+     */
+    SysPost selectByPostCode(String substring);
+
+    @Select("select * from sys_post where staffSid = #{sid}")
+    SysPost getPostByStaffSid(String sid);
+}

oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostMapper.xml

@@ -0,0 +1,44 @@
+<?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.wms.biz.func.syspost.SysPostMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.wms.biz.func.syspost.SysPostVo">
+        SELECT post.sid                                                                            sid,
+               post.name                                                                           name,
+               post.orgSid,
+               post.postCode,
+               post.postLevelKey,
+               post.postLevel,
+               post.orgSid,
+               IF(org.psid = '0', org.name,
+                  CONCAT((select name from sys_organization where sid = org.psid), "/", org.name)) orgName,
+               post.parentSid,
+               sp.name                                                                             parentName
+        FROM sys_post post
+                 left join sys_organization org on org.sid = post.orgSid
+                 left join sys_post sp on post.parentSid = sp.sid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.wms.biz.func.syspost.SysPostVo">
+        SELECT *
+        FROM sys_post
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <!--根据部门sid查询该部门下的所有岗位列表-->
+    <select id="selectListOne" resultType="com.yxt.wms.biz.func.syspost.SysPostListVo">
+        select name, postCode, sid
+        from sys_post
+    </select>
+    <!--根据岗位编码查询岗位信息-->
+    <select id="selectByPostCode" resultType="com.yxt.wms.biz.func.syspost.SysPost">
+        select *
+        from sys_post
+        where postCode = #{substring}
+    </select>
+</mapper>

oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostQuery.java

@@ -0,0 +1,41 @@
+package com.yxt.oms.biz.func.syspost;
+
+
+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: SysPostQuery.java <br/>
+ * Class: com.yxt.anrui.portal.api.syspost.SysPostQuery <br/>
+ * Description: 岗位 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "岗位 查询条件", description = "岗位 查询条件")
+@Data
+public class SysPostQuery implements Query {
+
+    
+	@ApiModelProperty("岗位名称")
+    private String name;
+
+    @ApiModelProperty("职级key")
+    private String postLevelKey;
+
+    @ApiModelProperty("职级")
+    private String postLevel;
+
+    @ApiModelProperty("岗位编码")
+    private String postCode;
+    
+	@ApiModelProperty("所属部门sid")
+    private String orgSid;
+}

oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostService.java

@@ -0,0 +1,130 @@
+package com.yxt.oms.biz.func.syspost;
+
+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.wms.feign.portal.syspost.SysPostFeign;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysPostService.java <br/>
+ * Class: com.yxt.user.biz.syspost.SysPostService <br/>
+ * Description: 岗位 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class SysPostService extends MybatisBaseService<SysPostMapper, SysPost> {
+
+
+    @Autowired
+    SysPostFeign sysPostFeign;
+
+    public PagerVo<SysPost> listPage(PagerQuery<SysPostQuery> pq) {
+        SysPostQuery query = pq.getParams();
+        QueryWrapper<SysPost> qw = createQueryWrapper(query);
+        IPage<SysPost> page = PagerUtil.queryToPage(pq);
+        IPage<SysPost> pagging = baseMapper.selectPage(page, qw);
+        PagerVo<SysPost> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public List<SysPost> listAll(SysPostQuery query) {
+        QueryWrapper<SysPost> qw = createQueryWrapper(query);
+        return baseMapper.selectList(qw);
+    }
+
+    private QueryWrapper<SysPost> createQueryWrapper(SysPostQuery query) {
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<SysPost> qw = new QueryWrapper<>();
+
+
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("post.name", query.getName());
+        }
+
+        if (StringUtils.isNotBlank(query.getOrgSid())) {
+            qw.eq("post.orgSid", query.getOrgSid());
+        }
+        return qw;
+    }
+
+    public ResultBean<PagerVo<SysPostVo>> listPageVo(PagerQuery<SysPostQuery> pq) {
+        return sysPostFeign.listPage(pq);
+    }
+
+    public ResultBean<List<SysPostVo>> listAllVo(SysPostQuery query) {
+        return sysPostFeign.listAll(query);
+    }
+
+    public ResultBean<List<SysPostVo>> listVo() {
+        return sysPostFeign.list();
+    }
+
+    public ResultBean saveOrUpdateDto(SysPostDto dto) {
+        return sysPostFeign.save(dto);
+    }
+    public ResultBean updateBySid(SysPostDto dto,String sid) {
+        return sysPostFeign.update(dto,sid);
+    }
+    public ResultBean del(String sid) {
+        return sysPostFeign.del(sid);
+    }
+    public ResultBean delBySids(String sid) {
+        return sysPostFeign.delBySids(sid);
+    }
+
+    public ResultBean<SysPostVo> fetchByIdVo(String id) {
+        return sysPostFeign.fetch(id);
+    }
+
+    public ResultBean<SysPostVo> fetchBySidVo(String sid) {
+        return sysPostFeign.fetchBySid(sid);
+    }
+
+    public ResultBean<List<SysPostVo>> fetchByOrgSid(String orgSid) {
+        return sysPostFeign.fetchByOrgSid(orgSid);
+    }
+
+    public ResultBean<String> fetchByOrgSidPostCode() {
+        return sysPostFeign.fetchByOrgSidPostCode();
+    }
+
+    /**
+     * 查询所有岗位列表
+     *
+     * @return
+     */
+    public  ResultBean<List<SysPostListVo>> selectList() {
+
+        return sysPostFeign.selectList();
+    }
+
+    /**
+     * 根据岗位编码查询岗位信息
+     *
+     * @param substring 岗位编码
+     * @return
+     */
+    public SysPost selectByPostCode(String substring) {
+        return baseMapper.selectByPostCode(substring);
+    }
+
+    public SysPost getPostByStaffSid(String sid) {
+        return baseMapper.getPostByStaffSid(sid);
+    }
+}

oms/src/main/java/com/yxt/oms/biz/func/syspost/SysPostVo.java

@@ -0,0 +1,52 @@
+package com.yxt.oms.biz.func.syspost;
+
+
+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: SysPostVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.syspost.SysPostVo <br/>
+ * Description: 岗位 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "岗位 视图数据对象", description = "岗位 视图数据对象")
+@Data
+public class SysPostVo implements Vo {
+
+    
+	@ApiModelProperty("岗位名称")
+    private String name;
+
+    @ApiModelProperty("职级key")
+    private String postLevelKey;
+
+    @ApiModelProperty("职级")
+    private String postLevel;
+
+    @ApiModelProperty("岗位编码")
+    private String postCode;
+    
+	@ApiModelProperty("所属部门sid")
+    private String orgSid;
+
+	@ApiModelProperty("所属部门名称")
+    private String orgName;
+
+    @ApiModelProperty("岗位sid")
+    private String sid;
+
+    @ApiModelProperty(value = "上级岗位名称")
+    private String parentName;
+    @ApiModelProperty(value = "上级岗位sid")
+    private String parentSid;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRole.java

@@ -0,0 +1,49 @@
+package com.yxt.oms.biz.func.sysrole;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRole.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRole <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 = "角色")
+@TableName("sys_role")
+@Data
+public class SysRole extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("角色名称")
+    private String name;
+    
+	@ApiModelProperty("排序")
+    private Integer sort;
+    
+	@ApiModelProperty("编码")
+    private String code;
+    
+	@ApiModelProperty("1、系统管理员、2、普通角色")
+    private Integer type;
+
+    @ApiModelProperty("岗位sid")
+    private String postSid;
+
+    @ApiModelProperty(value = "角色组织层级key")
+    private String roleType;
+    @ApiModelProperty(value = "角色组织层级value")
+    private String roleTypeValue;
+    private String orgSid;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleDto.java

@@ -0,0 +1,52 @@
+package com.yxt.oms.biz.func.sysrole;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleDto.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleDto <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 SysRoleDto implements Dto {
+
+    
+	@ApiModelProperty("角色名称")
+    private String name;
+    
+	@ApiModelProperty("排序")
+    private Integer sort;
+    
+	@ApiModelProperty("编码")
+    private String code;
+	@ApiModelProperty("备注")
+    private String remarks;
+
+	@ApiModelProperty("1、系统管理员、2、普通角色")
+    private Integer type;
+
+    @ApiModelProperty("岗位sid")
+    private String postSid;
+
+    @ApiModelProperty("岗位名称")
+    private String postName;
+
+    @ApiModelProperty(value = "角色组织层级key")
+    private String roleType;
+    @ApiModelProperty(value = "角色组织层级value")
+    private String roleTypeValue;
+    private String orgSid;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleMapper.java

@@ -0,0 +1,68 @@
+package com.yxt.oms.biz.func.sysrole;
+
+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: anrui_portal(门户建设) <br/>
+ * File: SysRoleMapper.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysrole.SysRoleMapper <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
+ */
+@Mapper
+public interface SysRoleMapper extends BaseMapper<SysRole> {
+
+	//@Update("update sys_role set name=#{msg} where id=#{id}")
+	//IPage<SysRoleVo> voPage(IPage<SysRole> page, @Param(Constants.WRAPPER) QueryWrapper<SysRole> qw);
+	
+	IPage<SysRoleVo> selectPageVo(IPage<SysRole> page, @Param(Constants.WRAPPER) Wrapper<SysRole> qw);
+
+	List<SysRoleVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SysRole> qw);
+
+	@Select("select * from sys_role")
+	List<SysRoleVo> selectListVo();
+
+	List<SysRoleVo> fetchByUserSid(String userSid);
+
+	List<SysRoleVo> listAllByUserSid(String userSid);
+
+	SysRole fetchByName(String name);
+
+	int deleteBatchSids(List<String> list);
+
+	int deleteBySid(String valueOf);
+
+	SysRoleVo fetchBySid(String sid);
+
+	int updateIsEnable(@Param("sid") String sid, @Param("isEnable") String isEnable);
+
+    String getLevelType(String roleSid);
+
+    String selectRoleSid(String userRoleSid);
+
+    String selectByUserSid(String sid);
+
+	List<String> selectByUser(String userSid);
+
+//    List<SysMenuRoleVoList> selectRoleList(String menuSid);
+//
+//    List<SysMenuRoleVoList> selectMobileRoleList(String menuSid);
+
+	List<String> selectByRole(@Param("list") List<String> roleSidList, @Param("menuSid") String menuSid,@Param("userSid") String userSid);
+
+    List<String> selectByMobileRole(@Param("list") List<String> roleSidList, @Param("menuSid") String menuSid,@Param("userSid") String userSid);
+}

oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleMapper.xml

@@ -0,0 +1,134 @@
+<?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.wms.biz.func.sysrole.SysRoleMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.wms.biz.func.sysrole.SysRoleVo">
+        SELECT sr.*, sp.sid as postSid, sp.name as postName
+        FROM sys_role sr
+                 LEFT JOIN sys_post sp ON sr.postSid = sp.sid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        ORDER BY sr.sort
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.wms.biz.func.sysrole.SysRoleVo">
+        SELECT *
+        FROM sys_role
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="listAllByUserSid" resultType="com.yxt.wms.biz.func.sysrole.SysRoleVo">
+        SELECT role.name, role.sid, ISNULL(userRole.sid) AS checked
+        FROM sys_role role
+                 LEFT JOIN sys_user_role userRole ON role.sid = userRole.`roleSid`
+            AND userRole.userSid = #{param1}
+    </select>
+
+    <select id="fetchByUserSid" resultType="com.yxt.wms.biz.func.sysrole.SysRoleVo">
+        SELECT role.name, role.remarks, role.sid
+        FROM sys_role role
+                 left join sys_user_role userrole on userrole.roleSid = role.sid
+        where userrole.userSid = #{param1}
+    </select>
+    <select id="fetchByName" resultType="com.yxt.wms.biz.func.sysrole.SysRole">
+        SELECT *
+        FROM sys_role role
+        where role.name = #{param1}
+    </select>
+    <select id="fetchBySid" resultType="com.yxt.wms.biz.func.sysrole.SysRoleVo">
+        SELECT role.*, post.sid as postSid, post.name as postName
+        FROM sys_role role
+                 LEFT JOIN sys_post post ON role.postSid = post.sid
+        WHERE role.sid = #{param1}
+    </select>
+    <delete id="deleteBatchSids" parameterType="String">
+        DELETE
+        FROM sys_role WHERE sid IN
+        <foreach collection="list" item="sid" open="(" separator="," close=")">
+            #{sid}
+        </foreach>
+    </delete>
+    <delete id="deleteBySid">
+        DELETE
+        FROM sys_role
+        WHERE sid = #{sid}
+    </delete>
+
+    <update id="updateIsEnable">
+        UPDATE sys_role
+        SET isEnable = #{isEnable}
+        WHERE sid = #{sid}
+    </update>
+
+    <select id="getLevelType" resultType="java.lang.String">
+        select roleType
+        from sys_role
+        where sid = #{roleSid}
+    </select>
+
+    <select id="selectRoleSid" resultType="java.lang.String">
+        SELECT ssr.sid
+        FROM sys_role sr
+                 LEFT JOIN sys_post sp ON sp.sid = sr.postSid
+                 left join sys_post ssp on sp.parentSid = ssp.sid
+                 left join sys_role ssr on ssp.sid = ssr.postSid
+        where sr.sid = #{sid}
+    </select>
+
+    <select id="selectByUserSid" resultType="java.lang.String">
+        select GROUP_CONCAT(sr.name SEPARATOR '|') as roleName
+        from sys_user_role sur
+                 left join sys_role sr on sur.roleSid = sr.sid
+        where sur.userSid = #{sid}
+    </select>
+
+    <select id="selectByUser" resultType="java.lang.String">
+        select roleSid
+        from sys_user_role
+        where userSid = #{userSid}
+    </select>
+
+<!--    <select id="selectRoleList" resultType="com.yxt.wms.biz.sysuser.SysMenuRoleVoList">-->
+<!--        select sr.sid roleSid, sr.name roleName, sr.roleType, sr.roleTypeValue,smr.dataRuleId-->
+<!--        from sys_role sr-->
+<!--                 left join sys_menu_role smr on sr.sid = smr.roleSid-->
+<!--        where smr.menuSid = #{menuSid}-->
+<!--    </select>-->
+
+<!--    <select id="selectMobileRoleList" resultType="com.yxt.wms.biz.sysuser.SysMenuRoleVoList">-->
+<!--        select sr.sid roleSid, sr.name roleName, sr.roleType, sr.roleTypeValue-->
+<!--        from sys_role sr-->
+<!--                 left join sys_mobile_menu_role smr on sr.sid = smr.roleSid-->
+<!--        where smr.menuSid = #{menuSid}-->
+<!--    </select>-->
+
+    <select id="selectByRole" resultType="java.lang.String">
+        select smr.dataRuleId from sys_menu_role smr
+        left join sys_menu sm on sm.sid = smr.menuSid
+        left join sys_role sr on sr.sid = smr.roleSid
+        left join sys_user_role sur on sur.roleSid = smr.roleSid
+        where smr.menuSid = #{menuSid} and sur.userSid = #{userSid} and sr.sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        and length(smr.dataRuleId)>0
+        order by dataRuleId asc
+    </select>
+
+    <select id="selectByMobileRole" resultType="java.lang.String">
+        select smr.dataRuleId from sys_mobile_menu_role smr
+        left join sys_mobile_menu sm on sm.sid = smr.menuSid
+        left join sys_role sr on sr.sid = smr.roleSid
+        left join sys_user_role sur on sur.roleSid = smr.roleSid
+        where smr.menuSid = #{menuSid} and sur.userSid = #{userSid}
+        and sr.sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        and length(smr.dataRuleId)>0
+        order by dataRuleId asc
+    </select>
+</mapper>

oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleQuery.java

@@ -0,0 +1,38 @@
+package com.yxt.oms.biz.func.sysrole;
+
+
+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: SysRoleQuery.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleQuery <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 SysRoleQuery implements Query {
+
+    
+	@ApiModelProperty("角色名称")
+    private String name;
+    
+	@ApiModelProperty("排序")
+    private Integer sort;
+    
+	@ApiModelProperty("编码")
+    private String code;
+    
+	@ApiModelProperty("1、系统管理员、2、普通角色")
+    private Integer type;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleService.java

@@ -0,0 +1,131 @@
+package com.yxt.oms.biz.func.sysrole;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.wms.biz.func.sysuserrole.SysUserRoleService;
+import com.yxt.wms.feign.portal.sysrole.SysRoleFeign;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysRoleService.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysrole.SysRoleService <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
+ */
+@Service
+public class SysRoleService extends MybatisBaseService<SysRoleMapper, SysRole> {
+    @Autowired
+    private SysUserRoleService sysUserRoleService;
+    @Autowired
+    SysRoleFeign sysRoleFeign;
+
+
+    public ResultBean<PagerVo<SysRoleVo>> listPage(PagerQuery<SysRoleQuery> pq) {
+        return sysRoleFeign.listPage(pq);
+    }
+
+    public ResultBean<List<SysRoleVo>> listAll(SysRoleQuery query) {
+        return sysRoleFeign.listAll(query);
+    }
+
+    private QueryWrapper<SysRole> createQueryWrapper(SysRoleQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<SysRole> qw = new QueryWrapper<>();
+
+
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.like("sr.name", query.getName());
+        }
+
+        if (query.getSort() != null) {
+            qw.eq("sr.sort", query.getSort());
+        }
+
+        if (StringUtils.isNotBlank(query.getCode())) {
+            qw.eq("sr.code", query.getCode());
+        }
+
+        if (query.getType() != null) {
+            qw.eq("sr.type", query.getType());
+        }
+        return qw;
+    }
+
+    public ResultBean<PagerVo<SysRoleVo>> listPageVo(PagerQuery<SysRoleQuery> pq) {
+        return sysRoleFeign.listPage(pq);
+    }
+
+    public ResultBean<List<SysRoleVo>> listAllVo(SysRoleQuery query) {
+        return sysRoleFeign.listAll(query);
+    }
+
+    public ResultBean<List<SysRoleVo>> listVo() {
+        return sysRoleFeign.list();
+    }
+
+    public ResultBean saveOrUpdateDto(SysRoleDto dto) {
+        return sysRoleFeign.save(dto);
+    }
+    public ResultBean updateBySid(SysRoleDto dto,String sid) {
+        return sysRoleFeign.update(dto,sid);
+    }
+    public ResultBean<SysRoleVo> fetchByIdVo(String id) {
+        return sysRoleFeign.fetch(id);
+    }
+
+    public ResultBean<List<SysRoleVo>> fetchByUserSid(String userSid) {
+        return sysRoleFeign.fetchByUserSid(userSid);
+    }
+
+    public ResultBean<List<SysRoleVo>> listAllByUserSid(String userSid) {
+        return sysRoleFeign.listAllByUserSid(userSid);
+    }
+
+    /**
+     * 描述 : <描述函数实现的功能>. <br/>
+     * <p>
+     *
+     * @param sids
+     * @return
+     */
+    public ResultBean delBySid(String sids) {
+        return sysRoleFeign.delBySids(sids);
+    }
+    /**
+     * 描述 : <描述函数实现的功能>. <br/>
+     * <p>
+     *
+     * @param sids
+     * @return
+     */
+    public ResultBean del(String sids) {
+        return sysRoleFeign.del(sids);
+    }
+
+    public ResultBean<SysRoleVo> fetchBySidVo(String sid) {
+        return sysRoleFeign.fetchBySid(sid);
+    }
+    public ResultBean<SysRoleVo> updateIsEnable(String sid, String isEnable) {
+        return sysRoleFeign.setIsEnable(sid,isEnable);
+    }
+
+
+
+
+
+}

oms/src/main/java/com/yxt/oms/biz/func/sysrole/SysRoleVo.java

@@ -0,0 +1,47 @@
+package com.yxt.oms.biz.func.sysrole;
+
+
+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: SysRoleVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleVo <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 SysRoleVo implements Vo {
+	@ApiModelProperty("角色名称")
+    private String name;
+    @ApiModelProperty("排序")
+    private Integer sort;
+    @ApiModelProperty("编码")
+    private String code;
+    @ApiModelProperty("1、系统管理员、2、普通角色")
+    private Integer type;
+	@ApiModelProperty("角色sid")
+    private String sid;
+	@ApiModelProperty("说明")
+    private String remarks;
+	@ApiModelProperty("是否选中，1：未选中,0：选中")
+    private String checked;
+	@ApiModelProperty("是否可用")
+    private String isEnable;
+    @ApiModelProperty("岗位sid")
+    private String postSid;
+    @ApiModelProperty("岗位名称")
+    private String postName;
+    @ApiModelProperty(value = "组织层级")
+    private String roleTypeValue;
+}

oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysMenuRoleVo.java

@@ -0,0 +1,55 @@
+package com.yxt.oms.biz.func.sysroleauthorize;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysMenuRoleVo.java <br/>
+ * Class: com.yxt.anrui.portal.api.sysmenurole.SysMenuRoleVo <br/>
+ * Description: 菜单与角色关联表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:28 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+
+@Data
+public class SysMenuRoleVo implements Vo {
+
+    
+	@ApiModelProperty("菜单sid")
+    private String menuSid;
+    
+	@ApiModelProperty("角色sid")
+    private String roleSid;
+	@ApiModelProperty("菜单父级sid")
+    private String pSid;
+	@ApiModelProperty("menusid")
+    private String sid;
+	@ApiModelProperty("menuUrl")
+    private String menuUrl;
+    @ApiModelProperty("menuName")
+    private String menuName;
+    @ApiModelProperty("pageUrl")
+    private String pageUrl;
+    @ApiModelProperty("iconUrl")
+    private String iconUrl;
+    @ApiModelProperty("isShow")
+    private String isShow;
+    @ApiModelProperty("alwaysShow")
+    private Integer alwaysShow;
+    @ApiModelProperty("pageUrlRedirect")
+    private String pageUrlRedirect;
+    @ApiModelProperty("pageAliasName")
+    private String pageAliasName;
+    @ApiModelProperty("pageName")
+    private String pageName;
+    @ApiModelProperty("remarks")
+    private String remarks;
+}