oms系统管理迁移构建启动

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

@@ -0,0 +1,99 @@
+package com.yxt.oms.apiadmin.aggregation;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.biz.func.dictcommon.*;
+import com.yxt.oms.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);
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.yxt.oms.apiadmin.aggregation;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.biz.func.dictcommon.DictCommonService;
+import com.yxt.oms.biz.func.dicttype.DictTypeDto;
+import com.yxt.oms.biz.func.dicttype.DictTypeQuery;
+import com.yxt.oms.biz.func.dicttype.DictTypeService;
+import com.yxt.oms.biz.func.dicttype.DictTypeVo;
+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;
+
+/**
+ * @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);
+    }
+}

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

@@ -1,74 +0,0 @@
-package com.yxt.oms.apiadmin.aggregation;
-
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
-import com.yxt.oms.biz.func.purchasereceiptbill.PurchaseReceiptBillService;
-import com.yxt.oms.biz.func.purchasereceiptbill.PurchaseReceiptBill;
-import com.yxt.oms.biz.func.purchasereceiptbill.PurchaseReceiptBillDto;
-import com.yxt.oms.biz.func.purchasereceiptbill.PurchaseReceiptBillQuery;
-import com.yxt.oms.biz.func.purchasereceiptbill.PurchaseReceiptBillVo;
-import com.yxt.oms.utils.OrgPathQuery;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * @author wangpengfei
- * @date 2024/2/26 15:49
- */
-@Api(tags = "商品品牌")
-@RestController
-@RequestMapping("/apiadmin/base/basegoodsbrand")
-public class PurchaseReceiptBillRest {
-
-    @Autowired
-    PurchaseReceiptBillService baseBrandInfoService;
-
-    @ApiOperation("分页列表")
-    @PostMapping("/listPage")
-    public ResultBean<PagerVo<PurchaseReceiptBillVo>> listPage(@RequestBody PagerQuery<PurchaseReceiptBillQuery> pq) {
-        return baseBrandInfoService.listPage(pq);
-    }
-
-    @ApiOperation("查询所有的品牌")
-    @PostMapping("/listAll")
-    public ResultBean<List<PurchaseReceiptBill>> listAll(@RequestBody OrgPathQuery query) {
-        return baseBrandInfoService.listAll(query);
-    }
-
-    @ApiOperation("保存")
-    @PostMapping("/save")
-    public ResultBean<String> save(@RequestBody PurchaseReceiptBillDto dto) {
-        return baseBrandInfoService.save(dto);
-    }
-
-    @ApiOperation("初始化")
-    @GetMapping("/initialization/{sid}")
-    public ResultBean<PurchaseReceiptBillVo> initialization(@PathVariable("sid") String sid) {
-        return baseBrandInfoService.initialization(sid);
-    }
-
-    @ApiOperation("删除")
-    @DeleteMapping("/delete/{sid}")
-    public ResultBean delete(@PathVariable("sid") String sid) {
-        return baseBrandInfoService.delete(sid);
-    }
-
-    @ApiOperation("根据sid批量删除")
-    @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-        ResultBean rb = ResultBean.fireFail();
-        baseBrandInfoService.delAll(sids);
-        return rb.success();
-    }
-
-    @ApiOperation("更改可用状态")
-    @GetMapping("/updateIsEnable/{sid}/{isEnable}")
-    public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) {
-        return baseBrandInfoService.updateIsEnable(sid,isEnable);
-    }
-}

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

@@ -0,0 +1,61 @@
+package com.yxt.oms.apiadmin.aggregation;
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.oms.biz.func.region.RegionChildTwoVo;
+import com.yxt.oms.biz.func.region.RegionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@Api(tags = "省、市、县")
+@RestController
+@RequestMapping("/apiadmin/regions")
+public class RegionRest {
+
+    @Autowired
+    private RegionService regionService;
+
+    /**
+     * 区域获取省
+     *
+     * @return 所有省的集合
+     */
+    @ApiOperation("获取省")
+    @ResponseBody
+    @GetMapping("/getProvince")
+    public ResultBean getProvince() {
+        List<RegionChildTwoVo> regionList = regionService.getProvince();
+        return ResultBean.fireSuccess().setData(regionList);
+    }
+
+    /**
+     * 根据省查询该省下所有的市
+     *
+     * @param sid 省sid
+     * @return 某省下所有的市
+     */
+    @ApiOperation("根据省sid获取该省的所有市")
+    @ResponseBody
+    @GetMapping("/getCity")
+    public ResultBean getCity(@RequestParam("sid") String sid){
+        List<RegionChildTwoVo> city = regionService.getCity(sid);
+        return ResultBean.fireSuccess().setData(city);
+    };
+
+    /**
+     * 根据市查询该市下的所有县区
+     *
+     * @param sid 市sid
+     * @return 某市下的所有县区
+     */
+    @ApiOperation("根据市sid获取该市的所有县区")
+    @ResponseBody
+    @GetMapping("/getCounty")
+    public ResultBean getCounty(@RequestParam("sid") String sid){
+        List<RegionChildTwoVo> county = regionService.getCounty(sid);
+        return ResultBean.fireSuccess().setData(county);
+    };
+}

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

@@ -4,6 +4,7 @@ import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.biz.func.sysmenu.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,19 +15,6 @@ 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")
@@ -38,7 +26,6 @@ public class SysMenuRest {
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
     public ResultBean<PagerVo<SysMenuVo>> listPage(@RequestBody PagerQuery<SysMenuQuery> pq) {
-
         return sysMenuService.listPageVo(pq);
     }
 

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

@@ -3,7 +3,8 @@ package com.yxt.oms.apiadmin.aggregation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.func.sysrole.SysRoleService;
+import com.yxt.oms.biz.func.sysmenurole.*;
+import com.yxt.oms.biz.func.sysrole.SysRoleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,19 +12,6 @@ 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")

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

@@ -3,6 +3,7 @@ package com.yxt.oms.apiadmin.aggregation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.biz.func.syspost.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,19 +11,6 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-/**
- * Project: anrui_portal(门户建设) <br/>
- * File: SysPostFeignFallback.java <br/>
- * Class: com.yxt.anrui.portal.biz.syspost.SysPostRest <br/>
- * Description: 岗位. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-08-03 00:24:28 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Api(tags = "岗位")
 @RestController
 @RequestMapping("apiadmin/syspost")

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

@@ -1,8 +1,8 @@
 package com.yxt.oms.apiadmin.aggregation;
 
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.wms.biz.func.sysroleauthorize.SysRoleAuthorizeDto;
+import com.yxt.oms.biz.func.sysroleauthorize.SysRoleAuthorizeDto;
-import com.yxt.wms.biz.func.sysroleauthorize.SysRoleAuthorizeService;
+import com.yxt.oms.biz.func.sysroleauthorize.SysRoleAuthorizeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -3,10 +3,10 @@ package com.yxt.oms.apiadmin.aggregation;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.func.sysrole.SysRoleDto;
+import com.yxt.oms.biz.func.sysrole.SysRoleDto;
-import com.yxt.wms.biz.func.sysrole.SysRoleQuery;
+import com.yxt.oms.biz.func.sysrole.SysRoleQuery;
-import com.yxt.wms.biz.func.sysrole.SysRoleService;
+import com.yxt.oms.biz.func.sysrole.SysRoleService;
-import com.yxt.wms.biz.func.sysrole.SysRoleVo;
+import com.yxt.oms.biz.func.sysrole.SysRoleVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -15,19 +15,6 @@ 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")

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

@@ -1,7 +1,7 @@
 package com.yxt.oms.apiadmin.aggregation;
 
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.wms.biz.func.sysstafforg.SysStaffOrgService;
+import com.yxt.oms.biz.func.sysstafforg.SysStaffOrgService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

oms/src/main/java/com/yxt/oms/biz/func/dictcommon/DictCommon.java

@@ -0,0 +1,25 @@
+package com.yxt.oms.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;
+}

oms/src/main/java/com/yxt/oms/biz/func/dictcommon/DictCommonDto.java

@@ -0,0 +1,36 @@
+package com.yxt.oms.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;
+}

oms/src/main/java/com/yxt/oms/biz/func/dictcommon/DictCommonMapper.java

@@ -0,0 +1,60 @@
+package com.yxt.oms.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);
+}

oms/src/main/java/com/yxt/oms/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.oms.biz.func.dictcommon.DictCommonMapper">
+    <select id="selectSize" resultType="com.yxt.oms.biz.func.dictcommon.DictCommon">
+        SELECT *
+        FROM dict_common
+        WHERE dictKey = #{dictkey}
+          AND dictType = #{dictType}
+          AND parentSid = #{parentSid}
+    </select>
+
+    <select id="selectByType" resultType="com.yxt.oms.biz.func.dictcommon.DictCommon">
+        SELECT *
+        FROM dict_common
+        WHERE dictType = #{dictTypeCode}
+    </select>
+
+    <select id="pageList" resultType="com.yxt.oms.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.oms.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.oms.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.oms.biz.func.dictcommon.DictCommonVo">
+        select * from dict_common dc where dc.dictType = #{type} and find_in_set(#{groupNum}, replace(dc.groupName, ',', ','));
+    </select>
+</mapper>

oms/src/main/java/com/yxt/oms/biz/func/dictcommon/DictCommonQuery.java

@@ -0,0 +1,24 @@
+package com.yxt.oms.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;
+}

oms/src/main/java/com/yxt/oms/biz/func/dictcommon/DictCommonService.java

@@ -0,0 +1,61 @@
+package com.yxt.oms.biz.func.dictcommon;
+
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.feign.portal.dictcommon.DictCommonFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/6/23 15:06
+ * @description
+ */
+@Service
+public class DictCommonService extends MybatisBaseService<DictCommonMapper, DictCommon> {
+
+    @Resource
+    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);
+    }
+}

oms/src/main/java/com/yxt/oms/biz/func/dictcommon/DictCommonTypeQuery.java

@@ -0,0 +1,21 @@
+package com.yxt.oms.biz.func.dictcommon;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/9/30 15:33
+ * @description 下拉框条件
+ */
+@Data
+public class DictCommonTypeQuery implements Query {
+    private static final long serialVersionUID = 139959085226402464L;
+
+    @ApiModelProperty(value = "数据字典类型", required = true)
+    private String type;
+
+    @ApiModelProperty(value = "psid", required = false,example = "0")
+    private String psid;
+}

oms/src/main/java/com/yxt/oms/biz/func/dictcommon/DictCommonVo.java

