From f84e425bb9debb5f2af8e417bf07d2a2b0077609 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 28 四月 2026 17:00:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

---
 src/api/inventoryManagement/stockInventory.js |   64 +++++++++++++++++++++++++++++++
 1 files changed, 63 insertions(+), 1 deletions(-)

diff --git a/src/api/inventoryManagement/stockInventory.js b/src/api/inventoryManagement/stockInventory.js
index c677ebf..eafccbf 100644
--- a/src/api/inventoryManagement/stockInventory.js
+++ b/src/api/inventoryManagement/stockInventory.js
@@ -8,12 +8,21 @@
     });
 };
 
+// 鍒嗛〉鏌ヨ鑱斿悎搴撳瓨璁板綍鍒楄〃锛堝寘鍚晢鍝佷俊鎭級
+export const getStockInventoryListPageCombined = (params) => {
+    return request({
+        url: "/stockInventory/pageListCombinedStockInventory",
+        method: "get",
+        params,
+    });
+};
+
 // 鍒涘缓搴撳瓨璁板綍
 export const createStockInventory = (params) => {
     return request({
         url: "/stockInventory/addstockInventory",
         method: "post",
-        params,
+        data: params,
     });
 };
 
@@ -22,6 +31,59 @@
     return request({
         url: "/stockInventory/subtractStockInventory",
         method: "post",
+        data: params,
+    });
+};
+
+// 鏂板鍏ュ簱璁板綍锛堜粎鍒涘缓璁板綍锛屼笉璋冩暣搴撳瓨锛�
+export const addStockInRecordOnly = (params) => {
+    return request({
+        url: "/stockInventory/addStockInRecordOnly",
+        method: "post",
+        data: params,
+    });
+};
+
+// 鏂板鍑哄簱璁板綍锛堜粎鍒涘缓璁板綍锛屼笉璋冩暣搴撳瓨锛�
+export const addStockOutRecordOnly = (params) => {
+    return request({
+        url: "/stockInventory/addStockOutRecordOnly",
+        method: "post",
+        data: params,
+    });
+};
+
+export const getStockInventoryReportList = (params) => {
+    return request({
+        url: "/stockInventory/stockInventoryPage",
+        method: "get",
         params,
     });
 };
+
+export const getStockInventoryInAndOutReportList = (params) => {
+    return request({
+        url: "/stockInventory/stockInAndOutRecord",
+        method: "get",
+        params,
+    });
+};
+
+// 鍐荤粨搴撳瓨璁板綍
+export const frozenStockInventory = (params) => {
+    return request({
+        url: "/stockInventory/frozenStock",
+        method: "post",
+        data: params,
+    });
+};
+
+// 瑙e喕搴撳瓨璁板綍
+export const thawStockInventory = (params) => {
+    return request({
+        url: "/stockInventory/thawStock",
+        method: "post",
+        data: params,
+    });
+};
+

--
Gitblit v1.9.3