From 6349328b76e4c677acaca22d8f35a2e8022b942c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 3 Nov 2025 17:22:02 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E6=8C=89?=
 =?UTF-8?q?=E5=AE=9E=E9=99=85=E5=BA=93=E5=8C=BA=E6=9F=A5=E8=AF=A2=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E5=92=8C=E9=92=A2=E5=8D=B7=E5=88=86=E5=B8=83=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加getStockByActual和getMaterialCoilDistributionByActualWarehouse API
修改库存和钢卷分布页面以支持按实际库区查询
移除合并页面中未使用的添加钢卷按钮
---
 klp-ui/src/api/wms/coil.js           | 11 +++++++++++
 klp-ui/src/api/wms/stock.js          |  8 ++++++++
 klp-ui/src/views/wms/coil/box3.vue   |  4 ++--
 klp-ui/src/views/wms/coil/merge.vue  |  2 +-
 klp-ui/src/views/wms/stock/index.vue | 20 ++++++++++++++------
 5 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/klp-ui/src/api/wms/coil.js b/klp-ui/src/api/wms/coil.js
index 4168a1e7..730fa9df 100644
--- a/klp-ui/src/api/wms/coil.js
+++ b/klp-ui/src/api/wms/coil.js
@@ -84,6 +84,17 @@ export function getMaterialCoilDistributionByType(query) {
   })
 }
 
+// 查询不同类型的钢卷在不同库区的分布情况
+export function getMaterialCoilDistributionByActualWarehouse(query) {
+  return request({
+    url: '/wms/materialCoil/distributionByActualWarehouse',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
 // 钢卷分卷
 export function splitMaterialCoil(data) {
   return request({
diff --git a/klp-ui/src/api/wms/stock.js b/klp-ui/src/api/wms/stock.js
index a49a3733..aa69d624 100644
--- a/klp-ui/src/api/wms/stock.js
+++ b/klp-ui/src/api/wms/stock.js
@@ -9,6 +9,14 @@ export function listStock(query) {
   })
 }
 
+export function getStockByActual(query) {
+  return request({
+    url: '/wms/stock/listActual',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询库存：原材料/产品与库区/库位的存放关系详细
 export function getStock(stockId) {
   return request({
diff --git a/klp-ui/src/views/wms/coil/box3.vue b/klp-ui/src/views/wms/coil/box3.vue
index 34935a9d..0b6d563d 100644
--- a/klp-ui/src/views/wms/coil/box3.vue
+++ b/klp-ui/src/views/wms/coil/box3.vue
@@ -102,7 +102,7 @@
 </template>
 
 <script>
-import { getMaterialCoilDistributionByType, getMaterialCoilDistributionByWarehouse } from "@/api/wms/coil";
+import { getMaterialCoilDistributionByType, getMaterialCoilDistributionByActualWarehouse } from "@/api/wms/coil";
 import MaterialSelect from "@/components/KLPService/MaterialSelect";
 import * as echarts from 'echarts';
 import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
@@ -183,7 +183,7 @@ export default {
         })
       } else if (this.queryParams.statType === '2') {
         // 仓库统计：物料字段无效，以仓库为核心
-        getMaterialCoilDistributionByWarehouse(this.queryParams).then(res => {
+        getMaterialCoilDistributionByActualWarehouse(this.queryParams).then(res => {
           this.list = res.data || [];
           this.updateCharts();
           this.loading = false;
diff --git a/klp-ui/src/views/wms/coil/merge.vue b/klp-ui/src/views/wms/coil/merge.vue
index dc30c54e..49233365 100644
--- a/klp-ui/src/views/wms/coil/merge.vue
+++ b/klp-ui/src/views/wms/coil/merge.vue
@@ -18,7 +18,7 @@
       <div class="flow-left">
         <div class="flow-section-title">
           <span>源卷列表</span>
-          <el-button v-if="!readonly" type="text" size="mini" @click="addSourceCoil" icon="el-icon-plus">添加钢卷</el-button>
+          <!-- <el-button v-if="!readonly" type="text" size="mini" @click="addSourceCoil" icon="el-icon-plus">添加钢卷</el-button> -->
         </div>
 
         <div class="source-list">
diff --git a/klp-ui/src/views/wms/stock/index.vue b/klp-ui/src/views/wms/stock/index.vue
index b36bc69b..adef791d 100644
--- a/klp-ui/src/views/wms/stock/index.vue
+++ b/klp-ui/src/views/wms/stock/index.vue
@@ -127,7 +127,7 @@
 </template>
 
 <script>
-import { listStock, delStock, addStock, updateStock } from "@/api/wms/stock";
+import { listStock, delStock, addStock, updateStock, getStockByActual } from "@/api/wms/stock";
 import { addStockIoWithDetail } from "@/api/wms/stockIo";
 import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
 import ProductSelect from "@/components/KLPService/ProductSelect";
@@ -247,11 +247,19 @@ export default {
     /** 查询库存列表 */
     getList() {
       this.loading = true;
-      listStock(this.queryParams).then(response => {
-        this.stockList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+      if (this.warehouseType === 'real') {
+        getStockByActual(this.queryParams).then(response => {
+          this.stockList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      } else {
+        listStock(this.queryParams).then(response => {
+          this.stockList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      }
     },
     // 树节点点击
     handleTreeSelect(node) {