Jelajahi Sumber

销售管理模块后端代码

lbyzx123 1 Minggu lalu
induk
melakukan
f2a18e4028
55 mengubah file dengan 138 tambahan dan 164 penghapusan
  1. 3 3
      ruoyi-admin/src/main/java/com/ruoyi/web/base/controller/BaseCustomerController.java
  2. 5 5
      ruoyi-admin/src/main/java/com/ruoyi/web/base/controller/RelCustomerMarketController.java
  3. 3 11
      ruoyi-admin/src/main/java/com/ruoyi/web/base/controller/SalesAllowanceController.java
  4. 7 7
      ruoyi-admin/src/main/java/com/ruoyi/web/base/controller/SalesDeliveryController.java
  5. 3 13
      ruoyi-admin/src/main/java/com/ruoyi/web/base/controller/SalesOrderController.java
  6. 6 6
      ruoyi-admin/src/main/java/com/ruoyi/web/base/controller/SalesPriceController.java
  7. 3 11
      ruoyi-admin/src/main/java/com/ruoyi/web/base/controller/SalesReturnController.java
  8. 1 1
      ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/BaseCustomer.java
  9. 1 1
      ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/RelCustomerMarket.java
  10. 1 1
      ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/SalesAllowance.java
  11. 1 1
      ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/SalesAllowanceItem.java
  12. 1 1
      ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/SalesDelivery.java
  13. 1 1
      ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/SalesDeliveryGoods.java
  14. 1 1
      ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/SalesOrder.java
  15. 1 1
      ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/SalesOrderGoods.java
  16. 1 1
      ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/SalesPrice.java
  17. 1 1
      ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/SalesPriceItem.java
  18. 1 1
      ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/SalesReturn.java
  19. 1 1
      ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/SalesReturnGoods.java
  20. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/BaseCustomerMapper.java
  21. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/RelCustomerMarketMapper.java
  22. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/SalesAllowanceItemMapper.java
  23. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/SalesAllowanceMapper.java
  24. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/SalesDeliveryGoodsMapper.java
  25. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/SalesDeliveryMapper.java
  26. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/SalesOrderGoodsMapper.java
  27. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/SalesOrderMapper.java
  28. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/SalesPriceItemMapper.java
  29. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/SalesPriceMapper.java
  30. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/SalesReturnGoodsMapper.java
  31. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/SalesReturnMapper.java
  32. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/IBaseCustomerService.java
  33. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/IRelCustomerMarketService.java
  34. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/ISalesAllowanceItemService.java
  35. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/ISalesAllowanceService.java
  36. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/ISalesDeliveryGoodsService.java
  37. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/ISalesDeliveryService.java
  38. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/ISalesOrderGoodsService.java
  39. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/ISalesOrderService.java
  40. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/ISalesPriceItemService.java
  41. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/ISalesPriceService.java
  42. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/ISalesReturnGoodsService.java
  43. 2 2
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/ISalesReturnService.java
  44. 4 4
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/BaseCustomerServiceImpl.java
  45. 4 4
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/RelCustomerMarketServiceImpl.java
  46. 4 4
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/SalesAllowanceItemServiceImpl.java
  47. 4 4
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/SalesAllowanceServiceImpl.java
  48. 4 4
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/SalesDeliveryGoodsServiceImpl.java
  49. 4 4
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/SalesDeliveryServiceImpl.java
  50. 4 4
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/SalesOrderGoodsServiceImpl.java
  51. 4 4
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/SalesOrderServiceImpl.java
  52. 4 4
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/SalesPriceItemServiceImpl.java
  53. 4 4
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/SalesPriceServiceImpl.java
  54. 4 4
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/SalesReturnGoodsServiceImpl.java
  55. 4 4
      ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/SalesReturnServiceImpl.java

+ 3 - 3
ruoyi-admin/src/main/java/com/ruoyi/web/base/controller/BaseCustomerController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.base.controller;
+package com.ruoyi.web.sales.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -6,8 +6,8 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.web.base.domain.BaseCustomer;
-import com.ruoyi.web.base.service.IBaseCustomerService;
+import com.ruoyi.web.sales.domain.BaseCustomer;
+import com.ruoyi.web.sales.service.IBaseCustomerService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiParam;

