Commit 2bd9dcbfc85d3595f1d9ee303f4fefc0764aec88

Authored by YunaiV
1 parent 7944d57e

reactor:移除 erp 的 api 包

Showing 236 changed files with 922 additions and 987 deletions
yudao-module-erp/pom.xml
@@ -7,13 +7,9 @@ @@ -7,13 +7,9 @@
7 <artifactId>yudao</artifactId> 7 <artifactId>yudao</artifactId>
8 <version>${revision}</version> 8 <version>${revision}</version>
9 </parent> 9 </parent>
10 - <modules>  
11 - <module>yudao-module-erp-api</module>  
12 - <module>yudao-module-erp-biz</module>  
13 - </modules>  
14 <modelVersion>4.0.0</modelVersion> 10 <modelVersion>4.0.0</modelVersion>
15 <artifactId>yudao-module-erp</artifactId> 11 <artifactId>yudao-module-erp</artifactId>
16 - <packaging>pom</packaging> 12 + <packaging>jar</packaging>
17 13
18 <name>${project.artifactId}</name> 14 <name>${project.artifactId}</name>
19 <description> 15 <description>
@@ -21,4 +17,49 @@ @@ -21,4 +17,49 @@
21 例如说:采购、销售、库存、财务、产品等等 17 例如说:采购、销售、库存、财务、产品等等
22 </description> 18 </description>
23 19
  20 + <dependencies>
  21 + <dependency>
  22 + <groupId>cn.iocoder.boot</groupId>
  23 + <artifactId>yudao-module-system</artifactId>
  24 + <version>${revision}</version>
  25 + </dependency>
  26 +
  27 + <!-- 业务组件 -->
  28 +
  29 + <!-- Web 相关 -->
  30 + <dependency>
  31 + <groupId>cn.iocoder.boot</groupId>
  32 + <artifactId>yudao-spring-boot-starter-web</artifactId>
  33 + </dependency>
  34 +
  35 + <dependency>
  36 + <groupId>cn.iocoder.boot</groupId>
  37 + <artifactId>yudao-spring-boot-starter-security</artifactId>
  38 + </dependency>
  39 +
  40 + <!-- DB 相关 -->
  41 + <dependency>
  42 + <groupId>cn.iocoder.boot</groupId>
  43 + <artifactId>yudao-spring-boot-starter-mybatis</artifactId>
  44 + </dependency>
  45 +
  46 + <dependency>
  47 + <groupId>cn.iocoder.boot</groupId>
  48 + <artifactId>yudao-spring-boot-starter-redis</artifactId>
  49 + </dependency>
  50 +
  51 + <!-- 工具类相关 -->
  52 + <dependency>
  53 + <groupId>cn.iocoder.boot</groupId>
  54 + <artifactId>yudao-spring-boot-starter-excel</artifactId>
  55 + </dependency>
  56 +
  57 + <!-- Test 测试相关 -->
  58 + <dependency>
  59 + <groupId>cn.iocoder.boot</groupId>
  60 + <artifactId>yudao-spring-boot-starter-test</artifactId>
  61 + </dependency>
  62 +
  63 + </dependencies>
  64 +
24 </project> 65 </project>
25 \ No newline at end of file 66 \ No newline at end of file
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpAccountController.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpAccountController.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinancePaymentController.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinanceReceiptController.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpFinanceReceiptController.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/account/ErpAccountPageReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/account/ErpAccountPageReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/account/ErpAccountRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/account/ErpAccountRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/account/ErpAccountSaveReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/account/ErpAccountSaveReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/payment/ErpFinancePaymentPageReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/payment/ErpFinancePaymentPageReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/payment/ErpFinancePaymentRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/payment/ErpFinancePaymentRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/payment/ErpFinancePaymentSaveReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/payment/ErpFinancePaymentSaveReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/receipt/ErpFinanceReceiptPageReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/receipt/ErpFinanceReceiptPageReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/receipt/ErpFinanceReceiptRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/receipt/ErpFinanceReceiptRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/receipt/ErpFinanceReceiptSaveReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/receipt/ErpFinanceReceiptSaveReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductCategoryController.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductCategoryController.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductUnitController.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductUnitController.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/category/ErpProductCategoryListReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/category/ErpProductCategoryListReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/category/ErpProductCategoryRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/category/ErpProductCategoryRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/category/ErpProductCategorySaveReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/category/ErpProductCategorySaveReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ErpProductPageReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ErpProductPageReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ErpProductRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ErpProductRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ProductSaveReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ProductSaveReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/unit/ErpProductUnitPageReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/unit/ErpProductUnitPageReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/unit/ErpProductUnitRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/unit/ErpProductUnitRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/unit/ErpProductUnitSaveReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/unit/ErpProductUnitSaveReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInController.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInController.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseReturnController.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseReturnController.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpSupplierController.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpSupplierController.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInPageReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInPageReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInSaveReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInSaveReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderPageReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderPageReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderSaveReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderSaveReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnPageReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnPageReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnSaveReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnSaveReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/supplier/ErpSupplierPageReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/supplier/ErpSupplierPageReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/supplier/ErpSupplierRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/supplier/ErpSupplierRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/supplier/ErpSupplierSaveReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/supplier/ErpSupplierSaveReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpCustomerController.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpCustomerController.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOutController.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOutController.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleReturnController.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleReturnController.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/customer/ErpCustomerPageReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/customer/ErpCustomerPageReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/customer/ErpCustomerRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/customer/ErpCustomerRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/customer/ErpCustomerSaveReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/customer/ErpCustomerSaveReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderPageReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderPageReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderSaveReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderSaveReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/out/ErpSaleOutPageReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/out/ErpSaleOutPageReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/out/ErpSaleOutRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/out/ErpSaleOutRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/out/ErpSaleOutSaveReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/out/ErpSaleOutSaveReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/returns/ErpSaleReturnPageReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/returns/ErpSaleReturnPageReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/returns/ErpSaleReturnRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/returns/ErpSaleReturnRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/returns/ErpSaleReturnSaveReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/returns/ErpSaleReturnSaveReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/ErpPurchaseStatisticsController.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/ErpPurchaseStatisticsController.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/ErpSaleStatisticsController.http renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/ErpSaleStatisticsController.http
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/ErpSaleStatisticsController.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/ErpSaleStatisticsController.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchaseSummaryRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchaseSummaryRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchaseTimeSummaryRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchaseTimeSummaryRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/sale/ErpSaleSummaryRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/sale/ErpSaleSummaryRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/sale/ErpSaleTimeSummaryRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/sale/ErpSaleTimeSummaryRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockCheckController.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockCheckController.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockController.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockController.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockInController.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockInController.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockMoveController.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockMoveController.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockOutController.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockOutController.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockRecordController.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpStockRecordController.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpWarehouseController.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/ErpWarehouseController.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/check/ErpStockCheckPageReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/check/ErpStockCheckPageReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/check/ErpStockCheckRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/check/ErpStockCheckRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/check/ErpStockCheckSaveReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/check/ErpStockCheckSaveReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/in/ErpStockInPageReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/in/ErpStockInPageReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/in/ErpStockInRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/in/ErpStockInRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/in/ErpStockInSaveReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/in/ErpStockInSaveReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/move/ErpStockMovePageReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/move/ErpStockMovePageReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/move/ErpStockMoveRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/move/ErpStockMoveRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/move/ErpStockMoveSaveReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/move/ErpStockMoveSaveReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/out/ErpStockOutPageReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/out/ErpStockOutPageReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/out/ErpStockOutRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/out/ErpStockOutRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/out/ErpStockOutSaveReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/out/ErpStockOutSaveReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/record/ErpStockRecordPageReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/record/ErpStockRecordPageReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/record/ErpStockRecordRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/record/ErpStockRecordRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/stock/ErpStockPageReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/stock/ErpStockPageReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/stock/ErpStockRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/stock/ErpStockRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/warehouse/ErpWarehousePageReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/warehouse/ErpWarehousePageReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/warehouse/ErpWarehouseRespVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/warehouse/ErpWarehouseRespVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/warehouse/ErpWarehouseSaveReqVO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/stock/vo/warehouse/ErpWarehouseSaveReqVO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/package-info.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/package-info.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/finance/ErpAccountDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/finance/ErpAccountDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/finance/ErpFinancePaymentDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/finance/ErpFinancePaymentDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/finance/ErpFinancePaymentItemDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/finance/ErpFinancePaymentItemDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/finance/ErpFinanceReceiptDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/finance/ErpFinanceReceiptDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/finance/ErpFinanceReceiptItemDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/finance/ErpFinanceReceiptItemDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/product/ErpProductCategoryDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/product/ErpProductCategoryDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/product/ErpProductDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/product/ErpProductDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/product/ErpProductUnitDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/product/ErpProductUnitDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInItemDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInItemDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseOrderDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseOrderDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseOrderItemDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseOrderItemDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseReturnDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseReturnDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseReturnItemDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseReturnItemDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpSupplierDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpSupplierDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpCustomerDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpCustomerDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderItemDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderItemDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOutDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOutDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOutItemDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOutItemDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleReturnDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleReturnDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleReturnItemDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleReturnItemDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockCheckDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockCheckDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockCheckItemDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockCheckItemDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockInDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockInDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockInItemDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockInItemDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockMoveDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockMoveDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockMoveItemDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockMoveItemDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockOutDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockOutDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockOutItemDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockOutItemDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockRecordDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpStockRecordDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpWarehouseDO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/stock/ErpWarehouseDO.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpAccountMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpAccountMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentItemMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentItemMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinancePaymentMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinanceReceiptItemMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinanceReceiptItemMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinanceReceiptMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/finance/ErpFinanceReceiptMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/product/ErpProductCategoryMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/product/ErpProductCategoryMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/product/ErpProductMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/product/ErpProductMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/product/ErpProductUnitMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/product/ErpProductUnitMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInItemMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInItemMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderItemMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderItemMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseOrderMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseReturnItemMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseReturnItemMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseReturnMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseReturnMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpSupplierMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpSupplierMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpCustomerMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpCustomerMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderItemMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderItemMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOutItemMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOutItemMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOutMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleOutMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleReturnItemMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleReturnItemMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleReturnMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/sale/ErpSaleReturnMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/statistics/ErpPurchaseStatisticsMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/statistics/ErpPurchaseStatisticsMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/statistics/ErpSaleStatisticsMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/statistics/ErpSaleStatisticsMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockCheckItemMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockCheckItemMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockCheckMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockCheckMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockInItemMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockInItemMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockInMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockInMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockMoveItemMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockMoveItemMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockMoveMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockMoveMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockOutItemMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockOutItemMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockOutMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockOutMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockRecordMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpStockRecordMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpWarehouseMapper.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/stock/ErpWarehouseMapper.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/redis/RedisKeyConstants.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/redis/RedisKeyConstants.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/redis/no/ErpNoRedisDAO.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/redis/no/ErpNoRedisDAO.java
yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/enums/DictTypeConstants.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/DictTypeConstants.java
yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpAuditStatus.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpAuditStatus.java
yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/enums/LogRecordConstants.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/LogRecordConstants.java
yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/enums/common/ErpBizTypeEnum.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/common/ErpBizTypeEnum.java
yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/enums/stock/ErpStockRecordBizTypeEnum.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/stock/ErpStockRecordBizTypeEnum.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/framework/package-info.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/framework/package-info.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/framework/web/config/ErpWebConfiguration.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/framework/web/config/ErpWebConfiguration.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/framework/web/package-info.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/framework/web/package-info.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/package-info.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/package-info.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpAccountService.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpAccountService.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpAccountServiceImpl.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpAccountServiceImpl.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentService.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentService.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinancePaymentServiceImpl.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinanceReceiptService.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinanceReceiptService.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinanceReceiptServiceImpl.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinanceReceiptServiceImpl.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductCategoryService.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductCategoryService.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductCategoryServiceImpl.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductCategoryServiceImpl.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductService.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductService.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductServiceImpl.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductServiceImpl.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductUnitService.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductUnitService.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductUnitServiceImpl.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/product/ErpProductUnitServiceImpl.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInService.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInService.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderService.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderService.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnService.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnService.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierService.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierService.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierServiceImpl.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpSupplierServiceImpl.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpCustomerService.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpCustomerService.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpCustomerServiceImpl.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpCustomerServiceImpl.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderService.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderService.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOutService.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOutService.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOutServiceImpl.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOutServiceImpl.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleReturnService.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleReturnService.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleReturnServiceImpl.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleReturnServiceImpl.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/statistics/ErpPurchaseStatisticsService.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/statistics/ErpPurchaseStatisticsService.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/statistics/ErpPurchaseStatisticsServiceImpl.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/statistics/ErpPurchaseStatisticsServiceImpl.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/statistics/ErpSaleStatisticsService.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/statistics/ErpSaleStatisticsService.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/statistics/ErpSaleStatisticsServiceImpl.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/statistics/ErpSaleStatisticsServiceImpl.java
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckService.java 0 → 100644
  1 +package cn.iocoder.yudao.module.erp.service.stock;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check.ErpStockCheckPageReqVO;
  5 +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check.ErpStockCheckSaveReqVO;
  6 +import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockCheckDO;
  7 +import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockCheckItemDO;
  8 +import jakarta.validation.Valid;
  9 +
  10 +import java.util.Collection;
  11 +import java.util.List;
  12 +
  13 +/**
  14 + * ERP 库存盘点单 Service 接口
  15 + *
  16 + * @author 芋道源码
  17 + */
  18 +public interface ErpStockCheckService {
  19 +
  20 + /**
  21 + * 创建库存盘点单
  22 + *
  23 + * @param createReqVO 创建信息
  24 + * @return 编号
  25 + */
  26 + Long createStockCheck(@Valid ErpStockCheckSaveReqVO createReqVO);
  27 +
  28 + /**
  29 + * 更新库存盘点单
  30 + *
  31 + * @param updateReqVO 更新信息
  32 + */
  33 + void updateStockCheck(@Valid ErpStockCheckSaveReqVO updateReqVO);
  34 +
  35 + /**
  36 + * 更新库存盘点单的状态
  37 + *
  38 + * @param id 编号
  39 + * @param status 状态
  40 + */
  41 + void updateStockCheckStatus(Long id, Integer status);
  42 +
  43 + /**
  44 + * 删除库存盘点单
  45 + *
  46 + * @param ids 编号数组
  47 + */
  48 + void deleteStockCheck(List<Long> ids);
  49 +
  50 + /**
  51 + * 获得库存盘点单
  52 + *
  53 + * @param id 编号
  54 + * @return 库存盘点单
  55 + */
  56 + ErpStockCheckDO getStockCheck(Long id);
  57 +
  58 + /**
  59 + * 获得库存盘点单分页
  60 + *
  61 + * @param pageReqVO 分页查询
  62 + * @return 库存盘点单分页
  63 + */
  64 + PageResult<ErpStockCheckDO> getStockCheckPage(ErpStockCheckPageReqVO pageReqVO);
  65 +
  66 + // ==================== 盘点项 ====================
  67 +
  68 + /**
  69 + * 获得库存盘点单项列表
  70 + *
  71 + * @param checkId 盘点编号
  72 + * @return 库存盘点单项列表
  73 + */
  74 + List<ErpStockCheckItemDO> getStockCheckItemListByCheckId(Long checkId);
  75 +
  76 + /**
  77 + * 获得库存盘点单项 List
  78 + *
  79 + * @param checkIds 盘点编号数组
  80 + * @return 库存盘点单项 List
  81 + */
  82 + List<ErpStockCheckItemDO> getStockCheckItemListByCheckIds(Collection<Long> checkIds);
  83 +
  84 +}
