From 25a40b9c4e6a1b650610b8b13088d486699532ce Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 20:23:21 +0800
Subject: [PATCH] 采购申请批量提交、订单导入重复校验；修复考勤异常申请字段不匹配
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
index af26750..edafc8f 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
@@ -190,9 +190,10 @@
@PreAuthorize("@ss.hasPermission('erp:purchase-order:import')")
public CommonResult<ErpPurchaseOrderImportRespVO> importPurchaseOrderExcel(
@RequestParam("file") MultipartFile file,
- @RequestParam(value = "directApprove", required = false, defaultValue = "false") Boolean directApprove) throws Exception {
+ @RequestParam(value = "directApprove", required = false, defaultValue = "false") Boolean directApprove,
+ @RequestParam(value = "overwrite", required = false, defaultValue = "false") Boolean overwrite) throws Exception {
List<ErpPurchaseOrderImportExcelVO> list = ExcelUtils.read(file, ErpPurchaseOrderImportExcelVO.class);
- return success(purchaseOrderService.importPurchaseOrderList(list, directApprove));
+ return success(purchaseOrderService.importPurchaseOrderList(list, directApprove, overwrite));
}
@PostMapping("/confirm-receipt")
--
Gitblit v1.9.3