From a0d55bcc8bfebd408d16166b27b7e05b3e4c9f4a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 16:51:50 +0800
Subject: [PATCH] feat(erp): 采购/销售明细按含税单价口径拆税，供应商合同补供应商名称与附件
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 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 f014f62..7a25da1 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
@@ -11,6 +11,8 @@
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderSaveReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderImportExcelVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderImportRespVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderItemDO;
import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
@@ -35,10 +37,12 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.List;
+import java.util.Arrays;
import java.util.Map;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -107,7 +111,6 @@
@GetMapping("/approve-process-list")
@Operation(summary = "鑾峰彇閲囪喘璁㈠崟瀹℃壒娴佺▼鍒楄〃")
- @PreAuthorize("@ss.hasPermission('erp:purchase-order:query')")
public CommonResult<List<Map<String, Object>>> getApproveProcessList() {
return success(purchaseOrderService.getPurchaseOrderApproveProcessDefinitionList());
}
@@ -124,7 +127,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱閲囪喘璁㈠崟")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('erp:purchase-order:query')")
public CommonResult<ErpPurchaseOrderRespVO> getPurchaseOrder(@RequestParam("id") Long id) {
ErpPurchaseOrderDO purchaseOrder = purchaseOrderService.getPurchaseOrder(id);
if (purchaseOrder == null) {
@@ -144,13 +146,11 @@
MapUtils.findAndThen(unitMeasureMap, item.getProductUnitId(), unit ->
item.setProductUnitName(unit.getName()));
})).setAttachmentList(storageAttachmentApi.listAttachments("erp_purchase_order", id))
- .setSourceTypeName(ErpPurchaseOrderSourceTypeEnum.WORK_ORDER.getType()
- .equals(purchaseOrder.getSourceType()) ? "鐢熶骇宸ュ崟" : null)));
+ .setSourceTypeName(getSourceTypeName(purchaseOrder.getSourceType()))));
}
@GetMapping("/page")
@Operation(summary = "鑾峰緱閲囪喘璁㈠崟鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('erp:purchase-order:query')")
public CommonResult<PageResult<ErpPurchaseOrderRespVO>> getPurchaseOrderPage(@Valid ErpPurchaseOrderPageReqVO pageReqVO) {
PageResult<ErpPurchaseOrderDO> pageResult = purchaseOrderService.getPurchaseOrderPage(pageReqVO);
return success(buildPurchaseOrderVOPageResult(pageResult));
@@ -166,6 +166,29 @@
List<ErpPurchaseOrderRespVO> list = buildPurchaseOrderVOPageResult(purchaseOrderService.getPurchaseOrderPage(pageReqVO)).getList();
// 瀵煎嚭 Excel
ExcelUtils.write(response, "閲囪喘璁㈠崟.xls", "鏁版嵁", ErpPurchaseOrderRespVO.class, list);
+ }
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆閲囪喘璁㈠崟妯℃澘")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-order:import')")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ List<ErpPurchaseOrderImportExcelVO> list = Arrays.asList(
+ ErpPurchaseOrderImportExcelVO.builder()
+ .no("CGDD20260101000001").supplierName("绀轰緥渚涘簲鍟�")
+ .orderTime("2026-01-01 10:00:00").productCode("ITEM001").productName("绀轰緥浜у搧A")
+ .count(new BigDecimal("100")).productPrice(new BigDecimal("10.00"))
+ .taxPercent(new BigDecimal("13")).qcCheckFlag("鍚�").remark("绀轰緥").build());
+ ExcelUtils.write(response, "閲囪喘璁㈠崟瀵煎叆妯℃澘.xls", "閲囪喘璁㈠崟", ErpPurchaseOrderImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆閲囪喘璁㈠崟")
+ @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 {
+ List<ErpPurchaseOrderImportExcelVO> list = ExcelUtils.read(file, ErpPurchaseOrderImportExcelVO.class);
+ return success(purchaseOrderService.importPurchaseOrderList(list, directApprove));
}
@PostMapping("/confirm-receipt")
@@ -219,7 +242,9 @@
.getPurchaseInvoicePriceSumMapByOrderIds(convertSet(pageResult.getList(), ErpPurchaseOrderDO::getId));
// 2. 寮�濮嬫嫾鎺�
return BeanUtils.toBean(pageResult, ErpPurchaseOrderRespVO.class, purchaseOrder -> {
- purchaseOrder.setItems(BeanUtils.toBean(purchaseOrderItemMap.get(purchaseOrder.getId()), ErpPurchaseOrderRespVO.Item.class,
+ purchaseOrder.setItems(BeanUtils.toBean(
+ purchaseOrderItemMap.getOrDefault(purchaseOrder.getId(), java.util.Collections.<ErpPurchaseOrderItemDO>emptyList()),
+ ErpPurchaseOrderRespVO.Item.class,
item -> {
MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem -> item.setProductName(mdmItem.getName())
.setProductBarCode(mdmItem.getBarCode()));
@@ -229,12 +254,19 @@
purchaseOrder.setProductNames(CollUtil.join(purchaseOrder.getItems(), "锛�", ErpPurchaseOrderRespVO.Item::getProductName));
MapUtils.findAndThen(supplierMap, purchaseOrder.getSupplierId(), supplier -> purchaseOrder.setSupplierName(supplier.getName()));
MapUtils.findAndThen(userMap, Long.parseLong(purchaseOrder.getCreator()), user -> purchaseOrder.setCreatorName(user.getNickname()));
- purchaseOrder.setSourceTypeName(ErpPurchaseOrderSourceTypeEnum.WORK_ORDER.getType()
- .equals(purchaseOrder.getSourceType()) ? "鐢熶骇宸ュ崟" : null);
+ purchaseOrder.setSourceTypeName(getSourceTypeName(purchaseOrder.getSourceType()));
// 鍓╀綑鍙紑绁ㄩ噾棰� = 璁㈠崟鎬婚噾棰� - 宸叉潵绁ㄩ噾棰�
purchaseOrder.setRemainInvoicePrice(purchaseOrder.getTotalPrice().subtract(
invoicePriceSumMap.getOrDefault(purchaseOrder.getId(), BigDecimal.ZERO)));
});
}
+ /**
+ * 鏉ユ簮绫诲瀷鐨勪腑鏂囧悕绉帮細鐢熶骇宸ュ崟 / 棰勫畾浠诲姟锛堥渶姹� 6.5 棰勮璐т笅鍗曠敓鎴愰噰璐鍗曪級
+ */
+ private static String getSourceTypeName(Integer sourceType) {
+ ErpPurchaseOrderSourceTypeEnum sourceTypeEnum = ErpPurchaseOrderSourceTypeEnum.valueOf(sourceType);
+ return sourceTypeEnum != null ? sourceTypeEnum.getName() : null;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3