0 \ No newline at end of file 85 \ No newline at end of file
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckServiceImpl.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckServiceImpl.java
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInService.java 0 → 100644
  1 +package cn.iocoder.yudao.module.erp.service.stock;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in.ErpStockInPageReqVO;
  5 +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in.ErpStockInSaveReqVO;
  6 +import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockInDO;
  7 +import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockInItemDO;
  8 +import jakarta.validation.Valid;
  9 +
  10 +import java.util.Collection;
  11 +import java.util.List;
  12 +
  13 +/**
  14 + * ERP 其它入库单 Service 接口
  15 + *
  16 + * @author 芋道源码
  17 + */
  18 +public interface ErpStockInService {
  19 +
  20 + /**
  21 + * 创建其它入库单
  22 + *
  23 + * @param createReqVO 创建信息
  24 + * @return 编号
  25 + */
  26 + Long createStockIn(@Valid ErpStockInSaveReqVO createReqVO);
  27 +
  28 + /**
  29 + * 更新其它入库单
  30 + *
  31 + * @param updateReqVO 更新信息
  32 + */
  33 + void updateStockIn(@Valid ErpStockInSaveReqVO updateReqVO);
  34 +
  35 + /**
  36 + * 更新其它入库单的状态
  37 + *
  38 + * @param id 编号
  39 + * @param status 状态
  40 + */
  41 + void updateStockInStatus(Long id, Integer status);
  42 +
  43 + /**
  44 + * 删除其它入库单
  45 + *
  46 + * @param ids 编号数组
  47 + */
  48 + void deleteStockIn(List<Long> ids);
  49 +
  50 + /**
  51 + * 获得其它入库单
  52 + *
  53 + * @param id 编号
  54 + * @return 其它入库单
  55 + */
  56 + ErpStockInDO getStockIn(Long id);
  57 +
  58 + /**
  59 + * 获得其它入库单分页
  60 + *
  61 + * @param pageReqVO 分页查询
  62 + * @return 其它入库单分页
  63 + */
  64 + PageResult<ErpStockInDO> getStockInPage(ErpStockInPageReqVO pageReqVO);
  65 +
  66 + // ==================== 入库项 ====================
  67 +
  68 + /**
  69 + * 获得其它入库单项列表
  70 + *
  71 + * @param inId 入库编号
  72 + * @return 其它入库单项列表
  73 + */
  74 + List<ErpStockInItemDO> getStockInItemListByInId(Long inId);
  75 +
  76 + /**
  77 + * 获得其它入库单项 List
  78 + *
  79 + * @param inIds 入库编号数组
  80 + * @return 其它入库单项 List
  81 + */
  82 + List<ErpStockInItemDO> getStockInItemListByInIds(Collection<Long> inIds);
  83 +
  84 +}
0 \ No newline at end of file 85 \ No newline at end of file
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInServiceImpl.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInServiceImpl.java
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockMoveService.java 0 → 100644
  1 +package cn.iocoder.yudao.module.erp.service.stock;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.move.ErpStockMovePageReqVO;
  5 +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.move.ErpStockMoveSaveReqVO;
  6 +import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockMoveDO;
  7 +import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockMoveItemDO;
  8 +import jakarta.validation.Valid;
  9 +
  10 +import java.util.Collection;
  11 +import java.util.List;
  12 +
  13 +/**
  14 + * ERP 库存调拨单 Service 接口
  15 + *
  16 + * @author 芋道源码
  17 + */
  18 +public interface ErpStockMoveService {
  19 +
  20 + /**
  21 + * 创建库存调拨单
  22 + *
  23 + * @param createReqVO 创建信息
  24 + * @return 编号
  25 + */
  26 + Long createStockMove(@Valid ErpStockMoveSaveReqVO createReqVO);
  27 +
  28 + /**
  29 + * 更新库存调拨单
  30 + *
  31 + * @param updateReqVO 更新信息
  32 + */
  33 + void updateStockMove(@Valid ErpStockMoveSaveReqVO updateReqVO);
  34 +
  35 + /**
  36 + * 更新库存调拨单的状态
  37 + *
  38 + * @param id 编号
  39 + * @param status 状态
  40 + */
  41 + void updateStockMoveStatus(Long id, Integer status);
  42 +
  43 + /**
  44 + * 删除库存调拨单
  45 + *
  46 + * @param ids 编号数组
  47 + */
  48 + void deleteStockMove(List<Long> ids);
  49 +
  50 + /**
  51 + * 获得库存调拨单
  52 + *
  53 + * @param id 编号
  54 + * @return 库存调拨单
  55 + */
  56 + ErpStockMoveDO getStockMove(Long id);
  57 +
  58 + /**
  59 + * 获得库存调拨单分页
  60 + *
  61 + * @param pageReqVO 分页查询
  62 + * @return 库存调拨单分页
  63 + */
  64 + PageResult<ErpStockMoveDO> getStockMovePage(ErpStockMovePageReqVO pageReqVO);
  65 +
  66 + // ==================== 调拨项 ====================
  67 +
  68 + /**
  69 + * 获得库存调拨单项列表
  70 + *
  71 + * @param moveId 调拨编号
  72 + * @return 库存调拨单项列表
  73 + */
  74 + List<ErpStockMoveItemDO> getStockMoveItemListByMoveId(Long moveId);
  75 +
  76 + /**
  77 + * 获得库存调拨单项 List
  78 + *
  79 + * @param moveIds 调拨编号数组
  80 + * @return 库存调拨单项 List
  81 + */
  82 + List<ErpStockMoveItemDO> getStockMoveItemListByMoveIds(Collection<Long> moveIds);
  83 +
  84 +}