+ 5 - 5
ruoyi-admin/src/main/java/com/ruoyi/web/base/controller/RelCustomerMarketController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.base.controller;
+package com.ruoyi.web.sales.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,14 +7,14 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.web.base.domain.BaseCustomer;
-import com.ruoyi.web.base.domain.RelCustomerMarket;
 import com.ruoyi.web.base.domain.BaseLine;
 import com.ruoyi.web.base.domain.BaseLine;
 import com.ruoyi.web.base.domain.BaseMarket;
 import com.ruoyi.web.base.domain.BaseMarket;
-import com.ruoyi.web.base.service.IRelCustomerMarketService;
-import com.ruoyi.web.base.service.IBaseCustomerService;
 import com.ruoyi.web.base.service.IBaseLineService;
 import com.ruoyi.web.base.service.IBaseLineService;
 import com.ruoyi.web.base.service.IBaseMarketService;
 import com.ruoyi.web.base.service.IBaseMarketService;
+import com.ruoyi.web.sales.domain.BaseCustomer;
+import com.ruoyi.web.sales.domain.RelCustomerMarket;
+import com.ruoyi.web.sales.service.IBaseCustomerService;
+import com.ruoyi.web.sales.service.IRelCustomerMarketService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;

+ 3 - 11
ruoyi-admin/src/main/java/com/ruoyi/web/base/controller/SalesAllowanceController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.base.controller;
+package com.ruoyi.web.sales.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -6,20 +6,12 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.web.base.domain.BaseCustomer;
 import com.ruoyi.web.base.domain.BaseEmployee;
 import com.ruoyi.web.base.domain.BaseEmployee;
 import com.ruoyi.web.base.domain.BaseMaterial;
 import com.ruoyi.web.base.domain.BaseMaterial;
-import com.ruoyi.web.base.domain.SalesAllowance;
-import com.ruoyi.web.base.domain.SalesAllowanceItem;
-import com.ruoyi.web.base.domain.SalesDelivery;
-import com.ruoyi.web.base.domain.SalesDeliveryGoods;
-import com.ruoyi.web.base.service.IBaseCustomerService;
 import com.ruoyi.web.base.service.IBaseEmployeeService;
 import com.ruoyi.web.base.service.IBaseEmployeeService;
 import com.ruoyi.web.base.service.IBaseMaterialService;
 import com.ruoyi.web.base.service.IBaseMaterialService;
-import com.ruoyi.web.base.service.ISalesAllowanceItemService;
-import com.ruoyi.web.base.service.ISalesAllowanceService;
-import com.ruoyi.web.base.service.ISalesDeliveryGoodsService;
-import com.ruoyi.web.base.service.ISalesDeliveryService;
+import com.ruoyi.web.sales.domain.*;
+import com.ruoyi.web.sales.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiParam;

+ 7 - 7
ruoyi-admin/src/main/java/com/ruoyi/web/base/controller/SalesDeliveryController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.base.controller;
+package com.ruoyi.web.sales.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -6,16 +6,16 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.web.base.domain.BaseCustomer;
 import com.ruoyi.web.base.domain.BaseEmployee;
 import com.ruoyi.web.base.domain.BaseEmployee;
 import com.ruoyi.web.base.domain.BaseMaterial;
 import com.ruoyi.web.base.domain.BaseMaterial;
-import com.ruoyi.web.base.domain.SalesDelivery;
-import com.ruoyi.web.base.domain.SalesDeliveryGoods;
-import com.ruoyi.web.base.service.IBaseCustomerService;
 import com.ruoyi.web.base.service.IBaseEmployeeService;
 import com.ruoyi.web.base.service.IBaseEmployeeService;
 import com.ruoyi.web.base.service.IBaseMaterialService;
 import com.ruoyi.web.base.service.IBaseMaterialService;
