From 30ef534fcffe0520bebe7a34abe69d7afbbf227f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 13 八月 2026 13:53:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_西宁_湟水峡' into dev_西宁_湟水峡
---
src/main/java/com/ruoyi/production/controller/SalesLedgerProductionAccountingController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/SalesLedgerProductionAccountingController.java b/src/main/java/com/ruoyi/production/controller/SalesLedgerProductionAccountingController.java
index 50fa4aa..1f496f6 100644
--- a/src/main/java/com/ruoyi/production/controller/SalesLedgerProductionAccountingController.java
+++ b/src/main/java/com/ruoyi/production/controller/SalesLedgerProductionAccountingController.java
@@ -11,6 +11,7 @@
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.dto.ProductOrderDto;
import com.ruoyi.production.dto.SalesLedgerProductionAccountingDto;
+import com.ruoyi.production.dto.UserProductionAccountingDto;
import com.ruoyi.production.pojo.SalesLedgerProductionAccounting;
import com.ruoyi.production.service.SalesLedgerProductionAccountingService;
import com.ruoyi.production.service.impl.SalesLedgerProductionAccountingServiceImpl;
@@ -58,14 +59,20 @@
}
//----------------------------------------------------------------------------------------------------------------------------------------------------
@GetMapping("/page")
- @ApiModelProperty("鏌ヨ宸ヤ汉鐢熶骇宸ヨ祫淇℃伅")
+ @ApiOperation("鏌ヨ宸ヤ汉鐢熶骇宸ヨ祫淇℃伅")
public R pageProductionAccounting(SalesLedgerProductionAccountingDto salesLedgerProductionAccountingDto, Page page){
return R.ok(salesLedgerProductionAccountingService.pageProductionAccounting(salesLedgerProductionAccountingDto, page));
}
@GetMapping("/listProductionDetails")
- @ApiModelProperty("鏌ヨ宸ヤ汉鐢熶骇宸ヨ祫淇℃伅")
+ @ApiOperation("鏌ヨ宸ヤ汉鐢熶骇宸ヨ祫淇℃伅")
public R listProductionDetails(SalesLedgerProductionAccountingDto salesLedgerProductionAccountingDto, Page page){
return R.ok(salesLedgerProductionAccountingService.listProductionDetails(salesLedgerProductionAccountingDto,page));
}
+
+ @GetMapping("getByUserId")
+ @ApiOperation("鏌ヨ宸ヤ汉鐢熶骇宸ヨ祫淇℃伅")
+ public R getByUserId(UserProductionAccountingDto userProductionAccountingDto){
+ return R.ok(salesLedgerProductionAccountingService.getByUserId(userProductionAccountingDto));
+ }
}
--
Gitblit v1.9.3