0 \ No newline at end of file 85 \ No newline at end of file
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockMoveServiceImpl.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockMoveServiceImpl.java
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutService.java 0 → 100644
  1 +package cn.iocoder.yudao.module.erp.service.stock;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.out.ErpStockOutPageReqVO;
  5 +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.out.ErpStockOutSaveReqVO;
  6 +import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockOutDO;
  7 +import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockOutItemDO;
  8 +import jakarta.validation.Valid;
  9 +
  10 +import java.util.Collection;
  11 +import java.util.List;
  12 +
  13 +/**
  14 + * ERP 其它出库单 Service 接口
  15 + *
  16 + * @author 芋道源码
  17 + */
  18 +public interface ErpStockOutService {
  19 +
  20 + /**
  21 + * 创建其它出库单
  22 + *
  23 + * @param createReqVO 创建信息
  24 + * @return 编号
  25 + */
  26 + Long createStockOut(@Valid ErpStockOutSaveReqVO createReqVO);
  27 +
  28 + /**
  29 + * 更新其它出库单
  30 + *
  31 + * @param updateReqVO 更新信息
  32 + */
  33 + void updateStockOut(@Valid ErpStockOutSaveReqVO updateReqVO);
  34 +
  35 + /**
  36 + * 更新其它出库单的状态
  37 + *
  38 + * @param id 编号
  39 + * @param status 状态
  40 + */
  41 + void updateStockOutStatus(Long id, Integer status);
  42 +
  43 + /**
  44 + * 删除其它出库单
  45 + *
  46 + * @param ids 编号数组
  47 + */
  48 + void deleteStockOut(List<Long> ids);
  49 +
  50 + /**
  51 + * 获得其它出库单
  52 + *
  53 + * @param id 编号
  54 + * @return 其它出库单
  55 + */
  56 + ErpStockOutDO getStockOut(Long id);
  57 +
  58 + /**
  59 + * 获得其它出库单分页
  60 + *
  61 + * @param pageReqVO 分页查询
  62 + * @return 其它出库单分页
  63 + */
  64 + PageResult<ErpStockOutDO> getStockOutPage(ErpStockOutPageReqVO pageReqVO);
  65 +
  66 + // ==================== 出库项 ====================
  67 +
  68 + /**
  69 + * 获得其它出库单项列表
  70 + *
  71 + * @param outId 出库编号
  72 + * @return 其它出库单项列表
  73 + */
  74 + List<ErpStockOutItemDO> getStockOutItemListByOutId(Long outId);
  75 +
  76 + /**
  77 + * 获得其它出库单项 List
  78 + *
  79 + * @param outIds 出库编号数组
  80 + * @return 其它出库单项 List
  81 + */
  82 + List<ErpStockOutItemDO> getStockOutItemListByOutIds(Collection<Long> outIds);
  83 +
  84 +}
0 \ No newline at end of file 85 \ No newline at end of file
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutServiceImpl.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutServiceImpl.java
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockRecordService.java renamed to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockRecordService.java
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockRecordServiceImpl.java 0 → 100644
  1 +package cn.iocoder.yudao.module.erp.service.stock;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
  5 +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.record.ErpStockRecordPageReqVO;
  6 +import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockRecordDO;
  7 +import cn.iocoder.yudao.module.erp.dal.mysql.stock.ErpStockRecordMapper;
  8 +import cn.iocoder.yudao.module.erp.service.stock.bo.ErpStockRecordCreateReqBO;
  9 +import jakarta.annotation.Resource;
  10 +import org.springframework.stereotype.Service;
  11 +import org.springframework.transaction.annotation.Transactional;
  12 +import org.springframework.validation.annotation.Validated;
  13 +
  14 +import java.math.BigDecimal;
  15 +
  16 +/**
  17 + * ERP 产品库存明细 Service 实现类
  18 + *
  19 + * @author 芋道源码
  20 + */
  21 +@Service
  22 +@Validated
  23 +public class ErpStockRecordServiceImpl implements ErpStockRecordService {
  24 +
  25 + @Resource
  26 + private ErpStockRecordMapper stockRecordMapper;
  27 +
  28 + @Resource
  29 + private ErpStockService stockService;
  30 +
  31 + @Override
  32 + public ErpStockRecordDO getStockRecord(Long id) {
  33 + return stockRecordMapper.selectById(id);
  34 + }
  35 +
  36 + @Override
  37 + public PageResult<ErpStockRecordDO> getStockRecordPage(ErpStockRecordPageReqVO pageReqVO) {
  38 + return stockRecordMapper.selectPage(pageReqVO);
  39 + }
  40 +
  41 + @Override
  42 + @Transactional(rollbackFor = Exception.class)
  43 + public void createStockRecord(ErpStockRecordCreateReqBO createReqBO) {
  44 + // 1. 更新库存
  45 + BigDecimal totalCount = stockService.updateStockCountIncrement(
  46 + createReqBO.getProductId(), createReqBO.getWarehouseId(), createReqBO.getCount());
  47 + // 2. 创建库存明细
  48 + ErpStockRecordDO stockRecord = BeanUtils.toBean(createReqBO, ErpStockRecordDO.class)
  49 + .setTotalCount(totalCount);
  50 + stockRecordMapper.insert(stockRecord);
  51 + }
  52 +
  53 +}
0 \ No newline at end of file 54 \ No newline at end of file
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockService.java 0 → 100644
  1 +package cn.iocoder.yudao.module.erp.service.stock;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.stock.ErpStockPageReqVO;
  5 +import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockDO;
  6 +
  7 +import java.math.BigDecimal;
  8 +
  9 +/**
  10 + * ERP 产品库存 Service 接口
  11 + *
  12 + * @author 芋道源码
  13 + */
  14 +public interface ErpStockService {
  15 +
  16 + /**
  17 + * 获得产品库存
  18 + *
  19 + * @param id 编号
  20 + * @return 库存
  21 + */
  22 + ErpStockDO getStock(Long id);
  23 +
  24 + /**
  25 + * 基于产品 + 仓库,获得产品库存
  26 + *
  27 + * @param productId 产品编号
  28 + * @param warehouseId 仓库编号
  29 + * @return 产品库存
  30 + */
  31 + ErpStockDO getStock(Long productId, Long warehouseId);
  32 +
  33 + /**
  34 + * 获得产品库存数量
  35 + *
  36 + * 如果不存在库存记录,则返回 0
  37 + *
  38 + * @param productId 产品编号
  39 + * @return 产品库存数量
  40 + */
  41 + BigDecimal getStockCount(Long productId);
  42 +
  43 + /**
  44 + * 获得产品库存分页
  45 + *
  46 + * @param pageReqVO 分页查询
  47 + * @return 库存分页
  48 + */
  49 + PageResult<ErpStockDO> getStockPage(ErpStockPageReqVO pageReqVO);
  50 +
  51 + /**
  52 + * 增量更新产品库存数量
  53 + *
  54 + * @param productId 产品编号
  55 + * @param warehouseId 仓库编号
  56 + * @param count 增量数量:正数,表示增加;负数,表示减少
  57 + * @return 更新后的库存
  58 + */
  59 + BigDecimal updateStockCountIncrement(Long productId, Long warehouseId, BigDecimal count);
  60 +
  61 +}
0 \ No newline at end of file 62 \ No newline at end of file
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockServiceImpl.java 0 → 100644
  1 +package cn.iocoder.yudao.module.erp.service.stock;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.stock.ErpStockPageReqVO;
  5 +import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockDO;
  6 +import cn.iocoder.yudao.module.erp.dal.mysql.stock.ErpStockMapper;
  7 +import cn.iocoder.yudao.module.erp.service.product.ErpProductService;
  8 +import jakarta.annotation.Resource;
  9 +import org.springframework.stereotype.Service;
  10 +import org.springframework.validation.annotation.Validated;
  11 +
  12 +import java.math.BigDecimal;
  13 +
  14 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  15 +import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_COUNT_NEGATIVE;
  16 +import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_COUNT_NEGATIVE2;
  17 +
  18 +/**
  19 + * ERP 产品库存 Service 实现类
  20 + *
  21 + * @author 芋道源码
  22 + */
  23 +@Service
  24 +@Validated
  25 +public class ErpStockServiceImpl implements ErpStockService {
  26 +
  27 + /**
  28 + * 允许库存为负数
  29 + *
  30 + * TODO 芋艿:后续做成 db 配置
  31 + */
  32 + private static final Boolean NEGATIVE_STOCK_COUNT_ENABLE = false;
  33 +
  34 + @Resource
  35 + private ErpProductService productService;
  36 + @Resource
  37 + private ErpWarehouseService warehouseService;
  38 +
  39 + @Resource
  40 + private ErpStockMapper stockMapper;
  41 +
  42 + @Override
  43 + public ErpStockDO getStock(Long id) {
  44 + return stockMapper.selectById(id);
  45 + }
  46 +
  47 + @Override
  48 + public ErpStockDO getStock(Long productId, Long warehouseId) {
  49 + return stockMapper.selectByProductIdAndWarehouseId(productId, warehouseId);
  50 + }
  51 +
  52 + @Override
  53 + public BigDecimal getStockCount(Long productId) {
  54 + BigDecimal count = stockMapper.selectSumByProductId(productId);
  55 + return count != null ? count : BigDecimal.ZERO;
  56 + }
  57 +
  58 + @Override
  59 + public PageResult<ErpStockDO> getStockPage(ErpStockPageReqVO pageReqVO) {
  60 + return stockMapper.selectPage(pageReqVO);
  61 + }
  62 +
  63 + @Override
  64 + public BigDecimal updateStockCountIncrement(Long productId, Long warehouseId, BigDecimal count) {
  65 + // 1.1 查询当前库存
  66 + ErpStockDO stock = stockMapper.selectByProductIdAndWarehouseId(productId, warehouseId);
  67 + if (stock == null) {
  68 + stock = new ErpStockDO().setProductId(productId).setWarehouseId(warehouseId).setCount(BigDecimal.ZERO);
  69 + stockMapper.insert(stock);
  70 + }
  71 + // 1.2 校验库存是否充足
  72 + if (!NEGATIVE_STOCK_COUNT_ENABLE && stock.getCount().add(count).compareTo(BigDecimal.ZERO) < 0) {
  73 + throw exception(STOCK_COUNT_NEGATIVE, productService.getProduct(productId).getName(),
  74 + warehouseService.getWarehouse(warehouseId).getName(), stock.getCount(), count);
  75 + }
  76 +
  77 + // 2. 库存变更
  78 + int updateCount = stockMapper.updateCountIncrement(stock.getId(), count, NEGATIVE_STOCK_COUNT_ENABLE);
  79 + if (updateCount == 0) {
  80 + // 此时不好去查询最新库存,所以直接抛出该提示,不提供具体库存数字
  81 + throw exception(STOCK_COUNT_NEGATIVE2, productService.getProduct(productId).getName(),
  82 + warehouseService.getWarehouse(warehouseId).getName());
  83 + }
  84 +
  85 + // 3. 返回最新库存
  86 + return stock.getCount().add(count);
  87 + }
  88 +
  89 +}