-import com.ruoyi.web.base.service.ISalesDeliveryGoodsService;
-import com.ruoyi.web.base.service.ISalesDeliveryService;
+import com.ruoyi.web.sales.domain.BaseCustomer;
+import com.ruoyi.web.sales.domain.SalesDelivery;
+import com.ruoyi.web.sales.domain.SalesDeliveryGoods;
+import com.ruoyi.web.sales.service.IBaseCustomerService;
+import com.ruoyi.web.sales.service.ISalesDeliveryGoodsService;
+import com.ruoyi.web.sales.service.ISalesDeliveryService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiParam;

+ 3 - 13
ruoyi-admin/src/main/java/com/ruoyi/web/base/controller/SalesOrderController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.base.controller;
+package com.ruoyi.web.sales.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -6,26 +6,16 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.web.base.domain.BaseCustomer;
 import com.ruoyi.web.base.domain.BaseEmployee;
 import com.ruoyi.web.base.domain.BaseEmployee;
 import com.ruoyi.web.base.domain.BaseLine;
 import com.ruoyi.web.base.domain.BaseLine;
 import com.ruoyi.web.base.domain.BaseMaterial;
 import com.ruoyi.web.base.domain.BaseMaterial;
 import com.ruoyi.web.base.domain.BaseMarket;
 import com.ruoyi.web.base.domain.BaseMarket;
-import com.ruoyi.web.base.domain.RelCustomerMarket;
-import com.ruoyi.web.base.domain.SalesPrice;
-import com.ruoyi.web.base.domain.SalesPriceItem;
-import com.ruoyi.web.base.domain.SalesOrder;
-import com.ruoyi.web.base.domain.SalesOrderGoods;
-import com.ruoyi.web.base.service.IBaseCustomerService;
 import com.ruoyi.web.base.service.IBaseEmployeeService;
 import com.ruoyi.web.base.service.IBaseEmployeeService;
 import com.ruoyi.web.base.service.IBaseLineService;
 import com.ruoyi.web.base.service.IBaseLineService;
 import com.ruoyi.web.base.service.IBaseMaterialService;
 import com.ruoyi.web.base.service.IBaseMaterialService;
 import com.ruoyi.web.base.service.IBaseMarketService;
 import com.ruoyi.web.base.service.IBaseMarketService;
-import com.ruoyi.web.base.service.IRelCustomerMarketService;
-import com.ruoyi.web.base.service.ISalesPriceService;
-import com.ruoyi.web.base.service.ISalesPriceItemService;
-import com.ruoyi.web.base.service.ISalesOrderGoodsService;
-import com.ruoyi.web.base.service.ISalesOrderService;
+import com.ruoyi.web.sales.domain.*;
+import com.ruoyi.web.sales.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiParam;

+ 6 - 6
ruoyi-admin/src/main/java/com/ruoyi/web/base/controller/SalesPriceController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.base.controller;
+package com.ruoyi.web.sales.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,13 +8,13 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.web.base.domain.BaseMaterial;
 import com.ruoyi.web.base.domain.BaseMaterial;
 import com.ruoyi.web.base.domain.BasePriceType;
 import com.ruoyi.web.base.domain.BasePriceType;
-import com.ruoyi.web.base.domain.SalesPrice;
-import com.ruoyi.web.base.domain.SalesPriceItem;
-import com.ruoyi.web.base.mapper.SalesPriceItemMapper;
 import com.ruoyi.web.base.service.IBaseMaterialService;
 import com.ruoyi.web.base.service.IBaseMaterialService;
 import com.ruoyi.web.base.service.IBasePriceTypeService;
 import com.ruoyi.web.base.service.IBasePriceTypeService;
-import com.ruoyi.web.base.service.ISalesPriceItemService;
-import com.ruoyi.web.base.service.ISalesPriceService;
+import com.ruoyi.web.sales.domain.SalesPrice;
+import com.ruoyi.web.sales.domain.SalesPriceItem;
+import com.ruoyi.web.sales.mapper.SalesPriceItemMapper;
+import com.ruoyi.web.sales.service.ISalesPriceItemService;
+import com.ruoyi.web.sales.service.ISalesPriceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;

