portal

wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseGoodsBrandRest.java → wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseGoodsBrandRest.java

@@ -1,13 +1,13 @@
-package com.yxt.wms.apiadmin;
+package com.yxt.wms.apiadmin.func;
 
 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.basebrandinfo.BaseBrandInfoService;
+import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfoService;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfo;
+import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfo;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfoDto;
+import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfoDto;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfoQuery;
+import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfoQuery;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfoVo;
+import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfoVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseGoodsSpuRest.java → wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseGoodsSpuRest.java

@@ -1,12 +1,12 @@
-package com.yxt.wms.apiadmin;
+package com.yxt.wms.apiadmin.func;
 
 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.basegoodsspu.BaseGoodsSpuService;
+import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuService;
-import com.yxt.wms.biz.basegoodsspu.BaseGoodsSpuDto;
+import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuDto;
-import com.yxt.wms.biz.basegoodsspu.BaseGoodsSpuQuery;
+import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuQuery;
-import com.yxt.wms.biz.basegoodsspu.BaseGoodsSpuVo;
+import com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseGoodsTypeRest.java → wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseGoodsTypeRest.java

@@ -1,9 +1,10 @@
-package com.yxt.wms.apiadmin;
+package com.yxt.wms.apiadmin.func;
 
 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.basegoodstype.*;
+
+import com.yxt.wms.biz.func.basegoodstype.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseGoodsUnitRest.java → wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseGoodsUnitRest.java

@@ -1,9 +1,9 @@
-package com.yxt.wms.apiadmin;
+package com.yxt.wms.apiadmin.func;
 
 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.basegoodsunit.*;
+import com.yxt.wms.biz.func.basegoodsunit.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseManufacturerRest.java → wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseManufacturerRest.java

@@ -1,9 +1,9 @@
-package com.yxt.wms.apiadmin;
+package com.yxt.wms.apiadmin.func;
 
 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.basemanufacturer.*;
+import com.yxt.wms.biz.func.basemanufacturer.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

wms-biz/src/main/java/com/yxt/wms/apiadmin/BaseSupplierInfoRest.java → wms-biz/src/main/java/com/yxt/wms/apiadmin/func/BaseSupplierInfoRest.java

@@ -23,12 +23,12 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.apiadmin;
+package com.yxt.wms.apiadmin.func;
 
 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.basesupplierinfo.*;
+import com.yxt.wms.biz.func.basesupplierinfo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,7 +80,7 @@ public class BaseSupplierInfoRest {
 
 	@ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean< BaseSupplierInfoDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<BaseSupplierInfoDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
 		return baseSupplierInfoService.fetchDetailsVoBySid(sid);
 	}
 

wms-biz/src/main/java/com/yxt/wms/apiadmin/func/DictCommonRest.java

@@ -0,0 +1,101 @@
+package com.yxt.wms.apiadmin.func;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.dictcommon.*;
+import com.yxt.wms.biz.func.dicttype.DictTypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/5 21:29
+ * @description
+ */
+@Slf4j
+@Controller
+@RequestMapping("apiadmin/dictcommons")
+@Api(tags = "数据字典数据项管理")
+public class DictCommonRest {
+
+    @Autowired
+    private DictTypeService dictTypeService;
+
+    @Autowired
+    private DictCommonService dictCommonService;
+
+    @PostMapping(value = "/save")
+    @ResponseBody
+    @ApiOperation(value = "数据字典数据项保存")
+    ResultBean save(@Valid @RequestBody DictCommonDto dictCommonDto) {
+        return dictCommonService.save(dictCommonDto);
+    }
+
+    @PostMapping("/pageList")
+    @ResponseBody
+    @ApiOperation(value = "数据字典数据项分页列表")
+    ResultBean<PagerVo<DictCommonVo>> pageList(@RequestBody PagerQuery<DictCommonQuery> pagerQuery) {
+        return dictCommonService.pageList(pagerQuery);
+    }
+
+    @PostMapping("/update/{sid}")
+    @ResponseBody
+    @ApiOperation(value = "数据字典修改后保存")
+    ResultBean update(@Valid @RequestBody DictCommonDto dictCommonDto, @ApiParam(value = "数据项sid", required = true) @PathVariable("sid") String sid){
+
+        return dictCommonService.updateBySid(dictCommonDto, sid);
+    }
+
+    @ResponseBody
+    @DeleteMapping("/delete/{sid}")
+    @ApiOperation(value = "删除")
+    ResultBean delete(@ApiParam(value = "数据项sid", required = true) @PathVariable("sid") String sid){
+        return dictCommonService.del(sid);
+    }
+
+    @GetMapping("/typeValues")
+    @ResponseBody
+    @ApiOperation("下拉框的获取")
+    ResultBean<List<DictCommonVo>> getTypeValues(@RequestParam("type") String type,  @RequestParam(value = "psid", defaultValue = "0")String psid){
+        return dictCommonService.getValue(type,psid);
+    }
+
+    @ResponseBody
+    @GetMapping("/selectBykey/{key}/{type}")
+    @ApiOperation(value = "数据字典信息修改时的初始化信息")
+    public ResultBean<DictCommonVo> selectBykey(@ApiParam(value = "数据字典key", required = true) @PathVariable("key") String key, @ApiParam(value = "数据字典type", required = true) @PathVariable("type") String type) {
+
+        return  dictCommonService.selectBykey(key, type);
+    }
+
+    @GetMapping("/getFirstDictKeyByType")
+    @ResponseBody
+    @ApiOperation("根据数据字典的key获取第一个值（默认值）")
+    ResultBean getFirstDictKeyByType(@RequestParam("dictType") String dictType, @RequestParam("psid") String psid){
+        ResultBean<List<DictCommonVo>> resultBean = getTypeValues(dictType, psid);
+        if (resultBean.getSuccess() && resultBean.getData() != null) {
+            String dictKey = resultBean.getData().get(0).getDictKey();
+            return new ResultBean().success().setData(dictKey);
+        } else {
+            return new ResultBean().fail().setData(new DictCommon());
+        }
+    }
+
+    @GetMapping("/getTypeValueList")
+    @ResponseBody
+    @ApiOperation("根据分类编码和数据分组查询数据字典")
+    ResultBean<List<DictCommonVo>> getTypeValueList(@RequestParam("type")String type,@RequestParam("groupNum")String groupNum){
+        return dictCommonService.getList(type,groupNum);
+    }
+}