@@ -0,0 +1,32 @@
+package com.yxt.oms.biz.func.dictcommon;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/6/23 15:54
+ * @description
+ */
+@Data
+public class DictCommonVo implements Vo {
+    private static final long serialVersionUID = -1094142938193916816L;
+
+    @ApiModelProperty(value = "数据字典项sid")
+    private String sid;
+
+    @ApiModelProperty(value = "数据字典项key")
+    private String dictKey;
+
+    @ApiModelProperty(value = "数据字典类型")
+    private String dictType;
+
+    @ApiModelProperty(value = "数据字典项名称")
+    private String dictValue;
+    @ApiModelProperty(value = "父级sid：0为第一级")
+    private String parentSid;
+
+    @ApiModelProperty(value = "分组名称")
+    private String groupName;
+}

oms/src/main/java/com/yxt/oms/biz/func/dicttype/DictType.java

@@ -0,0 +1,21 @@
+package com.yxt.oms.biz.func.dicttype;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/5 22:29
+ * @description
+ */
+@Data
+public class DictType extends BaseEntity {
+
+    private static final long serialVersionUID = -2790449398289680139L;
+
+    @ApiModelProperty(value = "类型代码")
+    private String dictTypeCode;
+    @ApiModelProperty(value = "类型名称")
+    private String dictTypeName;
+}

oms/src/main/java/com/yxt/oms/biz/func/dicttype/DictTypeDto.java

@@ -0,0 +1,30 @@
+package com.yxt.oms.biz.func.dicttype;
+
+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:20
+ * @description 数据字典类型参数
+ */
+@Data
+public class DictTypeDto implements Dto {
+    private static final long serialVersionUID = -2302005624272862359L;
+
+    @ApiModelProperty(value = "类型代码", required = true)
+    @NotBlank(message = "类型代码不能为空")
+    private String dictTypeCode;
+
+    @ApiModelProperty(value = "类型名称", required = true)
+    @NotBlank(message = "类型名称不能为空")
+    private String dictTypeName;
+
+    @ApiModelProperty(value = "类型说明", required = false)
+    private String remarks;
+
+
+}

oms/src/main/java/com/yxt/oms/biz/func/dicttype/DictTypeMapper.java

@@ -0,0 +1,28 @@
+package com.yxt.oms.biz.func.dicttype;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author dimengzhe
+ * @date 2021/6/23 14:56
+ * @description
+ */
+@Mapper
+public interface DictTypeMapper extends BaseMapper<DictType> {
+
+    /**
+     * 查询该类型代码存在的数量
+     *
+     * @param dictTypeCode 类型代码
+     * @return
+     */
+    int selectSize(String dictTypeCode);
+
+    IPage<DictTypeVo> pageList(IPage<?> page, @Param(Constants.WRAPPER) Wrapper<DictTypeVo> qw);
+
+}

oms/src/main/java/com/yxt/oms/biz/func/dicttype/DictTypeMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.oms.biz.func.dicttype.DictTypeMapper">
+
+    <select id="selectSize" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM dict_type
+        WHERE dictTypeCode = #{dictTypeCode}
+    </select>
+
+    <select id="pageList" resultType="com.yxt.oms.biz.func.dicttype.DictTypeVo">
+        SELECT dt.dictTypeCode, dt.dictTypeName, dt.sid, dt.remarks
+        FROM dict_type dt
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

oms/src/main/java/com/yxt/oms/biz/func/dicttype/DictTypeQuery.java

@@ -0,0 +1,24 @@
+package com.yxt.oms.biz.func.dicttype;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/6/28 9:17
+ * @description
+ */
+@Data
+public class DictTypeQuery implements Query {
+    private static final long serialVersionUID = -1033205660448956012L;
+
+    @ApiModelProperty(value = "数据字典code", required = false)
+    private String dictTypeCode;
+
+    @ApiModelProperty(value = "数据分类名称", required = false)
+    private String dictTypeName;
+
+    @ApiModelProperty(value = "说明", required = false)
+    private String remarks;
+}

oms/src/main/java/com/yxt/oms/biz/func/dicttype/DictTypeService.java

@@ -0,0 +1,35 @@
+package com.yxt.oms.biz.func.dicttype;
+
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.oms.feign.portal.dicttype.DictTypeFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author dimengzhe
+ * @date 2021/6/23 14:55
+ * @description 数据字典类型实现类
+ */
+@Service
+public class DictTypeService extends MybatisBaseService<DictTypeMapper, DictType> {
+     @Autowired
+     DictTypeFeign dictTypeFeign;
+
+
+    public ResultBean save(DictTypeDto dictTypeDto) {
+        return dictTypeFeign.save(dictTypeDto);
+    }
+    public ResultBean updateBySid(DictTypeDto dictTypeDto,String sid ) {
+        return dictTypeFeign.update(dictTypeDto,sid);
+    }
+    public ResultBean del( String sid ) {
+        return dictTypeFeign.delete(sid);
+    }
+
+    public ResultBean<PagerVo<DictTypeVo>> pageList(PagerQuery<DictTypeQuery> pagerQuery) {
+        return dictTypeFeign.pageList(pagerQuery);
+    }
+}

oms/src/main/java/com/yxt/oms/biz/func/dicttype/DictTypeVo.java

@@ -0,0 +1,32 @@
+package com.yxt.oms.biz.func.dicttype;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/6/23 15:18
+ * @description 数据字典类型返回数据
+ */
+@Data
+public class DictTypeVo implements Vo {
+    private static final long serialVersionUID = 9052935182700117654L;
+
+    @ApiModelProperty(value = "数据类型sid")
+    private String sid;
+
+    @ApiModelProperty(value = "类型代码")
+    private String dictTypeCode;
+
+    @ApiModelProperty(value = "类型名称")
+    private String dictTypeName;
+
+    @ApiModelProperty(value = "说明")
+    private String remarks;
+
+    @ApiModelProperty(value = "分组名称")
+    private String groupName;
+
+
+}

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

@@ -34,19 +34,6 @@ import lombok.Data;
 
 import java.util.Date;
 
-/**
- * Project: yxt-pms(采购) <br/>
- * File: PmsPurchaseBill.java <br/>
- * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBill <br/>
- * Description: 采购单. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-19 13:51:45 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "采购单", description = "采购单")
 @TableName("purchase_bill")

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

@@ -28,19 +28,6 @@ package com.yxt.oms.biz.func.purchasebill;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
-/**
- * Project: yxt-pms(采购) <br/>
- * File: PmsPurchaseBillMapper.java <br/>
- * Class: com.yxt.pms.biz.purchasebill.PmsPurchaseBillMapper <br/>
- * Description: 采购单. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-19 13:51:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface PurchaseBillMapper extends BaseMapper<PurchaseBill> {
 

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

@@ -25,25 +25,11 @@
  *********************************************************/
 package com.yxt.oms.biz.func.purchasebill;
 