+ 3 - 11
ruoyi-admin/src/main/java/com/ruoyi/web/base/controller/SalesReturnController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.base.controller;
+package com.ruoyi.web.sales.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -6,20 +6,12 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.web.base.domain.BaseCustomer;
 import com.ruoyi.web.base.domain.BaseEmployee;
 import com.ruoyi.web.base.domain.BaseEmployee;
 import com.ruoyi.web.base.domain.BaseMaterial;
 import com.ruoyi.web.base.domain.BaseMaterial;
-import com.ruoyi.web.base.domain.SalesDelivery;
-import com.ruoyi.web.base.domain.SalesDeliveryGoods;
-import com.ruoyi.web.base.domain.SalesReturn;
-import com.ruoyi.web.base.domain.SalesReturnGoods;
-import com.ruoyi.web.base.service.IBaseCustomerService;
 import com.ruoyi.web.base.service.IBaseEmployeeService;
 import com.ruoyi.web.base.service.IBaseEmployeeService;
 import com.ruoyi.web.base.service.IBaseMaterialService;
 import com.ruoyi.web.base.service.IBaseMaterialService;
-import com.ruoyi.web.base.service.ISalesDeliveryGoodsService;
-import com.ruoyi.web.base.service.ISalesDeliveryService;
-import com.ruoyi.web.base.service.ISalesReturnGoodsService;
-import com.ruoyi.web.base.service.ISalesReturnService;
+import com.ruoyi.web.sales.domain.*;
+import com.ruoyi.web.sales.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiParam;

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/BaseCustomer.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.base.domain;
+package com.ruoyi.web.sales.domain;
 
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel;

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/RelCustomerMarket.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.base.domain;
+package com.ruoyi.web.sales.domain;
 
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/SalesAllowance.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.base.domain;
+package com.ruoyi.web.sales.domain;
 
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/SalesAllowanceItem.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.base.domain;
+package com.ruoyi.web.sales.domain;
 
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/SalesDelivery.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.base.domain;
+package com.ruoyi.web.sales.domain;
 
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/SalesDeliveryGoods.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.base.domain;
+package com.ruoyi.web.sales.domain;
 
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/SalesOrder.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.base.domain;
+package com.ruoyi.web.sales.domain;
 
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/SalesOrderGoods.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.base.domain;
+package com.ruoyi.web.sales.domain;
 
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/SalesPrice.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.base.domain;
+package com.ruoyi.web.sales.domain;
 
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/SalesPriceItem.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.base.domain;
+package com.ruoyi.web.sales.domain;
 
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/SalesReturn.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.base.domain;
+package com.ruoyi.web.sales.domain;
 
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/SalesReturnGoods.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.base.domain;
+package com.ruoyi.web.sales.domain;
 
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/BaseCustomerMapper.java

@@ -1,7 +1,7 @@
-package com.ruoyi.web.base.mapper;
+package com.ruoyi.web.sales.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.web.base.domain.BaseCustomer;
+import com.ruoyi.web.sales.domain.BaseCustomer;
 
 
 public interface BaseCustomerMapper extends BaseMapper<BaseCustomer> {
 public interface BaseCustomerMapper extends BaseMapper<BaseCustomer> {
 }
 }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/RelCustomerMarketMapper.java