wms-biz/src/main/java/com/yxt/wms/apiadmin/func/DictTypeRest.java

@@ -0,0 +1,66 @@
+package com.yxt.wms.apiadmin.func;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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.dictcommon.DictCommon;
+import com.yxt.wms.biz.func.dictcommon.DictCommonService;
+import com.yxt.wms.biz.func.dicttype.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/5 22:37
+ * @description
+ */
+@Slf4j
+@Controller
+@RequestMapping("apiadmin/dicttypes")
+@Api(tags = "数据字典类型管理")
+public class DictTypeRest{
+
+    @Autowired
+    private DictTypeService dictTypeService;
+
+    @Autowired
+    private DictCommonService dictCommonService;
+
+
+    @PostMapping(value = "/save")
+    @ResponseBody
+    @ApiOperation(value = "数据字典类型保存")
+    ResultBean save(@Valid @RequestBody DictTypeDto dictTypeDto){
+        return dictTypeService.save(dictTypeDto);
+    }
+    @PostMapping("/pageList")
+    @ResponseBody
+    @ApiOperation(value = "数据字典类型分页列表")
+    ResultBean<PagerVo<DictTypeVo>> pageList(@RequestBody PagerQuery<DictTypeQuery> pagerQuery){
+        return dictTypeService.pageList(pagerQuery);
+    }
+
+    @PostMapping("/update/{sid}")
+    @ResponseBody
+    @ApiOperation(value = "数据字典类型更新")
+    ResultBean update(@Valid DictTypeDto dictTypeDto, @ApiParam(value = "数据字典类型sid", required = true) @PathVariable("sid") String sid){
+        return dictTypeService.updateBySid(dictTypeDto, sid);
+    }
+
+    @DeleteMapping("/delete/{sid}")
+    @ResponseBody
+    @ApiOperation(value = "数据字典类型删除")
+    ResultBean delete(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid){
+        return dictTypeService.del(sid);
+    }
+}

wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysMenuRest.java

@@ -0,0 +1,173 @@
+package com.yxt.wms.apiadmin.func;
+
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.biz.func.sysmenu.*;
+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);
+    }*/
+}

wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysMenuRoleRest.java

@@ -0,0 +1,116 @@
+package com.yxt.wms.apiadmin.func;
+
+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.*;
+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);
+    }
+}

wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysOrganizationRest.java

