From 1d9cfc91e7255b9e139b20ff230cb19246f19193 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 09 十一月 2026 14:32:11 +0800
Subject: [PATCH] refactor(erp): 重构ERP单据单号生成逻辑以支持冲突重试
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInvoiceController.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInvoiceController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInvoiceController.java
index 6076da5..6116e0c 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInvoiceController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseInvoiceController.java
@@ -9,6 +9,7 @@
import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
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.invoice.ErpPurchaseInvoiceItemReceiptRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoicePageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoiceRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoiceSaveReqVO;
@@ -166,6 +167,16 @@
});
}
+ @GetMapping("/item-receipt-list")
+ @Operation(summary = "鑾峰緱鏉ョエ鍙�夊叆搴撳崟鍒楄〃", description = "鎸夐噰璐鍗曡繃婊� MES 鍏ュ簱鍗曪紝浠呰繑鍥炴湭鍙栨秷鐨勫叆搴撳崟锛屽苟甯﹀嚭鍙潵绁ㄩ噾棰�")
+ @Parameter(name = "purchaseOrderId", description = "閲囪喘璁㈠崟缂栧彿", required = true)
+ @Parameter(name = "id", description = "鏉ョエ缂栧彿锛堢紪杈戞椂浼犲叆锛岀敤浜庢帓闄よ嚜韬凡鍗犵敤閲戦锛�")
+ public CommonResult<List<ErpPurchaseInvoiceItemReceiptRespVO>> getItemReceiptList(
+ @RequestParam("purchaseOrderId") Long purchaseOrderId,
+ @RequestParam(value = "id", required = false) Long id) {
+ return success(invoiceService.getItemReceiptListForInvoice(purchaseOrderId, id));
+ }
+
@GetMapping("/simple-list")
@Operation(summary = "鑾峰緱鏉ョエ绮剧畝鍒楄〃", description = "鍙寘鍚凡涓婁紶鍙戠エ闄勪欢鐨勬潵绁紝涓昏鐢ㄤ簬浠樻鍒涘缓鏃堕�夋嫨鍏宠仈鏉ョエ")
@Parameter(name = "supplierId", description = "渚涘簲鍟嗙紪鍙�", required = true)
--
Gitblit v1.9.3