0 \ No newline at end of file 90 \ No newline at end of file
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpWarehouseService.java 0 → 100644
  1 +package cn.iocoder.yudao.module.erp.service.stock;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.warehouse.ErpWarehouseSaveReqVO;
  5 +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.warehouse.ErpWarehousePageReqVO;
  6 +import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpWarehouseDO;
  7 +import jakarta.validation.Valid;
  8 +
  9 +import java.util.Collection;
  10 +import java.util.List;
  11 +import java.util.Map;
  12 +
  13 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
  14 +
  15 +/**
  16 + * ERP 仓库 Service 接口
  17 + *
  18 + * @author 芋道源码
  19 + */
  20 +public interface ErpWarehouseService {
  21 +
  22 + /**
  23 + * 创建仓库
  24 + *
  25 + * @param createReqVO 创建信息
  26 + * @return 编号
  27 + */
  28 + Long createWarehouse(@Valid ErpWarehouseSaveReqVO createReqVO);
  29 +
  30 + /**
  31 + * 更新ERP 仓库
  32 + *
  33 + * @param updateReqVO 更新信息
  34 + */
  35 + void updateWarehouse(@Valid ErpWarehouseSaveReqVO updateReqVO);
  36 +
  37 + /**
  38 + * 更新仓库默认状态
  39 + *
  40 + * @param id 编号
  41 + * @param defaultStatus 默认状态
  42 + */
  43 + void updateWarehouseDefaultStatus(Long id, Boolean defaultStatus);
  44 +
  45 + /**
  46 + * 删除仓库
  47 + *
  48 + * @param id 编号
  49 + */
  50 + void deleteWarehouse(Long id);
  51 +
  52 + /**
  53 + * 获得仓库
  54 + *
  55 + * @param id 编号
  56 + * @return 仓库
  57 + */
  58 + ErpWarehouseDO getWarehouse(Long id);
  59 +
  60 + /**
  61 + * 校验仓库列表的有效性
  62 + *
  63 + * @param ids 编号数组
  64 + * @return 仓库列表
  65 + */
  66 + List<ErpWarehouseDO> validWarehouseList(Collection<Long> ids);
  67 +
  68 + /**
  69 + * 获得指定状态的仓库列表
  70 + *
  71 + * @param status 状态
  72 + * @return 仓库列表
  73 + */
  74 + List<ErpWarehouseDO> getWarehouseListByStatus(Integer status);
  75 +
  76 + /**
  77 + * 获得仓库列表
  78 + *
  79 + * @param ids 编号数组
  80 + * @return 仓库列表
  81 + */
  82 + List<ErpWarehouseDO> getWarehouseList(Collection<Long> ids);
  83 +
  84 + /**
  85 + * 获得仓库 Map
  86 + *
  87 + * @param ids 编号数组
  88 + * @return 仓库 Map
  89 + */
  90 + default Map<Long, ErpWarehouseDO> getWarehouseMap(Collection<Long> ids) {
  91 + return convertMap(getWarehouseList(ids), ErpWarehouseDO::getId);
  92 + }
  93 +
  94 + /**
  95 + * 获得仓库分页
  96 + *
  97 + * @param pageReqVO 分页查询
  98 + * @return 仓库分页
  99 + */
  100 + PageResult<ErpWarehouseDO> getWarehousePage(ErpWarehousePageReqVO pageReqVO);
  101 +
  102 +}
0 \ No newline at end of file 103 \ No newline at end of file
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpWarehouseServiceImpl.java 0 → 100644
  1 +package cn.iocoder.yudao.module.erp.service.stock;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  5 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
  7 +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.warehouse.ErpWarehouseSaveReqVO;
  8 +import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.warehouse.ErpWarehousePageReqVO;
  9 +import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpWarehouseDO;
  10 +import cn.iocoder.yudao.module.erp.dal.mysql.stock.ErpWarehouseMapper;
  11 +import jakarta.annotation.Resource;
  12 +import org.springframework.stereotype.Service;
  13 +import org.springframework.transaction.annotation.Transactional;
  14 +import org.springframework.validation.annotation.Validated;
  15 +
  16 +import java.util.Collection;
  17 +import java.util.Collections;
  18 +import java.util.List;
  19 +import java.util.Map;
  20 +
  21 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  22 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
  23 +import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
  24 +
  25 +/**
  26 + * ERP 仓库 Service 实现类
  27 + *
  28 + * @author 芋道源码
  29 + */
  30 +@Service
  31 +@Validated
  32 +public class ErpWarehouseServiceImpl implements ErpWarehouseService {
  33 +
  34 + @Resource
  35 + private ErpWarehouseMapper warehouseMapper;
  36 +
  37 + @Override
  38 + public Long createWarehouse(ErpWarehouseSaveReqVO createReqVO) {
  39 + // 插入
  40 + ErpWarehouseDO warehouse = BeanUtils.toBean(createReqVO, ErpWarehouseDO.class);
  41 + warehouseMapper.insert(warehouse);
  42 + // 返回
  43 + return warehouse.getId();
  44 + }
  45 +
  46 + @Override
  47 + public void updateWarehouse(ErpWarehouseSaveReqVO updateReqVO) {
  48 + // 校验存在
  49 + validateWarehouseExists(updateReqVO.getId());
  50 + // 更新
  51 + ErpWarehouseDO updateObj = BeanUtils.toBean(updateReqVO, ErpWarehouseDO.class);
  52 + warehouseMapper.updateById(updateObj);
  53 + }
  54 +
  55 + @Override
  56 + @Transactional(rollbackFor = Exception.class)
  57 + public void updateWarehouseDefaultStatus(Long id, Boolean defaultStatus) {
  58 + // 1. 校验存在
  59 + validateWarehouseExists(id);
  60 +
  61 + // 2.1 如果开启,则需要关闭所有其它的默认
  62 + if (defaultStatus) {
  63 + ErpWarehouseDO warehouse = warehouseMapper.selectByDefaultStatus();
  64 + if (warehouse != null) {
  65 + warehouseMapper.updateById(new ErpWarehouseDO().setId(warehouse.getId()).setDefaultStatus(false));
  66 + }
  67 + }
  68 + // 2.2 更新对应的默认状态
  69 + warehouseMapper.updateById(new ErpWarehouseDO().setId(id).setDefaultStatus(defaultStatus));
  70 + }
  71 +
  72 + @Override
  73 + public void deleteWarehouse(Long id) {
  74 + // 校验存在
  75 + validateWarehouseExists(id);
  76 + // 删除
  77 + warehouseMapper.deleteById(id);
  78 + }
  79 +
  80 + private void validateWarehouseExists(Long id) {
  81 + if (warehouseMapper.selectById(id) == null) {
  82 + throw exception(WAREHOUSE_NOT_EXISTS);
  83 + }
  84 + }
  85 +
  86 + @Override
  87 + public ErpWarehouseDO getWarehouse(Long id) {
  88 + return warehouseMapper.selectById(id);
  89 + }
  90 +
  91 + @Override
  92 + public List<ErpWarehouseDO> validWarehouseList(Collection<Long> ids) {
  93 + if (CollUtil.isEmpty(ids)) {
  94 + return Collections.emptyList();
  95 + }
  96 + List<ErpWarehouseDO> list = warehouseMapper.selectBatchIds(ids);
  97 + Map<Long, ErpWarehouseDO> warehouseMap = convertMap(list, ErpWarehouseDO::getId);
  98 + for (Long id : ids) {
  99 + ErpWarehouseDO warehouse = warehouseMap.get(id);
  100 + if (warehouseMap.get(id) == null) {
  101 + throw exception(WAREHOUSE_NOT_EXISTS);
  102 + }
  103 + if (CommonStatusEnum.isDisable(warehouse.getStatus())) {
  104 + throw exception(WAREHOUSE_NOT_ENABLE, warehouse.getName());
  105 + }
  106 + }
  107 + return list;
  108 + }
  109 +
  110 + @Override
  111 + public List<ErpWarehouseDO> getWarehouseListByStatus(Integer status) {
  112 + return warehouseMapper.selectListByStatus(status);
  113 + }
  114 +
  115 + @Override
  116 + public List<ErpWarehouseDO> getWarehouseList(Collection<Long> ids) {
  117 + return warehouseMapper.selectBatchIds(ids);
  118 + }
  119 +
  120 + @Override
  121 + public PageResult<ErpWarehouseDO> getWarehousePage(ErpWarehousePageReqVO pageReqVO) {
  122 + return warehouseMapper.selectPage(pageReqVO);
  123 + }
  124 +
  125 +}
