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/controller/admin/purchase/ErpPurchaseOrderController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 7e3bd65..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
@@ -146,8 +146,7 @@
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")
@@ -255,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