From 6184b5e667e8f3088bdb129dd957af8e6049792b Mon Sep 17 00:00:00 2001
From: zhang_12370 <z2864490065@outlook.com>
Date: 星期二, 24 六月 2025 13:55:14 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/zd-before into dev

---
 src/api/warehouseManagement/index.js |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/src/api/warehouseManagement/index.js b/src/api/warehouseManagement/index.js
index c3bcaf8..859f8e9 100644
--- a/src/api/warehouseManagement/index.js
+++ b/src/api/warehouseManagement/index.js
@@ -36,7 +36,31 @@
 // 瀹℃牳鍏ュ簱
 export function addOrEditCoalValue(query) {
     return request({
-        url: '/basic/coalValue/addOrEditCoalValue',
+        url: '/pendingInventory/addOrEditCoalValue',
+        method: 'post',
+        data: query
+    })
+}
+// 鏍规嵁id鏌ヨ鐓よ川鏂规鏌ヨ
+export function coalPlanById(query) {
+    return request({
+        url: '/coalPlan/coalPlanById',
+        method: 'get',
+        params: query
+    })
+}
+// 鎻愪氦鍚堝苟
+export function merge(query) {
+    return request({
+        url: '/officialInventory/merge',
+        method: 'post',
+        data: query
+    })
+}
+// 姝e紡搴撳瓨缂栬緫
+export function editOfficial(query) {
+    return request({
+        url: '/officialInventory/editOfficial',
         method: 'post',
         data: query
     })

--
Gitblit v1.9.3