From 006020bc9a87dc40c2e73bc50f244b348b831de1 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 03 十一月 2026 13:41:56 +0800
Subject: [PATCH] 恢复 ERP 采购入库/退货后端,补齐采购统计接口
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnService.java | 101 +
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/ErpPurchaseStatisticsController.java | 38
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java | 327 ++++++
yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wms/dto/WmsPurchaseInboundReqDTO.java | 0
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnPageReqVO.java | 61 +
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInService.java | 101 +
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseReturnItemDO.java | 93 +
yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wms/dto/WmsSalesOutboundReqDTO.java | 0
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/statistics/ErpPurchaseStatisticsService.java | 38
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnRespVO.java | 142 ++
yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wms/dto/WmsStockQueryReqDTO.java | 0
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInDO.java | 118 ++
yudao-module-erp/src/main/resources/mapper/statistics/ErpPurchaseStatisticsMapper.xml | 136 ++
yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wms/dto/WmsStockDetailRespDTO.java | 0
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInPageReqVO.java | 61 +
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchaseUncompletedOrderRespVO.java | 40
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/statistics/ErpPurchaseStatisticsServiceImpl.java | 108 ++
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseReturnController.java | 178 +++
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/redis/no/ErpNoRedisDAO.java | 10
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInSaveReqVO.java | 79 +
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseReturnMapper.java | 70 +
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java | 11
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInMapper.java | 70 +
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/statistics/ErpPurchaseStatisticsMapper.java | 46
yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wms/stock/WmsStockApi.java | 0
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java | 352 ++++++
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInItemMapper.java | 56 +
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInController.java | 178 +++
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseReturnDO.java | 118 ++
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchaseSummaryRespVO.java | 20
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchaseSupplierStatisticsRespVO.java | 36
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchaseStatisticsReqVO.java | 44
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnSaveReqVO.java | 79 +
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseReturnItemMapper.java | 56 +
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInRespVO.java | 142 ++
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInItemDO.java | 93 +
docs/sql/cfwj_erp_purchase_in_return_20261103.sql | 120 ++
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchasePriceAnalysisRespVO.java | 36
38 files changed, 3,144 insertions(+), 14 deletions(-)
diff --git a/docs/sql/cfwj_erp_purchase_in_return_20261103.sql b/docs/sql/cfwj_erp_purchase_in_return_20261103.sql
new file mode 100644
index 0000000..a5a180d
--- /dev/null
+++ b/docs/sql/cfwj_erp_purchase_in_return_20261103.sql
@@ -0,0 +1,120 @@
+-- CFWJ锛堣瘹鍙戜簲閲戯級ERP 閲囪喘鍏ュ簱 / 閲囪喘閫�璐ц〃缁撴瀯 2026-11-03
+-- 鑳屾櫙锛欵RP 閲囪喘鍏ュ簱銆侀噰璐��璐т唬鐮佸湪 8c14b507 琚垹闄ゅ悗閲嶆柊鎭㈠锛�
+-- 缁熻椤碉紙erp/purchase-statistics锛変緷璧� erp_purchase_in / erp_purchase_return 涓ゅ紶琛ㄣ��
+-- 璇存槑锛氳〃缁撴瀯瀵归綈鐜版湁 erp_purchase_order锛堟棤 tenant_id 鍒楋紝deleted 浣跨敤 bit(1)锛夈��
+-- 骞傜瓑锛欳REATE TABLE IF NOT EXISTS锛屽彲閲嶅鎵ц銆�
+
+SET NAMES utf8mb4;
+
+CREATE TABLE IF NOT EXISTS `erp_purchase_in` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `no` varchar(255) NOT NULL COMMENT '閲囪喘鍏ュ簱鍗曞彿',
+ `status` int NOT NULL COMMENT '鍏ュ簱鐘舵��',
+ `supplier_id` bigint DEFAULT NULL COMMENT '渚涘簲鍟嗙紪鍙�',
+ `account_id` bigint DEFAULT NULL COMMENT '缁撶畻璐︽埛缂栧彿',
+ `in_time` datetime NOT NULL COMMENT '鍏ュ簱鏃堕棿',
+ `order_id` bigint DEFAULT NULL COMMENT '閲囪喘璁㈠崟缂栧彿',
+ `order_no` varchar(255) DEFAULT NULL COMMENT '閲囪喘璁㈠崟鍙�',
+ `total_count` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '鍚堣鏁伴噺',
+ `total_price` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '鏈�缁堝悎璁′环鏍硷紝鍗曚綅锛氬厓',
+ `payment_price` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '宸叉敮浠橀噾棰濓紝鍗曚綅锛氬厓',
+ `total_product_price` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '鍚堣浜у搧浠锋牸锛屽崟浣嶏細鍏�',
+ `total_tax_price` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '鍚堣绋庨锛屽崟浣嶏細鍏�',
+ `discount_percent` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '浼樻儬鐜囷紝鐧惧垎姣�',
+ `discount_price` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '浼樻儬閲戦锛屽崟浣嶏細鍏�',
+ `other_price` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '鍏跺畠閲戦锛屽崟浣嶏細鍏�',
+ `remark` varchar(255) DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) DEFAULT '' COMMENT '鏇存柊鑰�',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
+ PRIMARY KEY (`id`) USING BTREE,
+ KEY `idx_no` (`no`) USING BTREE,
+ KEY `idx_order_id` (`order_id`) USING BTREE,
+ KEY `idx_in_time` (`in_time`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='ERP 閲囪喘鍏ュ簱';
+
+CREATE TABLE IF NOT EXISTS `erp_purchase_in_items` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `in_id` bigint NOT NULL COMMENT '閲囪喘鍏ュ簱缂栧彿',
+ `order_item_id` bigint DEFAULT NULL COMMENT '閲囪喘璁㈠崟椤圭紪鍙�',
+ `warehouse_id` bigint DEFAULT NULL COMMENT '浠撳簱缂栧彿锛圡ES 浠撳簱锛�',
+ `product_id` bigint DEFAULT NULL COMMENT '鐗╂枡缂栧彿锛圡DM 鐗╂枡锛�',
+ `product_unit_id` bigint DEFAULT NULL COMMENT '浜у搧鍗曚綅缂栧彿',
+ `product_price` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '浜у搧鍗曚环锛屽崟浣嶏細鍏�',
+ `count` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '鏁伴噺',
+ `total_price` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '鎬讳环锛屽崟浣嶏細鍏�',
+ `tax_percent` decimal(24,6) DEFAULT NULL COMMENT '绋庣巼锛岀櫨鍒嗘瘮',
+ `tax_price` decimal(24,6) DEFAULT NULL COMMENT '绋庨锛屽崟浣嶏細鍏�',
+ `remark` varchar(255) DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) DEFAULT '' COMMENT '鏇存柊鑰�',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
+ PRIMARY KEY (`id`) USING BTREE,
+ KEY `idx_in_id` (`in_id`) USING BTREE,
+ KEY `idx_order_item_id` (`order_item_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='ERP 閲囪喘鍏ュ簱椤�';
+
+CREATE TABLE IF NOT EXISTS `erp_purchase_return` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `no` varchar(255) NOT NULL COMMENT '閲囪喘閫�璐у彿',
+ `status` int NOT NULL COMMENT '閫�璐х姸鎬�',
+ `supplier_id` bigint DEFAULT NULL COMMENT '渚涘簲鍟嗙紪鍙�',
+ `account_id` bigint DEFAULT NULL COMMENT '缁撶畻璐︽埛缂栧彿',
+ `return_time` datetime NOT NULL COMMENT '閫�璐ф椂闂�',
+ `order_id` bigint DEFAULT NULL COMMENT '閲囪喘璁㈠崟缂栧彿',
+ `order_no` varchar(255) DEFAULT NULL COMMENT '閲囪喘璁㈠崟鍙�',
+ `total_count` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '鍚堣鏁伴噺',
+ `total_price` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '鏈�缁堝悎璁′环鏍硷紝鍗曚綅锛氬厓',
+ `refund_price` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '宸查��娆鹃噾棰濓紝鍗曚綅锛氬厓',
+ `total_product_price` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '鍚堣浜у搧浠锋牸锛屽崟浣嶏細鍏�',
+ `total_tax_price` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '鍚堣绋庨锛屽崟浣嶏細鍏�',
+ `discount_percent` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '浼樻儬鐜囷紝鐧惧垎姣�',
+ `discount_price` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '浼樻儬閲戦锛屽崟浣嶏細鍏�',
+ `other_price` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '鍏跺畠閲戦锛屽崟浣嶏細鍏�',
+ `remark` varchar(255) DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) DEFAULT '' COMMENT '鏇存柊鑰�',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
+ PRIMARY KEY (`id`) USING BTREE,
+ KEY `idx_no` (`no`) USING BTREE,
+ KEY `idx_order_id` (`order_id`) USING BTREE,
+ KEY `idx_return_time` (`return_time`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='ERP 閲囪喘閫�璐�';
+
+CREATE TABLE IF NOT EXISTS `erp_purchase_return_items` (
+ `id` bigint NOT NULL AUTO_INCREMENT COMMENT '缂栧彿',
+ `return_id` bigint NOT NULL COMMENT '閲囪喘閫�璐х紪鍙�',
+ `order_item_id` bigint DEFAULT NULL COMMENT '閲囪喘璁㈠崟椤圭紪鍙�',
+ `warehouse_id` bigint DEFAULT NULL COMMENT '浠撳簱缂栧彿锛圡ES 浠撳簱锛�',
+ `product_id` bigint DEFAULT NULL COMMENT '鐗╂枡缂栧彿锛圡DM 鐗╂枡锛�',
+ `product_unit_id` bigint DEFAULT NULL COMMENT '浜у搧鍗曚綅缂栧彿',
+ `product_price` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '浜у搧鍗曚环锛屽崟浣嶏細鍏�',
+ `count` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '鏁伴噺',
+ `total_price` decimal(24,6) NOT NULL DEFAULT '0.000000' COMMENT '鎬讳环锛屽崟浣嶏細鍏�',
+ `tax_percent` decimal(24,6) DEFAULT NULL COMMENT '绋庣巼锛岀櫨鍒嗘瘮',
+ `tax_price` decimal(24,6) DEFAULT NULL COMMENT '绋庨锛屽崟浣嶏細鍏�',
+ `remark` varchar(255) DEFAULT NULL COMMENT '澶囨敞',
+ `creator` varchar(64) DEFAULT '' COMMENT '鍒涘缓鑰�',
+ `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '鍒涘缓鏃堕棿',
+ `updater` varchar(64) DEFAULT '' COMMENT '鏇存柊鑰�',
+ `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '鏇存柊鏃堕棿',
+ `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '鏄惁鍒犻櫎',
+ PRIMARY KEY (`id`) USING BTREE,
+ KEY `idx_return_id` (`return_id`) USING BTREE,
+ KEY `idx_order_item_id` (`order_item_id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='ERP 閲囪喘閫�璐ч」';
+
+-- ---------------------------------------------------------------------------
+-- 缁撶畻璐︽埛鍏滃簳锛氶噰璐叆搴� / 閲囪喘閫�璐х殑鍒涘缓閮芥牎楠岀粨绠楄处鎴凤紙erp_account锛夛紝
+-- 鑰� CFWJ 搴撴鍓嶆病鏈夎处鎴锋暟鎹�佷篃娌℃湁璐︽埛缁存姢鑿滃崟锛屼細瀵艰嚧鈥滅粨绠楄处鎴封�濅笅鎷変负绌恒�佸崟鎹缓涓嶅嚭鏉ャ��
+-- 杩欓噷琛ヤ竴鏉¢粯璁よ处鎴凤紝骞傜瓑锛堟寜 no 鍒ゆ柇锛夈��
+-- ---------------------------------------------------------------------------
+INSERT INTO `erp_account` (`name`, `no`, `remark`, `status`, `sort`, `default_status`, `creator`, `create_time`, `updater`, `update_time`)
+SELECT '鐜伴噾璐︽埛', 'CASH', '绯荤粺榛樿缁撶畻璐︽埛锛岄噰璐叆搴�/閫�璐с�佽储鍔℃敹浠樻浣跨敤', 0, 0, 1, '1', NOW(), '1', NOW()
+WHERE NOT EXISTS (SELECT 1 FROM `erp_account` WHERE `no` = 'CASH' AND `deleted` = 0);
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInController.java
new file mode 100644
index 0000000..ebab641
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInController.java
@@ -0,0 +1,178 @@
+package cn.iocoder.yudao.module.erp.controller.admin.purchase;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.in.ErpPurchaseInPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.in.ErpPurchaseInRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.in.ErpPurchaseInSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInItemDO;
+import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchaseInService;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
+import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
+import cn.iocoder.yudao.module.mes.api.wms.stock.WmsStockApi;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
+import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMultiMap;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+
+@Tag(name = "绠$悊鍚庡彴 - ERP 閲囪喘鍏ュ簱")
+@RestController
+@RequestMapping("/erp/purchase-in")
+@Validated
+public class ErpPurchaseInController {
+
+ @Resource
+ private ErpPurchaseInService purchaseInService;
+ @Resource
+ private SrmSupplierApi srmSupplierApi;
+
+ @Resource
+ private MdmItemApi mdmItemApi;
+ @Resource
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
+ @Resource
+ private WmsStockApi wmsStockApi;
+
+ @Resource
+ private AdminUserApi adminUserApi;
+
+ @PostMapping("/create")
+ @Operation(summary = "鍒涘缓閲囪喘鍏ュ簱")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-in:create')")
+ public CommonResult<Long> createPurchaseIn(@Valid @RequestBody ErpPurchaseInSaveReqVO createReqVO) {
+ return success(purchaseInService.createPurchaseIn(createReqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "鏇存柊閲囪喘鍏ュ簱")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-in:update')")
+ public CommonResult<Boolean> updatePurchaseIn(@Valid @RequestBody ErpPurchaseInSaveReqVO updateReqVO) {
+ purchaseInService.updatePurchaseIn(updateReqVO);
+ return success(true);
+ }
+
+ @PutMapping("/update-status")
+ @Operation(summary = "鏇存柊閲囪喘鍏ュ簱鐨勭姸鎬�")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-in:update-status')")
+ public CommonResult<Boolean> updatePurchaseInStatus(@RequestParam("id") Long id,
+ @RequestParam("status") Integer status) {
+ purchaseInService.updatePurchaseInStatus(id, status);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎閲囪喘鍏ュ簱")
+ @Parameter(name = "ids", description = "缂栧彿鏁扮粍", required = true)
+ @PreAuthorize("@ss.hasPermission('erp:purchase-in:delete')")
+ public CommonResult<Boolean> deletePurchaseIn(@RequestParam("ids") List<Long> ids) {
+ purchaseInService.deletePurchaseIn(ids);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱閲囪喘鍏ュ簱")
+ @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-in:query')")
+ public CommonResult<ErpPurchaseInRespVO> getPurchaseIn(@RequestParam("id") Long id) {
+ ErpPurchaseInDO purchaseIn = purchaseInService.getPurchaseIn(id);
+ if (purchaseIn == null) {
+ return success(null);
+ }
+ List<ErpPurchaseInItemDO> purchaseInItemList = purchaseInService.getPurchaseInItemListByInId(id);
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
+ convertSet(purchaseInItemList, ErpPurchaseInItemDO::getProductId));
+ Map<Long, MdmUnitMeasureRespDTO> unitMap = mdmUnitMeasureApi.getUnitMeasureMap(
+ convertSet(purchaseInItemList, ErpPurchaseInItemDO::getProductUnitId));
+ return success(BeanUtils.toBean(purchaseIn, ErpPurchaseInRespVO.class, purchaseInVO ->
+ purchaseInVO.setItems(BeanUtils.toBean(purchaseInItemList, ErpPurchaseInRespVO.Item.class, item -> {
+ BigDecimal stockCount = wmsStockApi.getStockQuantity(item.getProductId(), item.getWarehouseId());
+ item.setStockCount(stockCount != null ? stockCount : BigDecimal.ZERO);
+ MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem -> item.setProductName(mdmItem.getName())
+ .setProductBarCode(mdmItem.getBarCode()));
+ MapUtils.findAndThen(unitMap, item.getProductUnitId(), unit -> item.setProductUnitName(unit.getName()));
+ }))));
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱閲囪喘鍏ュ簱鍒嗛〉")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-in:query')")
+ public CommonResult<PageResult<ErpPurchaseInRespVO>> getPurchaseInPage(@Valid ErpPurchaseInPageReqVO pageReqVO) {
+ PageResult<ErpPurchaseInDO> pageResult = purchaseInService.getPurchaseInPage(pageReqVO);
+ return success(buildPurchaseInVOPageResult(pageResult));
+ }
+
+ @GetMapping("/export-excel")
+ @Operation(summary = "瀵煎嚭閲囪喘鍏ュ簱 Excel")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-in:export')")
+ @ApiAccessLog(operateType = EXPORT)
+ public void exportPurchaseInExcel(@Valid ErpPurchaseInPageReqVO pageReqVO,
+ HttpServletResponse response) throws IOException {
+ pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+ List<ErpPurchaseInRespVO> list = buildPurchaseInVOPageResult(purchaseInService.getPurchaseInPage(pageReqVO)).getList();
+ // 瀵煎嚭 Excel
+ ExcelUtils.write(response, "閲囪喘鍏ュ簱.xls", "鏁版嵁", ErpPurchaseInRespVO.class, list);
+ }
+
+ private PageResult<ErpPurchaseInRespVO> buildPurchaseInVOPageResult(PageResult<ErpPurchaseInDO> pageResult) {
+ if (CollUtil.isEmpty(pageResult.getList())) {
+ return PageResult.empty(pageResult.getTotal());
+ }
+ // 1.1 鍏ュ簱椤�
+ List<ErpPurchaseInItemDO> purchaseInItemList = purchaseInService.getPurchaseInItemListByInIds(
+ convertSet(pageResult.getList(), ErpPurchaseInDO::getId));
+ Map<Long, List<ErpPurchaseInItemDO>> purchaseInItemMap = convertMultiMap(purchaseInItemList, ErpPurchaseInItemDO::getInId);
+ // 1.2 鐗╂枡淇℃伅
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
+ convertSet(purchaseInItemList, ErpPurchaseInItemDO::getProductId));
+ Map<Long, MdmUnitMeasureRespDTO> unitMap = mdmUnitMeasureApi.getUnitMeasureMap(
+ convertSet(purchaseInItemList, ErpPurchaseInItemDO::getProductUnitId));
+ // 1.3 渚涘簲鍟嗕俊鎭紙渚涘簲鍟嗕富鏁版嵁宸茶縼绉诲埌 SRM锛�
+ Map<Long, SrmSupplierRespDTO> supplierMap = srmSupplierApi.getSupplierList(
+ convertSet(pageResult.getList(), ErpPurchaseInDO::getSupplierId)).getCheckedData().stream()
+ .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, v -> v, (a, b) -> a));
+ // 1.4 绠$悊鍛樹俊鎭�
+ Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
+ convertSet(pageResult.getList(), purchaseIn -> Long.parseLong(purchaseIn.getCreator())));
+ // 2. 寮�濮嬫嫾鎺�
+ return BeanUtils.toBean(pageResult, ErpPurchaseInRespVO.class, purchaseIn -> {
+ purchaseIn.setItems(BeanUtils.toBean(purchaseInItemMap.get(purchaseIn.getId()), ErpPurchaseInRespVO.Item.class,
+ item -> {
+ MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem -> item.setProductName(mdmItem.getName())
+ .setProductBarCode(mdmItem.getBarCode()));
+ MapUtils.findAndThen(unitMap, item.getProductUnitId(), unit -> item.setProductUnitName(unit.getName()));
+ }));
+ purchaseIn.setProductNames(CollUtil.join(purchaseIn.getItems(), "锛�", ErpPurchaseInRespVO.Item::getProductName));
+ MapUtils.findAndThen(supplierMap, purchaseIn.getSupplierId(), supplier -> purchaseIn.setSupplierName(supplier.getName()));
+ MapUtils.findAndThen(userMap, Long.parseLong(purchaseIn.getCreator()), user -> purchaseIn.setCreatorName(user.getNickname()));
+ });
+ }
+
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseReturnController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseReturnController.java
new file mode 100644
index 0000000..89152e7
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseReturnController.java
@@ -0,0 +1,178 @@
+package cn.iocoder.yudao.module.erp.controller.admin.purchase;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.returns.ErpPurchaseReturnPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.returns.ErpPurchaseReturnRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.returns.ErpPurchaseReturnSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseReturnDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseReturnItemDO;
+import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchaseReturnService;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
+import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
+import cn.iocoder.yudao.module.mes.api.wms.stock.WmsStockApi;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
+import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMultiMap;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+
+@Tag(name = "绠$悊鍚庡彴 - ERP 閲囪喘閫�璐�")
+@RestController
+@RequestMapping("/erp/purchase-return")
+@Validated
+public class ErpPurchaseReturnController {
+
+ @Resource
+ private ErpPurchaseReturnService purchaseReturnService;
+ @Resource
+ private SrmSupplierApi srmSupplierApi;
+
+ @Resource
+ private MdmItemApi mdmItemApi;
+ @Resource
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
+ @Resource
+ private WmsStockApi wmsStockApi;
+
+ @Resource
+ private AdminUserApi adminUserApi;
+
+ @PostMapping("/create")
+ @Operation(summary = "鍒涘缓閲囪喘閫�璐�")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-return:create')")
+ public CommonResult<Long> createPurchaseReturn(@Valid @RequestBody ErpPurchaseReturnSaveReqVO createReqVO) {
+ return success(purchaseReturnService.createPurchaseReturn(createReqVO));
+ }
+
+ @PutMapping("/update")
+ @Operation(summary = "鏇存柊閲囪喘閫�璐�")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-return:update')")
+ public CommonResult<Boolean> updatePurchaseReturn(@Valid @RequestBody ErpPurchaseReturnSaveReqVO updateReqVO) {
+ purchaseReturnService.updatePurchaseReturn(updateReqVO);
+ return success(true);
+ }
+
+ @PutMapping("/update-status")
+ @Operation(summary = "鏇存柊閲囪喘閫�璐х殑鐘舵��")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-return:update-status')")
+ public CommonResult<Boolean> updatePurchaseReturnStatus(@RequestParam("id") Long id,
+ @RequestParam("status") Integer status) {
+ purchaseReturnService.updatePurchaseReturnStatus(id, status);
+ return success(true);
+ }
+
+ @DeleteMapping("/delete")
+ @Operation(summary = "鍒犻櫎閲囪喘閫�璐�")
+ @Parameter(name = "ids", description = "缂栧彿鏁扮粍", required = true)
+ @PreAuthorize("@ss.hasPermission('erp:purchase-return:delete')")
+ public CommonResult<Boolean> deletePurchaseReturn(@RequestParam("ids") List<Long> ids) {
+ purchaseReturnService.deletePurchaseReturn(ids);
+ return success(true);
+ }
+
+ @GetMapping("/get")
+ @Operation(summary = "鑾峰緱閲囪喘閫�璐�")
+ @Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-return:query')")
+ public CommonResult<ErpPurchaseReturnRespVO> getPurchaseReturn(@RequestParam("id") Long id) {
+ ErpPurchaseReturnDO purchaseReturn = purchaseReturnService.getPurchaseReturn(id);
+ if (purchaseReturn == null) {
+ return success(null);
+ }
+ List<ErpPurchaseReturnItemDO> purchaseReturnItemList = purchaseReturnService.getPurchaseReturnItemListByReturnId(id);
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
+ convertSet(purchaseReturnItemList, ErpPurchaseReturnItemDO::getProductId));
+ Map<Long, MdmUnitMeasureRespDTO> unitMap = mdmUnitMeasureApi.getUnitMeasureMap(
+ convertSet(purchaseReturnItemList, ErpPurchaseReturnItemDO::getProductUnitId));
+ return success(BeanUtils.toBean(purchaseReturn, ErpPurchaseReturnRespVO.class, purchaseReturnVO ->
+ purchaseReturnVO.setItems(BeanUtils.toBean(purchaseReturnItemList, ErpPurchaseReturnRespVO.Item.class, item -> {
+ BigDecimal stockCount = wmsStockApi.getStockQuantity(item.getProductId(), item.getWarehouseId());
+ item.setStockCount(stockCount != null ? stockCount : BigDecimal.ZERO);
+ MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem -> item.setProductName(mdmItem.getName())
+ .setProductBarCode(mdmItem.getBarCode()));
+ MapUtils.findAndThen(unitMap, item.getProductUnitId(), unit -> item.setProductUnitName(unit.getName()));
+ }))));
+ }
+
+ @GetMapping("/page")
+ @Operation(summary = "鑾峰緱閲囪喘閫�璐у垎椤�")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-return:query')")
+ public CommonResult<PageResult<ErpPurchaseReturnRespVO>> getPurchaseReturnPage(@Valid ErpPurchaseReturnPageReqVO pageReqVO) {
+ PageResult<ErpPurchaseReturnDO> pageResult = purchaseReturnService.getPurchaseReturnPage(pageReqVO);
+ return success(buildPurchaseReturnVOPageResult(pageResult));
+ }
+
+ @GetMapping("/export-excel")
+ @Operation(summary = "瀵煎嚭閲囪喘閫�璐� Excel")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-return:export')")
+ @ApiAccessLog(operateType = EXPORT)
+ public void exportPurchaseReturnExcel(@Valid ErpPurchaseReturnPageReqVO pageReqVO,
+ HttpServletResponse response) throws IOException {
+ pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+ List<ErpPurchaseReturnRespVO> list = buildPurchaseReturnVOPageResult(purchaseReturnService.getPurchaseReturnPage(pageReqVO)).getList();
+ // 瀵煎嚭 Excel
+ ExcelUtils.write(response, "閲囪喘閫�璐�.xls", "鏁版嵁", ErpPurchaseReturnRespVO.class, list);
+ }
+
+ private PageResult<ErpPurchaseReturnRespVO> buildPurchaseReturnVOPageResult(PageResult<ErpPurchaseReturnDO> pageResult) {
+ if (CollUtil.isEmpty(pageResult.getList())) {
+ return PageResult.empty(pageResult.getTotal());
+ }
+ // 1.1 閫�璐ч」
+ List<ErpPurchaseReturnItemDO> purchaseReturnItemList = purchaseReturnService.getPurchaseReturnItemListByReturnIds(
+ convertSet(pageResult.getList(), ErpPurchaseReturnDO::getId));
+ Map<Long, List<ErpPurchaseReturnItemDO>> purchaseReturnItemMap = convertMultiMap(purchaseReturnItemList, ErpPurchaseReturnItemDO::getReturnId);
+ // 1.2 鐗╂枡淇℃伅
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
+ convertSet(purchaseReturnItemList, ErpPurchaseReturnItemDO::getProductId));
+ Map<Long, MdmUnitMeasureRespDTO> unitMap = mdmUnitMeasureApi.getUnitMeasureMap(
+ convertSet(purchaseReturnItemList, ErpPurchaseReturnItemDO::getProductUnitId));
+ // 1.3 渚涘簲鍟嗕俊鎭紙渚涘簲鍟嗕富鏁版嵁宸茶縼绉诲埌 SRM锛�
+ Map<Long, SrmSupplierRespDTO> supplierMap = srmSupplierApi.getSupplierList(
+ convertSet(pageResult.getList(), ErpPurchaseReturnDO::getSupplierId)).getCheckedData().stream()
+ .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, v -> v, (a, b) -> a));
+ // 1.4 绠$悊鍛樹俊鎭�
+ Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
+ convertSet(pageResult.getList(), purchaseReturn -> Long.parseLong(purchaseReturn.getCreator())));
+ // 2. 寮�濮嬫嫾鎺�
+ return BeanUtils.toBean(pageResult, ErpPurchaseReturnRespVO.class, purchaseReturn -> {
+ purchaseReturn.setItems(BeanUtils.toBean(purchaseReturnItemMap.get(purchaseReturn.getId()), ErpPurchaseReturnRespVO.Item.class,
+ item -> {
+ MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem -> item.setProductName(mdmItem.getName())
+ .setProductBarCode(mdmItem.getBarCode()));
+ MapUtils.findAndThen(unitMap, item.getProductUnitId(), unit -> item.setProductUnitName(unit.getName()));
+ }));
+ purchaseReturn.setProductNames(CollUtil.join(purchaseReturn.getItems(), "锛�", ErpPurchaseReturnRespVO.Item::getProductName));
+ MapUtils.findAndThen(supplierMap, purchaseReturn.getSupplierId(), supplier -> purchaseReturn.setSupplierName(supplier.getName()));
+ MapUtils.findAndThen(userMap, Long.parseLong(purchaseReturn.getCreator()), user -> purchaseReturn.setCreatorName(user.getNickname()));
+ });
+ }
+
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInPageReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInPageReqVO.java
new file mode 100644
index 0000000..e84607c
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInPageReqVO.java
@@ -0,0 +1,61 @@
+package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.in;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "绠$悊鍚庡彴 - ERP 閲囪喘鍏ュ簱鍒嗛〉 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ErpPurchaseInPageReqVO extends PageParam {
+
+ public static final Integer PAYMENT_STATUS_NONE = 0;
+ public static final Integer PAYMENT_STATUS_PART = 1;
+ public static final Integer PAYMENT_STATUS_ALL = 2;
+
+ @Schema(description = "閲囪喘鍗曠紪鍙�", example = "XS001")
+ private String no;
+
+ @Schema(description = "渚涘簲鍟嗙紪鍙�", example = "1724")
+ private Long supplierId;
+
+ @Schema(description = "鍏ュ簱鏃堕棿")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime[] inTime;
+
+ @Schema(description = "澶囨敞", example = "浣犵寽")
+ private String remark;
+
+ @Schema(description = "鍏ュ簱鐘舵��", example = "2")
+ private Integer status;
+
+ @Schema(description = "鍒涘缓鑰�")
+ private String creator;
+
+ @Schema(description = "浜у搧缂栧彿", example = "1")
+ private Long productId;
+
+ @Schema(description = "浠撳簱缂栧彿", example = "1")
+ private Long warehouseId;
+
+ @Schema(description = "缁撶畻璐﹀彿缂栧彿", example = "1")
+ private Long accountId;
+
+ @Schema(description = "浠樻鐘舵��", example = "1")
+ private Integer paymentStatus;
+
+ @Schema(description = "鏄惁鍙粯娆�", example = "true")
+ private Boolean paymentEnable; // 瀵瑰簲 paymentStatus = [0, 1]
+
+ @Schema(description = "閲囪喘鍗曞彿", example = "1")
+ private String orderNo;
+
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInRespVO.java
new file mode 100644
index 0000000..447a380
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInRespVO.java
@@ -0,0 +1,142 @@
+package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.in;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "绠$悊鍚庡彴 - ERP 閲囪喘鍏ュ簱 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ErpPurchaseInRespVO {
+
+ @Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "17386")
+ @ExcelProperty("缂栧彿")
+ private Long id;
+
+ @Schema(description = "鍏ュ簱鍗曠紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "XS001")
+ @ExcelProperty("鍏ュ簱鍗曠紪鍙�")
+ private String no;
+
+ @Schema(description = "鍏ュ簱鐘舵��", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+ @ExcelProperty("鍏ュ簱鐘舵��")
+ private Integer status;
+
+ @Schema(description = "渚涘簲鍟嗙紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "1724")
+ private Long supplierId;
+ @Schema(description = "渚涘簲鍟嗗悕绉�", example = "鑺嬮亾")
+ @ExcelProperty("渚涘簲鍟嗗悕绉�")
+ private String supplierName;
+
+ @Schema(description = "缁撶畻璐︽埛缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "311.89")
+ @ExcelProperty("缁撶畻璐︽埛缂栧彿")
+ private Long accountId;
+
+ @Schema(description = "鍏ュ簱鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("鍏ュ簱鏃堕棿")
+ private LocalDateTime inTime;
+
+ @Schema(description = "閲囪喘璁㈠崟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "17386")
+ private Long orderId;
+ @Schema(description = "閲囪喘璁㈠崟鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "XS001")
+ private String orderNo;
+
+ @Schema(description = "鍚堣鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "15663")
+ @ExcelProperty("鍚堣鏁伴噺")
+ private BigDecimal totalCount;
+ @Schema(description = "鏈�缁堝悎璁′环鏍�", requiredMode = Schema.RequiredMode.REQUIRED, example = "24906")
+ @ExcelProperty("鏈�缁堝悎璁′环鏍�")
+ private BigDecimal totalPrice;
+ @Schema(description = "宸蹭粯娆鹃噾棰濓紝鍗曚綅锛氬厓", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
+ private BigDecimal paymentPrice;
+
+ @Schema(description = "鍚堣浜у搧浠锋牸锛屽崟浣嶏細鍏�", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
+ private BigDecimal totalProductPrice;
+
+ @Schema(description = "鍚堣绋庨锛屽崟浣嶏細鍏�", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
+ private BigDecimal totalTaxPrice;
+
+ @Schema(description = "浼樻儬鐜囷紝鐧惧垎姣�", requiredMode = Schema.RequiredMode.REQUIRED, example = "99.88")
+ private BigDecimal discountPercent;
+
+ @Schema(description = "浼樻儬閲戦锛屽崟浣嶏細鍏�", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
+ private BigDecimal discountPrice;
+
+ @Schema(description = "瀹氶噾閲戦锛屽崟浣嶏細鍏�", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
+ private BigDecimal otherPrice;
+
+
+ @Schema(description = "澶囨敞", example = "浣犵寽")
+ @ExcelProperty("澶囨敞")
+ private String remark;
+
+ @Schema(description = "鍒涘缓浜�", example = "鑺嬮亾")
+ private String creator;
+ @Schema(description = "鍒涘缓浜哄悕绉�", example = "鑺嬮亾")
+ private String creatorName;
+
+ @Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+ @Schema(description = "鍏ュ簱椤瑰垪琛�", requiredMode = Schema.RequiredMode.REQUIRED)
+ private List<Item> items;
+
+ @Schema(description = "浜у搧淇℃伅", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("浜у搧淇℃伅")
+ private String productNames;
+
+ @Data
+ public static class Item {
+
+ @Schema(description = "鍏ュ簱椤圭紪鍙�", example = "11756")
+ private Long id;
+
+ @Schema(description = "閲囪喘璁㈠崟椤圭紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "11756")
+ private Long orderItemId;
+
+ @Schema(description = "浠撳簱缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
+ private Long warehouseId;
+
+ @Schema(description = "浜у搧缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
+ private Long productId;
+
+ @Schema(description = "浜у搧鍗曚綅鍗曚綅", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
+ private Long productUnitId;
+
+ @Schema(description = "浜у搧鍗曚环", example = "100.00")
+ private BigDecimal productPrice;
+
+ @Schema(description = "浜у搧鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
+ @NotNull(message = "浜у搧鏁伴噺涓嶈兘涓虹┖")
+ private BigDecimal count;
+
+ @Schema(description = "绋庣巼锛岀櫨鍒嗘瘮", example = "99.88")
+ private BigDecimal taxPercent;
+
+ @Schema(description = "绋庨锛屽崟浣嶏細鍏�", example = "100.00")
+ private BigDecimal taxPrice;
+
+ @Schema(description = "澶囨敞", example = "闅忎究")
+ private String remark;
+
+ // ========== 鍏宠仈瀛楁 ==========
+
+ @Schema(description = "浜у搧鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "宸у厠鍔�")
+ private String productName;
+ @Schema(description = "浜у搧鏉$爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "A9985")
+ private String productBarCode;
+ @Schema(description = "浜у搧鍗曚綅鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "鐩�")
+ private String productUnitName;
+
+ @Schema(description = "搴撳瓨鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
+ private BigDecimal stockCount; // 璇ュ瓧娈典粎浠呭湪鈥滆鎯呪�濆拰鈥滅紪杈戔�濇椂浣跨敤
+
+ }
+
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInSaveReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInSaveReqVO.java
new file mode 100644
index 0000000..8faa19c
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/in/ErpPurchaseInSaveReqVO.java
@@ -0,0 +1,79 @@
+package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.in;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "绠$悊鍚庡彴 - ERP 閲囪喘鍏ュ簱鏂板/淇敼 Request VO")
+@Data
+public class ErpPurchaseInSaveReqVO {
+
+ @Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "17386")
+ private Long id;
+
+ @Schema(description = "缁撶畻璐︽埛缂栧彿", example = "31189")
+ private Long accountId;
+
+ @Schema(description = "鍏ュ簱鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "鍏ュ簱鏃堕棿涓嶈兘涓虹┖")
+ private LocalDateTime inTime;
+
+ @Schema(description = "閲囪喘璁㈠崟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "17386")
+ @NotNull(message = "閲囪喘璁㈠崟缂栧彿涓嶈兘涓虹┖")
+ private Long orderId;
+
+ @Schema(description = "浼樻儬鐜囷紝鐧惧垎姣�", requiredMode = Schema.RequiredMode.REQUIRED, example = "99.88")
+ private BigDecimal discountPercent;
+
+ @Schema(description = "鍏跺畠閲戦锛屽崟浣嶏細鍏�", example = "7127")
+ private BigDecimal otherPrice;
+
+
+ @Schema(description = "澶囨敞", example = "浣犵寽")
+ private String remark;
+
+ @Schema(description = "鍏ュ簱娓呭崟鍒楄〃")
+ private List<Item> items;
+
+ @Data
+ public static class Item {
+
+ @Schema(description = "鍏ュ簱椤圭紪鍙�", example = "11756")
+ private Long id;
+
+ @Schema(description = "閲囪喘璁㈠崟椤圭紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "11756")
+ @NotNull(message = "閲囪喘璁㈠崟椤圭紪鍙蜂笉鑳戒负绌�")
+ private Long orderItemId;
+
+ @Schema(description = "浠撳簱缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
+ @NotNull(message = "浠撳簱缂栧彿涓嶈兘涓虹┖")
+ private Long warehouseId;
+
+ @Schema(description = "浜у搧缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
+ @NotNull(message = "浜у搧缂栧彿涓嶈兘涓虹┖")
+ private Long productId;
+
+ @Schema(description = "浜у搧鍗曚綅鍗曚綅", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
+ @NotNull(message = "浜у搧鍗曚綅鍗曚綅涓嶈兘涓虹┖")
+ private Long productUnitId;
+
+ @Schema(description = "浜у搧鍗曚环", example = "100.00")
+ private BigDecimal productPrice;
+
+ @Schema(description = "浜у搧鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
+ @NotNull(message = "浜у搧鏁伴噺涓嶈兘涓虹┖")
+ private BigDecimal count;
+
+ @Schema(description = "绋庣巼锛岀櫨鍒嗘瘮", example = "99.88")
+ private BigDecimal taxPercent;
+
+ @Schema(description = "澶囨敞", example = "闅忎究")
+ private String remark;
+
+ }
+
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnPageReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnPageReqVO.java
new file mode 100644
index 0000000..a534d2e
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnPageReqVO.java
@@ -0,0 +1,61 @@
+package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.returns;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "绠$悊鍚庡彴 - ERP 閲囪喘閫�璐у垎椤� Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ErpPurchaseReturnPageReqVO extends PageParam {
+
+ public static final Integer REFUND_STATUS_NONE = 0;
+ public static final Integer REFUND_STATUS_PART = 1;
+ public static final Integer REFUND_STATUS_ALL = 2;
+
+ @Schema(description = "閲囪喘鍗曠紪鍙�", example = "XS001")
+ private String no;
+
+ @Schema(description = "渚涘簲鍟嗙紪鍙�", example = "1724")
+ private Long supplierId;
+
+ @Schema(description = "閫�璐ф椂闂�")
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime[] returnTime;
+
+ @Schema(description = "澶囨敞", example = "浣犵寽")
+ private String remark;
+
+ @Schema(description = "閫�璐х姸鎬�", example = "2")
+ private Integer status;
+
+ @Schema(description = "鍒涘缓鑰�")
+ private String creator;
+
+ @Schema(description = "浜у搧缂栧彿", example = "1")
+ private Long productId;
+
+ @Schema(description = "浠撳簱缂栧彿", example = "1")
+ private Long warehouseId;
+
+ @Schema(description = "缁撶畻璐﹀彿缂栧彿", example = "1")
+ private Long accountId;
+
+ @Schema(description = "閲囪喘鍗曞彿", example = "1")
+ private String orderNo;
+
+ @Schema(description = "閫�娆剧姸鎬�", example = "1")
+ private Integer refundStatus;
+
+ @Schema(description = "鏄惁鍙��娆�", example = "true")
+ private Boolean refundEnable; // 瀵瑰簲 refundStatus = [0, 1]
+
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnRespVO.java
new file mode 100644
index 0000000..68781f5
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnRespVO.java
@@ -0,0 +1,142 @@
+package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.returns;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "绠$悊鍚庡彴 - ERP 閲囪喘閫�璐� Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class ErpPurchaseReturnRespVO {
+
+ @Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "17386")
+ @ExcelProperty("缂栧彿")
+ private Long id;
+
+ @Schema(description = "閫�璐у崟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "XS001")
+ @ExcelProperty("閫�璐у崟缂栧彿")
+ private String no;
+
+ @Schema(description = "閫�璐х姸鎬�", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+ @ExcelProperty("閫�璐х姸鎬�")
+ private Integer status;
+
+ @Schema(description = "渚涘簲鍟嗙紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "1724")
+ private Long supplierId;
+ @Schema(description = "渚涘簲鍟嗗悕绉�", example = "鑺嬮亾")
+ @ExcelProperty("渚涘簲鍟嗗悕绉�")
+ private String supplierName;
+
+ @Schema(description = "缁撶畻璐︽埛缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "311.89")
+ @ExcelProperty("缁撶畻璐︽埛缂栧彿")
+ private Long accountId;
+
+ @Schema(description = "閫�璐ф椂闂�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("閫�璐ф椂闂�")
+ private LocalDateTime returnTime;
+
+ @Schema(description = "閲囪喘璁㈠崟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "17386")
+ private Long orderId;
+ @Schema(description = "閲囪喘璁㈠崟鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "XS001")
+ private String orderNo;
+
+ @Schema(description = "鍚堣鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "15663")
+ @ExcelProperty("鍚堣鏁伴噺")
+ private BigDecimal totalCount;
+ @Schema(description = "鏈�缁堝悎璁′环鏍�", requiredMode = Schema.RequiredMode.REQUIRED, example = "24906")
+ @ExcelProperty("鏈�缁堝悎璁′环鏍�")
+ private BigDecimal totalPrice;
+ @Schema(description = "宸查��娆鹃噾棰濓紝鍗曚綅锛氬厓", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
+ private BigDecimal refundPrice;
+
+ @Schema(description = "鍚堣浜у搧浠锋牸锛屽崟浣嶏細鍏�", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
+ private BigDecimal totalProductPrice;
+
+ @Schema(description = "鍚堣绋庨锛屽崟浣嶏細鍏�", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
+ private BigDecimal totalTaxPrice;
+
+ @Schema(description = "浼樻儬鐜囷紝鐧惧垎姣�", requiredMode = Schema.RequiredMode.REQUIRED, example = "99.88")
+ private BigDecimal discountPercent;
+
+ @Schema(description = "浼樻儬閲戦锛屽崟浣嶏細鍏�", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
+ private BigDecimal discountPrice;
+
+ @Schema(description = "瀹氶噾閲戦锛屽崟浣嶏細鍏�", requiredMode = Schema.RequiredMode.REQUIRED, example = "7127")
+ private BigDecimal otherPrice;
+
+
+ @Schema(description = "澶囨敞", example = "浣犵寽")
+ @ExcelProperty("澶囨敞")
+ private String remark;
+
+ @Schema(description = "鍒涘缓浜�", example = "鑺嬮亾")
+ private String creator;
+ @Schema(description = "鍒涘缓浜哄悕绉�", example = "鑺嬮亾")
+ private String creatorName;
+
+ @Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("鍒涘缓鏃堕棿")
+ private LocalDateTime createTime;
+
+ @Schema(description = "閫�璐ч」鍒楄〃", requiredMode = Schema.RequiredMode.REQUIRED)
+ private List<Item> items;
+
+ @Schema(description = "浜у搧淇℃伅", requiredMode = Schema.RequiredMode.REQUIRED)
+ @ExcelProperty("浜у搧淇℃伅")
+ private String productNames;
+
+ @Data
+ public static class Item {
+
+ @Schema(description = "閫�璐ч」缂栧彿", example = "11756")
+ private Long id;
+
+ @Schema(description = "閲囪喘璁㈠崟椤圭紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "11756")
+ private Long orderItemId;
+
+ @Schema(description = "浠撳簱缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
+ private Long warehouseId;
+
+ @Schema(description = "浜у搧缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
+ private Long productId;
+
+ @Schema(description = "浜у搧鍗曚綅鍗曚綅", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
+ private Long productUnitId;
+
+ @Schema(description = "浜у搧鍗曚环", example = "100.00")
+ private BigDecimal productPrice;
+
+ @Schema(description = "浜у搧鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
+ @NotNull(message = "浜у搧鏁伴噺涓嶈兘涓虹┖")
+ private BigDecimal count;
+
+ @Schema(description = "绋庣巼锛岀櫨鍒嗘瘮", example = "99.88")
+ private BigDecimal taxPercent;
+
+ @Schema(description = "绋庨锛屽崟浣嶏細鍏�", example = "100.00")
+ private BigDecimal taxPrice;
+
+ @Schema(description = "澶囨敞", example = "闅忎究")
+ private String remark;
+
+ // ========== 鍏宠仈瀛楁 ==========
+
+ @Schema(description = "浜у搧鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "宸у厠鍔�")
+ private String productName;
+ @Schema(description = "浜у搧鏉$爜", requiredMode = Schema.RequiredMode.REQUIRED, example = "A9985")
+ private String productBarCode;
+ @Schema(description = "浜у搧鍗曚綅鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "鐩�")
+ private String productUnitName;
+
+ @Schema(description = "搴撳瓨鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
+ private BigDecimal stockCount; // 璇ュ瓧娈典粎浠呭湪鈥滆鎯呪�濆拰鈥滅紪杈戔�濇椂浣跨敤
+
+ }
+
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnSaveReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnSaveReqVO.java
new file mode 100644
index 0000000..775a655
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/returns/ErpPurchaseReturnSaveReqVO.java
@@ -0,0 +1,79 @@
+package cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.returns;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "绠$悊鍚庡彴 - ERP 閲囪喘閫�璐ф柊澧�/淇敼 Request VO")
+@Data
+public class ErpPurchaseReturnSaveReqVO {
+
+ @Schema(description = "缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "17386")
+ private Long id;
+
+ @Schema(description = "缁撶畻璐︽埛缂栧彿", example = "31189")
+ private Long accountId;
+
+ @Schema(description = "閫�璐ф椂闂�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotNull(message = "閫�璐ф椂闂翠笉鑳戒负绌�")
+ private LocalDateTime returnTime;
+
+ @Schema(description = "閲囪喘璁㈠崟缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "17386")
+ @NotNull(message = "閲囪喘璁㈠崟缂栧彿涓嶈兘涓虹┖")
+ private Long orderId;
+
+ @Schema(description = "浼樻儬鐜囷紝鐧惧垎姣�", requiredMode = Schema.RequiredMode.REQUIRED, example = "99.88")
+ private BigDecimal discountPercent;
+
+ @Schema(description = "鍏跺畠閲戦锛屽崟浣嶏細鍏�", example = "7127")
+ private BigDecimal otherPrice;
+
+
+ @Schema(description = "澶囨敞", example = "浣犵寽")
+ private String remark;
+
+ @Schema(description = "閫�璐ф竻鍗曞垪琛�")
+ private List<Item> items;
+
+ @Data
+ public static class Item {
+
+ @Schema(description = "閫�璐ч」缂栧彿", example = "11756")
+ private Long id;
+
+ @Schema(description = "閲囪喘璁㈠崟椤圭紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED, example = "11756")
+ @NotNull(message = "閲囪喘璁㈠崟椤圭紪鍙蜂笉鑳戒负绌�")
+ private Long orderItemId;
+
+ @Schema(description = "浠撳簱缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
+ @NotNull(message = "浠撳簱缂栧彿涓嶈兘涓虹┖")
+ private Long warehouseId;
+
+ @Schema(description = "浜у搧缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
+ @NotNull(message = "浜у搧缂栧彿涓嶈兘涓虹┖")
+ private Long productId;
+
+ @Schema(description = "浜у搧鍗曚綅鍗曚綅", requiredMode = Schema.RequiredMode.REQUIRED, example = "3113")
+ @NotNull(message = "浜у搧鍗曚綅鍗曚綅涓嶈兘涓虹┖")
+ private Long productUnitId;
+
+ @Schema(description = "浜у搧鍗曚环", example = "100.00")
+ private BigDecimal productPrice;
+
+ @Schema(description = "浜у搧鏁伴噺", requiredMode = Schema.RequiredMode.REQUIRED, example = "100.00")
+ @NotNull(message = "浜у搧鏁伴噺涓嶈兘涓虹┖")
+ private BigDecimal count;
+
+ @Schema(description = "绋庣巼锛岀櫨鍒嗘瘮", example = "99.88")
+ private BigDecimal taxPercent;
+
+ @Schema(description = "澶囨敞", example = "闅忎究")
+ private String remark;
+
+ }
+
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/ErpPurchaseStatisticsController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/ErpPurchaseStatisticsController.java
index fb41681..203d45a 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/ErpPurchaseStatisticsController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/ErpPurchaseStatisticsController.java
@@ -2,14 +2,20 @@
import cn.hutool.core.date.LocalDateTimeUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchasePriceAnalysisRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseStatisticsReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseSummaryRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseSupplierStatisticsRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseTimeSummaryRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseUncompletedOrderRespVO;
import cn.iocoder.yudao.module.erp.service.statistics.ErpPurchaseStatisticsService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -40,12 +46,14 @@
LocalDateTime yesterday = LocalDateTimeUtils.getYesterday();
LocalDateTime month = LocalDateTimeUtils.getMonth();
LocalDateTime year = LocalDateTimeUtils.getYear();
- ErpPurchaseSummaryRespVO summary = new ErpPurchaseSummaryRespVO()
+ // 1.1 姒傝锛氳鍗� / 鍏ュ簱 / 閫�璐х殑鎬绘暟涓庢�婚噾棰�
+ ErpPurchaseSummaryRespVO summary = purchaseStatisticsService.getPurchaseSummary();
+ // 1.2 棣栭〉鐪嬫澘锛氫粖鏃� / 鏄ㄦ棩 / 鏈湀 / 浠婂勾閲囪喘閲戦锛堝鐢ㄥ悓涓�鍝嶅簲锛岄伩鍏嶄袱濂楁帴鍙o級
+ return success(summary
.setTodayPrice(purchaseStatisticsService.getPurchasePrice(today, null))
.setYesterdayPrice(purchaseStatisticsService.getPurchasePrice(yesterday, today))
.setMonthPrice(purchaseStatisticsService.getPurchasePrice(month, null))
- .setYearPrice(purchaseStatisticsService.getPurchasePrice(year, null));
- return success(summary);
+ .setYearPrice(purchaseStatisticsService.getPurchasePrice(year, null)));
}
@GetMapping("/time-summary")
@@ -64,4 +72,28 @@
return success(summaryList);
}
+ @GetMapping("/supplier")
+ @Operation(summary = "鑾峰緱渚涘簲鍟嗕緵璐х粺璁�")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-statistics:query')")
+ public CommonResult<PageResult<ErpPurchaseSupplierStatisticsRespVO>> getSupplierStatistics(
+ @Valid ErpPurchaseStatisticsReqVO reqVO) {
+ return success(purchaseStatisticsService.getSupplierStatistics(reqVO));
+ }
+
+ @GetMapping("/price")
+ @Operation(summary = "鑾峰緱閲囪喘浠锋牸鍒嗘瀽")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-statistics:query')")
+ public CommonResult<PageResult<ErpPurchasePriceAnalysisRespVO>> getPriceAnalysis(
+ @Valid ErpPurchaseStatisticsReqVO reqVO) {
+ return success(purchaseStatisticsService.getPriceAnalysis(reqVO));
+ }
+
+ @GetMapping("/uncompleted")
+ @Operation(summary = "鑾峰緱鏈畬鎴愰噰璐鍗曡窡韪�")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-statistics:query')")
+ public CommonResult<PageResult<ErpPurchaseUncompletedOrderRespVO>> getUncompletedOrders(
+ @Valid ErpPurchaseStatisticsReqVO reqVO) {
+ return success(purchaseStatisticsService.getUncompletedOrders(reqVO));
+ }
+
}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchasePriceAnalysisRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchasePriceAnalysisRespVO.java
new file mode 100644
index 0000000..f0a07ff
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchasePriceAnalysisRespVO.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Schema(description = "绠$悊鍚庡彴 - ERP 閲囪喘浠锋牸鍒嗘瀽 Response VO")
+@Data
+public class ErpPurchasePriceAnalysisRespVO {
+
+ @Schema(description = "浜у搧缂栧彿锛圡DM 鐗╂枡缂栧彿锛�", example = "1024")
+ private Long productId;
+
+ @Schema(description = "浜у搧鍚嶇О", example = "鍏铻烘爴")
+ private String productName;
+
+ @Schema(description = "浜у搧鏉$爜", example = "6901234567890")
+ private String productBarCode;
+
+ @Schema(description = "骞冲潎浠锋牸", example = "12.50")
+ private BigDecimal avgPrice;
+
+ @Schema(description = "鏈�浣庝环鏍�", example = "10.00")
+ private BigDecimal minPrice;
+
+ @Schema(description = "鏈�楂樹环鏍�", example = "15.00")
+ private BigDecimal maxPrice;
+
+ @Schema(description = "鏈�杩戜竴娆¢噰璐环鏍�", example = "13.00")
+ private BigDecimal latestPrice;
+
+ @Schema(description = "浠锋牸鍙樺寲鐜囷紙鏈�杩戜环鏍肩浉瀵瑰钩鍧囦环鏍硷紝鐧惧垎姣旓級", example = "4.00")
+ private BigDecimal priceChangeRate;
+
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchaseStatisticsReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchaseStatisticsReqVO.java
new file mode 100644
index 0000000..30a6cae
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchaseStatisticsReqVO.java
@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+/**
+ * ERP 閲囪喘缁熻鏌ヨ Request VO
+ *
+ * 渚涘簲鍟嗕緵璐х粺璁°�佷环鏍煎垎鏋愩�佹湭瀹屾垚璁㈠崟璺熻釜涓変釜椤甸潰鍏辩敤
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ErpPurchaseStatisticsReqVO extends PageParam {
+
+ /**
+ * 渚涘簲鍟嗙紪鍙�
+ */
+ private Long supplierId;
+
+ /**
+ * 浜у搧缂栧彿锛圡DM 鐗╂枡缂栧彿锛�
+ */
+ private Long productId;
+
+ /**
+ * 璁㈠崟鍙凤紙妯$硦鍖归厤锛�
+ */
+ private String orderNo;
+
+ /**
+ * 璁㈠崟鏃堕棿鑼冨洿
+ */
+ @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+ private LocalDateTime[] orderTime;
+
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchaseSummaryRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchaseSummaryRespVO.java
index 22635e7..442893b 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchaseSummaryRespVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchaseSummaryRespVO.java
@@ -21,4 +21,24 @@
@Schema(description = "浠婂勾閲囪喘閲戦", requiredMode = Schema.RequiredMode.REQUIRED, example = "88888")
private BigDecimal yearPrice;
+ // ==================== 閲囪喘缁熻椤碉紙姹囨�诲崱鐗囷級 ====================
+
+ @Schema(description = "鎬昏鍗曟暟", example = "10")
+ private Long totalOrderCount;
+
+ @Schema(description = "鎬昏鍗曢噾棰�", example = "1024.00")
+ private BigDecimal totalOrderAmount;
+
+ @Schema(description = "鎬诲叆搴撴暟", example = "8")
+ private Long totalInCount;
+
+ @Schema(description = "鎬诲叆搴撻噾棰�", example = "888.00")
+ private BigDecimal totalInAmount;
+
+ @Schema(description = "鎬婚��璐ф暟", example = "1")
+ private Long totalReturnCount;
+
+ @Schema(description = "鎬婚��璐ч噾棰�", example = "100.00")
+ private BigDecimal totalReturnAmount;
+
}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchaseSupplierStatisticsRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchaseSupplierStatisticsRespVO.java
new file mode 100644
index 0000000..750ee56
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchaseSupplierStatisticsRespVO.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Schema(description = "绠$悊鍚庡彴 - ERP 渚涘簲鍟嗕緵璐х粺璁� Response VO")
+@Data
+public class ErpPurchaseSupplierStatisticsRespVO {
+
+ @Schema(description = "渚涘簲鍟嗙紪鍙�", example = "1024")
+ private Long supplierId;
+
+ @Schema(description = "渚涘簲鍟嗗悕绉�", example = "璇氬彂浜旈噾")
+ private String supplierName;
+
+ @Schema(description = "璁㈠崟鏁�", example = "10")
+ private Long orderCount;
+
+ @Schema(description = "璁㈠崟閲戦", example = "1024.00")
+ private BigDecimal orderAmount;
+
+ @Schema(description = "鍏ュ簱鍗曟暟", example = "8")
+ private Long inCount;
+
+ @Schema(description = "鍏ュ簱閲戦", example = "888.00")
+ private BigDecimal inAmount;
+
+ @Schema(description = "閫�璐у崟鏁�", example = "1")
+ private Long returnCount;
+
+ @Schema(description = "閫�璐ч噾棰�", example = "100.00")
+ private BigDecimal returnAmount;
+
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchaseUncompletedOrderRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchaseUncompletedOrderRespVO.java
new file mode 100644
index 0000000..4ef157e
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/statistics/vo/purchase/ErpPurchaseUncompletedOrderRespVO.java
@@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "绠$悊鍚庡彴 - ERP 鏈畬鎴愰噰璐鍗曡窡韪� Response VO")
+@Data
+public class ErpPurchaseUncompletedOrderRespVO {
+
+ @Schema(description = "璁㈠崟缂栧彿", example = "1024")
+ private Long orderId;
+
+ @Schema(description = "璁㈠崟鍙�", example = "CGDD20261103000001")
+ private String orderNo;
+
+ @Schema(description = "渚涘簲鍟嗗悕绉�", example = "璇氬彂浜旈噾")
+ private String supplierName;
+
+ @Schema(description = "璁㈠崟鏃堕棿")
+ private LocalDateTime orderTime;
+
+ @Schema(description = "浜у搧鍚嶇О锛堝涓敤閫楀彿鎷兼帴锛�", example = "鍏铻烘爴锛屽灚鐗�")
+ private String productNames;
+
+ @Schema(description = "璁㈠崟閲戦", example = "1024.00")
+ private BigDecimal orderAmount;
+
+ @Schema(description = "宸插叆搴撻噾棰�", example = "512.00")
+ private BigDecimal inAmount;
+
+ @Schema(description = "鏈畬鎴愰噾棰�", example = "512.00")
+ private BigDecimal uncompletedAmount;
+
+ @Schema(description = "瓒呮湡澶╂暟锛堟寜涓嬪崟鍚� 30 澶╀氦鏈熶及绠楋紝鏈秴鏈熶负 0锛�", example = "3")
+ private Integer daysOverdue;
+
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInDO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInDO.java
new file mode 100644
index 0000000..1582455
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInDO.java
@@ -0,0 +1,118 @@
+package cn.iocoder.yudao.module.erp.dal.dataobject.purchase;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpAccountDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * ERP 閲囪喘鍏ュ簱 DO
+ *
+ * @author 鑺嬮亾婧愮爜
+ */
+@TableName(value = "erp_purchase_in")
+@KeySequence("erp_purchase_in_seq") // 鐢ㄤ簬 Oracle銆丳ostgreSQL銆並ingbase銆丏B2銆丠2 鏁版嵁搴撶殑涓婚敭鑷銆傚鏋滄槸 MySQL 绛夋暟鎹簱锛屽彲涓嶅啓銆�
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ErpPurchaseInDO extends BaseDO {
+
+ /**
+ * 缂栧彿
+ */
+ @TableId
+ private Long id;
+ /**
+ * 閲囪喘鍏ュ簱鍗曞彿
+ */
+ private String no;
+ /**
+ * 鍏ュ簱鐘舵��
+ *
+ * 鏋氫妇 {@link cn.iocoder.yudao.module.erp.enums.ErpAuditStatus}
+ */
+ private Integer status;
+ /**
+ * 渚涘簲鍟嗙紪鍙�
+ *
+ * 鍏宠仈 {@link ErpSupplierDO#getId()}
+ */
+ private Long supplierId;
+ /**
+ * 缁撶畻璐︽埛缂栧彿
+ *
+ * 鍏宠仈 {@link ErpAccountDO#getId()}
+ */
+ private Long accountId;
+ /**
+ * 鍏ュ簱鏃堕棿
+ */
+ private LocalDateTime inTime;
+
+ /**
+ * 閲囪喘璁㈠崟缂栧彿
+ *
+ * 鍏宠仈 {@link ErpPurchaseOrderDO#getId()}
+ */
+ private Long orderId;
+ /**
+ * 閲囪喘璁㈠崟鍙�
+ *
+ * 鍐椾綑 {@link ErpPurchaseOrderDO#getNo()}
+ */
+ private String orderNo;
+
+ /**
+ * 鍚堣鏁伴噺
+ */
+ private BigDecimal totalCount;
+ /**
+ * 鏈�缁堝悎璁′环鏍硷紝鍗曚綅锛氬厓
+ *
+ * totalPrice = totalProductPrice + totalTaxPrice - discountPrice + otherPrice
+ */
+ private BigDecimal totalPrice;
+ /**
+ * 宸叉敮浠橀噾棰濓紝鍗曚綅锛氬厓
+ *
+ * 鐩殑锛氬拰 {@link cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpFinancePaymentDO} 缁撳悎锛岃褰曞凡鏀粯閲戦
+ */
+ private BigDecimal paymentPrice;
+
+ /**
+ * 鍚堣浜у搧浠锋牸锛屽崟浣嶏細鍏�
+ */
+ private BigDecimal totalProductPrice;
+ /**
+ * 鍚堣绋庨锛屽崟浣嶏細鍏�
+ */
+ private BigDecimal totalTaxPrice;
+ /**
+ * 浼樻儬鐜囷紝鐧惧垎姣�
+ */
+ private BigDecimal discountPercent;
+ /**
+ * 浼樻儬閲戦锛屽崟浣嶏細鍏�
+ *
+ * discountPrice = (totalProductPrice + totalTaxPrice) * discountPercent
+ */
+ private BigDecimal discountPrice;
+ /**
+ * 鍏跺畠閲戦锛屽崟浣嶏細鍏�
+ */
+ private BigDecimal otherPrice;
+
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInItemDO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInItemDO.java
new file mode 100644
index 0000000..abc0441
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseInItemDO.java
@@ -0,0 +1,93 @@
+package cn.iocoder.yudao.module.erp.dal.dataobject.purchase;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.math.BigDecimal;
+
+/**
+ * ERP 閲囪喘鍏ュ簱椤� DO
+ *
+ * @author 鑺嬮亾婧愮爜
+ */
+@TableName("erp_purchase_in_items")
+@KeySequence("erp_purchase_in_items_seq") // 鐢ㄤ簬 Oracle銆丳ostgreSQL銆並ingbase銆丏B2銆丠2 鏁版嵁搴撶殑涓婚敭鑷銆傚鏋滄槸 MySQL 绛夋暟鎹簱锛屽彲涓嶅啓銆�
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ErpPurchaseInItemDO extends BaseDO {
+
+ /**
+ * 缂栧彿
+ */
+ @TableId
+ private Long id;
+ /**
+ * 閲囪喘鍏ュ簱缂栧彿
+ *
+ * 鍏宠仈 {@link ErpPurchaseInDO##getId()}
+ */
+ private Long inId;
+ /**
+ * 閲囪喘璁㈠崟椤圭紪鍙�
+ *
+ * 鍏宠仈 {@link ErpPurchaseOrderItemDO#getId()}
+ * 鐩殑锛氭柟渚挎洿鏂板叧鑱旂殑閲囪喘璁㈠崟椤圭殑鍏ュ簱鏁伴噺
+ */
+ private Long orderItemId;
+ /**
+ * 浠撳簱缂栧彿
+ *
+ * 鍏宠仈 MES 浠撳簱缂栧彿
+ */
+ private Long warehouseId;
+ /**
+ * 浜у搧缂栧彿
+ *
+ * 鍏宠仈 MDM 鐗╂枡缂栧彿
+ */
+ private Long productId;
+ /**
+ * 浜у搧鍗曚綅鍗曚綅
+ *
+ * 鍐椾綑 MDM 鐗╂枡璁¢噺鍗曚綅缂栧彿
+ */
+ private Long productUnitId;
+
+ /**
+ * 浜у搧鍗曚綅鍗曚环锛屽崟浣嶏細鍏�
+ */
+ private BigDecimal productPrice;
+ /**
+ * 鏁伴噺
+ */
+ private BigDecimal count;
+ /**
+ * 鎬讳环锛屽崟浣嶏細鍏�
+ *
+ * totalPrice = productPrice * count
+ */
+ private BigDecimal totalPrice;
+ /**
+ * 绋庣巼锛岀櫨鍒嗘瘮
+ */
+ private BigDecimal taxPercent;
+ /**
+ * 绋庨锛屽崟浣嶏細鍏�
+ *
+ * taxPrice = totalPrice * taxPercent
+ */
+ private BigDecimal taxPrice;
+
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseReturnDO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseReturnDO.java
new file mode 100644
index 0000000..8f27dfa
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseReturnDO.java
@@ -0,0 +1,118 @@
+package cn.iocoder.yudao.module.erp.dal.dataobject.purchase;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpAccountDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * ERP 閲囪喘閫�璐� DO
+ *
+ * @author 鑺嬮亾婧愮爜
+ */
+@TableName(value = "erp_purchase_return")
+@KeySequence("erp_purchase_return_seq") // 鐢ㄤ簬 Oracle銆丳ostgreSQL銆並ingbase銆丏B2銆丠2 鏁版嵁搴撶殑涓婚敭鑷銆傚鏋滄槸 MySQL 绛夋暟鎹簱锛屽彲涓嶅啓銆�
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ErpPurchaseReturnDO extends BaseDO {
+
+ /**
+ * 缂栧彿
+ */
+ @TableId
+ private Long id;
+ /**
+ * 閲囪喘閫�璐у崟鍙�
+ */
+ private String no;
+ /**
+ * 閫�璐х姸鎬�
+ *
+ * 鏋氫妇 {@link cn.iocoder.yudao.module.erp.enums.ErpAuditStatus}
+ */
+ private Integer status;
+ /**
+ * 渚涘簲鍟嗙紪鍙�
+ *
+ * 鍏宠仈 {@link ErpSupplierDO#getId()}
+ */
+ private Long supplierId;
+ /**
+ * 缁撶畻璐︽埛缂栧彿
+ *
+ * 鍏宠仈 {@link ErpAccountDO#getId()}
+ */
+ private Long accountId;
+ /**
+ * 閫�璐ф椂闂�
+ */
+ private LocalDateTime returnTime;
+
+ /**
+ * 閲囪喘璁㈠崟缂栧彿
+ *
+ * 鍏宠仈 {@link ErpPurchaseOrderDO#getId()}
+ */
+ private Long orderId;
+ /**
+ * 閲囪喘璁㈠崟鍙�
+ *
+ * 鍐椾綑 {@link ErpPurchaseOrderDO#getNo()}
+ */
+ private String orderNo;
+
+ /**
+ * 鍚堣鏁伴噺
+ */
+ private BigDecimal totalCount;
+ /**
+ * 鏈�缁堝悎璁′环鏍硷紝鍗曚綅锛氬厓
+ *
+ * totalPrice = totalProductPrice + totalTaxPrice - discountPrice + otherPrice
+ */
+ private BigDecimal totalPrice;
+ /**
+ * 宸查��娆鹃噾棰濓紝鍗曚綅锛氬厓
+ *
+ * 鐩殑锛氬拰 {@link cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpFinancePaymentDO} 缁撳悎锛岃褰曞凡鏀粯閲戦
+ */
+ private BigDecimal refundPrice;
+
+ /**
+ * 鍚堣浜у搧浠锋牸锛屽崟浣嶏細鍏�
+ */
+ private BigDecimal totalProductPrice;
+ /**
+ * 鍚堣绋庨锛屽崟浣嶏細鍏�
+ */
+ private BigDecimal totalTaxPrice;
+ /**
+ * 浼樻儬鐜囷紝鐧惧垎姣�
+ */
+ private BigDecimal discountPercent;
+ /**
+ * 浼樻儬閲戦锛屽崟浣嶏細鍏�
+ *
+ * discountPrice = (totalProductPrice + totalTaxPrice) * discountPercent
+ */
+ private BigDecimal discountPrice;
+ /**
+ * 鍏跺畠閲戦锛屽崟浣嶏細鍏�
+ */
+ private BigDecimal otherPrice;
+
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseReturnItemDO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseReturnItemDO.java
new file mode 100644
index 0000000..0eb0d7d
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseReturnItemDO.java
@@ -0,0 +1,93 @@
+package cn.iocoder.yudao.module.erp.dal.dataobject.purchase;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+import java.math.BigDecimal;
+
+/**
+ * ERP 閲囪喘閫�璐ч」 DO
+ *
+ * @author 鑺嬮亾婧愮爜
+ */
+@TableName("erp_purchase_return_items")
+@KeySequence("erp_purchase_return_items_seq") // 鐢ㄤ簬 Oracle銆丳ostgreSQL銆並ingbase銆丏B2銆丠2 鏁版嵁搴撶殑涓婚敭鑷銆傚鏋滄槸 MySQL 绛夋暟鎹簱锛屽彲涓嶅啓銆�
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ErpPurchaseReturnItemDO extends BaseDO {
+
+ /**
+ * 缂栧彿
+ */
+ @TableId
+ private Long id;
+ /**
+ * 閲囪喘閫�璐х紪鍙�
+ *
+ * 鍏宠仈 {@link ErpPurchaseReturnDO##getId()}
+ */
+ private Long returnId;
+ /**
+ * 閲囪喘璁㈠崟椤圭紪鍙�
+ *
+ * 鍏宠仈 {@link ErpPurchaseOrderItemDO#getId()}
+ * 鐩殑锛氭柟渚挎洿鏂板叧鑱旂殑閲囪喘璁㈠崟椤圭殑閫�璐ф暟閲�
+ */
+ private Long orderItemId;
+ /**
+ * 浠撳簱缂栧彿
+ *
+ * 鍏宠仈 MES 浠撳簱缂栧彿
+ */
+ private Long warehouseId;
+ /**
+ * 浜у搧缂栧彿
+ *
+ * 鍏宠仈 MDM 鐗╂枡缂栧彿
+ */
+ private Long productId;
+ /**
+ * 浜у搧鍗曚綅鍗曚綅
+ *
+ * 鍐椾綑 MDM 鐗╂枡璁¢噺鍗曚綅缂栧彿
+ */
+ private Long productUnitId;
+
+ /**
+ * 浜у搧鍗曚綅鍗曚环锛屽崟浣嶏細鍏�
+ */
+ private BigDecimal productPrice;
+ /**
+ * 鏁伴噺
+ */
+ private BigDecimal count;
+ /**
+ * 鎬讳环锛屽崟浣嶏細鍏�
+ *
+ * totalPrice = productPrice * count
+ */
+ private BigDecimal totalPrice;
+ /**
+ * 绋庣巼锛岀櫨鍒嗘瘮
+ */
+ private BigDecimal taxPercent;
+ /**
+ * 绋庨锛屽崟浣嶏細鍏�
+ *
+ * taxPrice = totalPrice * taxPercent
+ */
+ private BigDecimal taxPrice;
+
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInItemMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInItemMapper.java
new file mode 100644
index 0000000..5a14317
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInItemMapper.java
@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.erp.dal.mysql.purchase;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInItemDO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
+
+/**
+ * ERP 閲囪喘鍏ュ簱椤� Mapper
+ *
+ * @author 鑺嬮亾婧愮爜
+ */
+@Mapper
+public interface ErpPurchaseInItemMapper extends BaseMapperX<ErpPurchaseInItemDO> {
+
+ default List<ErpPurchaseInItemDO> selectListByInId(Long inId) {
+ return selectList(ErpPurchaseInItemDO::getInId, inId);
+ }
+
+ default List<ErpPurchaseInItemDO> selectListByInIds(Collection<Long> inIds) {
+ return selectList(ErpPurchaseInItemDO::getInId, inIds);
+ }
+
+ default int deleteByInId(Long inId) {
+ return delete(ErpPurchaseInItemDO::getInId, inId);
+ }
+
+ /**
+ * 鍩轰簬閲囪喘璁㈠崟缂栧彿锛屾煡璇㈡瘡涓噰璐鍗曢」鐨勫叆搴撴暟閲忎箣鍜�
+ *
+ * @param inIds 鍏ュ簱璁㈠崟椤圭紪鍙锋暟缁�
+ * @return key锛氶噰璐鍗曢」缂栧彿锛泇alue锛氬叆搴撴暟閲忎箣鍜�
+ */
+ default Map<Long, BigDecimal> selectOrderItemCountSumMapByInIds(Collection<Long> inIds) {
+ if (CollUtil.isEmpty(inIds)) {
+ return Collections.emptyMap();
+ }
+ // SQL sum 鏌ヨ
+ List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpPurchaseInItemDO>()
+ .select("order_item_id, SUM(count) AS sum_count")
+ .groupBy("order_item_id")
+ .in("in_id", inIds));
+ // 鑾峰緱鏁伴噺
+ return convertMap(result, obj -> (Long) obj.get("order_item_id"), obj -> (BigDecimal) obj.get("sum_count"));
+ }
+
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInMapper.java
new file mode 100644
index 0000000..c155d8c
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseInMapper.java
@@ -0,0 +1,70 @@
+package cn.iocoder.yudao.module.erp.dal.mysql.purchase;
+
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.in.ErpPurchaseInPageReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInItemDO;
+import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * ERP 閲囪喘鍏ュ簱 Mapper
+ *
+ * @author 鑺嬮亾婧愮爜
+ */
+@Mapper
+public interface ErpPurchaseInMapper extends BaseMapperX<ErpPurchaseInDO> {
+
+ default PageResult<ErpPurchaseInDO> selectPage(ErpPurchaseInPageReqVO reqVO) {
+ MPJLambdaWrapperX<ErpPurchaseInDO> query = new MPJLambdaWrapperX<ErpPurchaseInDO>()
+ .likeIfPresent(ErpPurchaseInDO::getNo, reqVO.getNo())
+ .eqIfPresent(ErpPurchaseInDO::getSupplierId, reqVO.getSupplierId())
+ .betweenIfPresent(ErpPurchaseInDO::getInTime, reqVO.getInTime())
+ .eqIfPresent(ErpPurchaseInDO::getStatus, reqVO.getStatus())
+ .likeIfPresent(ErpPurchaseInDO::getRemark, reqVO.getRemark())
+ .eqIfPresent(ErpPurchaseInDO::getCreator, reqVO.getCreator())
+ .eqIfPresent(ErpPurchaseInDO::getAccountId, reqVO.getAccountId())
+ .likeIfPresent(ErpPurchaseInDO::getOrderNo, reqVO.getOrderNo())
+ .orderByDesc(ErpPurchaseInDO::getId);
+ // 浠樻鐘舵�併�備负浠�涔堥渶瑕� t. 鐨勫師鍥狅紝鏄洜涓鸿仈琛ㄦ煡璇㈡椂锛岄渶瑕佹寚瀹氳〃鍚嶏紝涓嶇劧浼氭姤瀛楁涓嶅瓨鍦ㄧ殑閿欒
+ if (Objects.equals(reqVO.getPaymentStatus(), ErpPurchaseInPageReqVO.PAYMENT_STATUS_NONE)) {
+ query.eq(ErpPurchaseInDO::getPaymentPrice, 0);
+ } else if (Objects.equals(reqVO.getPaymentStatus(), ErpPurchaseInPageReqVO.PAYMENT_STATUS_PART)) {
+ query.gt(ErpPurchaseInDO::getPaymentPrice, 0).apply("t.payment_price < t.total_price");
+ } else if (Objects.equals(reqVO.getPaymentStatus(), ErpPurchaseInPageReqVO.PAYMENT_STATUS_ALL)) {
+ query.apply("t.payment_price = t.total_price");
+ }
+ if (Boolean.TRUE.equals(reqVO.getPaymentEnable())) {
+ query.eq(ErpPurchaseInDO::getStatus, ErpAuditStatus.APPROVE.getStatus())
+ .apply("t.payment_price < t.total_price");
+ }
+ if (reqVO.getWarehouseId() != null || reqVO.getProductId() != null) {
+ query.leftJoin(ErpPurchaseInItemDO.class, ErpPurchaseInItemDO::getInId, ErpPurchaseInDO::getId)
+ .eq(reqVO.getWarehouseId() != null, ErpPurchaseInItemDO::getWarehouseId, reqVO.getWarehouseId())
+ .eq(reqVO.getProductId() != null, ErpPurchaseInItemDO::getProductId, reqVO.getProductId())
+ .groupBy(ErpPurchaseInDO::getId); // 閬垮厤 1 瀵瑰鏌ヨ锛屼骇鐢熺浉鍚岀殑 1
+ }
+ return selectJoinPage(reqVO, ErpPurchaseInDO.class, query);
+ }
+
+ default int updateByIdAndStatus(Long id, Integer status, ErpPurchaseInDO updateObj) {
+ return update(updateObj, new LambdaUpdateWrapper<ErpPurchaseInDO>()
+ .eq(ErpPurchaseInDO::getId, id).eq(ErpPurchaseInDO::getStatus, status));
+ }
+
+ default ErpPurchaseInDO selectByNo(String no) {
+ return selectOne(ErpPurchaseInDO::getNo, no);
+ }
+
+ default List<ErpPurchaseInDO> selectListByOrderId(Long orderId) {
+ return selectList(ErpPurchaseInDO::getOrderId, orderId);
+ }
+
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseReturnItemMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseReturnItemMapper.java
new file mode 100644
index 0000000..30527d2
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseReturnItemMapper.java
@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.erp.dal.mysql.purchase;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseReturnItemDO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
+
+/**
+ * ERP 閲囪喘閫�璐ч」 Mapper
+ *
+ * @author 鑺嬮亾婧愮爜
+ */
+@Mapper
+public interface ErpPurchaseReturnItemMapper extends BaseMapperX<ErpPurchaseReturnItemDO> {
+
+ default List<ErpPurchaseReturnItemDO> selectListByReturnId(Long returnId) {
+ return selectList(ErpPurchaseReturnItemDO::getReturnId, returnId);
+ }
+
+ default List<ErpPurchaseReturnItemDO> selectListByReturnIds(Collection<Long> returnIds) {
+ return selectList(ErpPurchaseReturnItemDO::getReturnId, returnIds);
+ }
+
+ default int deleteByReturnId(Long returnId) {
+ return delete(ErpPurchaseReturnItemDO::getReturnId, returnId);
+ }
+
+ /**
+ * 鍩轰簬閲囪喘璁㈠崟缂栧彿锛屾煡璇㈡瘡涓噰璐鍗曢」鐨勯��璐ф暟閲忎箣鍜�
+ *
+ * @param returnIds 鍏ュ簱璁㈠崟椤圭紪鍙锋暟缁�
+ * @return key锛氶噰璐鍗曢」缂栧彿锛泇alue锛氶��璐ф暟閲忎箣鍜�
+ */
+ default Map<Long, BigDecimal> selectOrderItemCountSumMapByReturnIds(Collection<Long> returnIds) {
+ if (CollUtil.isEmpty(returnIds)) {
+ return Collections.emptyMap();
+ }
+ // SQL sum 鏌ヨ
+ List<Map<String, Object>> result = selectMaps(new QueryWrapper<ErpPurchaseReturnItemDO>()
+ .select("order_item_id, SUM(count) AS sum_count")
+ .groupBy("order_item_id")
+ .in("return_id", returnIds));
+ // 鑾峰緱鏁伴噺
+ return convertMap(result, obj -> (Long) obj.get("order_item_id"), obj -> (BigDecimal) obj.get("sum_count"));
+ }
+
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseReturnMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseReturnMapper.java
new file mode 100644
index 0000000..689a55d
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/purchase/ErpPurchaseReturnMapper.java
@@ -0,0 +1,70 @@
+package cn.iocoder.yudao.module.erp.dal.mysql.purchase;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.returns.ErpPurchaseReturnPageReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseReturnDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseReturnItemDO;
+import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * ERP 閲囪喘閫�璐� Mapper
+ *
+ * @author 鑺嬮亾婧愮爜
+ */
+@Mapper
+public interface ErpPurchaseReturnMapper extends BaseMapperX<ErpPurchaseReturnDO> {
+
+ default PageResult<ErpPurchaseReturnDO> selectPage(ErpPurchaseReturnPageReqVO reqVO) {
+ MPJLambdaWrapperX<ErpPurchaseReturnDO> query = new MPJLambdaWrapperX<ErpPurchaseReturnDO>()
+ .likeIfPresent(ErpPurchaseReturnDO::getNo, reqVO.getNo())
+ .eqIfPresent(ErpPurchaseReturnDO::getSupplierId, reqVO.getSupplierId())
+ .betweenIfPresent(ErpPurchaseReturnDO::getReturnTime, reqVO.getReturnTime())
+ .eqIfPresent(ErpPurchaseReturnDO::getStatus, reqVO.getStatus())
+ .likeIfPresent(ErpPurchaseReturnDO::getRemark, reqVO.getRemark())
+ .eqIfPresent(ErpPurchaseReturnDO::getCreator, reqVO.getCreator())
+ .eqIfPresent(ErpPurchaseReturnDO::getAccountId, reqVO.getAccountId())
+ .likeIfPresent(ErpPurchaseReturnDO::getOrderNo, reqVO.getOrderNo())
+ .orderByDesc(ErpPurchaseReturnDO::getId);
+ // 閫�娆剧姸鎬併�備负浠�涔堥渶瑕� t. 鐨勫師鍥狅紝鏄洜涓鸿仈琛ㄦ煡璇㈡椂锛岄渶瑕佹寚瀹氳〃鍚嶏紝涓嶇劧浼氭姤瀛楁涓嶅瓨鍦ㄧ殑閿欒
+ if (Objects.equals(reqVO.getRefundStatus(), ErpPurchaseReturnPageReqVO.REFUND_STATUS_NONE)) {
+ query.eq(ErpPurchaseReturnDO::getRefundPrice, 0);
+ } else if (Objects.equals(reqVO.getRefundStatus(), ErpPurchaseReturnPageReqVO.REFUND_STATUS_PART)) {
+ query.gt(ErpPurchaseReturnDO::getRefundPrice, 0).apply("t.refund_price < t.total_price");
+ } else if (Objects.equals(reqVO.getRefundStatus(), ErpPurchaseReturnPageReqVO.REFUND_STATUS_ALL)) {
+ query.apply("t.refund_price = t.total_price");
+ }
+ if (Boolean.TRUE.equals(reqVO.getRefundEnable())) {
+ query.eq(ErpPurchaseInDO::getStatus, ErpAuditStatus.APPROVE.getStatus())
+ .apply("t.refund_price < t.total_price");
+ }
+ if (reqVO.getWarehouseId() != null || reqVO.getProductId() != null) {
+ query.leftJoin(ErpPurchaseReturnItemDO.class, ErpPurchaseReturnItemDO::getReturnId, ErpPurchaseReturnDO::getId)
+ .eq(reqVO.getWarehouseId() != null, ErpPurchaseReturnItemDO::getWarehouseId, reqVO.getWarehouseId())
+ .eq(reqVO.getProductId() != null, ErpPurchaseReturnItemDO::getProductId, reqVO.getProductId())
+ .groupBy(ErpPurchaseReturnDO::getId); // 閬垮厤 1 瀵瑰鏌ヨ锛屼骇鐢熺浉鍚岀殑 1
+ }
+ return selectJoinPage(reqVO, ErpPurchaseReturnDO.class, query);
+ }
+
+ default int updateByIdAndStatus(Long id, Integer status, ErpPurchaseReturnDO updateObj) {
+ return update(updateObj, new LambdaUpdateWrapper<ErpPurchaseReturnDO>()
+ .eq(ErpPurchaseReturnDO::getId, id).eq(ErpPurchaseReturnDO::getStatus, status));
+ }
+
+ default ErpPurchaseReturnDO selectByNo(String no) {
+ return selectOne(ErpPurchaseReturnDO::getNo, no);
+ }
+
+ default List<ErpPurchaseReturnDO> selectListByOrderId(Long orderId) {
+ return selectList(ErpPurchaseReturnDO::getOrderId, orderId);
+ }
+
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/statistics/ErpPurchaseStatisticsMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/statistics/ErpPurchaseStatisticsMapper.java
index 87736b2..0a6675d 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/statistics/ErpPurchaseStatisticsMapper.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/statistics/ErpPurchaseStatisticsMapper.java
@@ -1,5 +1,11 @@
package cn.iocoder.yudao.module.erp.dal.mysql.statistics;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchasePriceAnalysisRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseStatisticsReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseSummaryRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseSupplierStatisticsRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseUncompletedOrderRespVO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -17,4 +23,44 @@
BigDecimal getPurchasePrice(@Param("beginTime") LocalDateTime beginTime,
@Param("endTime") LocalDateTime endTime);
+ /**
+ * 閲囪喘姹囨�荤粺璁★紙璁㈠崟 / 鍏ュ簱 / 閫�璐х殑鎬绘暟涓庢�婚噾棰濓級
+ *
+ * @return 姹囨�荤粺璁�
+ */
+ ErpPurchaseSummaryRespVO selectPurchaseSummary();
+
+ /**
+ * 渚涘簲鍟嗕緵璐х粺璁�
+ *
+ * @param page 鍒嗛〉
+ * @param reqVO 鏌ヨ鏉′欢
+ * @return 鍒嗛〉缁撴灉
+ */
+ Page<ErpPurchaseSupplierStatisticsRespVO> selectSupplierStatistics(
+ Page<ErpPurchaseSupplierStatisticsRespVO> page,
+ @Param("reqVO") ErpPurchaseStatisticsReqVO reqVO);
+
+ /**
+ * 閲囪喘浠锋牸鍒嗘瀽锛堟寜浜у搧鑱氬悎锛�
+ *
+ * @param page 鍒嗛〉
+ * @param reqVO 鏌ヨ鏉′欢
+ * @return 鍒嗛〉缁撴灉
+ */
+ Page<ErpPurchasePriceAnalysisRespVO> selectPriceAnalysis(
+ Page<ErpPurchasePriceAnalysisRespVO> page,
+ @Param("reqVO") ErpPurchaseStatisticsReqVO reqVO);
+
+ /**
+ * 鏈畬鎴愰噰璐鍗曡窡韪�
+ *
+ * @param page 鍒嗛〉
+ * @param reqVO 鏌ヨ鏉′欢
+ * @return 鍒嗛〉缁撴灉
+ */
+ Page<ErpPurchaseUncompletedOrderRespVO> selectUncompletedOrders(
+ Page<ErpPurchaseUncompletedOrderRespVO> page,
+ @Param("reqVO") ErpPurchaseStatisticsReqVO reqVO);
+
}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/redis/no/ErpNoRedisDAO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/redis/no/ErpNoRedisDAO.java
index 83c3db5..768c1fd 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/redis/no/ErpNoRedisDAO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/redis/no/ErpNoRedisDAO.java
@@ -45,6 +45,16 @@
public static final String PURCHASE_INVOICE_NO_PREFIX = "FPD";
/**
+ * 閲囪喘鍏ュ簱 {@link cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInDO}
+ */
+ public static final String PURCHASE_IN_NO_PREFIX = "CGRK";
+
+ /**
+ * 閲囪喘閫�璐� {@link cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseReturnDO}
+ */
+ public static final String PURCHASE_RETURN_NO_PREFIX = "CGTH";
+
+ /**
* 浠樻鍗� {@link cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpFinancePaymentDO}
*/
public static final String FINANCE_PAYMENT_NO_PREFIX = "FKD";
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInService.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInService.java
new file mode 100644
index 0000000..37aa452
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInService.java
@@ -0,0 +1,101 @@
+package cn.iocoder.yudao.module.erp.service.purchase;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.in.ErpPurchaseInPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.in.ErpPurchaseInSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInItemDO;
+import jakarta.validation.Valid;
+
+import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * ERP 閲囪喘鍏ュ簱 Service 鎺ュ彛
+ *
+ * @author 鑺嬮亾婧愮爜
+ */
+public interface ErpPurchaseInService {
+
+ /**
+ * 鍒涘缓閲囪喘鍏ュ簱
+ *
+ * @param createReqVO 鍒涘缓淇℃伅
+ * @return 缂栧彿
+ */
+ Long createPurchaseIn(@Valid ErpPurchaseInSaveReqVO createReqVO);
+
+ /**
+ * 鏇存柊閲囪喘鍏ュ簱
+ *
+ * @param updateReqVO 鏇存柊淇℃伅
+ */
+ void updatePurchaseIn(@Valid ErpPurchaseInSaveReqVO updateReqVO);
+
+ /**
+ * 鏇存柊閲囪喘鍏ュ簱鐨勭姸鎬�
+ *
+ * @param id 缂栧彿
+ * @param status 鐘舵��
+ */
+ void updatePurchaseInStatus(Long id, Integer status);
+
+ /**
+ * 鏇存柊閲囪喘鍏ュ簱鐨勪粯娆鹃噾棰�
+ *
+ * @param id 缂栧彿
+ * @param paymentPrice 浠樻閲戦
+ */
+ void updatePurchaseInPaymentPrice(Long id, BigDecimal paymentPrice);
+
+ /**
+ * 鍒犻櫎閲囪喘鍏ュ簱
+ *
+ * @param ids 缂栧彿鏁扮粍
+ */
+ void deletePurchaseIn(List<Long> ids);
+
+ /**
+ * 鑾峰緱閲囪喘鍏ュ簱
+ *
+ * @param id 缂栧彿
+ * @return 閲囪喘鍏ュ簱
+ */
+ ErpPurchaseInDO getPurchaseIn(Long id);
+
+ /**
+ * 鏍¢獙閲囪喘鍏ュ簱锛屽凡缁忓鏍搁�氳繃
+ *
+ * @param id 缂栧彿
+ * @return 閲囪喘鍏ュ簱
+ */
+ ErpPurchaseInDO validatePurchaseIn(Long id);
+
+ /**
+ * 鑾峰緱閲囪喘鍏ュ簱鍒嗛〉
+ *
+ * @param pageReqVO 鍒嗛〉鏌ヨ
+ * @return 閲囪喘鍏ュ簱鍒嗛〉
+ */
+ PageResult<ErpPurchaseInDO> getPurchaseInPage(ErpPurchaseInPageReqVO pageReqVO);
+
+ // ==================== 閲囪喘鍏ュ簱椤� ====================
+
+ /**
+ * 鑾峰緱閲囪喘鍏ュ簱椤瑰垪琛�
+ *
+ * @param inId 閲囪喘鍏ュ簱缂栧彿
+ * @return 閲囪喘鍏ュ簱椤瑰垪琛�
+ */
+ List<ErpPurchaseInItemDO> getPurchaseInItemListByInId(Long inId);
+
+ /**
+ * 鑾峰緱閲囪喘鍏ュ簱椤� List
+ *
+ * @param inIds 閲囪喘鍏ュ簱缂栧彿鏁扮粍
+ * @return 閲囪喘鍏ュ簱椤� List
+ */
+ List<ErpPurchaseInItemDO> getPurchaseInItemListByInIds(Collection<Long> inIds);
+
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java
new file mode 100644
index 0000000..b1f7bf5
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInServiceImpl.java
@@ -0,0 +1,352 @@
+package cn.iocoder.yudao.module.erp.service.purchase;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.in.ErpPurchaseInPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.in.ErpPurchaseInSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInItemDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO;
+import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseInItemMapper;
+import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseInMapper;
+import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
+import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
+import cn.iocoder.yudao.module.erp.service.finance.ErpAccountService;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.mes.api.wms.dto.WmsPurchaseInboundReqDTO;
+import cn.iocoder.yudao.module.mes.api.wms.stock.WmsStockApi;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
+
+// TODO 鑺嬭壙锛氳褰曟搷浣滄棩蹇�
+
+/**
+ * ERP 閲囪喘鍏ュ簱 Service 瀹炵幇绫�
+ *
+ * @author 鑺嬮亾婧愮爜
+ */
+@Service
+@Validated
+@Slf4j
+public class ErpPurchaseInServiceImpl implements ErpPurchaseInService {
+
+ @Resource
+ private ErpPurchaseInMapper purchaseInMapper;
+ @Resource
+ private ErpPurchaseInItemMapper purchaseInItemMapper;
+
+ @Resource
+ private ErpNoRedisDAO noRedisDAO;
+
+ @Resource
+ private MdmItemApi mdmItemApi;
+ @Resource
+ @Lazy // 寤惰繜鍔犺浇锛岄伩鍏嶅惊鐜緷璧�
+ private ErpPurchaseOrderService purchaseOrderService;
+ @Resource
+ private ErpAccountService accountService;
+
+ @Resource
+ private WmsStockApi wmsStockApi;
+
+ @Resource
+ private AdminUserApi adminUserApi;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long createPurchaseIn(ErpPurchaseInSaveReqVO createReqVO) {
+ // 1.1 鏍¢獙閲囪喘璁㈠崟宸插鏍�
+ ErpPurchaseOrderDO purchaseOrder = purchaseOrderService.validatePurchaseOrder(createReqVO.getOrderId());
+ // 1.2 鏍¢獙鍏ュ簱椤圭殑鏈夋晥鎬�
+ List<ErpPurchaseInItemDO> purchaseInItems = validatePurchaseInItems(createReqVO.getItems());
+ // 1.3 鏍¢獙缁撶畻璐︽埛
+ accountService.validateAccount(createReqVO.getAccountId());
+ // 1.4 鐢熸垚鍏ュ簱鍗曞彿锛屽苟鏍¢獙鍞竴鎬�
+ String no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_IN_NO_PREFIX);
+ if (purchaseInMapper.selectByNo(no) != null) {
+ throw exception(PURCHASE_IN_NO_EXISTS);
+ }
+
+ // 2.1 鎻掑叆鍏ュ簱
+ ErpPurchaseInDO purchaseIn = BeanUtils.toBean(createReqVO, ErpPurchaseInDO.class, in -> in
+ .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus()))
+ .setOrderNo(purchaseOrder.getNo()).setSupplierId(purchaseOrder.getSupplierId());
+ calculateTotalPrice(purchaseIn, purchaseInItems);
+ purchaseInMapper.insert(purchaseIn);
+ // 2.2 鎻掑叆鍏ュ簱椤�
+ purchaseInItems.forEach(o -> o.setInId(purchaseIn.getId()));
+ purchaseInItemMapper.insertBatch(purchaseInItems);
+
+ // 3. 鏇存柊閲囪喘璁㈠崟鐨勫叆搴撴暟閲�
+ updatePurchaseOrderInCount(createReqVO.getOrderId());
+ return purchaseIn.getId();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updatePurchaseIn(ErpPurchaseInSaveReqVO updateReqVO) {
+ // 1.1 鏍¢獙瀛樺湪
+ ErpPurchaseInDO purchaseIn = validatePurchaseInExists(updateReqVO.getId());
+ if (ErpAuditStatus.APPROVE.getStatus().equals(purchaseIn.getStatus())) {
+ throw exception(PURCHASE_IN_UPDATE_FAIL_APPROVE, purchaseIn.getNo());
+ }
+ // 1.2 鏍¢獙閲囪喘璁㈠崟宸插鏍�
+ ErpPurchaseOrderDO purchaseOrder = purchaseOrderService.validatePurchaseOrder(updateReqVO.getOrderId());
+ // 1.3 鏍¢獙缁撶畻璐︽埛
+ accountService.validateAccount(updateReqVO.getAccountId());
+ // 1.4 鏍¢獙璁㈠崟椤圭殑鏈夋晥鎬�
+ List<ErpPurchaseInItemDO> purchaseInItems = validatePurchaseInItems(updateReqVO.getItems());
+
+ // 2.1 鏇存柊鍏ュ簱
+ ErpPurchaseInDO updateObj = BeanUtils.toBean(updateReqVO, ErpPurchaseInDO.class)
+ .setOrderNo(purchaseOrder.getNo()).setSupplierId(purchaseOrder.getSupplierId());
+ calculateTotalPrice(updateObj, purchaseInItems);
+ purchaseInMapper.updateById(updateObj);
+ // 2.2 鏇存柊鍏ュ簱椤�
+ updatePurchaseInItemList(updateReqVO.getId(), purchaseInItems);
+
+ // 3.1 鏇存柊閲囪喘璁㈠崟鐨勫叆搴撴暟閲�
+ updatePurchaseOrderInCount(updateObj.getOrderId());
+ // 3.2 娉ㄦ剰锛氬鏋滈噰璐鍗曠紪鍙峰彉鏇翠簡锛岄渶瑕佹洿鏂扳�滆�佲�濋噰璐鍗曠殑鍏ュ簱鏁伴噺
+ if (ObjectUtil.notEqual(purchaseIn.getOrderId(), updateObj.getOrderId())) {
+ updatePurchaseOrderInCount(purchaseIn.getOrderId());
+ }
+ }
+
+ private void calculateTotalPrice(ErpPurchaseInDO purchaseIn, List<ErpPurchaseInItemDO> purchaseInItems) {
+ purchaseIn.setTotalCount(getSumValue(purchaseInItems, ErpPurchaseInItemDO::getCount, BigDecimal::add));
+ purchaseIn.setTotalProductPrice(getSumValue(purchaseInItems, ErpPurchaseInItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO));
+ purchaseIn.setTotalTaxPrice(getSumValue(purchaseInItems, ErpPurchaseInItemDO::getTaxPrice, BigDecimal::add, BigDecimal.ZERO));
+ purchaseIn.setTotalPrice(purchaseIn.getTotalProductPrice().add(purchaseIn.getTotalTaxPrice()));
+ // 璁$畻浼樻儬浠锋牸
+ if (purchaseIn.getDiscountPercent() == null) {
+ purchaseIn.setDiscountPercent(BigDecimal.ZERO);
+ }
+ purchaseIn.setDiscountPrice(MoneyUtils.priceMultiplyPercent(purchaseIn.getTotalPrice(), purchaseIn.getDiscountPercent()));
+ purchaseIn.setTotalPrice(purchaseIn.getTotalPrice().subtract(purchaseIn.getDiscountPrice()).add(purchaseIn.getOtherPrice()));
+ }
+
+ private void updatePurchaseOrderInCount(Long orderId) {
+ // 1.1 鏌ヨ閲囪喘璁㈠崟瀵瑰簲鐨勯噰璐叆搴撳崟鍒楄〃
+ List<ErpPurchaseInDO> purchaseIns = purchaseInMapper.selectListByOrderId(orderId);
+ // 1.2 鏌ヨ瀵瑰簲鐨勯噰璐鍗曢」鐨勫叆搴撴暟閲�
+ Map<Long, BigDecimal> returnCountMap = purchaseInItemMapper.selectOrderItemCountSumMapByInIds(
+ convertList(purchaseIns, ErpPurchaseInDO::getId));
+ // 2. 鏇存柊閲囪喘璁㈠崟鐨勫叆搴撴暟閲�
+ purchaseOrderService.updatePurchaseOrderInCount(orderId, returnCountMap);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updatePurchaseInStatus(Long id, Integer status) {
+ boolean approve = ErpAuditStatus.APPROVE.getStatus().equals(status);
+ // 1.1 鏍¢獙瀛樺湪
+ ErpPurchaseInDO purchaseIn = validatePurchaseInExists(id);
+ // 1.2 鏍¢獙鐘舵��
+ if (purchaseIn.getStatus().equals(status)) {
+ throw exception(approve ? PURCHASE_IN_APPROVE_FAIL : PURCHASE_IN_PROCESS_FAIL);
+ }
+ // 1.3 鏍¢獙宸蹭粯娆�
+ if (!approve && purchaseIn.getPaymentPrice().compareTo(BigDecimal.ZERO) > 0) {
+ throw exception(PURCHASE_IN_PROCESS_FAIL_EXISTS_PAYMENT);
+ }
+
+ // 2. 鏇存柊鐘舵��
+ int updateCount = purchaseInMapper.updateByIdAndStatus(id, purchaseIn.getStatus(),
+ new ErpPurchaseInDO().setStatus(status));
+ if (updateCount == 0) {
+ throw exception(approve ? PURCHASE_IN_APPROVE_FAIL : PURCHASE_IN_PROCESS_FAIL);
+ }
+
+ // 3. 鍚屾 WMS 搴撳瓨锛圡ES 搴撳瓨锛�
+ if (approve) {
+ List<ErpPurchaseInItemDO> purchaseInItems = purchaseInItemMapper.selectListByInId(id);
+ syncToWmsPurchaseInbound(purchaseIn, purchaseInItems);
+ }
+ }
+
+ /**
+ * 鍚屾閲囪喘鍏ュ簱鍒� WMS 搴撳瓨
+ */
+ private void syncToWmsPurchaseInbound(ErpPurchaseInDO purchaseIn, List<ErpPurchaseInItemDO> purchaseInItems) {
+ if (CollUtil.isEmpty(purchaseInItems)) {
+ return;
+ }
+
+ log.info("[syncToWmsPurchaseInbound] 寮�濮嬪悓姝ラ噰璐叆搴撳埌WMS锛宲urchaseInId={}", purchaseIn.getId());
+
+ // 鏋勫缓鍏ュ簱璇锋眰
+ WmsPurchaseInboundReqDTO reqDTO = new WmsPurchaseInboundReqDTO()
+ .setBizId(purchaseIn.getId())
+ .setBizCode(purchaseIn.getNo())
+ .setReceiptTime(LocalDateTime.now());
+
+ // 杞崲鏄庣粏椤癸細ERP 浜у搧缂栧彿鍗� MDM 鐗╂枡缂栧彿锛屼粨搴撶紪鍙峰嵆 MES 浠撳簱缂栧彿
+ List<WmsPurchaseInboundReqDTO.Item> items = convertList(purchaseInItems, item -> new WmsPurchaseInboundReqDTO.Item()
+ .setItemId(item.getProductId())
+ .setWarehouseId(item.getWarehouseId())
+ .setQuantity(item.getCount())
+ .setBizLineId(item.getId()));
+
+ // 杩囨护鎺夋槧灏勫け璐ョ殑椤�
+ items = items.stream().filter(java.util.Objects::nonNull).toList();
+ if (CollUtil.isEmpty(items)) {
+ log.warn("[syncToWmsPurchaseInbound] 鏃犳湁鏁堢殑鍏ュ簱鏄庣粏锛岃烦杩嘩MS鍚屾");
+ return;
+ }
+
+ reqDTO.setItems(items);
+
+ try {
+ Long transactionId = wmsStockApi.purchaseInbound(reqDTO);
+ log.info("[syncToWmsPurchaseInbound] 鍚屾鎴愬姛锛宼ransactionId={}", transactionId);
+ } catch (Exception e) {
+ log.error("[syncToWmsPurchaseInbound] 鍚屾澶辫触", e);
+ // 娉ㄦ剰锛氳繖閲屽彲浠ラ�夋嫨鎶涘嚭寮傚父鍥炴粴锛屾垨浠呰褰曟棩蹇�
+ // throw exception(PURCHASE_IN_SYNC_WMS_FAIL);
+ }
+ }
+
+ @Override
+ public void updatePurchaseInPaymentPrice(Long id, BigDecimal paymentPrice) {
+ ErpPurchaseInDO purchaseIn = purchaseInMapper.selectById(id);
+ if (purchaseIn.getPaymentPrice().equals(paymentPrice)) {
+ return;
+ }
+ if (paymentPrice.compareTo(purchaseIn.getTotalPrice()) > 0) {
+ throw exception(PURCHASE_IN_FAIL_PAYMENT_PRICE_EXCEED, paymentPrice, purchaseIn.getTotalPrice());
+ }
+ purchaseInMapper.updateById(new ErpPurchaseInDO().setId(id).setPaymentPrice(paymentPrice));
+ }
+
+ private List<ErpPurchaseInItemDO> validatePurchaseInItems(List<ErpPurchaseInSaveReqVO.Item> list) {
+ // 1. 鏍¢獙鐗╂枡瀛樺湪锛堢墿鏂欎富鏁版嵁宸茶縼绉诲埌 MDM锛�
+ Set<Long> productIds = convertSet(list, ErpPurchaseInSaveReqVO.Item::getProductId);
+ Map<Long, MdmItemRespDTO> itemMap = productIds.isEmpty() ? Collections.emptyMap() : mdmItemApi.getItemMap(productIds);
+ if (itemMap.size() != productIds.size()) {
+ throw exception(PRODUCT_NOT_EXISTS);
+ }
+ // 2. 杞寲涓� ErpPurchaseInItemDO 鍒楄〃
+ return convertList(list, o -> BeanUtils.toBean(o, ErpPurchaseInItemDO.class, item -> {
+ item.setProductUnitId(itemMap.get(item.getProductId()).getUnitMeasureId());
+ item.setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()));
+ if (item.getTotalPrice() == null) {
+ return;
+ }
+ if (item.getTaxPercent() != null) {
+ item.setTaxPrice(MoneyUtils.priceMultiplyPercent(item.getTotalPrice(), item.getTaxPercent()));
+ }
+ }));
+ }
+
+ private void updatePurchaseInItemList(Long id, List<ErpPurchaseInItemDO> newList) {
+ // 绗竴姝ワ紝瀵规瘮鏂拌�佹暟鎹紝鑾峰緱娣诲姞銆佷慨鏀广�佸垹闄ょ殑鍒楄〃
+ List<ErpPurchaseInItemDO> oldList = purchaseInItemMapper.selectListByInId(id);
+ List<List<ErpPurchaseInItemDO>> diffList = diffList(oldList, newList, // id 涓嶅悓锛屽氨璁や负鏄笉鍚岀殑璁板綍
+ (oldVal, newVal) -> oldVal.getId().equals(newVal.getId()));
+
+ // 绗簩姝ワ紝鎵归噺娣诲姞銆佷慨鏀广�佸垹闄�
+ if (CollUtil.isNotEmpty(diffList.get(0))) {
+ diffList.get(0).forEach(o -> o.setInId(id));
+ purchaseInItemMapper.insertBatch(diffList.get(0));
+ }
+ if (CollUtil.isNotEmpty(diffList.get(1))) {
+ purchaseInItemMapper.updateBatch(diffList.get(1));
+ }
+ if (CollUtil.isNotEmpty(diffList.get(2))) {
+ purchaseInItemMapper.deleteByIds(convertList(diffList.get(2), ErpPurchaseInItemDO::getId));
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deletePurchaseIn(List<Long> ids) {
+ // 1. 鏍¢獙涓嶅浜庡凡瀹℃壒
+ List<ErpPurchaseInDO> purchaseIns = purchaseInMapper.selectByIds(ids);
+ if (CollUtil.isEmpty(purchaseIns)) {
+ return;
+ }
+ purchaseIns.forEach(purchaseIn -> {
+ if (ErpAuditStatus.APPROVE.getStatus().equals(purchaseIn.getStatus())) {
+ throw exception(PURCHASE_IN_DELETE_FAIL_APPROVE, purchaseIn.getNo());
+ }
+ });
+
+ // 2. 閬嶅巻鍒犻櫎锛屽苟璁板綍鎿嶄綔鏃ュ織
+ purchaseIns.forEach(purchaseIn -> {
+ // 2.1 鍒犻櫎璁㈠崟
+ purchaseInMapper.deleteById(purchaseIn.getId());
+ // 2.2 鍒犻櫎璁㈠崟椤�
+ purchaseInItemMapper.deleteByInId(purchaseIn.getId());
+
+ // 2.3 鏇存柊閲囪喘璁㈠崟鐨勫叆搴撴暟閲�
+ updatePurchaseOrderInCount(purchaseIn.getOrderId());
+ });
+
+ }
+
+ private ErpPurchaseInDO validatePurchaseInExists(Long id) {
+ ErpPurchaseInDO purchaseIn = purchaseInMapper.selectById(id);
+ if (purchaseIn == null) {
+ throw exception(PURCHASE_IN_NOT_EXISTS);
+ }
+ return purchaseIn;
+ }
+
+ @Override
+ public ErpPurchaseInDO getPurchaseIn(Long id) {
+ return purchaseInMapper.selectById(id);
+ }
+
+ @Override
+ public ErpPurchaseInDO validatePurchaseIn(Long id) {
+ ErpPurchaseInDO purchaseIn = validatePurchaseInExists(id);
+ if (ObjectUtil.notEqual(purchaseIn.getStatus(), ErpAuditStatus.APPROVE.getStatus())) {
+ throw exception(PURCHASE_IN_NOT_APPROVE);
+ }
+ return purchaseIn;
+ }
+
+ @Override
+ public PageResult<ErpPurchaseInDO> getPurchaseInPage(ErpPurchaseInPageReqVO pageReqVO) {
+ return purchaseInMapper.selectPage(pageReqVO);
+ }
+
+ // ==================== 閲囪喘鍏ュ簱椤� ====================
+
+ @Override
+ public List<ErpPurchaseInItemDO> getPurchaseInItemListByInId(Long inId) {
+ return purchaseInItemMapper.selectListByInId(inId);
+ }
+
+ @Override
+ public List<ErpPurchaseInItemDO> getPurchaseInItemListByInIds(Collection<Long> inIds) {
+ if (CollUtil.isEmpty(inIds)) {
+ return Collections.emptyList();
+ }
+ return purchaseInItemMapper.selectListByInIds(inIds);
+ }
+
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
index bc3620d..b6bc848 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
@@ -550,7 +550,8 @@
// 1. 鏇存柊姣忎釜閲囪喘璁㈠崟椤�
orderItems.forEach(item -> {
BigDecimal inCount = inCountMap.getOrDefault(item.getId(), BigDecimal.ZERO);
- if (item.getInCount().equals(inCount)) {
+ // 鍘嗗彶/瀵煎叆鏁版嵁鐨勫叆搴撴暟閲忓彲鑳戒负绌猴紝鎸� 0 澶勭悊锛岄伩鍏� NPE
+ if (ObjectUtil.defaultIfNull(item.getInCount(), BigDecimal.ZERO).compareTo(inCount) == 0) {
return;
}
if (inCount.compareTo(item.getCount()) > 0) {
@@ -570,12 +571,14 @@
// 1. 鏇存柊姣忎釜閲囪喘璁㈠崟椤�
orderItems.forEach(item -> {
BigDecimal returnCount = returnCountMap.getOrDefault(item.getId(), BigDecimal.ZERO);
- if (item.getReturnCount().equals(returnCount)) {
+ // 鍘嗗彶/瀵煎叆鏁版嵁鐨勯��璐ф暟閲忋�佸叆搴撴暟閲忓彲鑳戒负绌猴紝鎸� 0 澶勭悊锛岄伩鍏� NPE
+ if (ObjectUtil.defaultIfNull(item.getReturnCount(), BigDecimal.ZERO).compareTo(returnCount) == 0) {
return;
}
- if (returnCount.compareTo(item.getInCount()) > 0) {
+ BigDecimal inCount = ObjectUtil.defaultIfNull(item.getInCount(), BigDecimal.ZERO);
+ if (returnCount.compareTo(inCount) > 0) {
throw exception(PURCHASE_ORDER_ITEM_RETURN_FAIL_IN_EXCEED,
- "浜у搧ID:" + item.getProductId(), item.getInCount());
+ "浜у搧ID:" + item.getProductId(), inCount);
}
purchaseOrderItemMapper.updateById(new ErpPurchaseOrderItemDO().setId(item.getId()).setReturnCount(returnCount));
});
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnService.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnService.java
new file mode 100644
index 0000000..b6826fa
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnService.java
@@ -0,0 +1,101 @@
+package cn.iocoder.yudao.module.erp.service.purchase;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.returns.ErpPurchaseReturnPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.returns.ErpPurchaseReturnSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseReturnDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseReturnItemDO;
+import jakarta.validation.Valid;
+
+import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * ERP 閲囪喘閫�璐� Service 鎺ュ彛
+ *
+ * @author 鑺嬮亾婧愮爜
+ */
+public interface ErpPurchaseReturnService {
+
+ /**
+ * 鍒涘缓閲囪喘閫�璐�
+ *
+ * @param createReqVO 鍒涘缓淇℃伅
+ * @return 缂栧彿
+ */
+ Long createPurchaseReturn(@Valid ErpPurchaseReturnSaveReqVO createReqVO);
+
+ /**
+ * 鏇存柊閲囪喘閫�璐�
+ *
+ * @param updateReqVO 鏇存柊淇℃伅
+ */
+ void updatePurchaseReturn(@Valid ErpPurchaseReturnSaveReqVO updateReqVO);
+
+ /**
+ * 鏇存柊閲囪喘閫�璐х殑鐘舵��
+ *
+ * @param id 缂栧彿
+ * @param status 鐘舵��
+ */
+ void updatePurchaseReturnStatus(Long id, Integer status);
+
+ /**
+ * 鏇存柊閲囪喘閫�璐х殑閫�娆鹃噾棰�
+ *
+ * @param id 缂栧彿
+ * @param refundPrice 閫�娆鹃噾棰�
+ */
+ void updatePurchaseReturnRefundPrice(Long id, BigDecimal refundPrice);
+
+ /**
+ * 鍒犻櫎閲囪喘閫�璐�
+ *
+ * @param ids 缂栧彿鏁扮粍
+ */
+ void deletePurchaseReturn(List<Long> ids);
+
+ /**
+ * 鑾峰緱閲囪喘閫�璐�
+ *
+ * @param id 缂栧彿
+ * @return 閲囪喘閫�璐�
+ */
+ ErpPurchaseReturnDO getPurchaseReturn(Long id);
+
+ /**
+ * 鏍¢獙閲囪喘閫�璐э紝宸茬粡瀹℃牳閫氳繃
+ *
+ * @param id 缂栧彿
+ * @return 閲囪喘閫�璐�
+ */
+ ErpPurchaseReturnDO validatePurchaseReturn(Long id);
+
+ /**
+ * 鑾峰緱閲囪喘閫�璐у垎椤�
+ *
+ * @param pageReqVO 鍒嗛〉鏌ヨ
+ * @return 閲囪喘閫�璐у垎椤�
+ */
+ PageResult<ErpPurchaseReturnDO> getPurchaseReturnPage(ErpPurchaseReturnPageReqVO pageReqVO);
+
+ // ==================== 閲囪喘閫�璐ч」 ====================
+
+ /**
+ * 鑾峰緱閲囪喘閫�璐ч」鍒楄〃
+ *
+ * @param returnId 閲囪喘閫�璐х紪鍙�
+ * @return 閲囪喘閫�璐ч」鍒楄〃
+ */
+ List<ErpPurchaseReturnItemDO> getPurchaseReturnItemListByReturnId(Long returnId);
+
+ /**
+ * 鑾峰緱閲囪喘閫�璐ч」 List
+ *
+ * @param returnIds 閲囪喘閫�璐х紪鍙锋暟缁�
+ * @return 閲囪喘閫�璐ч」 List
+ */
+ List<ErpPurchaseReturnItemDO> getPurchaseReturnItemListByReturnIds(Collection<Long> returnIds);
+
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java
new file mode 100644
index 0000000..da68e9f
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseReturnServiceImpl.java
@@ -0,0 +1,327 @@
+package cn.iocoder.yudao.module.erp.service.purchase;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.returns.ErpPurchaseReturnPageReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.returns.ErpPurchaseReturnSaveReqVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseReturnDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseReturnItemDO;
+import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseReturnItemMapper;
+import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseReturnMapper;
+import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
+import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
+import cn.iocoder.yudao.module.erp.service.finance.ErpAccountService;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.mes.api.wms.dto.WmsPurchaseInboundReqDTO;
+import cn.iocoder.yudao.module.mes.api.wms.stock.WmsStockApi;
+import jakarta.annotation.Resource;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+
+import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
+import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
+
+// TODO 鑺嬭壙锛氳褰曟搷浣滄棩蹇�
+
+/**
+ * ERP 閲囪喘閫�璐� Service 瀹炵幇绫�
+ *
+ * @author 鑺嬮亾婧愮爜
+ */
+@Service
+@Validated
+@Slf4j
+public class ErpPurchaseReturnServiceImpl implements ErpPurchaseReturnService {
+
+ @Resource
+ private ErpPurchaseReturnMapper purchaseReturnMapper;
+ @Resource
+ private ErpPurchaseReturnItemMapper purchaseReturnItemMapper;
+
+ @Resource
+ private ErpNoRedisDAO noRedisDAO;
+
+ @Resource
+ private MdmItemApi mdmItemApi;
+ @Resource
+ @Lazy // 寤惰繜鍔犺浇锛岄伩鍏嶅惊鐜緷璧�
+ private ErpPurchaseOrderService purchaseOrderService;
+ @Resource
+ private ErpAccountService accountService;
+ @Resource
+ private WmsStockApi wmsStockApi;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long createPurchaseReturn(ErpPurchaseReturnSaveReqVO createReqVO) {
+ // 1.1 鏍¢獙閲囪喘璁㈠崟宸插鏍�
+ ErpPurchaseOrderDO purchaseOrder = purchaseOrderService.validatePurchaseOrder(createReqVO.getOrderId());
+ // 1.2 鏍¢獙閫�璐ч」鐨勬湁鏁堟��
+ List<ErpPurchaseReturnItemDO> purchaseReturnItems = validatePurchaseReturnItems(createReqVO.getItems());
+ // 1.3 鏍¢獙缁撶畻璐︽埛
+ accountService.validateAccount(createReqVO.getAccountId());
+ // 1.4 鐢熸垚閫�璐у崟鍙凤紝骞舵牎楠屽敮涓�鎬�
+ String no = noRedisDAO.generate(ErpNoRedisDAO.PURCHASE_RETURN_NO_PREFIX);
+ if (purchaseReturnMapper.selectByNo(no) != null) {
+ throw exception(PURCHASE_RETURN_NO_EXISTS);
+ }
+
+ // 2.1 鎻掑叆閫�璐�
+ ErpPurchaseReturnDO purchaseReturn = BeanUtils.toBean(createReqVO, ErpPurchaseReturnDO.class, in -> in
+ .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus()))
+ .setOrderNo(purchaseOrder.getNo()).setSupplierId(purchaseOrder.getSupplierId());
+ calculateTotalPrice(purchaseReturn, purchaseReturnItems);
+ purchaseReturnMapper.insert(purchaseReturn);
+ // 2.2 鎻掑叆閫�璐ч」
+ purchaseReturnItems.forEach(o -> o.setReturnId(purchaseReturn.getId()));
+ purchaseReturnItemMapper.insertBatch(purchaseReturnItems);
+
+ // 3. 鏇存柊閲囪喘璁㈠崟鐨勯��璐ф暟閲�
+ updatePurchaseOrderReturnCount(createReqVO.getOrderId());
+ return purchaseReturn.getId();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updatePurchaseReturn(ErpPurchaseReturnSaveReqVO updateReqVO) {
+ // 1.1 鏍¢獙瀛樺湪
+ ErpPurchaseReturnDO purchaseReturn = validatePurchaseReturnExists(updateReqVO.getId());
+ if (ErpAuditStatus.APPROVE.getStatus().equals(purchaseReturn.getStatus())) {
+ throw exception(PURCHASE_RETURN_UPDATE_FAIL_APPROVE, purchaseReturn.getNo());
+ }
+ // 1.2 鏍¢獙閲囪喘璁㈠崟宸插鏍�
+ ErpPurchaseOrderDO purchaseOrder = purchaseOrderService.validatePurchaseOrder(updateReqVO.getOrderId());
+ // 1.3 鏍¢獙缁撶畻璐︽埛
+ accountService.validateAccount(updateReqVO.getAccountId());
+ // 1.4 鏍¢獙璁㈠崟椤圭殑鏈夋晥鎬�
+ List<ErpPurchaseReturnItemDO> purchaseReturnItems = validatePurchaseReturnItems(updateReqVO.getItems());
+
+ // 2.1 鏇存柊閫�璐�
+ ErpPurchaseReturnDO updateObj = BeanUtils.toBean(updateReqVO, ErpPurchaseReturnDO.class)
+ .setOrderNo(purchaseOrder.getNo()).setSupplierId(purchaseOrder.getSupplierId());
+ calculateTotalPrice(updateObj, purchaseReturnItems);
+ purchaseReturnMapper.updateById(updateObj);
+ // 2.2 鏇存柊閫�璐ч」
+ updatePurchaseReturnItemList(updateReqVO.getId(), purchaseReturnItems);
+
+ // 3.1 鏇存柊閲囪喘璁㈠崟鐨勫嚭搴撴暟閲�
+ updatePurchaseOrderReturnCount(updateObj.getOrderId());
+ // 3.2 娉ㄦ剰锛氬鏋滈噰璐鍗曠紪鍙峰彉鏇翠簡锛岄渶瑕佹洿鏂扳�滆�佲�濋噰璐鍗曠殑鍑哄簱鏁伴噺
+ if (ObjectUtil.notEqual(purchaseReturn.getOrderId(), updateObj.getOrderId())) {
+ updatePurchaseOrderReturnCount(purchaseReturn.getOrderId());
+ }
+ }
+
+ private void calculateTotalPrice(ErpPurchaseReturnDO purchaseReturn, List<ErpPurchaseReturnItemDO> purchaseReturnItems) {
+ purchaseReturn.setTotalCount(getSumValue(purchaseReturnItems, ErpPurchaseReturnItemDO::getCount, BigDecimal::add));
+ purchaseReturn.setTotalProductPrice(getSumValue(purchaseReturnItems, ErpPurchaseReturnItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO));
+ purchaseReturn.setTotalTaxPrice(getSumValue(purchaseReturnItems, ErpPurchaseReturnItemDO::getTaxPrice, BigDecimal::add, BigDecimal.ZERO));
+ purchaseReturn.setTotalPrice(purchaseReturn.getTotalProductPrice().add(purchaseReturn.getTotalTaxPrice()));
+ // 璁$畻浼樻儬浠锋牸
+ if (purchaseReturn.getDiscountPercent() == null) {
+ purchaseReturn.setDiscountPercent(BigDecimal.ZERO);
+ }
+ purchaseReturn.setDiscountPrice(MoneyUtils.priceMultiplyPercent(purchaseReturn.getTotalPrice(), purchaseReturn.getDiscountPercent()));
+ purchaseReturn.setTotalPrice(purchaseReturn.getTotalPrice().subtract(purchaseReturn.getDiscountPrice()).add(purchaseReturn.getOtherPrice()));
+ }
+
+ private void updatePurchaseOrderReturnCount(Long orderId) {
+ // 1.1 鏌ヨ閲囪喘璁㈠崟瀵瑰簲鐨勯噰璐嚭搴撳崟鍒楄〃
+ List<ErpPurchaseReturnDO> purchaseReturns = purchaseReturnMapper.selectListByOrderId(orderId);
+ // 1.2 鏌ヨ瀵瑰簲鐨勯噰璐鍗曢」鐨勯��璐ф暟閲�
+ Map<Long, BigDecimal> returnCountMap = purchaseReturnItemMapper.selectOrderItemCountSumMapByReturnIds(
+ convertList(purchaseReturns, ErpPurchaseReturnDO::getId));
+ // 2. 鏇存柊閲囪喘璁㈠崟鐨勫嚭搴撴暟閲�
+ purchaseOrderService.updatePurchaseOrderReturnCount(orderId, returnCountMap);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updatePurchaseReturnStatus(Long id, Integer status) {
+ boolean approve = ErpAuditStatus.APPROVE.getStatus().equals(status);
+ // 1.1 鏍¢獙瀛樺湪
+ ErpPurchaseReturnDO purchaseReturn = validatePurchaseReturnExists(id);
+ // 1.2 鏍¢獙鐘舵��
+ if (purchaseReturn.getStatus().equals(status)) {
+ throw exception(approve ? PURCHASE_RETURN_APPROVE_FAIL : PURCHASE_RETURN_PROCESS_FAIL);
+ }
+ // 1.3 鏍¢獙宸查��娆�
+ if (!approve && purchaseReturn.getRefundPrice().compareTo(BigDecimal.ZERO) > 0) {
+ throw exception(PURCHASE_RETURN_PROCESS_FAIL_EXISTS_REFUND);
+ }
+
+ // 2. 鏇存柊鐘舵��
+ int updateCount = purchaseReturnMapper.updateByIdAndStatus(id, purchaseReturn.getStatus(),
+ new ErpPurchaseReturnDO().setStatus(status));
+ if (updateCount == 0) {
+ throw exception(approve ? PURCHASE_RETURN_APPROVE_FAIL : PURCHASE_RETURN_PROCESS_FAIL);
+ }
+
+ // 3. 瀹℃牳閫氳繃鏃讹紝鍚屾 MES 浠撳偍瀛樿揣锛堥噰璐��璐у嚭搴擄級
+ if (approve) {
+ syncToWmsPurchaseReturnOutbound(purchaseReturn);
+ }
+ }
+
+ /**
+ * 鍚屾閲囪喘閫�璐у埌 WMS锛圡ES 浠撳偍锛夊簱瀛�
+ */
+ private void syncToWmsPurchaseReturnOutbound(ErpPurchaseReturnDO purchaseReturn) {
+ List<ErpPurchaseReturnItemDO> purchaseReturnItems = purchaseReturnItemMapper.selectListByReturnId(purchaseReturn.getId());
+ if (CollUtil.isEmpty(purchaseReturnItems)) {
+ return;
+ }
+ WmsPurchaseInboundReqDTO reqDTO = new WmsPurchaseInboundReqDTO()
+ .setBizId(purchaseReturn.getId())
+ .setBizCode(purchaseReturn.getNo())
+ .setVendorId(purchaseReturn.getSupplierId())
+ .setReceiptTime(purchaseReturn.getReturnTime())
+ .setItems(convertList(purchaseReturnItems, item -> new WmsPurchaseInboundReqDTO.Item()
+ .setItemId(item.getProductId())
+ .setWarehouseId(item.getWarehouseId())
+ .setQuantity(item.getCount())
+ .setBizLineId(item.getId())));
+ try {
+ wmsStockApi.purchaseReturnOutbound(reqDTO);
+ } catch (Exception e) {
+ log.error("[syncToWmsPurchaseReturnOutbound] 鍚屾澶辫触锛宲urchaseReturnId={}", purchaseReturn.getId(), e);
+ }
+ }
+
+ @Override
+ public void updatePurchaseReturnRefundPrice(Long id, BigDecimal refundPrice) {
+ ErpPurchaseReturnDO purchaseReturn = purchaseReturnMapper.selectById(id);
+ if (purchaseReturn.getRefundPrice().equals(refundPrice)) {
+ return;
+ }
+ if (refundPrice.compareTo(purchaseReturn.getTotalPrice()) > 0) {
+ throw exception(PURCHASE_RETURN_FAIL_REFUND_PRICE_EXCEED, refundPrice, purchaseReturn.getTotalPrice());
+ }
+ purchaseReturnMapper.updateById(new ErpPurchaseReturnDO().setId(id).setRefundPrice(refundPrice));
+ }
+
+ private List<ErpPurchaseReturnItemDO> validatePurchaseReturnItems(List<ErpPurchaseReturnSaveReqVO.Item> list) {
+ // 1. 鏍¢獙鐗╂枡瀛樺湪锛堢墿鏂欎富鏁版嵁宸茶縼绉诲埌 MDM锛�
+ Set<Long> productIds = convertSet(list, ErpPurchaseReturnSaveReqVO.Item::getProductId);
+ Map<Long, MdmItemRespDTO> itemMap = productIds.isEmpty() ? Collections.emptyMap() : mdmItemApi.getItemMap(productIds);
+ if (itemMap.size() != productIds.size()) {
+ throw exception(PRODUCT_NOT_EXISTS);
+ }
+ // 2. 杞寲涓� ErpPurchaseReturnItemDO 鍒楄〃
+ return convertList(list, o -> BeanUtils.toBean(o, ErpPurchaseReturnItemDO.class, item -> {
+ item.setProductUnitId(itemMap.get(item.getProductId()).getUnitMeasureId());
+ item.setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()));
+ if (item.getTotalPrice() == null) {
+ return;
+ }
+ if (item.getTaxPercent() != null) {
+ item.setTaxPrice(MoneyUtils.priceMultiplyPercent(item.getTotalPrice(), item.getTaxPercent()));
+ }
+ }));
+ }
+
+ private void updatePurchaseReturnItemList(Long id, List<ErpPurchaseReturnItemDO> newList) {
+ // 绗竴姝ワ紝瀵规瘮鏂拌�佹暟鎹紝鑾峰緱娣诲姞銆佷慨鏀广�佸垹闄ょ殑鍒楄〃
+ List<ErpPurchaseReturnItemDO> oldList = purchaseReturnItemMapper.selectListByReturnId(id);
+ List<List<ErpPurchaseReturnItemDO>> diffList = diffList(oldList, newList, // id 涓嶅悓锛屽氨璁や负鏄笉鍚岀殑璁板綍
+ (oldVal, newVal) -> oldVal.getId().equals(newVal.getId()));
+
+ // 绗簩姝ワ紝鎵归噺娣诲姞銆佷慨鏀广�佸垹闄�
+ if (CollUtil.isNotEmpty(diffList.get(0))) {
+ diffList.get(0).forEach(o -> o.setReturnId(id));
+ purchaseReturnItemMapper.insertBatch(diffList.get(0));
+ }
+ if (CollUtil.isNotEmpty(diffList.get(1))) {
+ purchaseReturnItemMapper.updateBatch(diffList.get(1));
+ }
+ if (CollUtil.isNotEmpty(diffList.get(2))) {
+ purchaseReturnItemMapper.deleteByIds(convertList(diffList.get(2), ErpPurchaseReturnItemDO::getId));
+ }
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void deletePurchaseReturn(List<Long> ids) {
+ // 1. 鏍¢獙涓嶅浜庡凡瀹℃壒
+ List<ErpPurchaseReturnDO> purchaseReturns = purchaseReturnMapper.selectByIds(ids);
+ if (CollUtil.isEmpty(purchaseReturns)) {
+ return;
+ }
+ purchaseReturns.forEach(purchaseReturn -> {
+ if (ErpAuditStatus.APPROVE.getStatus().equals(purchaseReturn.getStatus())) {
+ throw exception(PURCHASE_RETURN_DELETE_FAIL_APPROVE, purchaseReturn.getNo());
+ }
+ });
+
+ // 2. 閬嶅巻鍒犻櫎锛屽苟璁板綍鎿嶄綔鏃ュ織
+ purchaseReturns.forEach(purchaseReturn -> {
+ // 2.1 鍒犻櫎璁㈠崟
+ purchaseReturnMapper.deleteById(purchaseReturn.getId());
+ // 2.2 鍒犻櫎璁㈠崟椤�
+ purchaseReturnItemMapper.deleteByReturnId(purchaseReturn.getId());
+
+ // 2.3 鏇存柊閲囪喘璁㈠崟鐨勫嚭搴撴暟閲�
+ updatePurchaseOrderReturnCount(purchaseReturn.getOrderId());
+ });
+
+ }
+
+ private ErpPurchaseReturnDO validatePurchaseReturnExists(Long id) {
+ ErpPurchaseReturnDO purchaseReturn = purchaseReturnMapper.selectById(id);
+ if (purchaseReturn == null) {
+ throw exception(PURCHASE_RETURN_NOT_EXISTS);
+ }
+ return purchaseReturn;
+ }
+
+ @Override
+ public ErpPurchaseReturnDO getPurchaseReturn(Long id) {
+ return purchaseReturnMapper.selectById(id);
+ }
+
+ @Override
+ public ErpPurchaseReturnDO validatePurchaseReturn(Long id) {
+ ErpPurchaseReturnDO purchaseReturn = getPurchaseReturn(id);
+ if (ObjectUtil.notEqual(purchaseReturn.getStatus(), ErpAuditStatus.APPROVE.getStatus())) {
+ throw exception(PURCHASE_RETURN_NOT_APPROVE);
+ }
+ return purchaseReturn;
+ }
+
+ @Override
+ public PageResult<ErpPurchaseReturnDO> getPurchaseReturnPage(ErpPurchaseReturnPageReqVO pageReqVO) {
+ return purchaseReturnMapper.selectPage(pageReqVO);
+ }
+
+ // ==================== 閲囪喘閫�璐ч」 ====================
+
+ @Override
+ public List<ErpPurchaseReturnItemDO> getPurchaseReturnItemListByReturnId(Long returnId) {
+ return purchaseReturnItemMapper.selectListByReturnId(returnId);
+ }
+
+ @Override
+ public List<ErpPurchaseReturnItemDO> getPurchaseReturnItemListByReturnIds(Collection<Long> returnIds) {
+ if (CollUtil.isEmpty(returnIds)) {
+ return Collections.emptyList();
+ }
+ return purchaseReturnItemMapper.selectListByReturnIds(returnIds);
+ }
+
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/statistics/ErpPurchaseStatisticsService.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/statistics/ErpPurchaseStatisticsService.java
index c7d143c..6d79364 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/statistics/ErpPurchaseStatisticsService.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/statistics/ErpPurchaseStatisticsService.java
@@ -1,5 +1,12 @@
package cn.iocoder.yudao.module.erp.service.statistics;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchasePriceAnalysisRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseStatisticsReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseSummaryRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseSupplierStatisticsRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseUncompletedOrderRespVO;
+
import java.math.BigDecimal;
import java.time.LocalDateTime;
@@ -21,4 +28,35 @@
*/
BigDecimal getPurchasePrice(LocalDateTime beginTime, LocalDateTime endTime);
+ /**
+ * 鑾峰緱閲囪喘姹囨�荤粺璁★紙璁㈠崟 / 鍏ュ簱 / 閫�璐х殑鎬绘暟涓庢�婚噾棰濓級
+ *
+ * @return 姹囨�荤粺璁�
+ */
+ ErpPurchaseSummaryRespVO getPurchaseSummary();
+
+ /**
+ * 鑾峰緱渚涘簲鍟嗕緵璐х粺璁�
+ *
+ * @param reqVO 鏌ヨ鏉′欢
+ * @return 鍒嗛〉缁撴灉
+ */
+ PageResult<ErpPurchaseSupplierStatisticsRespVO> getSupplierStatistics(ErpPurchaseStatisticsReqVO reqVO);
+
+ /**
+ * 鑾峰緱閲囪喘浠锋牸鍒嗘瀽
+ *
+ * @param reqVO 鏌ヨ鏉′欢
+ * @return 鍒嗛〉缁撴灉
+ */
+ PageResult<ErpPurchasePriceAnalysisRespVO> getPriceAnalysis(ErpPurchaseStatisticsReqVO reqVO);
+
+ /**
+ * 鑾峰緱鏈畬鎴愰噰璐鍗曡窡韪�
+ *
+ * @param reqVO 鏌ヨ鏉′欢
+ * @return 鍒嗛〉缁撴灉
+ */
+ PageResult<ErpPurchaseUncompletedOrderRespVO> getUncompletedOrders(ErpPurchaseStatisticsReqVO reqVO);
+
}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/statistics/ErpPurchaseStatisticsServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/statistics/ErpPurchaseStatisticsServiceImpl.java
index d725153..5e1ee7b 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/statistics/ErpPurchaseStatisticsServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/statistics/ErpPurchaseStatisticsServiceImpl.java
@@ -1,11 +1,32 @@
package cn.iocoder.yudao.module.erp.service.statistics;
+import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchasePriceAnalysisRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseStatisticsReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseSummaryRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseSupplierStatisticsRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseUncompletedOrderRespVO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderItemDO;
+import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderItemMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.statistics.ErpPurchaseStatisticsMapper;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.time.LocalDateTime;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMultiMap;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
/**
* ERP 閲囪喘缁熻 Service 瀹炵幇绫�
@@ -17,10 +38,97 @@
@Resource
private ErpPurchaseStatisticsMapper purchaseStatisticsMapper;
+ @Resource
+ private ErpPurchaseOrderItemMapper purchaseOrderItemMapper;
+ @Resource
+ private MdmItemApi mdmItemApi;
@Override
public BigDecimal getPurchasePrice(LocalDateTime beginTime, LocalDateTime endTime) {
return purchaseStatisticsMapper.getPurchasePrice(beginTime, endTime);
}
+ @Override
+ public ErpPurchaseSummaryRespVO getPurchaseSummary() {
+ ErpPurchaseSummaryRespVO summary = purchaseStatisticsMapper.selectPurchaseSummary();
+ return summary != null ? summary : new ErpPurchaseSummaryRespVO()
+ .setTotalOrderCount(0L).setTotalOrderAmount(BigDecimal.ZERO)
+ .setTotalInCount(0L).setTotalInAmount(BigDecimal.ZERO)
+ .setTotalReturnCount(0L).setTotalReturnAmount(BigDecimal.ZERO);
+ }
+
+ @Override
+ public PageResult<ErpPurchaseSupplierStatisticsRespVO> getSupplierStatistics(ErpPurchaseStatisticsReqVO reqVO) {
+ Page<ErpPurchaseSupplierStatisticsRespVO> page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize());
+ purchaseStatisticsMapper.selectSupplierStatistics(page, reqVO);
+ return new PageResult<>(page.getRecords(), page.getTotal());
+ }
+
+ @Override
+ public PageResult<ErpPurchasePriceAnalysisRespVO> getPriceAnalysis(ErpPurchaseStatisticsReqVO reqVO) {
+ Page<ErpPurchasePriceAnalysisRespVO> page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize());
+ purchaseStatisticsMapper.selectPriceAnalysis(page, reqVO);
+ fillProductInfo(page.getRecords());
+ return new PageResult<>(page.getRecords(), page.getTotal());
+ }
+
+ @Override
+ public PageResult<ErpPurchaseUncompletedOrderRespVO> getUncompletedOrders(ErpPurchaseStatisticsReqVO reqVO) {
+ Page<ErpPurchaseUncompletedOrderRespVO> page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize());
+ purchaseStatisticsMapper.selectUncompletedOrders(page, reqVO);
+ fillUncompletedOrderInfo(page.getRecords());
+ return new PageResult<>(page.getRecords(), page.getTotal());
+ }
+
+ /**
+ * 琛ュ叏浜у搧鍚嶇О銆佹潯鐮侊紝骞惰绠椾环鏍煎彉鍖栫巼
+ */
+ private void fillProductInfo(List<ErpPurchasePriceAnalysisRespVO> list) {
+ if (CollUtil.isEmpty(list)) {
+ return;
+ }
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
+ convertSet(list, ErpPurchasePriceAnalysisRespVO::getProductId));
+ list.forEach(vo -> {
+ MapUtils.findAndThen(itemMap, vo.getProductId(), item -> vo
+ .setProductName(item.getName()).setProductBarCode(item.getBarCode()));
+ // 浠锋牸鍙樺寲鐜� = (鏈�杩戜环鏍� - 骞冲潎浠锋牸) / 骞冲潎浠锋牸 脳 100
+ if (vo.getLatestPrice() == null || vo.getAvgPrice() == null
+ || vo.getAvgPrice().compareTo(BigDecimal.ZERO) == 0) {
+ vo.setPriceChangeRate(BigDecimal.ZERO);
+ return;
+ }
+ vo.setPriceChangeRate(vo.getLatestPrice().subtract(vo.getAvgPrice())
+ .multiply(BigDecimal.valueOf(100))
+ .divide(vo.getAvgPrice(), 2, RoundingMode.HALF_UP));
+ });
+ }
+
+ /**
+ * 琛ュ叏浜у搧鍚嶇О锛屽苟璁$畻鏈畬鎴愰噾棰�
+ */
+ private void fillUncompletedOrderInfo(List<ErpPurchaseUncompletedOrderRespVO> list) {
+ if (CollUtil.isEmpty(list)) {
+ return;
+ }
+ List<ErpPurchaseOrderItemDO> orderItems = purchaseOrderItemMapper.selectListByOrderIds(
+ convertSet(list, ErpPurchaseUncompletedOrderRespVO::getOrderId));
+ Map<Long, List<ErpPurchaseOrderItemDO>> orderItemMap = convertMultiMap(orderItems, ErpPurchaseOrderItemDO::getOrderId);
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
+ convertSet(orderItems, ErpPurchaseOrderItemDO::getProductId));
+ list.forEach(vo -> {
+ List<ErpPurchaseOrderItemDO> items = orderItemMap.getOrDefault(vo.getOrderId(), Collections.emptyList());
+ vo.setProductNames(items.stream()
+ .map(item -> {
+ MdmItemRespDTO mdmItem = itemMap.get(item.getProductId());
+ return mdmItem != null ? mdmItem.getName() : "ID=" + item.getProductId();
+ })
+ .distinct()
+ .collect(Collectors.joining("锛�")));
+ BigDecimal orderAmount = vo.getOrderAmount() != null ? vo.getOrderAmount() : BigDecimal.ZERO;
+ BigDecimal inAmount = vo.getInAmount() != null ? vo.getInAmount() : BigDecimal.ZERO;
+ vo.setUncompletedAmount(orderAmount.subtract(inAmount));
+ });
+ }
+
}
diff --git a/yudao-module-erp/src/main/resources/mapper/statistics/ErpPurchaseStatisticsMapper.xml b/yudao-module-erp/src/main/resources/mapper/statistics/ErpPurchaseStatisticsMapper.xml
index a88fb3a..006f5dc 100644
--- a/yudao-module-erp/src/main/resources/mapper/statistics/ErpPurchaseStatisticsMapper.xml
+++ b/yudao-module-erp/src/main/resources/mapper/statistics/ErpPurchaseStatisticsMapper.xml
@@ -10,9 +10,6 @@
<if test="endTime != null">
AND in_time < #{endTime}
</if>
- <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
- AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
- </if>
AND deleted = 0) -
(SELECT IFNULL(SUM(total_price), 0)
FROM erp_purchase_return
@@ -20,10 +17,135 @@
<if test="endTime != null">
AND return_time < #{endTime}
</if>
- <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
- AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
- </if>
AND deleted = 0)
</select>
-</mapper>
\ No newline at end of file
+ <select id="selectPurchaseSummary"
+ resultType="cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseSummaryRespVO">
+ SELECT
+ (SELECT COUNT(1) FROM erp_purchase_order WHERE deleted = 0) AS totalOrderCount,
+ (SELECT IFNULL(SUM(total_price), 0) FROM erp_purchase_order WHERE deleted = 0) AS totalOrderAmount,
+ (SELECT COUNT(1) FROM erp_purchase_in WHERE deleted = 0) AS totalInCount,
+ (SELECT IFNULL(SUM(total_price), 0) FROM erp_purchase_in WHERE deleted = 0) AS totalInAmount,
+ (SELECT COUNT(1) FROM erp_purchase_return WHERE deleted = 0) AS totalReturnCount,
+ (SELECT IFNULL(SUM(total_price), 0) FROM erp_purchase_return WHERE deleted = 0) AS totalReturnAmount
+ </select>
+
+ <select id="selectSupplierStatistics"
+ resultType="cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseSupplierStatisticsRespVO">
+ SELECT s.id AS supplierId,
+ s.name AS supplierName,
+ IFNULL(o.order_count, 0) AS orderCount,
+ IFNULL(o.order_amount, 0) AS orderAmount,
+ IFNULL(i.in_count, 0) AS inCount,
+ IFNULL(i.in_amount, 0) AS inAmount,
+ IFNULL(r.return_count, 0) AS returnCount,
+ IFNULL(r.return_amount, 0) AS returnAmount
+ FROM srm_supplier s
+ INNER JOIN (
+ SELECT supplier_id,
+ COUNT(1) AS order_count,
+ IFNULL(SUM(total_price), 0) AS order_amount
+ FROM erp_purchase_order
+ WHERE deleted = 0
+ AND supplier_id IS NOT NULL
+ <if test="reqVO.supplierId != null">
+ AND supplier_id = #{reqVO.supplierId}
+ </if>
+ <if test="reqVO.orderTime != null and reqVO.orderTime.length == 2">
+ AND order_time BETWEEN #{reqVO.orderTime[0]} AND #{reqVO.orderTime[1]}
+ </if>
+ GROUP BY supplier_id
+ ) o ON o.supplier_id = s.id
+ LEFT JOIN (
+ SELECT po.supplier_id,
+ COUNT(1) AS in_count,
+ IFNULL(SUM(pi.total_price), 0) AS in_amount
+ FROM erp_purchase_in pi
+ INNER JOIN erp_purchase_order po ON po.id = pi.order_id AND po.deleted = 0
+ WHERE pi.deleted = 0
+ <if test="reqVO.supplierId != null">
+ AND po.supplier_id = #{reqVO.supplierId}
+ </if>
+ <if test="reqVO.orderTime != null and reqVO.orderTime.length == 2">
+ AND po.order_time BETWEEN #{reqVO.orderTime[0]} AND #{reqVO.orderTime[1]}
+ </if>
+ GROUP BY po.supplier_id
+ ) i ON i.supplier_id = s.id
+ LEFT JOIN (
+ SELECT po.supplier_id,
+ COUNT(1) AS return_count,
+ IFNULL(SUM(pr.total_price), 0) AS return_amount
+ FROM erp_purchase_return pr
+ INNER JOIN erp_purchase_order po ON po.id = pr.order_id AND po.deleted = 0
+ WHERE pr.deleted = 0
+ <if test="reqVO.supplierId != null">
+ AND po.supplier_id = #{reqVO.supplierId}
+ </if>
+ <if test="reqVO.orderTime != null and reqVO.orderTime.length == 2">
+ AND po.order_time BETWEEN #{reqVO.orderTime[0]} AND #{reqVO.orderTime[1]}
+ </if>
+ GROUP BY po.supplier_id
+ ) r ON r.supplier_id = s.id
+ WHERE s.deleted = 0
+ <if test="reqVO.supplierId != null">
+ AND s.id = #{reqVO.supplierId}
+ </if>
+ ORDER BY orderAmount DESC, supplierId ASC
+ </select>
+
+ <select id="selectPriceAnalysis"
+ resultType="cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchasePriceAnalysisRespVO">
+ SELECT item.product_id AS productId,
+ AVG(item.product_price) AS avgPrice,
+ MIN(item.product_price) AS minPrice,
+ MAX(item.product_price) AS maxPrice,
+ (SELECT i2.product_price
+ FROM erp_purchase_order_items i2
+ INNER JOIN erp_purchase_order o2 ON o2.id = i2.order_id AND o2.deleted = 0
+ WHERE i2.deleted = 0
+ AND i2.product_id = item.product_id
+ ORDER BY o2.order_time DESC, i2.id DESC
+ LIMIT 1) AS latestPrice
+ FROM erp_purchase_order_items item
+ INNER JOIN erp_purchase_order o ON o.id = item.order_id AND o.deleted = 0
+ WHERE item.deleted = 0
+ <if test="reqVO.productId != null">
+ AND item.product_id = #{reqVO.productId}
+ </if>
+ <if test="reqVO.orderTime != null and reqVO.orderTime.length == 2">
+ AND o.order_time BETWEEN #{reqVO.orderTime[0]} AND #{reqVO.orderTime[1]}
+ </if>
+ GROUP BY item.product_id
+ ORDER BY productId ASC
+ </select>
+
+ <select id="selectUncompletedOrders"
+ resultType="cn.iocoder.yudao.module.erp.controller.admin.statistics.vo.purchase.ErpPurchaseUncompletedOrderRespVO">
+ SELECT o.id AS orderId,
+ o.no AS orderNo,
+ s.name AS supplierName,
+ o.order_time AS orderTime,
+ o.total_price AS orderAmount,
+ IFNULL((SELECT IFNULL(SUM(i.total_price), 0)
+ FROM erp_purchase_in i
+ WHERE i.order_id = o.id AND i.deleted = 0 AND i.status = 20), 0) AS inAmount,
+ GREATEST(DATEDIFF(CURDATE(), DATE(o.order_time)) - 30, 0) AS daysOverdue
+ FROM erp_purchase_order o
+ LEFT JOIN srm_supplier s ON s.id = o.supplier_id AND s.deleted = 0
+ WHERE o.deleted = 0
+ AND o.status = 20
+ AND (o.in_status IS NULL OR o.in_status != 2)
+ <if test="reqVO.supplierId != null">
+ AND o.supplier_id = #{reqVO.supplierId}
+ </if>
+ <if test="reqVO.orderNo != null and reqVO.orderNo != ''">
+ AND o.no LIKE CONCAT('%', #{reqVO.orderNo}, '%')
+ </if>
+ <if test="reqVO.orderTime != null and reqVO.orderTime.length == 2">
+ AND o.order_time BETWEEN #{reqVO.orderTime[0]} AND #{reqVO.orderTime[1]}
+ </if>
+ ORDER BY o.order_time ASC, o.id ASC
+ </select>
+
+</mapper>
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/wms/dto/WmsPurchaseInboundReqDTO.java b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wms/dto/WmsPurchaseInboundReqDTO.java
similarity index 100%
rename from yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/wms/dto/WmsPurchaseInboundReqDTO.java
rename to yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wms/dto/WmsPurchaseInboundReqDTO.java
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/wms/dto/WmsSalesOutboundReqDTO.java b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wms/dto/WmsSalesOutboundReqDTO.java
similarity index 100%
rename from yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/wms/dto/WmsSalesOutboundReqDTO.java
rename to yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wms/dto/WmsSalesOutboundReqDTO.java
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/wms/dto/WmsStockDetailRespDTO.java b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wms/dto/WmsStockDetailRespDTO.java
similarity index 100%
rename from yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/wms/dto/WmsStockDetailRespDTO.java
rename to yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wms/dto/WmsStockDetailRespDTO.java
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/wms/dto/WmsStockQueryReqDTO.java b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wms/dto/WmsStockQueryReqDTO.java
similarity index 100%
rename from yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/wms/dto/WmsStockQueryReqDTO.java
rename to yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wms/dto/WmsStockQueryReqDTO.java
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/wms/stock/WmsStockApi.java b/yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wms/stock/WmsStockApi.java
similarity index 100%
rename from yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/wms/stock/WmsStockApi.java
rename to yudao-module-mes-api/src/main/java/cn/iocoder/yudao/module/mes/api/wms/stock/WmsStockApi.java
--
Gitblit v1.9.3