@@ -1,9 +1,9 @@
-package com.ruoyi.web.base.mapper;
+package com.ruoyi.web.sales.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.web.base.domain.RelCustomerMarket;
+import com.ruoyi.web.sales.domain.RelCustomerMarket;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
 public interface RelCustomerMarketMapper extends BaseMapper<RelCustomerMarket> {
 public interface RelCustomerMarketMapper extends BaseMapper<RelCustomerMarket> {

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/SalesAllowanceItemMapper.java

@@ -1,7 +1,7 @@
-package com.ruoyi.web.base.mapper;
+package com.ruoyi.web.sales.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.web.base.domain.SalesAllowanceItem;
+import com.ruoyi.web.sales.domain.SalesAllowanceItem;
 
 
 public interface SalesAllowanceItemMapper extends BaseMapper<SalesAllowanceItem> {
 public interface SalesAllowanceItemMapper extends BaseMapper<SalesAllowanceItem> {
 }
 }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/SalesAllowanceMapper.java

@@ -1,7 +1,7 @@
-package com.ruoyi.web.base.mapper;
+package com.ruoyi.web.sales.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.web.base.domain.SalesAllowance;
+import com.ruoyi.web.sales.domain.SalesAllowance;
 
 
 public interface SalesAllowanceMapper extends BaseMapper<SalesAllowance> {
 public interface SalesAllowanceMapper extends BaseMapper<SalesAllowance> {
 }
 }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/SalesDeliveryGoodsMapper.java

@@ -1,7 +1,7 @@
-package com.ruoyi.web.base.mapper;
+package com.ruoyi.web.sales.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.web.base.domain.SalesDeliveryGoods;
+import com.ruoyi.web.sales.domain.SalesDeliveryGoods;
 
 
 public interface SalesDeliveryGoodsMapper extends BaseMapper<SalesDeliveryGoods> {
 public interface SalesDeliveryGoodsMapper extends BaseMapper<SalesDeliveryGoods> {
 }
 }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/SalesDeliveryMapper.java

@@ -1,7 +1,7 @@
-package com.ruoyi.web.base.mapper;
+package com.ruoyi.web.sales.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.web.base.domain.SalesDelivery;
+import com.ruoyi.web.sales.domain.SalesDelivery;
 
 
 public interface SalesDeliveryMapper extends BaseMapper<SalesDelivery> {
 public interface SalesDeliveryMapper extends BaseMapper<SalesDelivery> {
 }
 }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/SalesOrderGoodsMapper.java

@@ -1,7 +1,7 @@
-package com.ruoyi.web.base.mapper;
+package com.ruoyi.web.sales.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.web.base.domain.SalesOrderGoods;
+import com.ruoyi.web.sales.domain.SalesOrderGoods;
 
 
 public interface SalesOrderGoodsMapper extends BaseMapper<SalesOrderGoods> {
 public interface SalesOrderGoodsMapper extends BaseMapper<SalesOrderGoods> {
 }
 }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/SalesOrderMapper.java

@@ -1,7 +1,7 @@
-package com.ruoyi.web.base.mapper;
+package com.ruoyi.web.sales.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.web.base.domain.SalesOrder;
+import com.ruoyi.web.sales.domain.SalesOrder;
 
 
 public interface SalesOrderMapper extends BaseMapper<SalesOrder> {
 public interface SalesOrderMapper extends BaseMapper<SalesOrder> {
 }
 }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/SalesPriceItemMapper.java

@@ -1,7 +1,7 @@
-package com.ruoyi.web.base.mapper;
+package com.ruoyi.web.sales.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.web.base.domain.SalesPriceItem;
+import com.ruoyi.web.sales.domain.SalesPriceItem;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Select;
 
 

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/SalesPriceMapper.java

@@ -1,7 +1,7 @@
-package com.ruoyi.web.base.mapper;
+package com.ruoyi.web.sales.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.web.base.domain.SalesPrice;
+import com.ruoyi.web.sales.domain.SalesPrice;
 
 
 public interface SalesPriceMapper extends BaseMapper<SalesPrice> {
 public interface SalesPriceMapper extends BaseMapper<SalesPrice> {
 }
 }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/SalesReturnGoodsMapper.java

@@ -1,7 +1,7 @@
-package com.ruoyi.web.base.mapper;
+package com.ruoyi.web.sales.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.web.base.domain.SalesReturnGoods;
+import com.ruoyi.web.sales.domain.SalesReturnGoods;
 
 
 public interface SalesReturnGoodsMapper extends BaseMapper<SalesReturnGoods> {
 public interface SalesReturnGoodsMapper extends BaseMapper<SalesReturnGoods> {
 }
 }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/mapper/SalesReturnMapper.java

@@ -1,7 +1,7 @@
-package com.ruoyi.web.base.mapper;
+package com.ruoyi.web.sales.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.web.base.domain.SalesReturn;
+import com.ruoyi.web.sales.domain.SalesReturn;
 
 
 public interface SalesReturnMapper extends BaseMapper<SalesReturn> {
 public interface SalesReturnMapper extends BaseMapper<SalesReturn> {
 }
 }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/IBaseCustomerService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.web.base.service;
+package com.ruoyi.web.sales.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.web.base.domain.BaseCustomer;
+import com.ruoyi.web.sales.domain.BaseCustomer;
 
 
 public interface IBaseCustomerService extends IService<BaseCustomer> {
 public interface IBaseCustomerService extends IService<BaseCustomer> {
 }
 }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/IRelCustomerMarketService.java

@@ -1,9 +1,9 @@
-package com.ruoyi.web.base.service;
+package com.ruoyi.web.sales.service;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.web.base.domain.RelCustomerMarket;
+import com.ruoyi.web.sales.domain.RelCustomerMarket;
 
 
 public interface IRelCustomerMarketService extends IService<RelCustomerMarket> {
 public interface IRelCustomerMarketService extends IService<RelCustomerMarket> {
 
 

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/ISalesAllowanceItemService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.web.base.service;
+package com.ruoyi.web.sales.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.web.base.domain.SalesAllowanceItem;
+import com.ruoyi.web.sales.domain.SalesAllowanceItem;
 
 
 public interface ISalesAllowanceItemService extends IService<SalesAllowanceItem> {
 public interface ISalesAllowanceItemService extends IService<SalesAllowanceItem> {
 }
 }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/ISalesAllowanceService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.web.base.service;
+package com.ruoyi.web.sales.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.web.base.domain.SalesAllowance;
+import com.ruoyi.web.sales.domain.SalesAllowance;
 
 
 public interface ISalesAllowanceService extends IService<SalesAllowance> {
 public interface ISalesAllowanceService extends IService<SalesAllowance> {
 }
 }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/ISalesDeliveryGoodsService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.web.base.service;
+package com.ruoyi.web.sales.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.web.base.domain.SalesDeliveryGoods;
+import com.ruoyi.web.sales.domain.SalesDeliveryGoods;
 
 
 public interface ISalesDeliveryGoodsService extends IService<SalesDeliveryGoods> {
 public interface ISalesDeliveryGoodsService extends IService<SalesDeliveryGoods> {
 }
 }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/ISalesDeliveryService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.web.base.service;
+package com.ruoyi.web.sales.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.web.base.domain.SalesDelivery;
+import com.ruoyi.web.sales.domain.SalesDelivery;
 
 
 public interface ISalesDeliveryService extends IService<SalesDelivery> {
 public interface ISalesDeliveryService extends IService<SalesDelivery> {
 }
 }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/ISalesOrderGoodsService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.web.base.service;
+package com.ruoyi.web.sales.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.web.base.domain.SalesOrderGoods;
+import com.ruoyi.web.sales.domain.SalesOrderGoods;
 
 
 public interface ISalesOrderGoodsService extends IService<SalesOrderGoods> {
 public interface ISalesOrderGoodsService extends IService<SalesOrderGoods> {
 }
 }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/ISalesOrderService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.web.base.service;
+package com.ruoyi.web.sales.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.web.base.domain.SalesOrder;
+import com.ruoyi.web.sales.domain.SalesOrder;
 
 
 public interface ISalesOrderService extends IService<SalesOrder> {
 public interface ISalesOrderService extends IService<SalesOrder> {
 }
 }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/ISalesPriceItemService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.web.base.service;
+package com.ruoyi.web.sales.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.web.base.domain.SalesPriceItem;
+import com.ruoyi.web.sales.domain.SalesPriceItem;
 
 
 public interface ISalesPriceItemService extends IService<SalesPriceItem> {
 public interface ISalesPriceItemService extends IService<SalesPriceItem> {
 }
 }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/ISalesPriceService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.web.base.service;
+package com.ruoyi.web.sales.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.web.base.domain.SalesPrice;
+import com.ruoyi.web.sales.domain.SalesPrice;
 
 
 public interface ISalesPriceService extends IService<SalesPrice> {
 public interface ISalesPriceService extends IService<SalesPrice> {
 }
 }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/ISalesReturnGoodsService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.web.base.service;
+package com.ruoyi.web.sales.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.web.base.domain.SalesReturnGoods;
+import com.ruoyi.web.sales.domain.SalesReturnGoods;
 
 
 public interface ISalesReturnGoodsService extends IService<SalesReturnGoods> {
 public interface ISalesReturnGoodsService extends IService<SalesReturnGoods> {
 }
 }

+ 2 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/ISalesReturnService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.web.base.service;
+package com.ruoyi.web.sales.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.web.base.domain.SalesReturn;
+import com.ruoyi.web.sales.domain.SalesReturn;
 
 
 public interface ISalesReturnService extends IService<SalesReturn> {
 public interface ISalesReturnService extends IService<SalesReturn> {
 }
 }

+ 4 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/BaseCustomerServiceImpl.java

@@ -1,9 +1,9 @@
-package com.ruoyi.web.base.service.impl;
+package com.ruoyi.web.sales.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.web.base.domain.BaseCustomer;
-import com.ruoyi.web.base.mapper.BaseCustomerMapper;
-import com.ruoyi.web.base.service.IBaseCustomerService;
+import com.ruoyi.web.sales.domain.BaseCustomer;
+import com.ruoyi.web.sales.mapper.BaseCustomerMapper;
+import com.ruoyi.web.sales.service.IBaseCustomerService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 @Service
 @Service

+ 4 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/RelCustomerMarketServiceImpl.java

@@ -1,11 +1,11 @@
-package com.ruoyi.web.base.service.impl;
+package com.ruoyi.web.sales.service.impl;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.web.base.domain.RelCustomerMarket;
-import com.ruoyi.web.base.mapper.RelCustomerMarketMapper;
-import com.ruoyi.web.base.service.IRelCustomerMarketService;
+import com.ruoyi.web.sales.domain.RelCustomerMarket;
+import com.ruoyi.web.sales.mapper.RelCustomerMarketMapper;
+import com.ruoyi.web.sales.service.IRelCustomerMarketService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 @Service
 @Service

+ 4 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/SalesAllowanceItemServiceImpl.java

@@ -1,9 +1,9 @@
-package com.ruoyi.web.base.service.impl;
+package com.ruoyi.web.sales.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.web.base.domain.SalesAllowanceItem;
-import com.ruoyi.web.base.mapper.SalesAllowanceItemMapper;
-import com.ruoyi.web.base.service.ISalesAllowanceItemService;
+import com.ruoyi.web.sales.domain.SalesAllowanceItem;
+import com.ruoyi.web.sales.mapper.SalesAllowanceItemMapper;
+import com.ruoyi.web.sales.service.ISalesAllowanceItemService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 @Service
 @Service

+ 4 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/SalesAllowanceServiceImpl.java

@@ -1,9 +1,9 @@
-package com.ruoyi.web.base.service.impl;
+package com.ruoyi.web.sales.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.web.base.domain.SalesAllowance;
-import com.ruoyi.web.base.mapper.SalesAllowanceMapper;
-import com.ruoyi.web.base.service.ISalesAllowanceService;
+import com.ruoyi.web.sales.domain.SalesAllowance;
+import com.ruoyi.web.sales.mapper.SalesAllowanceMapper;
+import com.ruoyi.web.sales.service.ISalesAllowanceService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 @Service
 @Service

+ 4 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/SalesDeliveryGoodsServiceImpl.java

@@ -1,9 +1,9 @@
-package com.ruoyi.web.base.service.impl;
+package com.ruoyi.web.sales.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.web.base.domain.SalesDeliveryGoods;
-import com.ruoyi.web.base.mapper.SalesDeliveryGoodsMapper;
-import com.ruoyi.web.base.service.ISalesDeliveryGoodsService;
+import com.ruoyi.web.sales.domain.SalesDeliveryGoods;
+import com.ruoyi.web.sales.mapper.SalesDeliveryGoodsMapper;
+import com.ruoyi.web.sales.service.ISalesDeliveryGoodsService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 @Service
 @Service

+ 4 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/SalesDeliveryServiceImpl.java

@@ -1,9 +1,9 @@
-package com.ruoyi.web.base.service.impl;
+package com.ruoyi.web.sales.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.web.base.domain.SalesDelivery;
-import com.ruoyi.web.base.mapper.SalesDeliveryMapper;
-import com.ruoyi.web.base.service.ISalesDeliveryService;
+import com.ruoyi.web.sales.domain.SalesDelivery;
+import com.ruoyi.web.sales.mapper.SalesDeliveryMapper;
+import com.ruoyi.web.sales.service.ISalesDeliveryService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 @Service
 @Service

+ 4 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/SalesOrderGoodsServiceImpl.java

@@ -1,9 +1,9 @@
-package com.ruoyi.web.base.service.impl;
+package com.ruoyi.web.sales.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.web.base.domain.SalesOrderGoods;
-import com.ruoyi.web.base.mapper.SalesOrderGoodsMapper;
-import com.ruoyi.web.base.service.ISalesOrderGoodsService;
+import com.ruoyi.web.sales.domain.SalesOrderGoods;
+import com.ruoyi.web.sales.mapper.SalesOrderGoodsMapper;
+import com.ruoyi.web.sales.service.ISalesOrderGoodsService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 @Service
 @Service

+ 4 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/SalesOrderServiceImpl.java

@@ -1,9 +1,9 @@
-package com.ruoyi.web.base.service.impl;
+package com.ruoyi.web.sales.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.web.base.domain.SalesOrder;
-import com.ruoyi.web.base.mapper.SalesOrderMapper;
-import com.ruoyi.web.base.service.ISalesOrderService;
+import com.ruoyi.web.sales.domain.SalesOrder;
+import com.ruoyi.web.sales.mapper.SalesOrderMapper;
+import com.ruoyi.web.sales.service.ISalesOrderService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 @Service
 @Service

+ 4 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/SalesPriceItemServiceImpl.java

@@ -1,9 +1,9 @@
-package com.ruoyi.web.base.service.impl;
+package com.ruoyi.web.sales.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.web.base.domain.SalesPriceItem;
-import com.ruoyi.web.base.mapper.SalesPriceItemMapper;
-import com.ruoyi.web.base.service.ISalesPriceItemService;
+import com.ruoyi.web.sales.domain.SalesPriceItem;
+import com.ruoyi.web.sales.mapper.SalesPriceItemMapper;
+import com.ruoyi.web.sales.service.ISalesPriceItemService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 @Service
 @Service

+ 4 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/SalesPriceServiceImpl.java

@@ -1,9 +1,9 @@
-package com.ruoyi.web.base.service.impl;
+package com.ruoyi.web.sales.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.web.base.domain.SalesPrice;
-import com.ruoyi.web.base.mapper.SalesPriceMapper;
-import com.ruoyi.web.base.service.ISalesPriceService;
+import com.ruoyi.web.sales.domain.SalesPrice;
+import com.ruoyi.web.sales.mapper.SalesPriceMapper;
+import com.ruoyi.web.sales.service.ISalesPriceService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 @Service
 @Service

+ 4 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/SalesReturnGoodsServiceImpl.java

@@ -1,9 +1,9 @@
-package com.ruoyi.web.base.service.impl;
+package com.ruoyi.web.sales.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.web.base.domain.SalesReturnGoods;
-import com.ruoyi.web.base.mapper.SalesReturnGoodsMapper;
-import com.ruoyi.web.base.service.ISalesReturnGoodsService;
+import com.ruoyi.web.sales.domain.SalesReturnGoods;
+import com.ruoyi.web.sales.mapper.SalesReturnGoodsMapper;
+import com.ruoyi.web.sales.service.ISalesReturnGoodsService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 @Service
 @Service

+ 4 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/base/service/impl/SalesReturnServiceImpl.java

@@ -1,9 +1,9 @@
-package com.ruoyi.web.base.service.impl;
+package com.ruoyi.web.sales.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.web.base.domain.SalesReturn;
-import com.ruoyi.web.base.mapper.SalesReturnMapper;
-import com.ruoyi.web.base.service.ISalesReturnService;
+import com.ruoyi.web.sales.domain.SalesReturn;
+import com.ruoyi.web.sales.mapper.SalesReturnMapper;
+import com.ruoyi.web.sales.service.ISalesReturnService;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 @Service
 @Service