-
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: yxt-pms(采购) <br/>
- * File: PmsPurchaseBillQuery.java <br/>
- * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillQuery <br/>
- * Description: 采购单 查询条件. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-19 13:51:45 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "采购单 查询条件", description = "采购单 查询条件")
 public class PurchaseBillQuery implements Query {

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

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.oms.biz.func.purchasebill;
 
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
@@ -35,19 +34,6 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.util.Date;
 
-/**
- * Project: yxt-pms(采购) <br/>
- * File: PmsPurchaseBillVo.java <br/>
- * Class: com.yxt.pms.api.purchasebill.PmsPurchaseBillVo <br/>
- * Description: 采购单 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-19 13:51:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "采购单 视图数据对象", description = "采购单 视图数据对象")
 public class PurchaseBillVo implements Vo {

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

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

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

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

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

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

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

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

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.oms.biz.func.purchasebillamount.PurchaseBillAmountMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-</mapper>

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

@@ -25,24 +25,9 @@
  *********************************************************/
 package com.yxt.oms.biz.func.purchasebillamount;
 
-import cn.hutool.core.bean.BeanUtil;
-import com.yxt.common.base.service.MybatisBaseService;
 import org.springframework.stereotype.Service;
 
 @Service
 public class PurchaseBillAmountService{
 
-	public void insertByDto(PurchaseBillAmountDto dto){
-		PurchaseBillAmount entity = new PurchaseBillAmount();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.insert(entity);
-	}
-
-	public void delByMainSid(String dtoSid) {
-		baseMapper.delByMainSid(dtoSid);
-	}
-
-	public PurchaseBillAmountDetailsVo selByMainSid(String billSid) {
-		return baseMapper.selByMainSid(billSid);
-	}
 }

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

@@ -35,19 +35,6 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.util.Date;
 
-/**
- * Project: yxt-pms(采购) <br/>
- * File: PmsPurchaseBillDetail.java <br/>
- * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetail <br/>
- * Description: 采购单据明细. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-19 13:51:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "采购单据明细", description = "采购单据明细")
 @TableName("purchase_bill_detail")

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

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.oms.biz.func.purchasebilldetail;
 
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
@@ -35,19 +34,6 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.util.Date;
 
-/**
- * Project: yxt-pms(采购) <br/>
- * File: PmsPurchaseBillDetailVo.java <br/>
- * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailVo <br/>
- * Description: 采购单据明细 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-19 13:51:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "采购单据明细 视图数据详情", description = "采购单据明细 视图数据详情")
 public class PurchaseBillDetailDetailsVo implements Vo {

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

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.oms.biz.func.purchasebilldetail;
 
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
@@ -35,19 +34,6 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.util.Date;
 
-/**
- * Project: yxt-pms(采购) <br/>
- * File: PmsPurchaseBillDetailDto.java <br/>
- * Class: com.yxt.pms.api.purchasebilldetail.PmsPurchaseBillDetailDto <br/>
- * Description: 采购单据明细 数据传输对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-19 13:51:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "采购单据明细 数据传输对象", description = "采购单据明细 数据传输对象")
 public class PurchaseBillDetailDto implements Dto {

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

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

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

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.purchase.biz.purchasebilldetail.PurchaseBillDetailMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-
-	<select id="purDetailReForm" resultType="com.yxt.purchase.biz.purchasebilldetail.PurchaseBillDetailReportVo">
-		SELECT
-				pdd.goodsSpuName,
-				pdd.goodsSkuCode,
-				pdd.cost,
-				pdd.cost * pdd.count AS costCount,
-				pdd.taxAmount,
-				pdd.taxAmount * pdd.count AS taxAmountCount,
-				pdd.taxPrice,
-				pdd.count,
-				IFNULL(ppd.backCount,0) AS retreatCount,
-				pdd.amount,
-				pdd.warehouseName,
-				pdd.unit
-		FROM pms_purchase_bill_detail pdd
-					 LEFT JOIN pms_purchaseback_bill ppb
-				ON pdd.billSid = ppb.sourceBillSid
-					 LEFT JOIN pms_purchaseback_detail ppd
-				ON ppb.sid = ppd.billSid
-		<where> ${ew.sqlSegment} </where>
-    </select>
-
-	<select id="purSumReForm" resultType="com.yxt.purchase.biz.purchasebilldetail.PurchaseBillDetailSumVo">
-		SELECT
-				pdd.goodsSpuName,
-				pdd.goodsSkuCode,
-				pdd.unit,
-				pdd.goodsSkuOwnSpec,
-				pdd.count,
-				pdd.amount,
-				IFNULL(ppd.backCount,0) AS retreatCount,
-				ppd.backAmount
-		FROM pms_purchase_bill_detail pdd
-					 LEFT JOIN pms_purchaseback_bill ppb
-				ON pdd.billSid = ppb.sourceBillSid
-					 LEFT JOIN pms_purchaseback_detail ppd
-				ON ppb.sid = ppd.billSid
-		<where> ${ew.sqlSegment} </where>
-	</select>
-</mapper>

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

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

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

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

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

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

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

@@ -25,89 +25,9 @@
  *********************************************************/
 package com.yxt.oms.biz.func.purchasebilldetail;
 
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.vo.PagerVo;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
-/**
- * Project: yxt-pms(采购) <br/>
- * File: PmsPurchaseBillDetailService.java <br/>
- * Class: com.yxt.pms.biz.purchasebilldetail.PmsPurchaseBillDetailService <br/>
- * Description: 采购单据明细 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-19 13:51:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
-public class PurchaseBillDetailService extends MybatisBaseService<PurchaseBillDetailMapper, PurchaseBillDetail> {
+public class PurchaseBillDetailService {
-
-    public void insertByDto(PurchaseBillDetailDto dto) {
-        PurchaseBillDetail entity = new PurchaseBillDetail();
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.insert(entity);
-    }
-
-    public void delByMainSid(String dtoSid) {
-        baseMapper.delByMainSid(dtoSid);
-    }
-
-    public List<PurchaseBillDetailDetailsVo> selByMainSid(String billSid) {
-        return baseMapper.selByMainSid(billSid);
-    }
-
-    public PagerVo<PurchaseBillDetailReportVo> purDetailReForm(PagerQuery<PurchaseBillDetailReportQuery> pq) {
-        PurchaseBillDetailReportQuery query = pq.getParams();
-        QueryWrapper<PurchaseBillDetail> qw = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(query.getWarehouseName())) {
-            qw.like("pdd.warehouseName", query.getWarehouseName());
-        }
-        if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
-            qw.like("pdd.goodsSkuCode", query.getGoodsSkuCode());
-        }
-        if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())) {
-            qw.like("pdd.goodsSkuOwnSpec", query.getGoodsSkuOwnSpec());
-        }
-        if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
-            qw.like("pdd.goodsSpuName", query.getGoodsSpuName());
-        }
-        IPage<PurchaseBillDetail> page = PagerUtil.queryToPage(pq);
-        IPage<PurchaseBillDetailReportVo> pagging = baseMapper.purDetailReForm(page, qw);
-        PagerVo<PurchaseBillDetailReportVo> p = PagerUtil.pageToVo(pagging, null);
-        return p;
-    }
 
-    public PagerVo<PurchaseBillDetailSumVo> purSumReForm(PagerQuery<PurchaseBillDetailReportQuery> pq) {
-        PurchaseBillDetailReportQuery query = pq.getParams();
-        QueryWrapper<PurchaseBillDetail> qw = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(query.getWarehouseName())) {
-            qw.like("pdd.warehouseName", query.getWarehouseName());
-        }
-        if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
-            qw.like("pdd.goodsSkuCode", query.getGoodsSkuCode());
-        }
-        if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())) {
-            qw.like("pdd.goodsSkuOwnSpec", query.getGoodsSkuOwnSpec());
-        }
-        if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
-            qw.like("pdd.goodsSpuName", query.getGoodsSpuName());
-        }
-        qw.eq("pdd.isDelete",0);
-        qw.groupBy("pdd.goodsSkuCode");
-        IPage<PurchaseBillDetail> page = PagerUtil.queryToPage(pq);
-        IPage<PurchaseBillDetailSumVo> pagging = baseMapper.purSumReForm(page, qw);
-        PagerVo<PurchaseBillDetailSumVo> p = PagerUtil.pageToVo(pagging, null);
-        return p;
-    }
 }

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

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

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

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

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

@@ -31,19 +31,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: yxt-pms(采购) <br/>
- * File: PmsPurchaseBillExtend.java <br/>
- * Class: com.yxt.pms.api.purchasebillextend.PmsPurchaseBillExtend <br/>
- * Description: 采购单扩展. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-19 13:51:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "采购单扩展", description = "采购单扩展")
 @TableName("purchase_bill_extend")

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

@@ -25,25 +25,11 @@
  *********************************************************/
 package com.yxt.oms.biz.func.purchasebillextend;
 
-
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: yxt-pms(采购) <br/>
- * File: PmsPurchaseBillExtendVo.java <br/>
- * Class: com.yxt.pms.api.purchasebillextend.PmsPurchaseBillExtendVo <br/>
- * Description: 采购单扩展 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-19 13:51:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "采购单扩展 视图数据详情", description = "采购单扩展 视图数据详情")
 public class PurchaseBillExtendDetailsVo implements Vo {

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

@@ -25,25 +25,11 @@
  *********************************************************/
 package com.yxt.oms.biz.func.purchasebillextend;
 
-
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: yxt-pms(采购) <br/>
- * File: PmsPurchaseBillExtendDto.java <br/>
- * Class: com.yxt.pms.api.purchasebillextend.PmsPurchaseBillExtendDto <br/>
- * Description: 采购单扩展 数据传输对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-19 13:51:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "采购单扩展 数据传输对象", description = "采购单扩展 数据传输对象")
 public class PurchaseBillExtendDto implements Dto {

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

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

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.purchase.biz.purchasebillextend.PurchaseBillExtendMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-</mapper>

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

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

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

@@ -25,37 +25,9 @@
  *********************************************************/
 package com.yxt.oms.biz.func.purchasebillextend;
 
-import cn.hutool.core.bean.BeanUtil;
-import com.yxt.common.base.service.MybatisBaseService;
 import org.springframework.stereotype.Service;
 
-/**
- * Project: yxt-pms(采购) <br/>
- * File: PmsPurchaseBillExtendService.java <br/>
- * Class: com.yxt.pms.biz.purchasebillextend.PmsPurchaseBillExtendService <br/>
- * Description: 采购单扩展 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-19 13:51:46 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
-public class PurchaseBillExtendService extends MybatisBaseService<PurchaseBillExtendMapper, PurchaseBillExtend> {
+public class PurchaseBillExtendService {
 
-	public void insertByDto(PurchaseBillExtendDto dto){
-		PurchaseBillExtend entity = new PurchaseBillExtend();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.insert(entity);
-	}
-
-	public void delByMainSid(String dtoSid) {
-		baseMapper.delByMainSid(dtoSid);
-	}
-
-	public PurchaseBillExtendDetailsVo selByMainSid(String billSid) {
-		return baseMapper.selByMainSid(billSid);
-	}
 }

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

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

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

@@ -1,42 +0,0 @@
-package com.yxt.oms.biz.func.purchasereceiptbill;
-
-import com.yxt.common.core.domain.BaseEntity;
-import lombok.Data;
-
-/**
- * @author wangpengfei
- * @date 2024/2/26 13:36
- */
-@Data
-public class PurchaseReceiptBill extends BaseEntity {
-
-
-    private String sourceBillSid;//来源单sid（工单sid）
-    private String sourceBillNo;//来源单编号
-    private String billNo;//单据编号
-    private String createDate;//单据日期
-    private String createUserSid;//制单人sid
-    private String createByName;//制单人姓名
-    private String purchaseType;//采购类型（厂家采购、外采）
-    private String supplierSid;//供应商sid
-    private String supplierName;//供应商名称
-    private String supplierPhone;//供应商联系电话
-    private String billType;//票据类型(不含税、增值税、普通税、已含增值税)
-    private String markupType;//加价方式（统一加价率、区间加价率、仓库加价率）
-    private String priceStrategy;//进价不同时的价格策略（加权平均、分别计价）
-    private String isInvoicing;//是否需要开发票（是1，否0）
-    private String invoiceCode;//发票号码
-    private String tempMarkupRate;//临时加价率
-    private String purchaserSid;//采购员sid（单选）
-    private String purchaserName;//
-    private String storekeeperSid;//库管员sid（单选）
-    private String storekeeperName;//
-    private String errorAmount;//误差调整金额
-    private String freight;//运费
-    private String discountAmount;//优惠金额
-    private String payableAmount;//应付金额（=采购金额+运费-优惠金额）
-    private String useOrgSid;//使用组织sid
-    private String createOrgSid;//创建组织sid
-
-
-}

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

@@ -1,56 +0,0 @@
-package com.yxt.oms.biz.func.purchasereceiptbill;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yxt.common.core.dto.Dto;
-import com.yxt.oms.biz.func.purchasereceiptbilldetail.PurchaseReceiptBillDetailDto;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author wangpengfei
- * @date 2024/2/26 13:38
- */
-@Data
-public class PurchaseReceiptBillDto implements Dto {
-    private String id;
-    private String sid;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createTime;
-    private String remarks;
-    private String isEnable;
-    private String sourceBillSid;//来源单sid（工单sid）
-    private String sourceBillNo;//来源单编号
-    private String billNo;//单据编号
-    private String createDate;//单据日期
-    private String createUserSid;//制单人sid
-    private String createByName;//制单人姓名
-    private String purchaseType;//采购类型（厂家采购、外采）
-    private String supplierSid;//供应商sid
-    private String supplierName;//供应商名称
-    private String supplierPhone;//供应商联系电话
-    private String billType;//票据类型(不含税、增值税、普通税、已含增值税)
-    private String markupType;//加价方式（统一加价率、区间加价率、仓库加价率）
-    private String priceStrategy;//进价不同时的价格策略（加权平均、分别计价）
-    private String isInvoicing;//是否需要开发票（是1，否0）
-    private String invoiceCode;//发票号码
-    private String tempMarkupRate;//临时加价率
-    private String purchaserSid;//采购员sid（单选）
-    private String purchaserName;//
-    private String storekeeperSid;//库管员sid（单选）
-    private String storekeeperName;//
-    private String errorAmount;//误差调整金额
-    private String freight;//运费
-    private String discountAmount;//优惠金额
-    private String payableAmount;//应付金额（=采购金额+运费-优惠金额）
-    private String useOrgSid;//使用组织sid
-    private String createOrgSid;//创建组织sid
-    private String contact;//联系人
-    private String mobile;//联系人手机
-    private String goodsOwnerSid;//货主sid
-    private String goodsOwner;//货主
-    private List<PurchaseReceiptBillDetailDto> purchaseReceiptBillList=new ArrayList<>();
-}

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

@@ -1,13 +0,0 @@
-package com.yxt.oms.biz.func.purchasereceiptbill;
-
-import com.yxt.common.core.query.Query;
-import lombok.Data;
-
-/**
- * @author wangpengfei
- * @date 2024/2/26 13:37
- */
-@Data
-public class PurchaseReceiptBillQuery implements Query {
-    private String name;
-}

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

@@ -1,101 +0,0 @@
-package com.yxt.oms.biz.func.purchasereceiptbill;
-
-import com.yxt.common.base.config.component.FileUploadComponent;
-import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
-import com.yxt.oms.biz.func.purchasereceiptbilldetail.PurchaseReceiptBillDetailDto;
-import com.yxt.oms.biz.func.warehouseansbill.WarehouseAnsBillDto;
-import com.yxt.oms.biz.func.warehouseansbilldetail.WarehouseAnsBillDetailDto;
-import com.yxt.oms.feign.purchase.purchasereceiptbill.PurchaseReceiptBillFeign;
-import com.yxt.oms.feign.warehouse.warehouseansbill.WarehouseAnsBillFeign;
-import com.yxt.oms.utils.OrgPathQuery;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author wangpengfei
- * @date 2024/2/26 13:40
- */
-@Service
-public class PurchaseReceiptBillService {
-    @Autowired
-    private FileUploadComponent fileUploadComponent;
-    @Resource
-    PurchaseReceiptBillFeign purchaseReceiptBillFeign;
-    @Resource
-    WarehouseAnsBillFeign warehouseAnsBillFeignl;
-
-    public ResultBean<PagerVo<PurchaseReceiptBillVo>> listPage(PagerQuery<PurchaseReceiptBillQuery> pq) {
-        ResultBean rb = ResultBean.fireFail();
-        return purchaseReceiptBillFeign.listPage(pq);
-    }
-
-    public ResultBean<List<PurchaseReceiptBill>> listAll(OrgPathQuery query) {
-    ResultBean rb = ResultBean.fireFail();
-
-    return purchaseReceiptBillFeign.listAll(query);
-}
-    public ResultBean<String> save(PurchaseReceiptBillDto dto) {
-        ResultBean rb = ResultBean.fireFail();
-        WarehouseAnsBillDto dto1=new WarehouseAnsBillDto();
-        dto1.setSourceBillNo("");
-        dto1.setBusTypeKey("采购预约");
-        dto1.setBusTypeValue("采购预约");
-        dto1.setCreateByName(dto.getCreateByName());
-        dto1.setBillState(1);
-        dto1.setReviewStatus("");
-        dto1.setRefuseReason("");
-        dto1.setContact(dto.getContact());
-        dto1.setMobile(dto.getMobile());
-        dto1.setGoodsOwner(dto.getGoodsOwner());
-        dto1.setGoodsOwnerSid(dto.getGoodsOwnerSid());
-        dto1.setSupplierSid(dto.getSupplierSid());
-        dto1.setSupplierName(dto.getSupplierName());
-        dto1.setDeliveryDate(new Date());
-        dto1.setUseOrgSid(dto.getUseOrgSid());
-        dto1.setCreateBySid(dto.getCreateOrgSid());
-        List<WarehouseAnsBillDetailDto> wmsAnsBillDetailList = new ArrayList<>();
-        for (PurchaseReceiptBillDetailDto purchaseReceiptBillDetailDto : dto.getPurchaseReceiptBillList()) {
-            WarehouseAnsBillDetailDto d=new WarehouseAnsBillDetailDto();
-            d.setGoodsSkuSid(purchaseReceiptBillDetailDto.getGoodsSid());
-            d.setGoodsSkuTitle(purchaseReceiptBillDetailDto.getGoodsName());
-            d.setUnit(purchaseReceiptBillDetailDto.getUnit());
-            d.setCost(purchaseReceiptBillDetailDto.getCost());
-            d.setOrderCount(purchaseReceiptBillDetailDto.getCount());
-            d.setTaxAmount(purchaseReceiptBillDetailDto.getTaxAmount());
-            d.setTaxPrice(purchaseReceiptBillDetailDto.getTaxPrice());
-            d.setAmount(purchaseReceiptBillDetailDto.getAmount());
-            wmsAnsBillDetailList.add(d);
-        }
-        warehouseAnsBillFeignl.saveBill(dto1);
-        return purchaseReceiptBillFeign.saveOrUpdate(dto);
-    }
-
-    public ResultBean<PurchaseReceiptBillVo> initialization(String sid) {
-        ResultBean rb = ResultBean.fireFail();
-
-        return purchaseReceiptBillFeign.initialization(sid);
-    }
-
-
-
-    public ResultBean delete(String sid) {
-        ResultBean rb = ResultBean.fireFail();
-        return rb.success().setMsg("成功");
-    }
-    public ResultBean delAll(String[] sids) {
-        return purchaseReceiptBillFeign.delBySids(sids);
-    }
-    public ResultBean updateIsEnable(String sid,String isEnable) {
-        ResultBean rb = ResultBean.fireFail();
-        return purchaseReceiptBillFeign.updateIsEnable(sid,isEnable);
-    }
-
-}

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

@@ -1,52 +0,0 @@
-package com.yxt.oms.biz.func.purchasereceiptbill;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yxt.common.core.vo.Vo;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author wangpengfei
- * @date 2024/2/26 13:37
- */
-@Data
-public class PurchaseReceiptBillVo implements Vo {
-    private String id;
-    private String sid;
-    private String lockVersion;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createTime;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date modifyTime;
-    private String remarks;
-    private String isEnable;
-    private String state;
-    private String isDelete;
-    private String sourceBillSid;//来源单sid（工单sid）
-    private String sourceBillNo;//来源单编号
-    private String billNo;//单据编号
-    private String createDate;//单据日期
-    private String createUserSid;//制单人sid
-    private String createByName;//制单人姓名
-    private String purchaseType;//采购类型（厂家采购、外采）
-    private String supplierSid;//供应商sid
-    private String supplierName;//供应商名称
-    private String supplierPhone;//供应商联系电话
-    private String billType;//票据类型(不含税、增值税、普通税、已含增值税)
-    private String markupType;//加价方式（统一加价率、区间加价率、仓库加价率）
-    private String priceStrategy;//进价不同时的价格策略（加权平均、分别计价）
-    private String isInvoicing;//是否需要开发票（是1，否0）
-    private String invoiceCode;//发票号码
-    private String tempMarkupRate;//临时加价率
-    private String purchaserSid;//采购员sid（单选）
-    private String purchaserName;//
-    private String storekeeperSid;//库管员sid（单选）
-    private String storekeeperName;//
-    private String errorAmount;//误差调整金额
-    private String freight;//运费
-    private String discountAmount;//优惠金额
-    private String payableAmount;//应付金额（=采购金额+运费-优惠金额）
-    private String useOrgSid;//使用组织sid
-    private String createOrgSid;//创建组织sid
-}

oms/src/main/java/com/yxt/oms/biz/func/purchasereceiptbilldetail/PurchaseReceiptBillDetail.java

@@ -1,33 +0,0 @@
-package com.yxt.oms.biz.func.purchasereceiptbilldetail;
-
-import com.yxt.common.core.domain.BaseEntity;
-import lombok.Data;
-
-/**
- * @author wangpengfei
- * @date 2024/2/26 13:36
- */
-@Data
-public class PurchaseReceiptBillDetail extends BaseEntity {
-
-
-    private String billSid;//单据sid
-    private String goodsSid;//商品sid
-    private String goodsName;//商品名称
-    private String goodsCode;//商品编码（图号）
-    private String specification;//规格
-    private String goodsModel;//型号
-    private double currentCount;//当前库存数量
-    private String unit;//计量单位
-    private String warehouseSid;//仓库sid
-    private String warehouseName;//仓库名称
-    private String position;//货位
-    private double cost;//单位成本（进货价）
-    private double count;//采购数量
-    private double taxAmount;//税额（
-    private double taxPrice;//含税价
-    private double amount;//采购金额
-    private double price1;//销售价1
-    private double price2;//销售价2
-
-}

oms/src/main/java/com/yxt/oms/biz/func/purchasereceiptbilldetail/PurchaseReceiptBillDetailDto.java

@@ -1,39 +0,0 @@
-package com.yxt.oms.biz.func.purchasereceiptbilldetail;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yxt.common.core.dto.Dto;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author wangpengfei
- * @date 2024/2/26 13:38
- */
-@Data
-public class PurchaseReceiptBillDetailDto implements Dto {
-    private String id;
-    private String sid;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createTime;
-    private String remarks;
-    private String isEnable;
-    private String billSid;//单据sid
-    private String goodsSid;//商品sid
-    private String goodsName;//商品名称
-    private String goodsCode;//商品编码（图号）
-    private String specification;//规格
-    private String goodsModel;//型号
-    private double currentCount;//当前库存数量
-    private String unit;//计量单位
-    private String warehouseSid;//仓库sid
-    private String warehouseName;//仓库名称
-    private String position;//货位
-    private double cost;//单位成本（进货价）
-    private double count;//采购数量
-    private double taxAmount;//税额（
-    private double taxPrice;//含税价
-    private double amount;//采购金额
-    private double price1;//销售价1
-    private double price2;//销售价2
-}

oms/src/main/java/com/yxt/oms/biz/func/purchasereceiptbilldetail/PurchaseReceiptBillDetailQuery.java

@@ -1,13 +0,0 @@
-package com.yxt.oms.biz.func.purchasereceiptbilldetail;
-
-import com.yxt.common.core.query.Query;
-import lombok.Data;
-
-/**
- * @author wangpengfei
- * @date 2024/2/26 13:37
- */
-@Data
-public class PurchaseReceiptBillDetailQuery implements Query {
-    private String name;
-}

oms/src/main/java/com/yxt/oms/biz/func/purchasereceiptbilldetail/PurchaseReceiptBillDetailVo.java

@@ -1,44 +0,0 @@
-package com.yxt.oms.biz.func.purchasereceiptbilldetail;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yxt.common.core.vo.Vo;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author wangpengfei
- * @date 2024/2/26 13:37
- */
-@Data
-public class PurchaseReceiptBillDetailVo implements Vo {
-    private String id;
-    private String sid;
-    private String lockVersion;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createTime;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date modifyTime;
-    private String remarks;
-    private String isEnable;
-    private String state;
-    private String isDelete;
-    private String billSid;//单据sid
-    private String goodsSid;//商品sid
-    private String goodsName;//商品名称
-    private String goodsCode;//商品编码（图号）
-    private String specification;//规格
-    private String goodsModel;//型号
-    private double currentCount;//当前库存数量
-    private String unit;//计量单位
-    private String warehouseSid;//仓库sid
-    private String warehouseName;//仓库名称
-    private String position;//货位
-    private double cost;//单位成本（进货价）
-    private double count;//采购数量
-    private double taxAmount;//税额（
-    private double taxPrice;//含税价
-    private double amount;//采购金额
-    private double price1;//销售价1
-    private double price2;//销售价2
-}

oms/src/main/java/com/yxt/oms/biz/func/region/Region.java

@@ -0,0 +1,29 @@
+package com.yxt.oms.biz.func.region;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/2 14:21
+ * @description
+ */
+@Data
+public class Region extends BaseEntity {
+    private static final long serialVersionUID = -2834981997098086066L;
+    @ApiModelProperty(value = "上级sid")
+    private String pSid;
+    @ApiModelProperty(value = "级别")
+    private Integer level;
+    @ApiModelProperty(value = "名称，区域名称")
+    private String name;
+    @ApiModelProperty(value = "行政区划代码")
+    private String districtCode;
+    @ApiModelProperty(value = "sid全路径")
+    private String sidPath;
+    @ApiModelProperty(value = "排序号")
+    private Integer sortNo;
+
+
+}

oms/src/main/java/com/yxt/oms/biz/func/region/RegionChildTwoVo.java

@@ -0,0 +1,30 @@
+package com.yxt.oms.biz.func.region;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/2 23:15
+ * @description
+ */
+@Data
+public class RegionChildTwoVo implements Vo {
+    private static final long serialVersionUID = 4618662603777612150L;
+
+    @ApiModelProperty(value = "sid")
+    private String sid;
+    @ApiModelProperty(value = "上级sid")
+    private String pSid;
+    @ApiModelProperty(value = "级别")
+    private Integer level;
+    @ApiModelProperty(value = "名称，区域名称")
+    private String name;
+    @ApiModelProperty(value = "行政区划代码")
+    private String districtCode;
+    @ApiModelProperty(value = "sid全路径")
+    private String sidPath;
+    @ApiModelProperty(value = "排序号")
+    private Integer sortNo;
+}

oms/src/main/java/com/yxt/oms/biz/func/region/RegionChildVo.java

@@ -0,0 +1,34 @@
+package com.yxt.oms.biz.func.region;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/2 23:14
+ * @description
+ */
+@Data
+public class RegionChildVo implements Vo {
+    private static final long serialVersionUID = -4741874809037026585L;
+
+    @ApiModelProperty(value = "sid")
+    private String sid;
+    @ApiModelProperty(value = "上级sid")
+    private String pSid;
+    @ApiModelProperty(value = "级别")
+    private Integer level;
+    @ApiModelProperty(value = "名称，区域名称")
+    private String name;
+    @ApiModelProperty(value = "行政区划代码")
+    private String districtCode;
+    @ApiModelProperty(value = "sid全路径")
+    private String sidPath;
+    @ApiModelProperty(value = "排序号")
+    private Integer sortNo;
+
+    private List<RegionChildTwoVo> regionChildTwoVoList;
+}

oms/src/main/java/com/yxt/oms/biz/func/region/RegionDto.java

@@ -0,0 +1,46 @@
+package com.yxt.oms.biz.func.region;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+/**
+ * @Author dimengzhe
+ * @Date 2021/11/11 15:18
+ * @Description
+ */
+@Data
+public class RegionDto implements Dto {
+    private static final long serialVersionUID = 1283045363206557586L;
+    /**
+     * 名称，区域名称
+     */
+    @ApiModelProperty(value = "区域名称", required = true)
+    @NotBlank(message = "区域名称不能为空")
+    @Size(max = 64, min = 1)
+    private String name;
+    /**
+     * 行政区划代码
+     */
+    @ApiModelProperty(value = "行政区划代码", required = true)
+    @NotBlank(message = "行政区划代码不能为空")
+    private String districtCode;
+    /**
+     * 上级sid
+     */
+    @ApiModelProperty(value = "上级sid", required = true, example = "0")
+    private String psid;
+
+    /**
+     * 排序号
+     */
+    @ApiModelProperty(value = "排序号", required = true)
+    private Integer sortNo;
+    @ApiModelProperty(value = "级别")
+    private int level;
+
+
+}

oms/src/main/java/com/yxt/oms/biz/func/region/RegionListVo.java

@@ -0,0 +1,24 @@
+package com.yxt.oms.biz.func.region;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/13 21:41
+ * @description
+ */
+@Data
+public class RegionListVo implements Vo {
+    private static final long serialVersionUID = 8123582673134551495L;
+    @ApiModelProperty(value = "sid")
+    private String sid;
+    @ApiModelProperty(value = "名称")
+    private String name;
+    @ApiModelProperty(value = "区划代码")
+    private String districtCode;
+    @ApiModelProperty(value = "排序")
+    private Integer sortNo;
+}

oms/src/main/java/com/yxt/oms/biz/func/region/RegionMapper.java

@@ -0,0 +1,21 @@
+package com.yxt.oms.biz.func.region;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/2 15:10
+ * @description
+ */
+@Mapper
+public interface RegionMapper extends BaseMapper<Region> {
+
+    List<RegionChildTwoVo> getProvince();
+
+    List<RegionChildTwoVo> getCity(String sid);
+
+    List<RegionChildTwoVo> getCounty(String sid);
+}

oms/src/main/java/com/yxt/oms/biz/func/region/RegionMapper.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.oms.biz.func.region.RegionMapper">
+    <resultMap id="regionMapNoChild" type="com.yxt.oms.biz.func.region.RegionChildTwoVo">
+        <result column="name" jdbcType="VARCHAR" property="name"/>
+        <result column="sid" jdbcType="VARCHAR" property="sid"/>
+        <result column="pSid" jdbcType="VARCHAR" property="pSid"/>
+        <result column="districtCode" jdbcType="INTEGER" property="districtCode"/>
+        <result column="sidPath" jdbcType="VARCHAR" property="sidPath"/>
+    </resultMap>
+
+    <select id="getProvince" parameterType="com.yxt.oms.biz.func.region.RegionVo" resultMap="regionMapNoChild">
+        SELECT name, sid, pSid, districtCode, sidPath
+        FROM region
+        WHERE level = 1
+          AND pSid = 0
+    </select>
+
+    <select id="getCity" parameterType="com.yxt.oms.biz.func.region.RegionVo" resultMap="regionMapNoChild">
+        SELECT name, sid, pSid, districtCode, sidPath
+        FROM region
+        WHERE level = 2
+          AND pSid = #{sid}
+        ORDER BY sortNo + 0
+    </select>
+
+    <select id="getCounty" parameterType="com.yxt.oms.biz.func.region.RegionVo" resultMap="regionMapNoChild">
+        SELECT name, sid, pSid, districtCode, sidPath
+        FROM region
+        WHERE level = 3
+          AND pSid = #{sid}
+    </select>
+</mapper>

oms/src/main/java/com/yxt/oms/biz/func/region/RegionQuery.java

@@ -0,0 +1,23 @@
+package com.yxt.oms.biz.func.region;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/13 21:55
+ * @description
+ */
+@Data
+public class RegionQuery implements Query {
+    private static final long serialVersionUID = -3494331991678665867L;
+
+    @ApiModelProperty(value = "行政区划")
+    private String districtCode;
+    @ApiModelProperty(value = "名称")
+    private String name;
+    @ApiModelProperty(value = "pSid,市级列表此值需要传省级列表sid", example = "0")
+    private String psid;
+}

oms/src/main/java/com/yxt/oms/biz/func/region/RegionService.java

@@ -0,0 +1,45 @@
+package com.yxt.oms.biz.func.region;
+
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.oms.feign.portal.region.RegionFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/2 15:06
+ * @description
+ */
+@Service
+public class RegionService extends MybatisBaseService<RegionMapper, Region> {
+
+    @Autowired
+    private RegionFeign regionFeign;
+
+    public List<RegionChildTwoVo> getProvince() {
+        return regionFeign.getProvince().getData();
+    }
+
+    /**
+     * 获取某省下的所有市
+     *
+     * @param sid 省sid
+     * @return 该省下的所有市的list
+     */
+    public List<RegionChildTwoVo> getCity(String sid) {
+        return regionFeign.getCity(sid).getData();
+
+    }
+
+    /**
+     * 获取某市下的所有区县
+     *
+     * @param sid 市sid
+     * @return 该市下的所有县区的list
+     */
+    public List<RegionChildTwoVo> getCounty(String sid) {
+        return regionFeign.getCounty(sid).getData();
+    }
+}

oms/src/main/java/com/yxt/oms/biz/func/region/RegionThirdLevelNameVo.java

@@ -0,0 +1,24 @@
+package com.yxt.oms.biz.func.region;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2021/10/4
+ */
+@Data
+public class RegionThirdLevelNameVo implements Vo {
+
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    @ApiModelProperty(value = "县")
+    private String county;
+
+}

oms/src/main/java/com/yxt/oms/biz/func/region/RegionVo.java

@@ -0,0 +1,35 @@
+package com.yxt.oms.biz.func.region;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author dimengzhe
+ * @date 2021/7/2 14:22
+ * @description
+ */
+@Data
+public class RegionVo implements Vo {
+    private static final long serialVersionUID = 3351684167946104384L;
+
+    @ApiModelProperty(value = "sid")
+    private String sid;
+    @ApiModelProperty(value = "上级sid")
+    private String pSid;
+    @ApiModelProperty(value = "级别")
+    private Integer level;
+    @ApiModelProperty(value = "名称，区域名称")
+    private String name;
+    @ApiModelProperty(value = "行政区划代码")
+    private String districtCode;
+    @ApiModelProperty(value = "sid全路径")
+    private String sidPath;
+    @ApiModelProperty(value = "排序号")
+    private Integer sortNo;
+
+    private List<RegionVo> children;
+
+}

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

@@ -6,19 +6,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: anrui_portal(门户建设) <br/>
- * File: SysMenu.java <br/>
- * Class: com.yxt.anrui.portal.api.sysmenu.SysMenu <br/>
- * Description: 菜单表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-08-03 00:24:28 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @ApiModel(value = "菜单表", description = "菜单表")
 @TableName("sys_menu")
 @Data

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

@@ -11,19 +11,6 @@ import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
-/**
- * Project: anrui_portal(门户建设) <br/>
- * File: SysMenuMapper.java <br/>
- * Class: com.yxt.anrui.portal.biz.sysmenu.SysMenuMapper <br/>
- * Description: 菜单表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-08-03 00:24:28 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface SysMenuMapper extends BaseMapper<SysMenu> {
 

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

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.wms.biz.func.sysmenu.SysMenuMapper">
+<mapper namespace="com.yxt.oms.biz.func.sysmenu.SysMenuMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="selectPageVo" resultType="com.yxt.wms.biz.func.sysmenu.SysMenuVo">
+    <select id="selectPageVo" resultType="com.yxt.oms.biz.func.sysmenu.SysMenuVo">
         SELECT *
         FROM sys_menu
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
-    <select id="selectListAllVo" resultType="com.yxt.wms.biz.func.sysmenu.SysMenuVo">
+    <select id="selectListAllVo" resultType="com.yxt.oms.biz.func.sysmenu.SysMenuVo">
         SELECT menu.*, source.sourceName, pmenu.name as pName
         FROM sys_menu menu
                      left join sys_menu pmenu on pmenu.sid = menu.psid
@@ -20,7 +20,7 @@
             ${ew.sqlSegment}
         </where>
     </select>
-    <select id="listAllParentByRoleSid" resultType="com.yxt.wms.biz.func.sysmenu.SysMenuVo">
+    <select id="listAllParentByRoleSid" resultType="com.yxt.oms.biz.func.sysmenu.SysMenuVo">
         SELECT menu.*, ISNULL(menuRole.sid) as checked
         FROM sys_menu menu
                      left join sys_menu_role menuRole on menu.sid = menuRole.menuSid AND menuRole.roleSid = #{param1}
@@ -29,7 +29,7 @@
             and menu.sourceSid = #{sourceSid}
         </if>
     </select>
-    <select id="getChildrensForMenuTree" resultType="com.yxt.wms.biz.func.sysmenu.SysMenuTreeVo">
+    <select id="getChildrensForMenuTree" resultType="com.yxt.oms.biz.func.sysmenu.SysMenuTreeVo">
         SELECT menu.*, source.sourceName, sourceMenu.menuRootSid as menuRootSid
         FROM sys_menu menu
                      left join sys_source_menu sourceMenu on sourceMenu.menuSid = menu.sid
@@ -45,7 +45,7 @@
         where sourceSid = #{sid}
     </update>
 
-    <select id="selectChildernList" resultType="com.yxt.wms.biz.func.sysmenu.SysMenuTreeVo">
+    <select id="selectChildernList" resultType="com.yxt.oms.biz.func.sysmenu.SysMenuTreeVo">
         SELECT menu.*, source.sourceName, menu.pSid as menuRootSid
         FROM sys_menu menu
                      left join sys_source source on source.sid = menu.sourceSid
@@ -60,11 +60,11 @@
           and sourceSid = #{sourceSid}
     </select>
 
-    <select id="selectByMenuUrl" resultType="com.yxt.wms.biz.func.sysmenu.SysMenu">
+    <select id="selectByMenuUrl" resultType="com.yxt.oms.biz.func.sysmenu.SysMenu">
         select * from sys_menu where menuUrl = #{menuUrl}
     </select>
     <!--将该资源下的所有一级菜单列表-->
-    <select id="fetchRootMenuBySourceSid"  resultType="com.yxt.wms.biz.func.sysmenu.SysMenuTreeVo">
+    <select id="fetchRootMenuBySourceSid"  resultType="com.yxt.oms.biz.func.sysmenu.SysMenuTreeVo">
         SELECT menu.NAME              AS NAME,
         menu.sid               AS sid,
         menu.sid               AS sid,

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

@@ -8,37 +8,24 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.func.sysmenurole.SysMenuRoleVo;
+import com.yxt.oms.biz.func.sysmenurole.SysMenuRoleVo;
-import com.yxt.wms.feign.portal.sysmenu.SysMenuFeign;
+import com.yxt.oms.feign.portal.sysmenu.SysMenuFeign;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-/**
- * Project: anrui_portal(门户建设) <br/>
- * File: SysMenuService.java <br/>
- * Class: com.yxt.user.biz.sysmenu.SysMenuService <br/>
- * Description: 菜单表 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-08-03 00:24:28 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class SysMenuService extends MybatisBaseService<SysMenuMapper, SysMenu> {
-    @Autowired
-    SysMenuFeign sysMenuFeign;
-
 
+    @Resource
+    SysMenuFeign sysMenuFeign;
 
     public PagerVo<SysMenu> listPage(PagerQuery<SysMenuQuery> pq) {
         SysMenuQuery query = pq.getParams();

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

@@ -9,19 +9,6 @@ import org.apache.ibatis.annotations.*;
 
 import java.util.List;
 
-/**
- * Project: anrui_portal(门户建设) <br/>
- * File: SysMenuRoleMapper.java <br/>
- * Class: com.yxt.anrui.portal.biz.sysmenurole.SysMenuRoleMapper <br/>
- * Description: 菜单与角色关联表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-08-03 00:24:28 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface SysMenuRoleMapper extends BaseMapper<SysMenuRole> {
 

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

@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.wms.biz.func.sysmenurole.SysMenuRoleMapper">
+<mapper namespace="com.yxt.oms.biz.func.sysmenurole.SysMenuRoleMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="selectPageVo" resultType="com.yxt.wms.biz.func.sysmenurole.SysMenuRoleVo">
+    <select id="selectPageVo" resultType="com.yxt.oms.biz.func.sysmenurole.SysMenuRoleVo">
         SELECT * FROM sys_menu_role
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
 
-    <select id="selectListAllVo" resultType="com.yxt.wms.biz.func.sysmenurole.SysMenuRoleVo">
+    <select id="selectListAllVo" resultType="com.yxt.oms.biz.func.sysmenurole.SysMenuRoleVo">
         SELECT * FROM sys_menu_role
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
-    <select id="list" parameterType="com.yxt.wms.biz.func.sysmenurole.SysMenuRoleQuery"
+    <select id="list" parameterType="com.yxt.oms.biz.func.sysmenurole.SysMenuRoleQuery"
-            resultType="com.yxt.wms.biz.func.sysmenurole.SysMenuRoleVo">
+            resultType="com.yxt.oms.biz.func.sysmenurole.SysMenuRoleVo">
         SELECT distinct rm.menuSid as sid,
                         m.name     as menuName,
                         m.menuUrl,
@@ -37,13 +37,13 @@
                 ${ew.customSqlSegment}
     </select>
 
-    <select id="selectByRoleSid" resultType="com.yxt.wms.biz.func.sysmenurole.MenuRoleVo">
+    <select id="selectByRoleSid" resultType="com.yxt.oms.biz.func.sysmenurole.MenuRoleVo">
         select menuSid, dataRuleId
         from sys_menu_role
         where roleSid = #{roleSid}
     </select>
 
-    <select id="selMenuByRole" resultType="com.yxt.wms.biz.func.sysmenurole.SysMenuRoleDataVo">
+    <select id="selMenuByRole" resultType="com.yxt.oms.biz.func.sysmenurole.SysMenuRoleDataVo">
         SELECT
         smr.sid,
         sm.`name`,
@@ -57,7 +57,7 @@
         </where>
     </select>
 
-    <select id="selMenuByRoleApp" resultType="com.yxt.wms.biz.func.sysmenurole.SysMenuRoleDataVo">
+    <select id="selMenuByRoleApp" resultType="com.yxt.oms.biz.func.sysmenurole.SysMenuRoleDataVo">
         SELECT
         smmr.sid,
         smm.`name`,

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

@@ -7,12 +7,13 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.func.sysmenu.SysMenuService;
+import com.yxt.oms.biz.func.sysmenu.SysMenuService;
-import com.yxt.wms.feign.portal.sysmenurole.SysMenuRoleFeign;
+import com.yxt.oms.feign.portal.sysmenurole.SysMenuRoleFeign;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -33,7 +34,7 @@ import java.util.Map;
 @Service
 public class SysMenuRoleService extends MybatisBaseService<SysMenuRoleMapper, SysMenuRole> {
 
-    @Autowired
+    @Resource
     SysMenuRoleFeign sysMenuRoleFeign;
     @Autowired
     SysMenuService sysMenuService;

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

@@ -11,19 +11,6 @@ import org.apache.ibatis.annotations.Select;
 import java.util.List;
 import java.util.Map;
 
-/**
- * Project: anrui_portal(门户建设) <br/>
- * File: SysOrganizationMapper.java <br/>
- * Class: SysOrganizationMapper <br/>
- * Description: 组织机构表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-08-03 00:24:28 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
 

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.wms.biz.func.sysorganization.SysOrganizationMapper">
+<mapper namespace="com.yxt.oms.biz.func.sysorganization.SysOrganizationMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="selectPageVo" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+    <select id="selectPageVo" resultType="com.yxt.oms.biz.func.sysorganization.SysOrganizationVo">
         SELECT so.*,
                (SELECT GROUP_CONCAT(ss.name)
                 FROM `sys_staff_org` sso
@@ -33,7 +33,7 @@
         ORDER BY so.sort
     </select>
 
-    <select id="selectListAllVo" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+    <select id="selectListAllVo" resultType="com.yxt.oms.biz.func.sysorganization.SysOrganizationVo">
         SELECT *
         FROM sys_organization
         <where>
@@ -41,13 +41,13 @@
         </where>
     </select>
 
-    <select id="selectFirstOrgList" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+    <select id="selectFirstOrgList" resultType="com.yxt.oms.biz.func.sysorganization.SysOrganizationVo">
         SELECT sid, name, psid, orgCode
         FROM sys_organization
         WHERE psid = '0'
     </select>
 
-    <select id="selectChildrenListByPsid" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+    <select id="selectChildrenListByPsid" resultType="com.yxt.oms.biz.func.sysorganization.SysOrganizationVo">
         SELECT sid, name, psid, orgCode
         FROM sys_organization
         WHERE psid = #{psid}
@@ -68,7 +68,7 @@
     </select>
 
     <select id="selectAppOrganization"
-            resultType="com.yxt.wms.biz.func.sysorganization.AppContactSysOrganizationVo">
+            resultType="com.yxt.oms.biz.func.sysorganization.AppContactSysOrganizationVo">
         SELECT sid,
                name,
                (SELECT count(1) FROM sys_staff_org WHERE orgSid = org.sid)                    staffNum,
@@ -78,7 +78,7 @@
     </select>
 
     <select id="selectAppOrganizationByPsid"
-            resultType="com.yxt.wms.biz.func.sysorganization.AppContactSysOrganizationVo">
+            resultType="com.yxt.oms.biz.func.sysorganization.AppContactSysOrganizationVo">
         SELECT org.sid,
                org.name,
                (SELECT count(1) FROM sys_staff_org WHERE orgSid = org.sid)                    staffNum,
@@ -87,57 +87,57 @@
         WHERE org.psid = #{psid}
     </select>
 
-    <select id="treeList" resultType="com.yxt.wms.biz.func.sysorganization.SysOrgVo">
+    <select id="treeList" resultType="com.yxt.oms.biz.func.sysorganization.SysOrgVo">
         SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath, so.orgCode
         FROM sys_organization so
         WHERE psid = #{psid}
     </select>
 
-    <select id="selectOrgCode" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganization">
+    <select id="selectOrgCode" resultType="com.yxt.oms.biz.func.sysorganization.SysOrganization">
         SELECT *
         FROM sys_organization
         WHERE psid = '0'
     </select>
 
-    <select id="getListOrg" resultType="com.yxt.wms.biz.func.sysorganization.SysOrgVo">
+    <select id="getListOrg" resultType="com.yxt.oms.biz.func.sysorganization.SysOrgVo">
         SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath
         FROM sys_organization so
         WHERE isDept = 0
         ORDER BY psid
     </select>
 
-    <select id="selectOrgCodeByPsid" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganization">
+    <select id="selectOrgCodeByPsid" resultType="com.yxt.oms.biz.func.sysorganization.SysOrganization">
         SELECT *
         FROM sys_organization
         LIMIT 0,1
     </select>
 
-    <select id="selectTreeList" resultType="com.yxt.wms.biz.func.sysorganization.SysOrgListVo">
+    <select id="selectTreeList" resultType="com.yxt.oms.biz.func.sysorganization.SysOrgListVo">
         SELECT so.name, so.psid, so.sid, so.orgSidPath, so.orgCode
         FROM sys_organization so
         WHERE psid = #{psid}
     </select>
     <!--根据部门编码查询部门信息-->
-    <select id="selectByOrgCode" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganization">
+    <select id="selectByOrgCode" resultType="com.yxt.oms.biz.func.sysorganization.SysOrganization">
         select *
         from sys_organization
         where orgCode = #{substring}
     </select>
 
-    <select id="selectChildernList" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+    <select id="selectChildernList" resultType="com.yxt.oms.biz.func.sysorganization.SysOrganizationVo">
         SELECT so.name, so.psid, so.sid, so.orgSidPath, so.orgCode
         FROM sys_organization so
         WHERE psid = #{psid}
         ORDER BY so.sort ASC
     </select>
 
-<!--    <select id="getUseOrgByUserSid" resultType="com.yxt.wms.biz.func.sysstafforg.SysStaffOrgVo">-->
+<!--    <select id="getUseOrgByUserSid" resultType="com.yxt.oms.biz.func.sysstafforg.SysStaffOrgVo">-->
 <!--        select orgSidPath-->
 <!--        from sys_staff_org-->
 <!--        where staffSid = #{staffSid}-->
 <!--    </select>-->
 
-    <select id="getUseOrgBySid" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+    <select id="getUseOrgBySid" resultType="com.yxt.oms.biz.func.sysorganization.SysOrganizationVo">
         SELECT so.name, so.psid, so.sid, so.orgSidPath, so.orgCode
         FROM sys_organization so
         WHERE sid = #{sid}
@@ -150,7 +150,7 @@
         WHERE sid = #{sid}
     </update>
 
-    <select id="getQrCodeVo" resultType="com.yxt.wms.biz.func.sysorganization.QrCodeVo">
+    <select id="getQrCodeVo" resultType="com.yxt.oms.biz.func.sysorganization.QrCodeVo">
         SELECT so.name departmentName, so.qrText qrFilePath, so.addrs address, so.sid
         FROM sys_organization so
         WHERE so.sid = #{sid}
@@ -166,7 +166,7 @@
           AND isDept = 0
     </select>
 
-    <select id="getListOrgByBrand" resultType="com.yxt.wms.biz.func.sysorganization.SysOrgVo">
+    <select id="getListOrgByBrand" resultType="com.yxt.oms.biz.func.sysorganization.SysOrgVo">
         SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath
         FROM sys_organization so
         WHERE isDept = 0
@@ -174,45 +174,45 @@
         ORDER BY psid
     </select>
 
-    <select id="selectOrgList" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationListVo">
+    <select id="selectOrgList" resultType="com.yxt.oms.biz.func.sysorganization.SysOrganizationListVo">
         select so.name orgDeptName, so.sid orgDeptSid
         from sys_organization so
         where so.psid = #{orgSid}
           and orgAttributeKey = 'DP03_SYS'
     </select>
 
-    <select id="selectOrgLists" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationListsVo">
+    <select id="selectOrgLists" resultType="com.yxt.oms.biz.func.sysorganization.SysOrganizationListsVo">
         select so.name orgDeptName, so.sid orgDeptSid
         from sys_organization so
         where so.psid = #{orgSid}
     </select>
 
-    <select id="selectByOrgDeptSid" resultType="com.yxt.wms.biz.func.sysorganization.SysOrgStaffVo">
+    <select id="selectByOrgDeptSid" resultType="com.yxt.oms.biz.func.sysorganization.SysOrgStaffVo">
         select distinct si.name staffName, si.sid staffSid
         from sys_staff_org so
                  left join sys_staffinfo si on so.staffSid = si.sid
         where so.orgSid = #{orgDeptSid}
     </select>
 
-    <select id="selectByPSid" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+    <select id="selectByPSid" resultType="com.yxt.oms.biz.func.sysorganization.SysOrganizationVo">
         select *
         from sys_organization
         where psid = #{sid}
           and name = #{name}
     </select>
 
-    <select id="selectOrgSidList" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+    <select id="selectOrgSidList" resultType="com.yxt.oms.biz.func.sysorganization.SysOrganizationVo">
         select sid,name,orgCode from sys_organization so where so.isDept = 0
     </select>
 
-    <select id="getListDeptByOrgSid" resultType="com.yxt.wms.biz.func.sysorganization.SysOrgVo">
+    <select id="getListDeptByOrgSid" resultType="com.yxt.oms.biz.func.sysorganization.SysOrgVo">
         SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath
         FROM sys_organization so
         WHERE isDept = 1
           AND so.psid = #{orgSid}
     </select>
 
-    <select id="selectOrgByPSid" resultType="com.yxt.wms.biz.func.sysorganization.SysOrganizationVo">
+    <select id="selectOrgByPSid" resultType="com.yxt.oms.biz.func.sysorganization.SysOrganizationVo">
         SELECT so.name, so.psid, so.id, so.sid, so.orgSidPath
         FROM sys_organization so
         WHERE isDept = 0 AND so.psid = #{psid}

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

@@ -10,19 +10,6 @@ import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
-/**
- * Project: anrui_portal(门户建设) <br/>
- * File: SysPostMapper.java <br/>
- * Class: com.yxt.anrui.portal.biz.syspost.SysPostMapper <br/>
- * Description: 岗位. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-08-03 00:24:28 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface SysPostMapper extends BaseMapper<SysPost> {
 

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.wms.biz.func.syspost.SysPostMapper">
+<mapper namespace="com.yxt.oms.biz.func.syspost.SysPostMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="selectPageVo" resultType="com.yxt.wms.biz.func.syspost.SysPostVo">
+    <select id="selectPageVo" resultType="com.yxt.oms.biz.func.syspost.SysPostVo">
         SELECT post.sid                                                                            sid,
                post.name                                                                           name,
                post.orgSid,
@@ -23,7 +23,7 @@
         </where>
     </select>
 
-    <select id="selectListAllVo" resultType="com.yxt.wms.biz.func.syspost.SysPostVo">
+    <select id="selectListAllVo" resultType="com.yxt.oms.biz.func.syspost.SysPostVo">
         SELECT *
         FROM sys_post
         <where>
@@ -31,12 +31,12 @@
         </where>
     </select>
     <!--根据部门sid查询该部门下的所有岗位列表-->
-    <select id="selectListOne" resultType="com.yxt.wms.biz.func.syspost.SysPostListVo">
+    <select id="selectListOne" resultType="com.yxt.oms.biz.func.syspost.SysPostListVo">
         select name, postCode, sid
         from sys_post
     </select>
     <!--根据岗位编码查询岗位信息-->
-    <select id="selectByPostCode" resultType="com.yxt.wms.biz.func.syspost.SysPost">
+    <select id="selectByPostCode" resultType="com.yxt.oms.biz.func.syspost.SysPost">
         select *
         from sys_post
         where postCode = #{substring}

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

@@ -7,31 +7,19 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.feign.portal.syspost.SysPostFeign;
+import com.yxt.oms.feign.portal.syspost.SysPostFeign;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
-/**
- * Project: anrui_portal(门户建设) <br/>
- * File: SysPostService.java <br/>
- * Class: com.yxt.user.biz.syspost.SysPostService <br/>
- * Description: 岗位 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-08-03 00:24:28 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class SysPostService extends MybatisBaseService<SysPostMapper, SysPost> {
 
 
-    @Autowired
+    @Resource
     SysPostFeign sysPostFeign;
 
     public PagerVo<SysPost> listPage(PagerQuery<SysPostQuery> pq) {

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

@@ -10,19 +10,6 @@ import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
-/**
- * Project: anrui_portal(门户建设) <br/>
- * File: SysRoleMapper.java <br/>
- * Class: com.yxt.anrui.portal.biz.sysrole.SysRoleMapper <br/>
- * Description: 角色. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-08-03 00:24:29 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface SysRoleMapper extends BaseMapper<SysRole> {
 

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.wms.biz.func.sysrole.SysRoleMapper">
+<mapper namespace="com.yxt.oms.biz.func.sysrole.SysRoleMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="selectPageVo" resultType="com.yxt.wms.biz.func.sysrole.SysRoleVo">
+    <select id="selectPageVo" resultType="com.yxt.oms.biz.func.sysrole.SysRoleVo">
         SELECT sr.*, sp.sid as postSid, sp.name as postName
         FROM sys_role sr
                  LEFT JOIN sys_post sp ON sr.postSid = sp.sid
@@ -13,32 +13,32 @@
         ORDER BY sr.sort
     </select>
 
-    <select id="selectListAllVo" resultType="com.yxt.wms.biz.func.sysrole.SysRoleVo">
+    <select id="selectListAllVo" resultType="com.yxt.oms.biz.func.sysrole.SysRoleVo">
         SELECT *
         FROM sys_role
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
-    <select id="listAllByUserSid" resultType="com.yxt.wms.biz.func.sysrole.SysRoleVo">
+    <select id="listAllByUserSid" resultType="com.yxt.oms.biz.func.sysrole.SysRoleVo">
         SELECT role.name, role.sid, ISNULL(userRole.sid) AS checked
         FROM sys_role role
                  LEFT JOIN sys_user_role userRole ON role.sid = userRole.`roleSid`
             AND userRole.userSid = #{param1}
     </select>
 
-    <select id="fetchByUserSid" resultType="com.yxt.wms.biz.func.sysrole.SysRoleVo">
+    <select id="fetchByUserSid" resultType="com.yxt.oms.biz.func.sysrole.SysRoleVo">
         SELECT role.name, role.remarks, role.sid
         FROM sys_role role
                  left join sys_user_role userrole on userrole.roleSid = role.sid
         where userrole.userSid = #{param1}
     </select>
-    <select id="fetchByName" resultType="com.yxt.wms.biz.func.sysrole.SysRole">
+    <select id="fetchByName" resultType="com.yxt.oms.biz.func.sysrole.SysRole">
         SELECT *
         FROM sys_role role
         where role.name = #{param1}
     </select>
-    <select id="fetchBySid" resultType="com.yxt.wms.biz.func.sysrole.SysRoleVo">
+    <select id="fetchBySid" resultType="com.yxt.oms.biz.func.sysrole.SysRoleVo">
         SELECT role.*, post.sid as postSid, post.name as postName
         FROM sys_role role
                  LEFT JOIN sys_post post ON role.postSid = post.sid
@@ -91,14 +91,14 @@
         where userSid = #{userSid}
     </select>
 
-<!--    <select id="selectRoleList" resultType="com.yxt.wms.biz.sysuser.SysMenuRoleVoList">-->
+<!--    <select id="selectRoleList" resultType="com.yxt.oms.biz.sysuser.SysMenuRoleVoList">-->
 <!--        select sr.sid roleSid, sr.name roleName, sr.roleType, sr.roleTypeValue,smr.dataRuleId-->
 <!--        from sys_role sr-->
 <!--                 left join sys_menu_role smr on sr.sid = smr.roleSid-->
 <!--        where smr.menuSid = #{menuSid}-->
 <!--    </select>-->
 
-<!--    <select id="selectMobileRoleList" resultType="com.yxt.wms.biz.sysuser.SysMenuRoleVoList">-->
+<!--    <select id="selectMobileRoleList" resultType="com.yxt.oms.biz.sysuser.SysMenuRoleVoList">-->
 <!--        select sr.sid roleSid, sr.name roleName, sr.roleType, sr.roleTypeValue-->
 <!--        from sys_role sr-->
 <!--                 left join sys_mobile_menu_role smr on sr.sid = smr.roleSid-->

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

@@ -5,12 +5,13 @@ import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.func.sysuserrole.SysUserRoleService;
+import com.yxt.oms.biz.func.sysuserrole.SysUserRoleService;
-import com.yxt.wms.feign.portal.sysrole.SysRoleFeign;
+import com.yxt.oms.feign.portal.sysrole.SysRoleFeign;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -28,12 +29,12 @@ import java.util.List;
  */
 @Service
 public class SysRoleService extends MybatisBaseService<SysRoleMapper, SysRole> {
+
     @Autowired
     private SysUserRoleService sysUserRoleService;
-    @Autowired
+    @Resource
     SysRoleFeign sysRoleFeign;
 
-
     public ResultBean<PagerVo<SysRoleVo>> listPage(PagerQuery<SysRoleQuery> pq) {
         return sysRoleFeign.listPage(pq);
     }

oms/src/main/java/com/yxt/oms/biz/func/sysroleauthorize/SysRoleAuthorizeMapper.xml

@@ -1,12 +1,12 @@
 <?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.sysroleauthorize.SysRoleAuthorizeMapper">
+<mapper namespace="com.yxt.oms.biz.func.sysroleauthorize.SysRoleAuthorizeMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
 
 
-    <select id="list" parameterType="com.yxt.wms.biz.func.sysroleauthorize.SysRoleAuthorizeQuery"
+    <select id="list" parameterType="com.yxt.oms.biz.func.sysroleauthorize.SysRoleAuthorizeQuery"
-            resultType="com.yxt.wms.biz.func.sysroleauthorize.SysMenuRoleVo">
+            resultType="com.yxt.oms.biz.func.sysroleauthorize.SysMenuRoleVo">
         SELECT distinct rm.menuSid as sid,
                         m.name     as menuName,
                         m.menuUrl,
@@ -25,7 +25,7 @@
                  LEFT JOIN sys_menu m ON rm.menuSid = m.sid
             ${ew.customSqlSegment}
     </select>
-    <select id="selectByRoleSid" resultType="com.yxt.wms.biz.func.sysroleauthorize.SysRoleAuthorizeVo">
+    <select id="selectByRoleSid" resultType="com.yxt.oms.biz.func.sysroleauthorize.SysRoleAuthorizeVo">
         select menuSid, dataRuleId
         from sys_menu_role
         where roleSid = #{roleSid}

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

@@ -2,29 +2,17 @@ package com.yxt.oms.biz.func.sysroleauthorize;
 
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.wms.feign.portal.sysroleauthorize.SysRoleAuthorizeFeign;
+import com.yxt.oms.feign.portal.sysroleauthorize.SysRoleAuthorizeFeign;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-/**
+import javax.annotation.Resource;
- * Project: anrui_portal(门户建设) <br/>
+
- * File: SysSourceService.java <br/>
- * Class: com.yxt.anrui.portal.biz.syssource.SysSourceService <br/>
- * Description: 资源表 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-08-03 00:24:29 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class SysRoleAuthorizeService extends MybatisBaseService<SysRoleAuthorizeMapper, SysRoleAuthorize> {
-	@Autowired
-	SysRoleAuthorizeFeign sysRoleAuthorizeFeign;
-
 
+	@Resource
+	SysRoleAuthorizeFeign sysRoleAuthorizeFeign;
 
 	public ResultBean updateRoleAndMenu(SysRoleAuthorizeDto dto) {
 

oms/src/main/java/com/yxt/oms/biz/func/sysstafforg/SysStaffOrgService.java

@@ -2,9 +2,9 @@ package com.yxt.oms.biz.func.sysstafforg;
 
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.wms.biz.func.sysroleauthorize.SysRoleAuthorize;
+import com.yxt.oms.biz.func.sysroleauthorize.SysRoleAuthorize;
-import com.yxt.wms.biz.func.sysroleauthorize.SysRoleAuthorizeMapper;
+import com.yxt.oms.biz.func.sysroleauthorize.SysRoleAuthorizeMapper;
-import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
+import com.yxt.oms.feign.portal.sysstafforg.SysStaffOrgFeign;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleMapper.java

@@ -11,19 +11,6 @@ import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
-/**
- * Project: anrui_portal(门户建设) <br/>
- * File: SysUserRoleMapper.java <br/>
- * Class: com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleMapper <br/>
- * Description: 用户与角色关联表. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-08-03 00:24:30 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Mapper
 public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
 

oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleMapper.xml

@@ -1,16 +1,16 @@
 <?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.sysuserrole.SysUserRoleMapper">
+<mapper namespace="com.yxt.oms.biz.func.sysuserrole.SysUserRoleMapper">
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.wms.biz.func.sysuserrole.SysUserRoleVo">
+	<select id="selectPageVo" resultType="com.yxt.oms.biz.func.sysuserrole.SysUserRoleVo">
 		SELECT * FROM sys_user_role <where> ${ew.sqlSegment} </where>
 	</select>
 	
-	<select id="selectListAllVo" resultType="com.yxt.wms.biz.func.sysuserrole.SysUserRoleVo">
+	<select id="selectListAllVo" resultType="com.yxt.oms.biz.func.sysuserrole.SysUserRoleVo">
 		SELECT * FROM sys_user_role <where> ${ew.sqlSegment} </where>
 	</select>
-	<select id="selectByUserSid" resultType="com.yxt.wms.biz.func.sysuserrole.SysUserRoleVo">
+	<select id="selectByUserSid" resultType="com.yxt.oms.biz.func.sysuserrole.SysUserRoleVo">
 		 SELECT *
         FROM sys_user_role
         WHERE userSid = #{userSid}

oms/src/main/java/com/yxt/oms/biz/func/sysuserrole/SysUserRoleService.java

@@ -7,30 +7,18 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.feign.portal.sysuserrole.SysUserRoleFeign;
+import com.yxt.oms.feign.portal.sysuserrole.SysUserRoleFeign;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 
-/**
- * Project: anrui_portal(门户建设) <br/>
- * File: SysUserRoleService.java <br/>
- * Class: com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleService <br/>
- * Description: 用户与角色关联表 业务逻辑. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2021-08-03 00:24:30 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Service
 public class SysUserRoleService extends MybatisBaseService<SysUserRoleMapper, SysUserRole> {
 
-	@Autowired
+	@Resource
 	SysUserRoleFeign sysUserRoleFeign;
 
 

oms/src/main/java/com/yxt/oms/feign/portal/dictcommon/DictCommonFeign.java

@@ -3,9 +3,9 @@ package com.yxt.oms.feign.portal.dictcommon;
 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.DictCommonDto;
+import com.yxt.oms.biz.func.dictcommon.DictCommonDto;
-import com.yxt.wms.biz.func.dictcommon.DictCommonQuery;
+import com.yxt.oms.biz.func.dictcommon.DictCommonQuery;
-import com.yxt.wms.biz.func.dictcommon.DictCommonVo;
+import com.yxt.oms.biz.func.dictcommon.DictCommonVo;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -54,7 +54,7 @@ public interface DictCommonFeign {
     @GetMapping("/typeValues")
     @ResponseBody
     @ApiOperation("下拉框的获取")
-    ResultBean<List<DictCommonVo>> getTypeValues(@RequestParam("type") String type,  @RequestParam(value = "psid", defaultValue = "0")String psid);
+    ResultBean<List<DictCommonVo>> getTypeValues(@RequestParam("type") String type, @RequestParam(value = "psid", defaultValue = "0")String psid);
 
     @GetMapping("/getFirstDictKeyByType")
     @ResponseBody

oms/src/main/java/com/yxt/oms/feign/portal/dictcommon/DictCommonFeignFallback.java

@@ -3,9 +3,9 @@ package com.yxt.oms.feign.portal.dictcommon;
 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.DictCommonDto;
+import com.yxt.oms.biz.func.dictcommon.DictCommonDto;
-import com.yxt.wms.biz.func.dictcommon.DictCommonQuery;
+import com.yxt.oms.biz.func.dictcommon.DictCommonQuery;
-import com.yxt.wms.biz.func.dictcommon.DictCommonVo;
+import com.yxt.oms.biz.func.dictcommon.DictCommonVo;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

oms/src/main/java/com/yxt/oms/feign/portal/dicttype/DictTypeFeign.java

@@ -3,9 +3,9 @@ package com.yxt.oms.feign.portal.dicttype;
 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.dicttype.DictTypeDto;
+import com.yxt.oms.biz.func.dicttype.DictTypeDto;
-import com.yxt.wms.biz.func.dicttype.DictTypeQuery;
+import com.yxt.oms.biz.func.dicttype.DictTypeQuery;
-import com.yxt.wms.biz.func.dicttype.DictTypeVo;
+import com.yxt.oms.biz.func.dicttype.DictTypeVo;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;

oms/src/main/java/com/yxt/oms/feign/portal/dicttype/DictTypeFeignFallback.java

@@ -3,9 +3,9 @@ package com.yxt.oms.feign.portal.dicttype;
 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.dicttype.DictTypeDto;
+import com.yxt.oms.biz.func.dicttype.DictTypeDto;
-import com.yxt.wms.biz.func.dicttype.DictTypeQuery;
+import com.yxt.oms.biz.func.dicttype.DictTypeQuery;
-import com.yxt.wms.biz.func.dicttype.DictTypeVo;
+import com.yxt.oms.biz.func.dicttype.DictTypeVo;
 
 /**
  * @author dimengzhe

oms/src/main/java/com/yxt/oms/feign/portal/region/RegionFeign.java

@@ -1,7 +1,7 @@
 package com.yxt.oms.feign.portal.region;
 
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.wms.biz.func.region.RegionChildTwoVo;
+import com.yxt.oms.biz.func.region.RegionChildTwoVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;