Merge branch 'develop' into release

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/controller/SupplierController.java → ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/controller/BaseSupplierController.java

@@ -1,9 +1,9 @@
 package org.dromara.InventoryManagement.controller;
 
 import lombok.RequiredArgsConstructor;
-import org.dromara.InventoryManagement.domain.bo.SupplierBo;
-import org.dromara.InventoryManagement.domain.vo.SupplierVo;
-import org.dromara.InventoryManagement.service.impl.SupplierServiceImpl;
+import org.dromara.InventoryManagement.domain.bo.BaseSupplierBo;
+import org.dromara.InventoryManagement.domain.vo.BaseSupplierVo;
+import org.dromara.InventoryManagement.service.impl.BaseBaseSupplierServiceImpl;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
@@ -16,39 +16,39 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/inventoryManagement/Supplier")
-public class SupplierController extends BaseController {
+public class BaseSupplierController extends BaseController {
 
-    private final SupplierServiceImpl supplierService;
+    private final BaseBaseSupplierServiceImpl supplierService;
 
     /**
      * 分页查询供应商管理
-     * @param supplierBo 查询条件
+     * @param baseSupplierBo 查询条件
      * @param pageQuery 分页条件
      * @return 结果
      */
     @GetMapping("/PageList")
-    public TableDataInfo<SupplierVo> selectPageSupplierList(SupplierBo supplierBo, PageQuery pageQuery) {
-        return supplierService.selectPageSupplierList(supplierBo, pageQuery);
+    public TableDataInfo<BaseSupplierVo> selectPageSupplierList(BaseSupplierBo baseSupplierBo, PageQuery pageQuery) {
+        return supplierService.selectPageSupplierList(baseSupplierBo, pageQuery);
     }
 
     /**
      * 新增供应商
-     * @param supplierBo 供应商BO对象
+     * @param baseSupplierBo 供应商BO对象
      * @return 结果
      */
     @PostMapping()
-    public int insertSupplier(@Validated @RequestBody SupplierBo supplierBo) {
-        return supplierService.insertSupplier(supplierBo);
+    public int insertSupplier(@Validated @RequestBody BaseSupplierBo baseSupplierBo) {
+        return supplierService.insertSupplier(baseSupplierBo);
     }
 
     /**
      * 修改供应商
-     * @param supplierBo 供应商BO对象
+     * @param baseSupplierBo 供应商BO对象
      * @return 影响行数
      */
     @PutMapping()
-    public int updateSupplier(@Validated @RequestBody SupplierBo supplierBo) {
-        return supplierService.updateSupplier(supplierBo);
+    public int updateSupplier(@Validated @RequestBody BaseSupplierBo baseSupplierBo) {
+        return supplierService.updateSupplier(baseSupplierBo);
     }
 
     /**

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/controller/OutBoundOrderController.java

@@ -1,5 +1,6 @@
 package org.dromara.InventoryManagement.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
 import org.dromara.InventoryManagement.domain.bo.OutBoundOrderBo;
@@ -17,10 +18,13 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/inventoryManagement/outBoundOrder")
 public class OutBoundOrderController extends BaseController {
     private final OutBoundOrderService outBoundOrderService;
+
     @GetMapping("/PageList")
     public TableDataInfo<OutBoundOrderVo> selectOutBoundOrderPageList(OutBoundOrderBo outBoundOrderBo, PageQuery pageQuery) {
         return outBoundOrderService.selectOutBoundOrderPageList(outBoundOrderBo, pageQuery);
     }
+
+    @SaCheckPermission("InventoryManagement:outBoundOrder:add")
     @PostMapping()
     public R<Void> insertOutBoundOrder(@RequestBody OutBoundOrderBo outBoundOrderBo) {
         return toAjax(outBoundOrderService.insertOutBoundOrder(outBoundOrderBo));

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/Supplier.java → ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/BaseSupplier.java

@@ -14,7 +14,7 @@ import java.util.Date;
 @Data
 @TableName("fa_ykjp_info_supplier")
 @EqualsAndHashCode(callSuper = true)
-public class Supplier extends TenantEntity {
+public class BaseSupplier extends TenantEntity {
 
     /**
      * ID

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/bo/SupplierBo.java → ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/bo/BaseSupplierBo.java

@@ -5,7 +5,7 @@ import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.dromara.InventoryManagement.domain.Supplier;
+import org.dromara.InventoryManagement.domain.BaseSupplier;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 import java.util.Date;
@@ -15,8 +15,8 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = Supplier.class, reverseConvertGenerate = false)
-public class SupplierBo extends BaseEntity {
+@AutoMapper(target = BaseSupplier.class, reverseConvertGenerate = false)
+public class BaseSupplierBo extends BaseEntity {
 
     /**
      * ID

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/vo/SupplierVo.java → ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/vo/BaseSupplierVo.java

@@ -3,7 +3,7 @@ package org.dromara.InventoryManagement.domain.vo;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.dromara.InventoryManagement.domain.Supplier;
+import org.dromara.InventoryManagement.domain.BaseSupplier;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 import java.util.Date;
@@ -13,8 +13,8 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = Supplier.class)
-public class SupplierVo extends BaseEntity {
+@AutoMapper(target = BaseSupplier.class)
+public class BaseSupplierVo extends BaseEntity {
 
     /**
      * ID

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/mapper/BaseSupplierMapper.java

@@ -0,0 +1,13 @@
+package org.dromara.InventoryManagement.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.InventoryManagement.domain.BaseSupplier;
+import org.dromara.InventoryManagement.domain.vo.BaseSupplierVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 供应商表 Mapper
+ */
+@Mapper
+public interface BaseSupplierMapper extends BaseMapperPlus<BaseSupplier, BaseSupplierVo> {
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/mapper/SupplierMapper.java

@@ -1,13 +0,0 @@
-package org.dromara.InventoryManagement.mapper;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.dromara.InventoryManagement.domain.Supplier;
-import org.dromara.InventoryManagement.domain.vo.SupplierVo;
-import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
-
-/**
- * 供应商表 Mapper
- */
-@Mapper
-public interface SupplierMapper extends BaseMapperPlus<Supplier, SupplierVo> {
-}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/service/SupplierService.java → ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/service/BaseSupplierService.java

@@ -1,33 +1,33 @@
 package org.dromara.InventoryManagement.service;
 
-import org.dromara.InventoryManagement.domain.bo.SupplierBo;
-import org.dromara.InventoryManagement.domain.vo.SupplierVo;
+import org.dromara.InventoryManagement.domain.bo.BaseSupplierBo;
+import org.dromara.InventoryManagement.domain.vo.BaseSupplierVo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
-public interface SupplierService {
+public interface BaseSupplierService {
 
     /**
      * 分页查询供应商
-     * @param supplierBo 供应商BO对象
+     * @param baseSupplierBo 供应商BO对象
      * @param pageQuery 分页参数
      * @return 分页结果
      */
-    TableDataInfo<SupplierVo> selectPageSupplierList(SupplierBo supplierBo, PageQuery pageQuery);
+    TableDataInfo<BaseSupplierVo> selectPageSupplierList(BaseSupplierBo baseSupplierBo, PageQuery pageQuery);
 
     /**
      * 新增供应商
-     * @param supplierBo 供应商BO对象
+     * @param baseSupplierBo 供应商BO对象
      * @return 结果
      */
-    int insertSupplier(SupplierBo supplierBo);
+    int insertSupplier(BaseSupplierBo baseSupplierBo);
 
     /**
      * 修改供应商
-     * @param supplierBo 供应商BO对象
+     * @param baseSupplierBo 供应商BO对象
      * @return 影响行数
      */
-    int updateSupplier(SupplierBo supplierBo);
+    int updateSupplier(BaseSupplierBo baseSupplierBo);
 
     /**
      * 删除供应商

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/service/impl/BaseBaseSupplierServiceImpl.java

@@ -0,0 +1,71 @@
+package org.dromara.InventoryManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.BaseSupplier;
+import org.dromara.InventoryManagement.domain.bo.BaseSupplierBo;
+import org.dromara.InventoryManagement.domain.vo.BaseSupplierVo;
+import org.dromara.InventoryManagement.mapper.BaseSupplierMapper;
+import org.dromara.InventoryManagement.service.BaseSupplierService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.OrderNumberGenerator;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+
+@Service
+@RequiredArgsConstructor
+public class BaseBaseSupplierServiceImpl implements BaseSupplierService {
+
+    private final BaseSupplierMapper baseSupplierMapper;
+    private final OrderNumberGenerator generator = OrderNumberGenerator.getInstance();
+
+    /**
+     * 分页查询供应商
+     * @param baseSupplierBo 供应商BO对象
+     * @param pageQuery  分页参数
+     * @return 分页结果
+     */
+    @Override
+    public TableDataInfo<BaseSupplierVo> selectPageSupplierList(BaseSupplierBo baseSupplierBo, PageQuery pageQuery) {
+        QueryWrapper<BaseSupplier> qw = new QueryWrapper<>();
+        qw.like(StringUtils.isNotBlank(baseSupplierBo.getCode()),"code", baseSupplierBo.getCode());
+        Page<BaseSupplierVo> page = baseSupplierMapper.selectVoPage(pageQuery.build(), qw);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 新增供应商
+     * @param baseSupplierBo 供应商BO对象
+     * @return 结果
+     */
+    @Override
+    public int insertSupplier(BaseSupplierBo baseSupplierBo) {
+        baseSupplierBo.setCode(generator.generateOrderNumber("SP"));
+        return baseSupplierMapper.insert(MapstructUtils.convert(baseSupplierBo, BaseSupplier.class));
+    }
+
+    /**
+     * 修改供应商
+     * @param baseSupplierBo 供应商BO对象
+     * @return 影响行数
+     */
+    @Override
+    public int updateSupplier(BaseSupplierBo baseSupplierBo) {
+        return baseSupplierMapper.updateById(MapstructUtils.convert(baseSupplierBo, BaseSupplier.class));
+    }
+
+    /**
+     * 删除供应商
+     * @param supplierIds 供应商ID
+     * @return 影响行数
+     */
+    @Override
+    public int deleteSupplierById(Long[] supplierIds) {
+        return baseSupplierMapper.deleteByIds(Arrays.asList(supplierIds));
+    }
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/service/impl/SupplierServiceImpl.java

@@ -1,71 +0,0 @@
-package org.dromara.InventoryManagement.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.RequiredArgsConstructor;
-import org.dromara.InventoryManagement.domain.Supplier;
-import org.dromara.InventoryManagement.domain.bo.SupplierBo;
-import org.dromara.InventoryManagement.domain.vo.SupplierVo;
-import org.dromara.InventoryManagement.mapper.SupplierMapper;
-import org.dromara.InventoryManagement.service.SupplierService;
-import org.dromara.common.core.utils.MapstructUtils;
-import org.dromara.common.core.utils.OrderNumberGenerator;
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.springframework.stereotype.Service;
-
-import java.util.Arrays;
-
-@Service
-@RequiredArgsConstructor
-public class SupplierServiceImpl implements SupplierService {
-
-    private final SupplierMapper supplierMapper;
-    private final OrderNumberGenerator generator = OrderNumberGenerator.getInstance();
-
-    /**
-     * 分页查询供应商
-     * @param supplierBo 供应商BO对象
-     * @param pageQuery  分页参数
-     * @return 分页结果
-     */
-    @Override
-    public TableDataInfo<SupplierVo> selectPageSupplierList(SupplierBo supplierBo, PageQuery pageQuery) {
-        QueryWrapper<Supplier> qw = new QueryWrapper<>();
-        qw.like(StringUtils.isNotBlank(supplierBo.getCode()),"code", supplierBo.getCode());
-        Page<SupplierVo> page = supplierMapper.selectVoPage(pageQuery.build(), qw);
-        return TableDataInfo.build(page);
-    }
-
-    /**
-     * 新增供应商
-     * @param supplierBo 供应商BO对象
-     * @return 结果
-     */
-    @Override
-    public int insertSupplier(SupplierBo supplierBo) {
-        supplierBo.setCode(generator.generateOrderNumber("SP"));
-        return supplierMapper.insert(MapstructUtils.convert(supplierBo, Supplier.class));
-    }
-
-    /**
-     * 修改供应商
-     * @param supplierBo 供应商BO对象
-     * @return 影响行数
-     */
-    @Override
-    public int updateSupplier(SupplierBo supplierBo) {
-        return supplierMapper.updateById(MapstructUtils.convert(supplierBo, Supplier.class));
-    }
-
-    /**
-     * 删除供应商
-     * @param supplierIds 供应商ID
-     * @return 影响行数
-     */
-    @Override
-    public int deleteSupplierById(Long[] supplierIds) {
-        return supplierMapper.deleteByIds(Arrays.asList(supplierIds));
-    }
-}

ruoyi-modules/ruoyi-InventoryManagement/src/main/resources/mapper/SupplierMapper.xml → ruoyi-modules/ruoyi-InventoryManagement/src/main/resources/mapper/BaseSupplierMapper.xml

@@ -2,6 +2,6 @@
 <!DOCTYPE mapper
     PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.InventoryManagement.mapper.SupplierMapper">
+<mapper namespace="org.dromara.InventoryManagement.mapper.BaseSupplierMapper">
 
 </mapper>