0 \ No newline at end of file 126 \ No newline at end of file
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/stock/bo/ErpStockRecordCreateReqBO.java 0 → 100644
  1 +package cn.iocoder.yudao.module.erp.service.stock.bo;
  2 +
  3 +import jakarta.validation.constraints.NotNull;
  4 +import lombok.AllArgsConstructor;
  5 +import lombok.Data;
  6 +import lombok.NoArgsConstructor;
  7 +
  8 +import java.math.BigDecimal;
  9 +
  10 +/**
  11 + * 库存明细的创建 Request BO
  12 + *
  13 + * @author 芋道源码
  14 + */
  15 +@Data
  16 +@NoArgsConstructor
  17 +@AllArgsConstructor
  18 +public class ErpStockRecordCreateReqBO {
  19 +
  20 + /**
  21 + * 产品编号
  22 + */
  23 + @NotNull(message = "产品编号不能为空")
  24 + private Long productId;
  25 + /**
  26 + * 仓库编号
  27 + */
  28 + @NotNull(message = "仓库编号不能为空")
  29 + private Long warehouseId;
  30 + /**
  31 + * 出入库数量
  32 + *
  33 + * 正数,表示入库;负数,表示出库
  34 + */
  35 + @NotNull(message = "出入库数量不能为空")
  36 + private BigDecimal count;
  37 +
  38 + /**
  39 + * 业务类型
  40 + */
  41 + @NotNull(message = "业务类型不能为空")
  42 + private Integer bizType;
  43 + /**
  44 + * 业务编号
  45 + */
  46 + @NotNull(message = "业务编号不能为空")
  47 + private Long bizId;
  48 + /**
  49 + * 业务项编号
  50 + */
  51 + @NotNull(message = "业务项编号不能为空")
  52 + private Long bizItemId;
  53 + /**
  54 + * 业务单号
  55 + */
  56 + @NotNull(message = "业务单号不能为空")
  57 + private String bizNo;
  58 +
  59 +}
yudao-module-erp/src/main/resources/mapper/statistics/ErpPurchaseStatisticsMapper.xml 0 → 100644
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="cn.iocoder.yudao.module.erp.dal.mysql.statistics.ErpPurchaseStatisticsMapper">
  4 +
  5 + <select id="getPurchasePrice" resultType="java.math.BigDecimal">
  6 + SELECT
  7 + (SELECT IFNULL(SUM(total_price), 0)
  8 + FROM erp_purchase_in
  9 + WHERE in_time >= #{beginTime}
  10 + <if test="endTime != null">
  11 + AND in_time &lt; #{endTime}
  12 + </if>
  13 + AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getRequiredTenantId()}
  14 + AND deleted = 0) -
  15 + (SELECT IFNULL(SUM(total_price), 0)
  16 + FROM erp_purchase_return
  17 + WHERE return_time >= #{beginTime}
  18 + <if test="endTime != null">
  19 + AND return_time &lt; #{endTime}
  20 + </if>
  21 + AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getRequiredTenantId()}
  22 + AND deleted = 0)
  23 + </select>
  24 +
  25 +</mapper>
0 \ No newline at end of file 26 \ No newline at end of file
yudao-module-erp/src/main/resources/mapper/statistics/ErpSaleStatisticsMapper.xml 0 → 100644
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="cn.iocoder.yudao.module.erp.dal.mysql.statistics.ErpSaleStatisticsMapper">
  4 +
  5 + <select id="getSalePrice" resultType="java.math.BigDecimal">
  6 + SELECT
  7 + (SELECT IFNULL(SUM(total_price), 0)
  8 + FROM erp_sale_out
  9 + WHERE out_time >= #{beginTime}
  10 + <if test="endTime != null">
  11 + AND out_time &lt; #{endTime}
  12 + </if>
  13 + AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getRequiredTenantId()}
  14 + AND deleted = 0) -
  15 + (SELECT IFNULL(SUM(total_price), 0)
  16 + FROM erp_sale_return
  17 + WHERE return_time >= #{beginTime}
  18 + <if test="endTime != null">
  19 + AND return_time &lt; #{endTime}
  20 + </if>
  21 + AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getRequiredTenantId()}
  22 + AND deleted = 0)
  23 + </select>
  24 +
  25 +</mapper>
