From 4039f4dce566ffddf444bed260906acdff0b164f Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期六, 16 五月 2026 15:58:08 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro' into dev_NEW_pro_鹤壁

---
 src/api/inventoryManagement/stockInventory.js |  101 +++++++++++++++++++++++++++++---------------------
 1 files changed, 59 insertions(+), 42 deletions(-)

diff --git a/src/api/inventoryManagement/stockInventory.js b/src/api/inventoryManagement/stockInventory.js
index dfa5f46..328657c 100644
--- a/src/api/inventoryManagement/stockInventory.js
+++ b/src/api/inventoryManagement/stockInventory.js
@@ -1,61 +1,78 @@
 import request from "@/utils/request";
 // 鍒嗛〉鏌ヨ搴撳瓨璁板綍鍒楄〃
-export const getStockInventoryListPage = (params) => {
-    return request({
-        url: "/stockInventory/pagestockInventory",
-        method: "get",
-        params,
-    });
+export const getStockInventoryListPage = params => {
+  return request({
+    url: "/stockInventory/pagestockInventory",
+    method: "get",
+    params,
+  });
+};
+
+// 鍒嗛〉鏌ヨ鑱斿悎搴撳瓨璁板綍鍒楄〃锛堝寘鍚晢鍝佷俊鎭級
+export const getStockInventoryListPageCombined = params => {
+  return request({
+    url: "/stockInventory/pageListCombinedStockInventory",
+    method: "get",
+    params,
+  });
 };
 
 // 鍒涘缓搴撳瓨璁板綍
-export const createStockInventory = (params) => {
-    return request({
-        url: "/stockInventory/addstockInventory",
-        method: "post",
-        data: params,
-    });
+export const createStockInventory = params => {
+  return request({
+    url: "/stockInventory/addstockInventory",
+    method: "post",
+    data: params,
+  });
 };
 
 // 鍑忓皯搴撳瓨璁板綍
-export const subtractStockInventory = (params) => {
-    return request({
-        url: "/stockInventory/subtractStockInventory",
-        method: "post",
-        data: params,
-    });
+export const subtractStockInventory = params => {
+  return request({
+    url: "/stockInventory/subtractStockInventory",
+    method: "post",
+    data: params,
+  });
 };
 
-export const getStockInventoryReportList = (params) => {
-    return request({
-        url: "/stockInventory/stockInventoryPage",
-        method: "get",
-        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 getStockInventoryInAndOutReportList = params => {
+  return request({
+    url: "/stockInventory/stockInAndOutRecord",
+    method: "get",
+    params,
+  });
 };
 
 // 鍐荤粨搴撳瓨璁板綍
-export const frozenStockInventory = (params) => {
-    return request({
-        url: "/stockInventory/frozenStock",
-        method: "post",
-        data: 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,
-    });
+export const thawStockInventory = params => {
+  return request({
+    url: "/stockInventory/thawStock",
+    method: "post",
+    data: params,
+  });
+};
+
+export const getStockInventoryByModelId = productModelId => {
+  return request({
+    url: "/stockInventory/getByModelId",
+    method: "get",
+    params: { productModelId },
+  });
 };

--
Gitblit v1.9.3