@@ -0,0 +1,273 @@
+package com.yxt.wms.apiadmin.func;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.common.base.config.RedisUtil;
+import com.yxt.common.base.config.component.FileUploadComponent;
+import com.yxt.common.base.utils.QRCodeUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.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.io.File;
+import java.util.*;
+
+import static java.util.stream.Collectors.toList;
+
+/**
+ * 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);
+    }
+}

wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysPostRest.java

@@ -0,0 +1,120 @@
+package com.yxt.wms.apiadmin.func;
+
+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.syspost.*;
+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.ArrayList;
+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();
+    }
+}

wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysRoleRest.java

@@ -0,0 +1,117 @@
+package com.yxt.wms.apiadmin.func;
+
+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);
+	}
+}

wms-biz/src/main/java/com/yxt/wms/apiadmin/SysUserRest.java → wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysUserRest.java

@@ -1,11 +1,12 @@
-package com.yxt.wms.apiadmin;
+package com.yxt.wms.apiadmin.func;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.wms.biz.sysuser.SysUserService;
+import com.yxt.wms.biz.func.sysuser.SysUserService;
-import com.yxt.wms.feign.user.sysuser.SysUserDto;
+import com.yxt.wms.feign.portal.sysuser.SysUserDto;
-import com.yxt.wms.feign.user.sysuser.SysUserQuery;
+import com.yxt.wms.feign.portal.sysuser.SysUserQuery;
-import com.yxt.wms.feign.user.sysuser.SysUserVo;
+import com.yxt.wms.feign.portal.sysuser.SysUserVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,15 +50,26 @@ public class SysUserRest {
     @PostMapping("/sendMessageCode")
     @ResponseBody
     @ApiOperation(value = "3、获取注册码")
-    @ApiOperationSupport(order = 30)
+    public ResultBean sendMessageCode(@RequestParam("mobile") String mobile){
-    public ResultBean sendMessageCode(String mobile){
         return sysUserService.sendMessageCode(mobile);
     }
     @PostMapping("/sendMessageLogin")
     @ResponseBody
     @ApiOperation(value = "3、获取登录码")
-    @ApiOperationSupport(order = 30)
+    public ResultBean sendMessageLogin(@RequestParam("mobile") String mobile){
-    public ResultBean sendMessageLogin(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);
+    }
 }

wms-biz/src/main/java/com/yxt/wms/apiadmin/func/SysUserRoleRest.java

@@ -0,0 +1,104 @@
+package com.yxt.wms.apiadmin.func;
+
+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.SysUserRoleDto;
+import com.yxt.wms.biz.func.sysuserrole.SysUserRoleQuery;
+import com.yxt.wms.biz.func.sysuserrole.SysUserRoleService;
+import com.yxt.wms.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;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysUserRoleFeignFallback.java <br/>
+ * Class: com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleRest <br/>
+ * Description: 用户与角色关联表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "用户与角色关联表")
+@RestController
+@RequestMapping("apiadmin/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);
+    }
+}

wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfo.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfo.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basebrandinfo;
+package com.yxt.wms.biz.func.basebrandinfo;
 
 import com.yxt.common.core.domain.BaseEntity;
 import lombok.Data;

wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoDto.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoDto.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basebrandinfo;
+package com.yxt.wms.biz.func.basebrandinfo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.dto.Dto;

wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoMapper.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoMapper.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basebrandinfo;
+package com.yxt.wms.biz.func.basebrandinfo;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoMapper.xml → wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoMapper.xml

@@ -1,10 +1,10 @@
 <?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.basebrandinfo.BaseBrandInfoMapper">
+<mapper namespace="com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfoMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-    <select id="listPage" resultType="com.yxt.wms.biz.basebrandinfo.BaseBrandInfoVo">
+    <select id="listPage" resultType="com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfoVo">
         select
             *
         from base_brand_info

wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoQuery.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basebrandinfo;
+package com.yxt.wms.biz.func.basebrandinfo;
 
 import com.yxt.common.core.query.Query;
 import lombok.Data;

wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoService.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoService.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basebrandinfo;
+package com.yxt.wms.biz.func.basebrandinfo;
 
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;

wms-biz/src/main/java/com/yxt/wms/biz/basebrandinfo/BaseBrandInfoVo.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basebrandinfo/BaseBrandInfoVo.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basebrandinfo;
+package com.yxt.wms.biz.func.basebrandinfo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSku.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSku.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodssku;
+package com.yxt.wms.biz.func.basegoodssku;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yxt.common.core.domain.BaseEntity;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuDetailsVo.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuDetailsVo.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodssku;
+package com.yxt.wms.biz.func.basegoodssku;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuDto.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuDto.java

@@ -1,9 +1,9 @@
-package com.yxt.wms.biz.basegoodssku;
+package com.yxt.wms.biz.func.basegoodssku;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.dto.Dto;
-import com.yxt.wms.biz.basegoodsskuextend.BaseGoodsSkuExtendDto;
+import com.yxt.wms.biz.func.basegoodsskuextend.BaseGoodsSkuExtendDto;
 import lombok.Data;
 
 import java.util.Date;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuMapper.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuMapper.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodssku;
+package com.yxt.wms.biz.func.basegoodssku;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuMapper.xml → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuMapper.xml

@@ -1,10 +1,10 @@
 <?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.basegoodssku.BaseGoodsSkuMapper">
+<mapper namespace="com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-    <select id="listPage" resultType="com.yxt.wms.biz.basegoodssku.BaseGoodsSkuVo">
+    <select id="listPage" resultType="com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuVo">
         select s.*,s.own_spec as ownSpec,a.goodsName
         from base_goods_sku s
             left join base_goods_spu a on a.sid=s.goodsSpuSid
@@ -12,20 +12,20 @@
             ${ew.sqlSegment}
         </where>
     </select>
-    <select id="getSkusBySpuSid" resultType="com.yxt.wms.biz.basegoodssku.BaseGoodsSkuVo">
+    <select id="getSkusBySpuSid" resultType="com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuVo">
         select s.*,
                s.own_spec as ownSpec
         from base_goods_sku s
         where s.goodsSpuSid = #{spuSid}
     </select>
-    <select id="getSkuBySid" resultType="com.yxt.wms.biz.basegoodssku.BaseGoodsSkuVo">
+    <select id="getSkuBySid" resultType="com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuVo">
         select *,
                s.own_spec as ownSpec
         from base_goods_sku s
         where s.sid = #{sid}
     </select>
 
-    <select id="getSelectList" resultType="com.yxt.wms.biz.basegoodssku.BaseGoodsSkuSelectList">
+    <select id="getSelectList" resultType="com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuSelectList">
         select sku.sid       goodsSkuSid,
                spu.sid   as  goodsSpuSid,
                spu.goodsName goodsSpuName,
@@ -40,7 +40,7 @@
         </where>
     </select>
 
-    <select id="purGoodsListPage" resultType="com.yxt.wms.biz.basegoodssku.BaseGoodsSkuPurSelectList">
+    <select id="purGoodsListPage" resultType="com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuPurSelectList">
         SELECT
         s.sid,
         s.goodsSkuCode,

wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuPurSelectList.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuPurSelectList.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodssku;
+package com.yxt.wms.biz.func.basegoodssku;
 
 import lombok.Data;
 

wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuPurSelectQuery.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuPurSelectQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodssku;
+package com.yxt.wms.biz.func.basegoodssku;
 
 import com.yxt.common.core.query.Query;
 import lombok.Data;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuQuery.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodssku;
+package com.yxt.wms.biz.func.basegoodssku;
 
 import com.yxt.common.core.query.Query;
 import lombok.Data;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuSelectList.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuSelectList.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodssku;
+package com.yxt.wms.biz.func.basegoodssku;
 
 import lombok.Data;
 

wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuSelectQuery.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuSelectQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodssku;
+package com.yxt.wms.biz.func.basegoodssku;
 
 import com.yxt.common.core.query.Query;
 import lombok.Data;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuService.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuService.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodssku;
+package com.yxt.wms.biz.func.basegoodssku;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodssku/BaseGoodsSkuVo.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodssku/BaseGoodsSkuVo.java

@@ -1,9 +1,9 @@
-package com.yxt.wms.biz.basegoodssku;
+package com.yxt.wms.biz.func.basegoodssku;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
-import com.yxt.wms.biz.basegoodsskuextend.BaseGoodsSkuExtendVo;
+import com.yxt.wms.biz.func.basegoodsskuextend.BaseGoodsSkuExtendVo;
 import lombok.Data;
 
 import java.util.Date;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtend.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtend.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsskuextend;
+package com.yxt.wms.biz.func.basegoodsskuextend;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yxt.common.core.domain.BaseEntity;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendDto.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendDto.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsskuextend;
+package com.yxt.wms.biz.func.basegoodsskuextend;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendMapper.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendMapper.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsskuextend;
+package com.yxt.wms.biz.func.basegoodsskuextend;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendMapper.xml → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendMapper.xml

@@ -1,10 +1,10 @@
 <?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.basegoodsskuextend.BaseGoodsSkuExtendMapper">
+<mapper namespace="com.yxt.wms.biz.func.basegoodsskuextend.BaseGoodsSkuExtendMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-    <select id="listPage" resultType="com.yxt.wms.biz.basegoodsskuextend.BaseGoodsSkuExtendVo">
+    <select id="listPage" resultType="com.yxt.wms.biz.func.basegoodsskuextend.BaseGoodsSkuExtendVo">
         select
             s.*,a.title
         from base_goods_sku_extend s
@@ -13,13 +13,13 @@
             ${ew.sqlSegment}
         </where>
     </select>
-    <select id="getExtendBySkuSid" resultType="com.yxt.wms.biz.basegoodsskuextend.BaseGoodsSkuExtendVo">
+    <select id="getExtendBySkuSid" resultType="com.yxt.wms.biz.func.basegoodsskuextend.BaseGoodsSkuExtendVo">
         select
         s.*,s.InventoryAlertUpperLimit as inventoryAlertUpperLimit,s.InventoryAlertLowerLimit as inventoryAlertLowerLimit
         from base_goods_sku_extend s
         where s.goodsSkuSid=#{skuSid}
     </select>
-    <select id="getExtendBySid" resultType="com.yxt.wms.biz.basegoodsskuextend.BaseGoodsSkuExtendVo">
+    <select id="getExtendBySid" resultType="com.yxt.wms.biz.func.basegoodsskuextend.BaseGoodsSkuExtendVo">
         select
             s.*,s.InventoryAlertUpperLimit as inventoryAlertUpperLimit,s.InventoryAlertLowerLimit as inventoryAlertLowerLimit
         from base_goods_sku_extend s

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendQuery.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsskuextend;
+package com.yxt.wms.biz.func.basegoodsskuextend;
 
 import com.yxt.common.core.query.Query;
 import lombok.Data;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendService.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendService.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsskuextend;
+package com.yxt.wms.biz.func.basegoodsskuextend;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/BaseGoodsSkuExtendVo.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/BaseGoodsSkuExtendVo.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsskuextend;
+package com.yxt.wms.biz.func.basegoodsskuextend;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsskuextend/UrlsVo.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsskuextend/UrlsVo.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsskuextend;
+package com.yxt.wms.biz.func.basegoodsskuextend;
 
 import lombok.Data;
 

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpu.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpu.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsspu;
+package com.yxt.wms.biz.func.basegoodsspu;
 
 import com.yxt.common.core.domain.BaseEntity;
 import lombok.Data;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuDto.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuDto.java

@@ -1,9 +1,9 @@
-package com.yxt.wms.biz.basegoodsspu;
+package com.yxt.wms.biz.func.basegoodsspu;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.dto.Dto;
-import com.yxt.wms.biz.basegoodssku.BaseGoodsSkuDto;
+import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuDto;
-import com.yxt.wms.biz.basegoodsspudetail.BaseGoodsSpuDetailDto;
+import com.yxt.wms.biz.func.basegoodsspudetail.BaseGoodsSpuDetailDto;
 import lombok.Data;
 
 import java.util.Date;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuMapper.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuMapper.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsspu;
+package com.yxt.wms.biz.func.basegoodsspu;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuMapper.xml → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuMapper.xml

@@ -1,10 +1,10 @@
 <?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.basegoodsspu.BaseGoodsSpuMapper">
+<mapper namespace="com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-    <select id="listPage" resultType="com.yxt.wms.biz.basegoodsspu.BaseGoodsSpuVo">
+    <select id="listPage" resultType="com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuVo">
         select
             s.*,a.goodsTypeName as typeName,b.brandName as brandName,c.manufacturerName as manufacturerName
         from base_goods_spu s
@@ -15,7 +15,7 @@
             ${ew.sqlSegment}
         </where>
     </select>
-    <select id="initialization" resultType="com.yxt.wms.biz.basegoodsspu.BaseGoodsSpuVo">
+    <select id="initialization" resultType="com.yxt.wms.biz.func.basegoodsspu.BaseGoodsSpuVo">
         select
         s.*,a.goodsTypeName as typeName,b.brandName as brandName,c.manufacturerName as manufacturerName
         from base_goods_spu s

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuQuery.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsspu;
+package com.yxt.wms.biz.func.basegoodsspu;
 
 import com.yxt.common.core.query.Query;
 import lombok.Data;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuService.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuService.java

@@ -1,21 +1,17 @@
-package com.yxt.wms.biz.basegoodsspu;
+package com.yxt.wms.biz.func.basegoodsspu;
 
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.apiadmin.BaseGoodsBrandRest;
+import com.yxt.wms.biz.func.basebrandinfo.BaseBrandInfo;
-import com.yxt.wms.biz.basebrandinfo.BaseBrandInfo;
+import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuDto;
-import com.yxt.wms.biz.basegoodssku.BaseGoodsSku;
+import com.yxt.wms.biz.func.basegoodsskuextend.BaseGoodsSkuExtendDto;
-import com.yxt.wms.biz.basegoodssku.BaseGoodsSkuDto;
+import com.yxt.wms.biz.func.basegoodsspudetail.BaseGoodsSpuDetailDto;
-import com.yxt.wms.biz.basegoodsskuextend.BaseGoodsSkuExtend;
+import com.yxt.wms.biz.func.basegoodstype.BaseGoodsType;
-import com.yxt.wms.biz.basegoodsskuextend.BaseGoodsSkuExtendDto;
+import com.yxt.wms.biz.func.basegoodsunit.BaseGoodsUnit;
-import com.yxt.wms.biz.basegoodsspudetail.BaseGoodsSpuDetail;
+import com.yxt.wms.biz.func.basemanufacturer.BaseManufacturer;
-import com.yxt.wms.biz.basegoodsspudetail.BaseGoodsSpuDetailDto;
-import com.yxt.wms.biz.basegoodstype.BaseGoodsType;
-import com.yxt.wms.biz.basegoodsunit.BaseGoodsUnit;
-import com.yxt.wms.biz.basemanufacturer.BaseManufacturer;
 import com.yxt.wms.feign.base.basebrandinfo.BaseBrandInfoFeign;
 import com.yxt.wms.feign.base.basegoodsspu.*;
 import com.yxt.wms.feign.base.basegoodstype.BaseGoodsTypeFeign;
@@ -24,7 +20,6 @@ import com.yxt.wms.feign.base.basemanufacturer.BaseManufacturerFeign;
 import com.yxt.wms.utils.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -32,7 +27,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
-import java.math.BigDecimal;
 import java.net.URLEncoder;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspu/BaseGoodsSpuVo.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspu/BaseGoodsSpuVo.java

@@ -1,9 +1,9 @@
-package com.yxt.wms.biz.basegoodsspu;
+package com.yxt.wms.biz.func.basegoodsspu;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
-import com.yxt.wms.biz.basegoodssku.BaseGoodsSkuVo;
+import com.yxt.wms.biz.func.basegoodssku.BaseGoodsSkuVo;
-import com.yxt.wms.biz.basegoodsspudetail.BaseGoodsSpuDetailVo;
+import com.yxt.wms.biz.func.basegoodsspudetail.BaseGoodsSpuDetailVo;
 import lombok.Data;
 
 import java.util.Date;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetail.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetail.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsspudetail;
+package com.yxt.wms.biz.func.basegoodsspudetail;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.yxt.common.core.domain.BaseEntity;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailDto.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailDto.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsspudetail;
+package com.yxt.wms.biz.func.basegoodsspudetail;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailMapper.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailMapper.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsspudetail;
+package com.yxt.wms.biz.func.basegoodsspudetail;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailMapper.xml → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailMapper.xml

@@ -1,10 +1,10 @@
 <?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.basegoodsspudetail.BaseGoodsSpuDetailMapper">
+<mapper namespace="com.yxt.wms.biz.func.basegoodsspudetail.BaseGoodsSpuDetailMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-    <select id="listPage" resultType="com.yxt.wms.biz.basegoodsspudetail.BaseGoodsSpuDetailVo">
+    <select id="listPage" resultType="com.yxt.wms.biz.func.basegoodsspudetail.BaseGoodsSpuDetailVo">
         select
             s.*,a.goodsName
         from base_goods_spu_detail s
@@ -14,7 +14,7 @@
             ${ew.sqlSegment}
         </where>
     </select>
-    <select id="getSpuDetailsBySpuSid" resultType="com.yxt.wms.biz.basegoodsspudetail.BaseGoodsSpuDetailVo">
+    <select id="getSpuDetailsBySpuSid" resultType="com.yxt.wms.biz.func.basegoodsspudetail.BaseGoodsSpuDetailVo">
         select
         s.*,s.generic_spec as genericSpec,s.special_spec as specialSpec
         from base_goods_spu_detail s

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailQuery.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsspudetail;
+package com.yxt.wms.biz.func.basegoodsspudetail;
 
 import com.yxt.common.core.query.Query;
 import lombok.Data;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailService.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailService.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsspudetail;
+package com.yxt.wms.biz.func.basegoodsspudetail;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsspudetail/BaseGoodsSpuDetailVo.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsspudetail/BaseGoodsSpuDetailVo.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsspudetail;
+package com.yxt.wms.biz.func.basegoodsspudetail;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsType.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsType.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodstype;
+package com.yxt.wms.biz.func.basegoodstype;
 
 import com.yxt.common.core.domain.BaseEntity;
 import lombok.Data;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeDto.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeDto.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodstype;
+package com.yxt.wms.biz.func.basegoodstype;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.dto.Dto;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeMapper.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeMapper.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodstype;
+package com.yxt.wms.biz.func.basegoodstype;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeMapper.xml → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeMapper.xml

@@ -1,10 +1,10 @@
 <?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.basegoodstype.BaseGoodsTypeMapper">
+<mapper namespace="com.yxt.wms.biz.func.basegoodstype.BaseGoodsTypeMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-    <select id="listPage" resultType="com.yxt.wms.biz.basegoodstype.BaseGoodsTypeVo">
+    <select id="listPage" resultType="com.yxt.wms.biz.func.basegoodstype.BaseGoodsTypeVo">
         select
         *
         from base_goods_type

wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeQuery.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodstype;
+package com.yxt.wms.biz.func.basegoodstype;
 
 import com.yxt.common.core.query.Query;
 import lombok.Data;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeService.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeService.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodstype;
+package com.yxt.wms.biz.func.basegoodstype;
 
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.query.PagerQuery;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodstype/BaseGoodsTypeVo.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodstype/BaseGoodsTypeVo.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodstype;
+package com.yxt.wms.biz.func.basegoodstype;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnit.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnit.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsunit;
+package com.yxt.wms.biz.func.basegoodsunit;
 
 import com.yxt.common.core.domain.BaseEntity;
 import lombok.Data;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitDto.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitDto.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsunit;
+package com.yxt.wms.biz.func.basegoodsunit;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.dto.Dto;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitMapper.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitMapper.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsunit;
+package com.yxt.wms.biz.func.basegoodsunit;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitMapper.xml → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitMapper.xml

@@ -1,10 +1,10 @@
 <?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.basegoodsunit.BaseGoodsUnitMapper">
+<mapper namespace="com.yxt.wms.biz.func.basegoodsunit.BaseGoodsUnitMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-    <select id="listPage" resultType="com.yxt.wms.biz.basegoodsunit.BaseGoodsUnitVo">
+    <select id="listPage" resultType="com.yxt.wms.biz.func.basegoodsunit.BaseGoodsUnitVo">
         select
         *
         from base_goods_unit

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitQuery.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsunit;
+package com.yxt.wms.biz.func.basegoodsunit;
 
 import com.yxt.common.core.query.Query;
 import lombok.Data;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitService.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitService.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsunit;
+package com.yxt.wms.biz.func.basegoodsunit;
 
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.query.PagerQuery;

wms-biz/src/main/java/com/yxt/wms/biz/basegoodsunit/BaseGoodsUnitVo.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basegoodsunit/BaseGoodsUnitVo.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basegoodsunit;
+package com.yxt.wms.biz.func.basegoodsunit;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;

wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturer.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturer.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basemanufacturer;
+package com.yxt.wms.biz.func.basemanufacturer;
 
 import com.yxt.common.core.domain.BaseEntity;
 import lombok.Data;

wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerDto.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerDto.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basemanufacturer;
+package com.yxt.wms.biz.func.basemanufacturer;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.dto.Dto;

wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerMapper.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerMapper.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basemanufacturer;
+package com.yxt.wms.biz.func.basemanufacturer;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerMapper.xml → wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerMapper.xml

@@ -1,10 +1,10 @@
 <?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.basemanufacturer.BaseManufacturerMapper">
+<mapper namespace="com.yxt.wms.biz.func.basemanufacturer.BaseManufacturerMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
-    <select id="listPage" resultType="com.yxt.wms.biz.basemanufacturer.BaseManufacturerVo">
+    <select id="listPage" resultType="com.yxt.wms.biz.func.basemanufacturer.BaseManufacturerVo">
         select
         *
         from base_manufacturer
@@ -12,7 +12,7 @@
             ${ew.sqlSegment}
         </where>
     </select>
-    <select id="getAllTypeByUseOrgSid" resultType="com.yxt.wms.biz.basemanufacturer.BaseManufacturerVo">
+    <select id="getAllTypeByUseOrgSid" resultType="com.yxt.wms.biz.func.basemanufacturer.BaseManufacturerVo">
         select *
         from base_manufacturer
         where useOrgSid = #{useOrgSid}

wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerQuery.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerQuery.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basemanufacturer;
+package com.yxt.wms.biz.func.basemanufacturer;
 
 import com.yxt.common.core.query.Query;
 import lombok.Data;

wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerService.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerService.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basemanufacturer;
+package com.yxt.wms.biz.func.basemanufacturer;
 
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.query.PagerQuery;

wms-biz/src/main/java/com/yxt/wms/biz/basemanufacturer/BaseManufacturerVo.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basemanufacturer/BaseManufacturerVo.java

@@ -1,4 +1,4 @@
-package com.yxt.wms.biz.basemanufacturer;
+package com.yxt.wms.biz.func.basemanufacturer;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;

wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBank.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBank.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierBank;
+package com.yxt.wms.biz.func.basesupplierBank;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;

wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankDetailsVo.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankDetailsVo.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierBank;
+package com.yxt.wms.biz.func.basesupplierBank;
 
 
 import com.yxt.common.core.vo.Vo;

wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankDto.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankDto.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierBank;
+package com.yxt.wms.biz.func.basesupplierBank;
 
 
 import com.yxt.common.core.dto.Dto;

wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankMapper.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankMapper.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierBank;
+package com.yxt.wms.biz.func.basesupplierBank;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankMapper.xml → wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankMapper.xml

@@ -1,13 +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.wms.biz.basesupplierBank.BaseSupplierBankMapper">
+<mapper namespace="com.yxt.wms.biz.func.basesupplierBank.BaseSupplierBankMapper">
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.wms.biz.basesupplierBank.BaseSupplierBankVo">
+	<select id="selectPageVo" resultType="com.yxt.wms.biz.func.basesupplierBank.BaseSupplierBankVo">
 		SELECT * FROM base_supplier_bank <where> ${ew.sqlSegment} </where>
 	</select>
 	
-	<select id="selectListAllVo" resultType="com.yxt.wms.biz.basesupplierBank.BaseSupplierBankVo">
+	<select id="selectListAllVo" resultType="com.yxt.wms.biz.func.basesupplierBank.BaseSupplierBankVo">
 		SELECT * FROM base_supplier_bank <where> ${ew.sqlSegment} </where>
 	</select>
 </mapper>

wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankQuery.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankQuery.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierBank;
+package com.yxt.wms.biz.func.basesupplierBank;
 
 
 import com.yxt.common.core.query.Query;

wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankService.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankService.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierBank;
+package com.yxt.wms.biz.func.basesupplierBank;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

wms-biz/src/main/java/com/yxt/wms/biz/basesupplierBank/BaseSupplierBankVo.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankVo.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierBank;
+package com.yxt.wms.biz.func.basesupplierBank;
 
 
 import com.yxt.common.core.vo.Vo;

wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfo.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfo.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierinfo;
+package com.yxt.wms.biz.func.basesupplierinfo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;

wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoChoice.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoChoice.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierinfo;
+package com.yxt.wms.biz.func.basesupplierinfo;
 
 
 import com.yxt.common.core.vo.Vo;

wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoDetailsVo.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoDetailsVo.java

@@ -23,11 +23,11 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierinfo;
+package com.yxt.wms.biz.func.basesupplierinfo;
 
 
 import com.yxt.common.core.vo.Vo;
-import com.yxt.wms.biz.basesupplierBank.BaseSupplierBankDetailsVo;
+import com.yxt.wms.biz.func.basesupplierBank.BaseSupplierBankDetailsVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoDto.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoDto.java

@@ -23,11 +23,11 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierinfo;
+package com.yxt.wms.biz.func.basesupplierinfo;
 
 
 import com.yxt.common.core.dto.Dto;
-import com.yxt.wms.biz.basesupplierBank.BaseSupplierBankDto;
+import com.yxt.wms.biz.func.basesupplierBank.BaseSupplierBankDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoMapper.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoMapper.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierinfo;
+package com.yxt.wms.biz.func.basesupplierinfo;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoMapper.xml → wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoMapper.xml

@@ -1,13 +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.wms.biz.basesupplierinfo.BaseSupplierInfoMapper">
+<mapper namespace="com.yxt.wms.biz.func.basesupplierinfo.BaseSupplierInfoMapper">
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.wms.biz.basesupplierinfo.BaseSupplierInfoVo">
+	<select id="selectPageVo" resultType="com.yxt.wms.biz.func.basesupplierinfo.BaseSupplierInfoVo">
 		SELECT * FROM base_supplier_info <where> ${ew.sqlSegment} </where>
 	</select>
 	
-	<select id="selectListAllVo" resultType="com.yxt.wms.biz.basesupplierinfo.BaseSupplierInfoVo">
+	<select id="selectListAllVo" resultType="com.yxt.wms.biz.func.basesupplierinfo.BaseSupplierInfoVo">
 		SELECT * FROM base_supplier_info <where> ${ew.sqlSegment} </where>
 	</select>
 </mapper>

wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoQuery.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoQuery.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierinfo;
+package com.yxt.wms.biz.func.basesupplierinfo;
 
 
 import com.yxt.common.core.query.Query;

wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoService.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoService.java

@@ -23,18 +23,13 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierinfo;
+package com.yxt.wms.biz.func.basesupplierinfo;
 
-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.feign.base.basesupplierinfo.BaseSupplierInfoFeign;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

wms-biz/src/main/java/com/yxt/wms/biz/basesupplierinfo/BaseSupplierInfoVo.java → wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoVo.java

@@ -23,7 +23,7 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.yxt.wms.biz.basesupplierinfo;
+package com.yxt.wms.biz.func.basesupplierinfo;
 
 
 import com.yxt.common.core.vo.Vo;

wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommon.java

@@ -0,0 +1,25 @@
+package com.yxt.wms.biz.func.dictcommon;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/6/23 15:40
+ * @description 数据字典数据项
+ */
+@Data
+public class DictCommon extends BaseEntity {
+    private static final long serialVersionUID = 8921237815183601526L;
+    @ApiModelProperty(value = "数据项值")
+    private String dictKey;
+    @ApiModelProperty(value = "数据类型")
+    private String dictType;
+    @ApiModelProperty(value = "数据项相对应的value值")
+    private String dictValue;
+    @ApiModelProperty(value = "数据项的父级sid")
+    private String parentSid;
+    @ApiModelProperty(value = "分组名称")
+    private String groupName;
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonDto.java

@@ -0,0 +1,36 @@
+package com.yxt.wms.biz.func.dictcommon;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author dimengzhe
+ * @date 2021/6/23 15:41
+ * @description 数据字典数据项参数
+ */
+@Data
+public class DictCommonDto implements Dto {
+    private static final long serialVersionUID = 9102264215113210976L;
+
+    @ApiModelProperty(value = "数据项值", required = true)
+    @NotBlank(message = "数据项值不能为空")
+    private String dictKey;
+
+    @ApiModelProperty(value = "数据类型", required = true)
+    @NotBlank(message = "数据类型不能为空")
+    private String dictType;
+
+    @ApiModelProperty(value = "数据项相对应的value值", required = true)
+    @NotBlank(message = "数据项相对应的value值不能为空")
+    private String dictValue;
+
+    @ApiModelProperty(value = "数据项的父级sid", required = true)
+    @NotBlank(message = "数据项的父级sid不能为空")
+    private String parentSid;
+
+    @ApiModelProperty(value = "分组名称", required = true)
+    private String groupName;
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonMapper.java

@@ -0,0 +1,60 @@
+package com.yxt.wms.biz.func.dictcommon;
+
+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 java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/6/23 15:07
+ * @description
+ */
+@Mapper
+public interface DictCommonMapper extends BaseMapper<DictCommon> {
+    /**
+     * 根据数据项的key值和分类类型code值查询数量
+     *
+     * @param dictKey   数据项key值
+     * @param dictType  类型code值
+     * @param parentSid 父级sid，无父级的此字段为0
+     * @return
+     */
+    DictCommon selectSize(@Param("dictkey") String dictKey, @Param("dictType") String dictType, @Param("parentSid") String parentSid);
+
+
+    /**
+     * 根据类型查询数据项
+     *
+     * @param dictTypeCode 数据分类的类型
+     * @return
+     */
+    List<DictCommon> selectByType(String dictTypeCode);
+
+
+    IPage<DictCommonVo> pageList(
+            IPage<DictCommonQuery> page, @Param(Constants.WRAPPER) Wrapper<DictCommonVo> qw);
+
+    DictCommonVo selectBykey(@Param("key") String key, @Param("type") String sid);
+
+    /**
+     * 根据类型和父级sid查询数据字典
+     *
+     * @param qw 查询条件
+     * @return
+     */
+    List<DictCommonVo> getValue(@Param(Constants.WRAPPER) QueryWrapper<DictCommonVo> qw);
+
+    /**
+     * 根据数据字典编码类别和分组查询数据字典
+     * @param type 数据字典编码类别
+     * @param groupNum 数据字典分组
+     * @return
+     */
+    List<DictCommonVo> getList(@Param("type") String type, @Param("groupNum") String groupNum);
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonMapper.xml

@@ -0,0 +1,43 @@
+<?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.dictcommon.DictCommonMapper">
+    <select id="selectSize" resultType="com.yxt.wms.biz.func.dictcommon.DictCommon">
+        SELECT *
+        FROM dict_common
+        WHERE dictKey = #{dictkey}
+          AND dictType = #{dictType}
+          AND parentSid = #{parentSid}
+    </select>
+
+    <select id="selectByType" resultType="com.yxt.wms.biz.func.dictcommon.DictCommon">
+        SELECT *
+        FROM dict_common
+        WHERE dictType = #{dictTypeCode}
+    </select>
+
+    <select id="pageList" resultType="com.yxt.wms.biz.func.dictcommon.DictCommonVo">
+        SELECT dc.dictValue, dc.dictType, dc.dictKey, dc.sid, dc.parentSid,dc.groupName
+        FROM dict_common dc
+                ${ew.customSqlSegment}
+    </select>
+    <!--获取下拉框-->
+    <select id="getValue" resultType="com.yxt.wms.biz.func.dictcommon.DictCommonVo">
+        SELECT dc.sid, dc.dictType, dc.dictKey, dc.dictValue, dc.parentSid
+        FROM dict_common dc ${ew.customSqlSegment}
+    </select>
+
+    <select id="selectBykey" resultType="com.yxt.wms.biz.func.dictcommon.DictCommonVo">
+        SELECT sid,
+               dictKey,
+               dictType,
+               dictValue,
+               groupName
+        FROM dict_common
+        WHERE dictType = #{type}
+          AND dictkey = #{key}
+    </select>
+
+    <select id="getList" resultType="com.yxt.wms.biz.func.dictcommon.DictCommonVo">
+        select * from dict_common dc where dc.dictType = #{type} and find_in_set(#{groupNum}, replace(dc.groupName, ',', ','));
+    </select>
+</mapper>

wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonQuery.java

@@ -0,0 +1,24 @@
+package com.yxt.wms.biz.func.dictcommon;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/6/28 10:39
+ * @description
+ */
+@Data
+public class DictCommonQuery implements Query {
+    private static final long serialVersionUID = -787372981183812826L;
+
+    @ApiModelProperty(value = "数据字典条目key", required = false)
+    private String dictKey;
+   
+    @ApiModelProperty(value = "数据字典文本", required = false)
+    private String dictValue;
+
+    @ApiModelProperty(value ="dictType")
+    private String dictType;
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/dictcommon/DictCommonService.java

@@ -0,0 +1,65 @@
+package com.yxt.wms.biz.func.dictcommon;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.wms.feign.portal.dictcommon.DictCommonFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/6/23 15:06
+ * @description
+ */
+@Service
+public class DictCommonService extends MybatisBaseService<DictCommonMapper, DictCommon> {
+
+    @Autowired
+    DictCommonFeign dictCommonFeign;
+
+    public ResultBean save(DictCommonDto dictCommonDto) {
+        return dictCommonFeign.save(dictCommonDto);
+    }
+    public ResultBean updateBySid(DictCommonDto dictCommonDto,String sid ) {
+        return dictCommonFeign.update(dictCommonDto,sid );
+    }
+    public ResultBean del(String sid ) {
+        return dictCommonFeign.delete(sid );
+    }
+
+    public List<DictCommon> selectByType(String dictTypeCode) {
+        return baseMapper.selectByType(dictTypeCode);
+    }
+
+    public ResultBean<PagerVo<DictCommonVo>> pageList(PagerQuery<DictCommonQuery> pagerQuery) {
+        return dictCommonFeign.pageList(pagerQuery);
+    }
+
+    /**
+     * 根据类型和父级sid查询数据字典
+     *
+     * @param  查询条件
+     * @return
+     */
+    public ResultBean<List<DictCommonVo>> getValue(String type,String psid) {
+
+        return dictCommonFeign.getTypeValues(type, psid);
+    }
+
+    public ResultBean<DictCommonVo> selectBykey(String key, String type) {
+        return dictCommonFeign.selectBykey(key, type);
+    }
+
+    public ResultBean<List<DictCommonVo>> getList(String type, String groupNum) {
+        return  dictCommonFeign.getTypeValueList(type,groupNum);
+    }
+}