0 \ No newline at end of file 26 \ No newline at end of file
yudao-module-erp/yudao-module-erp-api/pom.xml deleted
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<project xmlns="http://maven.apache.org/POM/4.0.0"  
3 - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
4 - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">  
5 - <parent>  
6 - <groupId>cn.iocoder.boot</groupId>  
7 - <artifactId>yudao-module-erp</artifactId>  
8 - <version>${revision}</version>  
9 - </parent>  
10 - <modelVersion>4.0.0</modelVersion>  
11 - <artifactId>yudao-module-erp-api</artifactId>  
12 - <packaging>jar</packaging>  
13 -  
14 - <name>${project.artifactId}</name>  
15 - <description>  
16 - erp 模块 API,暴露给其它模块调用  
17 - </description>  
18 -  
19 - <dependencies>  
20 - <dependency>  
21 - <groupId>cn.iocoder.boot</groupId>  
22 - <artifactId>yudao-common</artifactId>  
23 - </dependency>  
24 -  
25 - <!-- 参数校验 -->  
26 - <dependency>  
27 - <groupId>org.springframework.boot</groupId>  
28 - <artifactId>spring-boot-starter-validation</artifactId>  
29 - <optional>true</optional>  
30 - </dependency>  
31 - </dependencies>  
32 -  
33 -</project>  
34 \ No newline at end of file 0 \ No newline at end of file
yudao-module-erp/yudao-module-erp-api/src/main/java/cn/iocoder/yudao/module/erp/api/package-info.java deleted
1 -/**  
2 - * erp API 包,定义暴露给其它模块的 API  
3 - */  
4 -package cn.iocoder.yudao.module.erp.api;  
yudao-module-erp/yudao-module-erp-biz/pom.xml deleted
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<project xmlns="http://maven.apache.org/POM/4.0.0"  
3 - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
4 - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">  
5 - <parent>  
6 - <groupId>cn.iocoder.boot</groupId>  
7 - <artifactId>yudao-module-erp</artifactId>  
8 - <version>${revision}</version>  
9 - </parent>  
10 - <modelVersion>4.0.0</modelVersion>  
11 - <artifactId>yudao-module-erp-biz</artifactId>  
12 -  
13 - <name>${project.artifactId}</name>  
14 - <description>  
15 - erp 包下,企业资源管理(Enterprise Resource Planning)。  
16 - 例如说:采购、销售、库存、财务、产品等等  
17 - </description>  
18 -  
19 - <dependencies>  
20 - <dependency>  
21 - <groupId>cn.iocoder.boot</groupId>  
22 - <artifactId>yudao-module-system-api</artifactId>  
23 - <version>${revision}</version>  
24 - </dependency>  
25 - <dependency>  
26 - <groupId>cn.iocoder.boot</groupId>  
27 - <artifactId>yudao-module-erp-api</artifactId>  
28 - <version>${revision}</version>  
29 - </dependency>  
30 -  
31 - <!-- 业务组件 -->  
32 -  
33 - <!-- Web 相关 -->  
34 - <dependency>  
35 - <groupId>cn.iocoder.boot</groupId>  
36 - <artifactId>yudao-spring-boot-starter-web</artifactId>  
37 - </dependency>  
38 -  
39 - <dependency>  
40 - <groupId>cn.iocoder.boot</groupId>  
41 - <artifactId>yudao-spring-boot-starter-security</artifactId>  
42 - </dependency>  
43 -  
44 - <!-- DB 相关 -->  
45 - <dependency>  
46 - <groupId>cn.iocoder.boot</groupId>  
47 - <artifactId>yudao-spring-boot-starter-mybatis</artifactId>  
48 - </dependency>  
49 -  
50 - <dependency>  
51 - <groupId>cn.iocoder.boot</groupId>  
52 - <artifactId>yudao-spring-boot-starter-redis</artifactId>  
53 - </dependency>  
54 -  
55 - <!-- 工具类相关 -->  
56 - <dependency>  
57 - <groupId>cn.iocoder.boot</groupId>  
58 - <artifactId>yudao-spring-boot-starter-excel</artifactId>  
59 - </dependency>  
60 -  
61 - <!-- Test 测试相关 -->  
62 - <dependency>  
63 - <groupId>cn.iocoder.boot</groupId>  
64 - <artifactId>yudao-spring-boot-starter-test</artifactId>  
65 - </dependency>  
66 -  
67 - </dependencies>  
68 -  
69 -</project>  
70 \ No newline at end of file 0 \ No newline at end of file
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockCheckService.java deleted
1 -package cn.iocoder.yudao.module.erp.service.stock;  
2 -  
3 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
4 -import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check.ErpStockCheckPageReqVO;  
5 -import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check.ErpStockCheckSaveReqVO;  
6 -import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockCheckDO;  
7 -import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockCheckItemDO;  
8 -import jakarta.validation.Valid;  
9 -  
10 -import java.util.Collection;  
11 -import java.util.List;  
12 -  
13 -/**  
14 - * ERP 库存盘点单 Service 接口  
15 - *  
16 - * @author 芋道源码  
17 - */  
18 -public interface ErpStockCheckService {  
19 -  
20 - /**  
21 - * 创建库存盘点单  
22 - *  
23 - * @param createReqVO 创建信息  
24 - * @return 编号  
25 - */  
26 - Long createStockCheck(@Valid ErpStockCheckSaveReqVO createReqVO);  
27 -  
28 - /**  
29 - * 更新库存盘点单  
30 - *  
31 - * @param updateReqVO 更新信息  
32 - */  
33 - void updateStockCheck(@Valid ErpStockCheckSaveReqVO updateReqVO);  
34 -  
35 - /**  
36 - * 更新库存盘点单的状态  
37 - *  
38 - * @param id 编号  
39 - * @param status 状态  
40 - */  
41 - void updateStockCheckStatus(Long id, Integer status);  
42 -  
43 - /**  
44 - * 删除库存盘点单  
45 - *  
46 - * @param ids 编号数组  
47 - */  
48 - void deleteStockCheck(List<Long> ids);  
49 -  
50 - /**  
51 - * 获得库存盘点单  
52 - *  
53 - * @param id 编号  
54 - * @return 库存盘点单  
55 - */  
56 - ErpStockCheckDO getStockCheck(Long id);  
57 -  
58 - /**  
59 - * 获得库存盘点单分页  
60 - *  
61 - * @param pageReqVO 分页查询  
62 - * @return 库存盘点单分页  
63 - */  
64 - PageResult<ErpStockCheckDO> getStockCheckPage(ErpStockCheckPageReqVO pageReqVO);  
65 -  
66 - // ==================== 盘点项 ====================  
67 -  
68 - /**  
69 - * 获得库存盘点单项列表  
70 - *  
71 - * @param checkId 盘点编号  
72 - * @return 库存盘点单项列表  
73 - */  
74 - List<ErpStockCheckItemDO> getStockCheckItemListByCheckId(Long checkId);  
75 -  
76 - /**  
77 - * 获得库存盘点单项 List  
78 - *  
79 - * @param checkIds 盘点编号数组  
80 - * @return 库存盘点单项 List  
81 - */  
82 - List<ErpStockCheckItemDO> getStockCheckItemListByCheckIds(Collection<Long> checkIds);  
83 -  
84 -}  
85 \ No newline at end of file 0 \ No newline at end of file
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockInService.java deleted
1 -package cn.iocoder.yudao.module.erp.service.stock;  
2 -  
3 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
4 -import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in.ErpStockInPageReqVO;  
5 -import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.in.ErpStockInSaveReqVO;  
6 -import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockInDO;  
7 -import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockInItemDO;  
8 -import jakarta.validation.Valid;  
9 -  
10 -import java.util.Collection;  
11 -import java.util.List;  
12 -  
13 -/**  
14 - * ERP 其它入库单 Service 接口  
15 - *  
16 - * @author 芋道源码  
17 - */  
18 -public interface ErpStockInService {  
19 -  
20 - /**  
21 - * 创建其它入库单  
22 - *  
23 - * @param createReqVO 创建信息  
24 - * @return 编号  
25 - */  
26 - Long createStockIn(@Valid ErpStockInSaveReqVO createReqVO);  
27 -  
28 - /**  
29 - * 更新其它入库单  
30 - *  
31 - * @param updateReqVO 更新信息  
32 - */  
33 - void updateStockIn(@Valid ErpStockInSaveReqVO updateReqVO);  
34 -  
35 - /**  
36 - * 更新其它入库单的状态  
37 - *  
38 - * @param id 编号  
39 - * @param status 状态  
40 - */  
41 - void updateStockInStatus(Long id, Integer status);  
42 -  
43 - /**  
44 - * 删除其它入库单  
45 - *  
46 - * @param ids 编号数组  
47 - */  
48 - void deleteStockIn(List<Long> ids);  
49 -  
50 - /**  
51 - * 获得其它入库单  
52 - *  
53 - * @param id 编号  
54 - * @return 其它入库单  
55 - */  
56 - ErpStockInDO getStockIn(Long id);  
57 -  
58 - /**  
59 - * 获得其它入库单分页  
60 - *  
61 - * @param pageReqVO 分页查询  
62 - * @return 其它入库单分页  
63 - */  
64 - PageResult<ErpStockInDO> getStockInPage(ErpStockInPageReqVO pageReqVO);  
65 -  
66 - // ==================== 入库项 ====================  
67 -  
68 - /**  
69 - * 获得其它入库单项列表  
70 - *  
71 - * @param inId 入库编号  
72 - * @return 其它入库单项列表  
73 - */  
74 - List<ErpStockInItemDO> getStockInItemListByInId(Long inId);  
75 -  
76 - /**  
77 - * 获得其它入库单项 List  
78 - *  
79 - * @param inIds 入库编号数组  
80 - * @return 其它入库单项 List  
81 - */  
82 - List<ErpStockInItemDO> getStockInItemListByInIds(Collection<Long> inIds);  
83 -  
84 -}  
85 \ No newline at end of file 0 \ No newline at end of file
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockMoveService.java deleted
1 -package cn.iocoder.yudao.module.erp.service.stock;  
2 -  
3 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
4 -import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.move.ErpStockMovePageReqVO;  
5 -import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.move.ErpStockMoveSaveReqVO;  
6 -import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockMoveDO;  
7 -import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockMoveItemDO;  
8 -import jakarta.validation.Valid;  
9 -  
10 -import java.util.Collection;  
11 -import java.util.List;  
12 -  
13 -/**  
14 - * ERP 库存调拨单 Service 接口  
15 - *  
16 - * @author 芋道源码  
17 - */  
18 -public interface ErpStockMoveService {  
19 -  
20 - /**  
21 - * 创建库存调拨单  
22 - *  
23 - * @param createReqVO 创建信息  
24 - * @return 编号  
25 - */  
26 - Long createStockMove(@Valid ErpStockMoveSaveReqVO createReqVO);  
27 -  
28 - /**  
29 - * 更新库存调拨单  
30 - *  
31 - * @param updateReqVO 更新信息  
32 - */  
33 - void updateStockMove(@Valid ErpStockMoveSaveReqVO updateReqVO);  
34 -  
35 - /**  
36 - * 更新库存调拨单的状态  
37 - *  
38 - * @param id 编号  
39 - * @param status 状态  
40 - */  
41 - void updateStockMoveStatus(Long id, Integer status);  
42 -  
43 - /**  
44 - * 删除库存调拨单  
45 - *  
46 - * @param ids 编号数组  
47 - */  
48 - void deleteStockMove(List<Long> ids);  
49 -  
50 - /**  
51 - * 获得库存调拨单  
52 - *  
53 - * @param id 编号  
54 - * @return 库存调拨单  
55 - */  
56 - ErpStockMoveDO getStockMove(Long id);  
57 -  
58 - /**  
59 - * 获得库存调拨单分页  
60 - *  
61 - * @param pageReqVO 分页查询  
62 - * @return 库存调拨单分页  
63 - */  
64 - PageResult<ErpStockMoveDO> getStockMovePage(ErpStockMovePageReqVO pageReqVO);  
65 -  
66 - // ==================== 调拨项 ====================  
67 -  
68 - /**  
69 - * 获得库存调拨单项列表  
70 - *  
71 - * @param moveId 调拨编号  
72 - * @return 库存调拨单项列表  
73 - */  
74 - List<ErpStockMoveItemDO> getStockMoveItemListByMoveId(Long moveId);  
75 -  
76 - /**  
77 - * 获得库存调拨单项 List  
78 - *  
79 - * @param moveIds 调拨编号数组  
80 - * @return 库存调拨单项 List  
81 - */  
82 - List<ErpStockMoveItemDO> getStockMoveItemListByMoveIds(Collection<Long> moveIds);  
83 -  
84 -}  
85 \ No newline at end of file 0 \ No newline at end of file
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockOutService.java deleted
1 -package cn.iocoder.yudao.module.erp.service.stock;  
2 -  
3 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
4 -import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.out.ErpStockOutPageReqVO;  
5 -import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.out.ErpStockOutSaveReqVO;  
6 -import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockOutDO;  
7 -import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockOutItemDO;  
8 -import jakarta.validation.Valid;  
9 -  
10 -import java.util.Collection;  
11 -import java.util.List;  
12 -  
13 -/**  
14 - * ERP 其它出库单 Service 接口  
15 - *  
16 - * @author 芋道源码  
17 - */  
18 -public interface ErpStockOutService {  
19 -  
20 - /**  
21 - * 创建其它出库单  
22 - *  
23 - * @param createReqVO 创建信息  
24 - * @return 编号  
25 - */  
26 - Long createStockOut(@Valid ErpStockOutSaveReqVO createReqVO);  
27 -  
28 - /**  
29 - * 更新其它出库单  
30 - *  
31 - * @param updateReqVO 更新信息  
32 - */  
33 - void updateStockOut(@Valid ErpStockOutSaveReqVO updateReqVO);  
34 -  
35 - /**  
36 - * 更新其它出库单的状态  
37 - *  
38 - * @param id 编号  
39 - * @param status 状态  
40 - */  
41 - void updateStockOutStatus(Long id, Integer status);  
42 -  
43 - /**  
44 - * 删除其它出库单  
45 - *  
46 - * @param ids 编号数组  
47 - */  
48 - void deleteStockOut(List<Long> ids);  
49 -  
50 - /**  
51 - * 获得其它出库单  
52 - *  
53 - * @param id 编号  
54 - * @return 其它出库单  
55 - */  
56 - ErpStockOutDO getStockOut(Long id);  
57 -  
58 - /**  
59 - * 获得其它出库单分页  
60 - *  
61 - * @param pageReqVO 分页查询  
62 - * @return 其它出库单分页  
63 - */  
64 - PageResult<ErpStockOutDO> getStockOutPage(ErpStockOutPageReqVO pageReqVO);  
65 -  
66 - // ==================== 出库项 ====================  
67 -  
68 - /**  
69 - * 获得其它出库单项列表  
70 - *  
71 - * @param outId 出库编号  
72 - * @return 其它出库单项列表  
73 - */  
74 - List<ErpStockOutItemDO> getStockOutItemListByOutId(Long outId);  
75 -  
76 - /**  
77 - * 获得其它出库单项 List  
78 - *  
79 - * @param outIds 出库编号数组  
80 - * @return 其它出库单项 List  
81 - */  
82 - List<ErpStockOutItemDO> getStockOutItemListByOutIds(Collection<Long> outIds);  
83 -  
84 -}  
85 \ No newline at end of file 0 \ No newline at end of file
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockRecordServiceImpl.java deleted
1 -package cn.iocoder.yudao.module.erp.service.stock;  
2 -  
3 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
4 -import cn.iocoder.yudao.framework.common.util.object.BeanUtils;  
5 -import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.record.ErpStockRecordPageReqVO;  
6 -import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockRecordDO;  
7 -import cn.iocoder.yudao.module.erp.dal.mysql.stock.ErpStockRecordMapper;  
8 -import cn.iocoder.yudao.module.erp.service.stock.bo.ErpStockRecordCreateReqBO;  
9 -import jakarta.annotation.Resource;  
10 -import org.springframework.stereotype.Service;  
11 -import org.springframework.transaction.annotation.Transactional;  
12 -import org.springframework.validation.annotation.Validated;  
13 -  
14 -import java.math.BigDecimal;  
15 -  
16 -/**  
17 - * ERP 产品库存明细 Service 实现类  
18 - *  
19 - * @author 芋道源码  
20 - */  
21 -@Service  
22 -@Validated  
23 -public class ErpStockRecordServiceImpl implements ErpStockRecordService {  
24 -  
25 - @Resource  
26 - private ErpStockRecordMapper stockRecordMapper;  
27 -  
28 - @Resource  
29 - private ErpStockService stockService;  
30 -  
31 - @Override  
32 - public ErpStockRecordDO getStockRecord(Long id) {  
33 - return stockRecordMapper.selectById(id);  
34 - }  
35 -  
36 - @Override  
37 - public PageResult<ErpStockRecordDO> getStockRecordPage(ErpStockRecordPageReqVO pageReqVO) {  
38 - return stockRecordMapper.selectPage(pageReqVO);  
39 - }  
40 -  
41 - @Override  
42 - @Transactional(rollbackFor = Exception.class)  
43 - public void createStockRecord(ErpStockRecordCreateReqBO createReqBO) {  
44 - // 1. 更新库存  
45 - BigDecimal totalCount = stockService.updateStockCountIncrement(  
46 - createReqBO.getProductId(), createReqBO.getWarehouseId(), createReqBO.getCount());  
47 - // 2. 创建库存明细  
48 - ErpStockRecordDO stockRecord = BeanUtils.toBean(createReqBO, ErpStockRecordDO.class)  
49 - .setTotalCount(totalCount);  
50 - stockRecordMapper.insert(stockRecord);  
51 - }  
52 -  
53 -}  
54 \ No newline at end of file 0 \ No newline at end of file
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockService.java deleted
1 -package cn.iocoder.yudao.module.erp.service.stock;  
2 -  
3 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
4 -import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.stock.ErpStockPageReqVO;  
5 -import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockDO;  
6 -  
7 -import java.math.BigDecimal;  
8 -  
9 -/**  
10 - * ERP 产品库存 Service 接口  
11 - *  
12 - * @author 芋道源码  
13 - */  
14 -public interface ErpStockService {  
15 -  
16 - /**  
17 - * 获得产品库存  
18 - *  
19 - * @param id 编号  
20 - * @return 库存  
21 - */  
22 - ErpStockDO getStock(Long id);  
23 -  
24 - /**  
25 - * 基于产品 + 仓库,获得产品库存  
26 - *  
27 - * @param productId 产品编号  
28 - * @param warehouseId 仓库编号  
29 - * @return 产品库存  
30 - */  
31 - ErpStockDO getStock(Long productId, Long warehouseId);  
32 -  
33 - /**  
34 - * 获得产品库存数量  
35 - *  
36 - * 如果不存在库存记录,则返回 0  
37 - *  
38 - * @param productId 产品编号  
39 - * @return 产品库存数量  
40 - */  
41 - BigDecimal getStockCount(Long productId);  
42 -  
43 - /**  
44 - * 获得产品库存分页  
45 - *  
46 - * @param pageReqVO 分页查询  
47 - * @return 库存分页  
48 - */  
49 - PageResult<ErpStockDO> getStockPage(ErpStockPageReqVO pageReqVO);  
50 -  
51 - /**  
52 - * 增量更新产品库存数量  
53 - *  
54 - * @param productId 产品编号  
55 - * @param warehouseId 仓库编号  
56 - * @param count 增量数量:正数,表示增加;负数,表示减少  
57 - * @return 更新后的库存  
58 - */  
59 - BigDecimal updateStockCountIncrement(Long productId, Long warehouseId, BigDecimal count);  
60 -  
61 -}  
62 \ No newline at end of file 0 \ No newline at end of file
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpStockServiceImpl.java deleted
1 -package cn.iocoder.yudao.module.erp.service.stock;  
2 -  
3 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
4 -import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.stock.ErpStockPageReqVO;  
5 -import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockDO;  
6 -import cn.iocoder.yudao.module.erp.dal.mysql.stock.ErpStockMapper;  
7 -import cn.iocoder.yudao.module.erp.service.product.ErpProductService;  
8 -import jakarta.annotation.Resource;  
9 -import org.springframework.stereotype.Service;  
10 -import org.springframework.validation.annotation.Validated;  
11 -  
12 -import java.math.BigDecimal;  
13 -  
14 -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;  
15 -import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_COUNT_NEGATIVE;  
16 -import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_COUNT_NEGATIVE2;  
17 -  
18 -/**  
19 - * ERP 产品库存 Service 实现类  
20 - *  
21 - * @author 芋道源码  
22 - */  
23 -@Service  
24 -@Validated  
25 -public class ErpStockServiceImpl implements ErpStockService {  
26 -  
27 - /**  
28 - * 允许库存为负数  
29 - *  
30 - * TODO 芋艿:后续做成 db 配置  
31 - */  
32 - private static final Boolean NEGATIVE_STOCK_COUNT_ENABLE = false;  
33 -  
34 - @Resource  
35 - private ErpProductService productService;  
36 - @Resource  
37 - private ErpWarehouseService warehouseService;  
38 -  
39 - @Resource  
40 - private ErpStockMapper stockMapper;  
41 -  
42 - @Override  
43 - public ErpStockDO getStock(Long id) {  
44 - return stockMapper.selectById(id);  
45 - }  
46 -  
47 - @Override  
48 - public ErpStockDO getStock(Long productId, Long warehouseId) {  
49 - return stockMapper.selectByProductIdAndWarehouseId(productId, warehouseId);  
50 - }  
51 -  
52 - @Override  
53 - public BigDecimal getStockCount(Long productId) {  
54 - BigDecimal count = stockMapper.selectSumByProductId(productId);  
55 - return count != null ? count : BigDecimal.ZERO;  
56 - }  
57 -  
58 - @Override  
59 - public PageResult<ErpStockDO> getStockPage(ErpStockPageReqVO pageReqVO) {  
60 - return stockMapper.selectPage(pageReqVO);  
61 - }  
62 -  
63 - @Override  
64 - public BigDecimal updateStockCountIncrement(Long productId, Long warehouseId, BigDecimal count) {  
65 - // 1.1 查询当前库存  
66 - ErpStockDO stock = stockMapper.selectByProductIdAndWarehouseId(productId, warehouseId);  
67 - if (stock == null) {  
68 - stock = new ErpStockDO().setProductId(productId).setWarehouseId(warehouseId).setCount(BigDecimal.ZERO);  
69 - stockMapper.insert(stock);  
70 - }  
71 - // 1.2 校验库存是否充足  
72 - if (!NEGATIVE_STOCK_COUNT_ENABLE && stock.getCount().add(count).compareTo(BigDecimal.ZERO) < 0) {  
73 - throw exception(STOCK_COUNT_NEGATIVE, productService.getProduct(productId).getName(),  
74 - warehouseService.getWarehouse(warehouseId).getName(), stock.getCount(), count);  
75 - }  
76 -  
77 - // 2. 库存变更  
78 - int updateCount = stockMapper.updateCountIncrement(stock.getId(), count, NEGATIVE_STOCK_COUNT_ENABLE);  
79 - if (updateCount == 0) {  
80 - // 此时不好去查询最新库存,所以直接抛出该提示,不提供具体库存数字  
81 - throw exception(STOCK_COUNT_NEGATIVE2, productService.getProduct(productId).getName(),  
82 - warehouseService.getWarehouse(warehouseId).getName());  
83 - }  
84 -  
85 - // 3. 返回最新库存  
86 - return stock.getCount().add(count);  
87 - }  
88 -  
89 -}  
90 \ No newline at end of file 0 \ No newline at end of file
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpWarehouseService.java deleted
1 -package cn.iocoder.yudao.module.erp.service.stock;  
2 -  
3 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
4 -import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.warehouse.ErpWarehouseSaveReqVO;  
5 -import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.warehouse.ErpWarehousePageReqVO;  
6 -import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpWarehouseDO;  
7 -import jakarta.validation.Valid;  
8 -  
9 -import java.util.Collection;  
10 -import java.util.List;  
11 -import java.util.Map;  
12 -  
13 -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;  
14 -  
15 -/**  
16 - * ERP 仓库 Service 接口  
17 - *  
18 - * @author 芋道源码  
19 - */  
20 -public interface ErpWarehouseService {  
21 -  
22 - /**  
23 - * 创建仓库  
24 - *  
25 - * @param createReqVO 创建信息  
26 - * @return 编号  
27 - */  
28 - Long createWarehouse(@Valid ErpWarehouseSaveReqVO createReqVO);  
29 -  
30 - /**  
31 - * 更新ERP 仓库  
32 - *  
33 - * @param updateReqVO 更新信息  
34 - */  
35 - void updateWarehouse(@Valid ErpWarehouseSaveReqVO updateReqVO);  
36 -  
37 - /**  
38 - * 更新仓库默认状态  
39 - *  
40 - * @param id 编号  
41 - * @param defaultStatus 默认状态  
42 - */  
43 - void updateWarehouseDefaultStatus(Long id, Boolean defaultStatus);  
44 -  
45 - /**  
46 - * 删除仓库  
47 - *  
48 - * @param id 编号  
49 - */  
50 - void deleteWarehouse(Long id);  
51 -  
52 - /**  
53 - * 获得仓库  
54 - *  
55 - * @param id 编号  
56 - * @return 仓库  
57 - */  
58 - ErpWarehouseDO getWarehouse(Long id);  
59 -  
60 - /**  
61 - * 校验仓库列表的有效性  
62 - *  
63 - * @param ids 编号数组  
64 - * @return 仓库列表  
65 - */  
66 - List<ErpWarehouseDO> validWarehouseList(Collection<Long> ids);  
67 -  
68 - /**  
69 - * 获得指定状态的仓库列表  
70 - *  
71 - * @param status 状态  
72 - * @return 仓库列表  
73 - */  
74 - List<ErpWarehouseDO> getWarehouseListByStatus(Integer status);  
75 -  
76 - /**  
77 - * 获得仓库列表  
78 - *  
79 - * @param ids 编号数组  
80 - * @return 仓库列表  
81 - */  
82 - List<ErpWarehouseDO> getWarehouseList(Collection<Long> ids);  
83 -  
84 - /**  
85 - * 获得仓库 Map  
86 - *  
87 - * @param ids 编号数组  
88 - * @return 仓库 Map  
89 - */  
90 - default Map<Long, ErpWarehouseDO> getWarehouseMap(Collection<Long> ids) {  
91 - return convertMap(getWarehouseList(ids), ErpWarehouseDO::getId);  
92 - }  
93 -  
94 - /**  
95 - * 获得仓库分页  
96 - *  
97 - * @param pageReqVO 分页查询  
98 - * @return 仓库分页  
99 - */  
100 - PageResult<ErpWarehouseDO> getWarehousePage(ErpWarehousePageReqVO pageReqVO);  
101 -  
102 -}  
103 \ No newline at end of file 0 \ No newline at end of file
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/ErpWarehouseServiceImpl.java deleted
1 -package cn.iocoder.yudao.module.erp.service.stock;  
2 -  
3 -import cn.hutool.core.collection.CollUtil;  
4 -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;  
5 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
6 -import cn.iocoder.yudao.framework.common.util.object.BeanUtils;  
7 -import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.warehouse.ErpWarehouseSaveReqVO;  
8 -import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.warehouse.ErpWarehousePageReqVO;  
9 -import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpWarehouseDO;  
10 -import cn.iocoder.yudao.module.erp.dal.mysql.stock.ErpWarehouseMapper;  
11 -import jakarta.annotation.Resource;  
12 -import org.springframework.stereotype.Service;  
13 -import org.springframework.transaction.annotation.Transactional;  
14 -import org.springframework.validation.annotation.Validated;  
15 -  
16 -import java.util.Collection;  
17 -import java.util.Collections;  
18 -import java.util.List;  
19 -import java.util.Map;  
20 -  
21 -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;  
22 -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;  
23 -import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;  
24 -  
25 -/**  
26 - * ERP 仓库 Service 实现类  
27 - *  
28 - * @author 芋道源码  
29 - */  
30 -@Service  
31 -@Validated  
32 -public class ErpWarehouseServiceImpl implements ErpWarehouseService {  
33 -  
34 - @Resource  
35 - private ErpWarehouseMapper warehouseMapper;  
36 -  
37 - @Override  
38 - public Long createWarehouse(ErpWarehouseSaveReqVO createReqVO) {  
39 - // 插入  
40 - ErpWarehouseDO warehouse = BeanUtils.toBean(createReqVO, ErpWarehouseDO.class);  
41 - warehouseMapper.insert(warehouse);  
42 - // 返回  
43 - return warehouse.getId();  
44 - }  
45 -  
46 - @Override  
47 - public void updateWarehouse(ErpWarehouseSaveReqVO updateReqVO) {  
48 - // 校验存在  
49 - validateWarehouseExists(updateReqVO.getId());  
50 - // 更新  
51 - ErpWarehouseDO updateObj = BeanUtils.toBean(updateReqVO, ErpWarehouseDO.class);  
52 - warehouseMapper.updateById(updateObj);  
53 - }  
54 -  
55 - @Override  
56 - @Transactional(rollbackFor = Exception.class)  
57 - public void updateWarehouseDefaultStatus(Long id, Boolean defaultStatus) {  
58 - // 1. 校验存在  
59 - validateWarehouseExists(id);  
60 -  
61 - // 2.1 如果开启,则需要关闭所有其它的默认  
62 - if (defaultStatus) {  
63 - ErpWarehouseDO warehouse = warehouseMapper.selectByDefaultStatus();  
64 - if (warehouse != null) {  
65 - warehouseMapper.updateById(new ErpWarehouseDO().setId(warehouse.getId()).setDefaultStatus(false));  
66 - }  
67 - }  
68 - // 2.2 更新对应的默认状态  
69 - warehouseMapper.updateById(new ErpWarehouseDO().setId(id).setDefaultStatus(defaultStatus));  
70 - }  
71 -  
72 - @Override  
73 - public void deleteWarehouse(Long id) {  
74 - // 校验存在  
75 - validateWarehouseExists(id);  
76 - // 删除  
77 - warehouseMapper.deleteById(id);  
78 - }  
79 -  
80 - private void validateWarehouseExists(Long id) {  
81 - if (warehouseMapper.selectById(id) == null) {  
82 - throw exception(WAREHOUSE_NOT_EXISTS);  
83 - }  
84 - }  
85 -  
86 - @Override  
87 - public ErpWarehouseDO getWarehouse(Long id) {  
88 - return warehouseMapper.selectById(id);  
89 - }  
90 -  
91 - @Override  
92 - public List<ErpWarehouseDO> validWarehouseList(Collection<Long> ids) {  
93 - if (CollUtil.isEmpty(ids)) {  
94 - return Collections.emptyList();  
95 - }  
96 - List<ErpWarehouseDO> list = warehouseMapper.selectBatchIds(ids);  
97 - Map<Long, ErpWarehouseDO> warehouseMap = convertMap(list, ErpWarehouseDO::getId);  
98 - for (Long id : ids) {  
99 - ErpWarehouseDO warehouse = warehouseMap.get(id);  
100 - if (warehouseMap.get(id) == null) {  
101 - throw exception(WAREHOUSE_NOT_EXISTS);  
102 - }  
103 - if (CommonStatusEnum.isDisable(warehouse.getStatus())) {  
104 - throw exception(WAREHOUSE_NOT_ENABLE, warehouse.getName());  
105 - }  
106 - }  
107 - return list;  
108 - }  
109 -  
110 - @Override  
111 - public List<ErpWarehouseDO> getWarehouseListByStatus(Integer status) {  
112 - return warehouseMapper.selectListByStatus(status);  
113 - }  
114 -  
115 - @Override  
116 - public List<ErpWarehouseDO> getWarehouseList(Collection<Long> ids) {  
117 - return warehouseMapper.selectBatchIds(ids);  
118 - }  
119 -  
120 - @Override  
121 - public PageResult<ErpWarehouseDO> getWarehousePage(ErpWarehousePageReqVO pageReqVO) {  
122 - return warehouseMapper.selectPage(pageReqVO);  
123 - }  
124 -  
125 -}  
126 \ No newline at end of file 0 \ No newline at end of file
yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/service/stock/bo/ErpStockRecordCreateReqBO.java deleted
1 -package cn.iocoder.yudao.module.erp.service.stock.bo;  
2 -  
3 -import jakarta.validation.constraints.NotNull;  
4 -import lombok.AllArgsConstructor;  
5 -import lombok.Data;  
6 -import lombok.NoArgsConstructor;  
7 -  
8 -import java.math.BigDecimal;  
9 -  
10 -/**  
11 - * 库存明细的创建 Request BO  
12 - *  
13 - * @author 芋道源码  
14 - */  
15 -@Data  
16 -@NoArgsConstructor  
17 -@AllArgsConstructor  
18 -public class ErpStockRecordCreateReqBO {  
19 -  
20 - /**  
21 - * 产品编号  
22 - */  
23 - @NotNull(message = "产品编号不能为空")  
24 - private Long productId;  
25 - /**  
26 - * 仓库编号  
27 - */  
28 - @NotNull(message = "仓库编号不能为空")  
29 - private Long warehouseId;  
30 - /**  
31 - * 出入库数量  
32 - *  
33 - * 正数,表示入库;负数,表示出库  
34 - */  
35 - @NotNull(message = "出入库数量不能为空")  
36 - private BigDecimal count;  
37 -  
38 - /**  
39 - * 业务类型  
40 - */  
41 - @NotNull(message = "业务类型不能为空")  
42 - private Integer bizType;  
43 - /**  
44 - * 业务编号  
45 - */  
46 - @NotNull(message = "业务编号不能为空")  
47 - private Long bizId;  
48 - /**  
49 - * 业务项编号  
50 - */  
51 - @NotNull(message = "业务项编号不能为空")  
52 - private Long bizItemId;  
53 - /**  
54 - * 业务单号  
55 - */  
56 - @NotNull(message = "业务单号不能为空")  
57 - private String bizNo;  
58 -  
59 -}  
yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/statistics/ErpPurchaseStatisticsMapper.xml deleted
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">  
3 -<mapper namespace="cn.iocoder.yudao.module.erp.dal.mysql.statistics.ErpPurchaseStatisticsMapper">  
4 -  
5 - <select id="getPurchasePrice" resultType="java.math.BigDecimal">  
6 - SELECT  
7 - (SELECT IFNULL(SUM(total_price), 0)  
8 - FROM erp_purchase_in  
9 - WHERE in_time >= #{beginTime}  
10 - <if test="endTime != null">  
11 - AND in_time &lt; #{endTime}  
12 - </if>  
13 - AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getRequiredTenantId()}  
14 - AND deleted = 0) -  
15 - (SELECT IFNULL(SUM(total_price), 0)  
16 - FROM erp_purchase_return  
17 - WHERE return_time >= #{beginTime}  
18 - <if test="endTime != null">  
19 - AND return_time &lt; #{endTime}  
20 - </if>  
21 - AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getRequiredTenantId()}  
22 - AND deleted = 0)  
23 - </select>  
24 -  
25 -</mapper>  
26 \ No newline at end of file 0 \ No newline at end of file
yudao-module-erp/yudao-module-erp-biz/src/main/resources/mapper/statistics/ErpSaleStatisticsMapper.xml deleted
1 -<?xml version="1.0" encoding="UTF-8"?>  
2 -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">  
3 -<mapper namespace="cn.iocoder.yudao.module.erp.dal.mysql.statistics.ErpSaleStatisticsMapper">  
4 -  
5 - <select id="getSalePrice" resultType="java.math.BigDecimal">  
6 - SELECT  
7 - (SELECT IFNULL(SUM(total_price), 0)  
8 - FROM erp_sale_out  
9 - WHERE out_time >= #{beginTime}  
10 - <if test="endTime != null">  
11 - AND out_time &lt; #{endTime}  
12 - </if>  
13 - AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getRequiredTenantId()}  
14 - AND deleted = 0) -  
15 - (SELECT IFNULL(SUM(total_price), 0)  
16 - FROM erp_sale_return  
17 - WHERE return_time >= #{beginTime}  
18 - <if test="endTime != null">  
19 - AND return_time &lt; #{endTime}  
20 - </if>  
21 - AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getRequiredTenantId()}  
22 - AND deleted = 0)  
23 - </select>  
24 -  
25 -</mapper>  
26 \ No newline at end of file 0 \ No newline at end of file
yudao-server/pom.xml
@@ -97,7 +97,7 @@ @@ -97,7 +97,7 @@
97 <!-- ERP 相关模块。默认注释,保证编译速度 --> 97 <!-- ERP 相关模块。默认注释,保证编译速度 -->
98 <!-- <dependency>--> 98 <!-- <dependency>-->
99 <!-- <groupId>cn.iocoder.boot</groupId>--> 99 <!-- <groupId>cn.iocoder.boot</groupId>-->
100 -<!-- <artifactId>yudao-module-erp-biz</artifactId>--> 100 +<!-- <artifactId>yudao-module-erp</artifactId>-->
101 <!-- <version>${revision}</version>--> 101 <!-- <version>${revision}</version>-->
102 <!-- </dependency>--> 102 <!-- </dependency>-->
103 103