From 2c2605a1297882bf88c3c86313ee37797854689b Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 08 六月 2026 10:28:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_宁夏_万通新型
---
src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
index 537c903..84c92c3 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
@@ -7,8 +7,10 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
+import com.ruoyi.purchase.dto.PurchaseStockInDto;
import com.ruoyi.purchase.mapper.PurchaseLedgerTemplateMapper;
import com.ruoyi.purchase.mapper.SalesLedgerProductTemplateMapper;
import com.ruoyi.purchase.pojo.PurchaseLedger;
@@ -137,6 +139,13 @@
return toAjax(purchaseLedgerService.addOrEditPurchase(purchaseLedgerDto));
}
+ @Operation(summary = "鎵归噺鎺ㄨ繘閲囪喘鍙拌处鍒板叆搴�")
+ @Log(title = "鎵归噺鎺ㄨ繘閲囪喘鍙拌处鍒板叆搴�", businessType = BusinessType.OTHER)
+ @PostMapping("/batchInsertPurchaseSteps")
+ public R batchInsertPurchaseSteps(@RequestBody PurchaseLedgerDto purchaseLedgerDto) {
+ return purchaseLedgerService.batchInsertPurchaseSteps(purchaseLedgerDto == null ? null : purchaseLedgerDto.getIds());
+ }
+
/**
* 鏌ヨ閲囪喘妯℃澘
*/
@@ -250,4 +259,11 @@
public AjaxResult createPurchaseNo(@RequestParam Date entryDate) {
return AjaxResult.success("鐢熸垚鎴愬姛",purchaseLedgerService.getPurchaseNo(entryDate));
}
+
+ @PostMapping("/manualStockIn")
+ @Log(title = "鎵嬪姩鍏ュ簱", businessType = BusinessType.OTHER)
+ @Operation(summary = "鎵嬪姩鍏ュ簱")
+ public AjaxResult manualStockIn(@RequestBody PurchaseStockInDto purchaseStockInDto) {
+ return toAjax(purchaseLedgerService.manualStockIn(purchaseStockInDto));
+ }
}
--
Gitblit v1.9.3