Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

2026-05-20 14:07:25 +08:00
parent 15beca11c8 ca21fe33f3
commit 2c9cc6241f
17 changed files with 222 additions and 313 deletions
--- a/klp-ui/src/api/wms/coil.js
+++ b/klp-ui/src/api/wms/coil.js
@@ -473,3 +473,13 @@ export function excludeLock(coilId) {
    timeout: 600000,
  })
 }
+
+// 轻量钢卷列表
+export function listLightCoil(data) {
+  return request({
+    url: '/wms/materialCoil/listForReport',
+    method: 'get',
+    timeout: 600000,
+    params: data
+  })
+}
--- a/klp-ui/src/api/wms/pendingAction.js
+++ b/klp-ui/src/api/wms/pendingAction.js
@@ -167,3 +167,15 @@ export function restorePendingAction(actionId) {
    method: 'put'
  })
 }
+
+/**
+ * 轻量待操作列表
+ */
+export function listLightPendingAction(query) {
+  return request({
+    url: '/wms/coilPendingAction/actionCoilIdList',
+    method: 'get',
+    params: query,
+    timeout: 600000
+  })
+}
--- a/klp-ui/src/components/CoilSelector/index.vue
+++ b/klp-ui/src/components/CoilSelector/index.vue
@@ -142,7 +142,7 @@
                </div>

                <div class="selected-table-wrapper">
-                  <el-table :data="selectedCoils" :height="orderBy ? '100%' : '200px'">
+                  <el-table :data="selectedCoils" :height="orderBy ? 'calc(100% - 30px)' : '200px'">
                    <el-table-column v-for="column in renderColumns" :label="column.label" :align="column.align"
                      :prop="column.prop" :width="column.width" :show-overflow-tooltip="column.showOverflowTooltip" />

--- a/klp-ui/src/views/micro/pages/acid/index.vue
+++ b/klp-ui/src/views/micro/pages/acid/index.vue
@@ -1,11 +1,7 @@
 <template>
  <div class="acid-container">
    <div class="acid-sidebar">
-      <el-menu
-        :default-active="activeMenu"
-        class="sidebar-menu"
-        @select="handleMenuSelect"
-      >
+      <el-menu :default-active="activeMenu" class="sidebar-menu" @select="handleMenuSelect">
        <el-menu-item index="inventory">
          <i class="el-icon-box"></i>
          <span slot="title">库存</span>
@@ -34,6 +30,10 @@
          <i class="el-icon-date"></i>
          <span slot="title">计划</span>
        </el-menu-item>
+        <el-menu-item index="tracking">
+          <i class="el-icon-location-outline"></i>
+          <span slot="title">跟踪</span>
+        </el-menu-item>
        <el-menu-item index="actualPerformance">
          <i class="el-icon-data-analysis"></i>
          <span slot="title">实绩</span>
@@ -54,10 +54,6 @@
          <i class="el-icon-alarm-clock"></i>
          <span slot="title">app</span>
        </el-menu-item>
-        <el-menu-item index="tracking">
-          <i class="el-icon-location-outline"></i>
-          <span slot="title">跟踪</span>
-        </el-menu-item>
      </el-menu>
    </div>
    <div style="flex: 1; overflow: hidden;">
--- a/klp-ui/src/views/wms/report/components/coilTable/index.vue
+++ b/klp-ui/src/views/wms/report/components/coilTable/index.vue
@@ -1,15 +1,15 @@
 <template>
  <div class="coil-table">
    <div class="table-controls">
-      <div class="filter-section">
+      <!-- <div class="filter-section">
        <el-input v-model="filterKeyword" placeholder="输入关键词筛选" clearable @input="handleFilterChange"
          style="width: 200px; margin-right: 10px" />
        <el-select v-model="filterColumn" placeholder="选择筛选字段" @change="handleFilterChange"
          style="width: 200px; margin-right: 10px" multiple collapse-tags>
          <el-option v-for="column in columns" :key="column.prop" :label="column.title" :value="column.prop" />
        </el-select>
-      </div>
-      <div class="sort-section">
+      </div> -->
+      <!-- <div class="sort-section">
        <el-select v-model="sortField" placeholder="选择排序字段" @change="handleSortChange"
          style="width: 150px; margin-right: 10px">
          <el-option v-for="column in columns" :key="column.prop" :label="column.title" :value="column.prop" />
@@ -18,10 +18,10 @@
          <el-option label="升序" value="asc" />
          <el-option label="降序" value="desc" />
        </el-select>
-      </div>
-      <el-pagination layout="total, sizes, prev, pager, next, jumper" :total="total" :page-size.sync="pageSize"
-        :page-sizes="[10, 20, 50, 100, 200, 500, 1000]" @size-change="handleSizeChange"
-        @current-change="handleCurrentChange" />
+      </div> -->
+    <el-pagination layout="total, sizes, prev, pager, next, jumper" :total="paginationTotal" :page-size="effectivePageSize"
+      :current-page="pageNum" :page-sizes="[10, 20, 50, 100, 200, 500, 1000]" @size-change="handleSizeChange"
+      @current-change="handleCurrentChange" />

      <slot name="settings"></slot>
    </div>
@@ -107,13 +107,23 @@ export default {
        // 自定义高亮样式
        style: {}
      })
+    },
+    // 服务端分页总数（>0 时开启服务端分页模式）
+    total: {
+      type: Number,
+      default: 0
+    },
+    // 服务端分页每页条数
+    pageSize: {
+      type: Number,
+      default: 0
    }
  },
  dicts: ['coil_quality_status', 'coil_abnormal_code', 'coil_abnormal_degree'],
  data() {
    return {
      pageNum: 1,
-      pageSize: 1000,
+      innerPageSize: 1000,
      // 排序相关
      sortField: '',
      sortDirection: 'asc',
@@ -133,8 +143,17 @@ export default {
    this.filterColumn = this.columns.map(column => column.prop)
  },
  computed: {
-    // 处理排序和筛选后的数据
+    isServerPagination() {
+      return this.total > 0
+    },
+    effectivePageSize() {
+      return this.pageSize > 0 ? this.pageSize : this.innerPageSize
+    },
+    // 处理排序和筛选后的数据（服务端分页模式下跳过筛选排序）
    processedData() {
+      if (this.isServerPagination) {
+        return this.data
+      }
      let result = [...this.data]

      // 筛选逻辑
@@ -183,32 +202,48 @@ export default {

      return result
    },
-    // 内部实现前端分页逻辑
+    // 内部实现前端分页逻辑（服务端分页模式下直接返回数据）
    tableData() {
-      return this.processedData.slice((this.pageNum - 1) * this.pageSize, this.pageNum * this.pageSize)
+      if (this.isServerPagination) {
+        return this.data
+      }
+      return this.processedData.slice((this.pageNum - 1) * this.effectivePageSize, this.pageNum * this.effectivePageSize)
    },
    // 计算总页数
    totalPage() {
-      return Math.ceil(this.processedData.length / this.pageSize)
+      const total = this.isServerPagination ? this.total : this.processedData.length
+      return Math.ceil(total / this.effectivePageSize)
    },
    // 计算总条数
-    total() {
+    pageTotal() {
      return this.processedData.length
    },
+    // 分页总条数（服务端优先）
+    paginationTotal() {
+      return this.isServerPagination ? this.total : this.pageTotal
+    },
    // 是否展示分页组件
    showPagination() {
+      if (this.isServerPagination) return true
      return this.totalPage > 1
    }
  },
  methods: {
    // 分页大小改变时触发
    handleSizeChange(val) {
-      this.pageSize = val
+      if (this.isServerPagination) {
+        this.$emit('size-change', val)
+      } else {
+        this.innerPageSize = val
+      }
      this.pageNum = 1
    },
    // 分页当前页改变时触发
    handleCurrentChange(val) {
      this.pageNum = val
+      if (this.isServerPagination) {
+        this.$emit('current-change', val)
+      }
    },
    // 生产耗时，单位分钟，渲染为xx天xx小时xx分钟
    formatProductionDuration(duration) {
--- a/klp-ui/src/views/wms/report/delivery.vue
+++ b/klp-ui/src/views/wms/report/delivery.vue
@@ -55,7 +55,8 @@

    <el-descriptions title="明细信息" :column="3" border>
    </el-descriptions>
-    <coil-table :columns="deliveryColumns" :data="list"></coil-table>
+    <coil-table :columns="deliveryColumns" :data="list" :total="total" :page-size="pageSize"
+      @current-change="handlePageChange" @size-change="handleSizeChange"></coil-table>

    <el-dialog title="列设置" :visible.sync="settingVisible" width="50%">
      <el-radio-group v-model="activeColumnConfig">
@@ -67,7 +68,7 @@
 </template>

 <script>
-import { listCoilWithIds, listWithBindInfoCoil } from "@/api/wms/coil";
+import { listWithBindInfoCoil, listLightCoil } from "@/api/wms/coil";
 import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
 import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
 import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
@@ -118,11 +119,10 @@ export default {
      activeColumnConfig: 'coil-report-delivery',
      settingVisible: false,
      list: [],
+      lightList: [],
      defaultStartTime: startTime,
      defaultEndTime: endTime,
      queryParams: {
-        pageNum: 1,
-        pageSize: 99999,
        status: 1,
        dataType: 1,
        selectType: 'product',
@@ -133,8 +133,10 @@ export default {
        itemSpecification: '',
        itemMaterial: '',
        itemManufacturer: '',
-        includeBindInfo: true,
      },
+      pageNum: 1,
+      pageSize: 100,
+      total: 0,
      loading: false,

      deliveryColumns: [],
@@ -142,9 +144,9 @@ export default {
  },
  computed: {
    summary() {
-      // 总钢卷数量、总重、均重
-      const totalCount = this.list.length
-      const totalWeight = this.list.reduce((acc, cur) => acc + parseFloat(cur.netWeight), 0)
+      // 总钢卷数量、总重、均重（基于轻量全量列表）
+      const totalCount = this.lightList.length
+      const totalWeight = this.lightList.reduce((acc, cur) => acc + parseFloat(cur.netWeight), 0)
      const avgWeight = totalCount > 0 ? (totalWeight / totalCount).toFixed(2) : 0
      return {
        totalCount,
@@ -153,7 +155,7 @@ export default {
      }
    },
    coilIds() {
-      return this.list.map(item => item.coilId).join(',')
+      return this.lightList.map(item => item.coilId).join(',')
    },
  },
  methods: {
@@ -167,11 +169,20 @@ export default {
    },
    getList() {
      this.loading = true
-      listWithBindInfoCoil({
+      this.pageNum = 1
+      Promise.all([
+        this.fetchLightList(),
+        this.fetchDetailList()
+      ]).finally(() => {
+        this.loading = false
+      })
+    },
+    // 轻量全量接口，用于统计计算
+    fetchLightList() {
+      return listLightCoil({
        ...this.queryParams
      }).then(res => {
-        this.list = res.rows.map(item => {
-          // 计算宽度和厚度，将规格按照*分割，*前的是厚度，*后的是宽度
+        this.lightList = (res || []).map(item => {
          const [thickness, width] = item.specification?.split('*') || []
          return {
            ...item,
@@ -179,6 +190,41 @@ export default {
            computedWidth: parseFloat(width),
          }
        })
+      })
+    },
+    // 分页明细接口，用于表格展示
+    fetchDetailList() {
+      return listWithBindInfoCoil({
+        ...this.queryParams,
+        includeBindInfo: true,
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
+      }).then(res => {
+        this.total = res.total || 0
+        this.list = (res.rows || []).map(item => {
+          const [thickness, width] = item.specification?.split('*') || []
+          return {
+            ...item,
+            computedThickness: parseFloat(thickness),
+            computedWidth: parseFloat(width),
+          }
+        })
+      })
+    },
+    // 切换页码
+    handlePageChange(pageNum) {
+      this.pageNum = pageNum
+      this.loading = true
+      this.fetchDetailList().finally(() => {
+        this.loading = false
+      })
+    },
+    // 切换每页条数
+    handleSizeChange(pageSize) {
+      this.pageSize = pageSize
+      this.pageNum = 1
+      this.loading = true
+      this.fetchDetailList().finally(() => {
        this.loading = false
      })
    },
--- a/klp-ui/src/views/wms/report/template/comprehensive.vue
+++ b/klp-ui/src/views/wms/report/template/comprehensive.vue
@@ -40,15 +40,15 @@
          <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
            @keyup.enter.native="handleQuery" />
        </el-form-item>
-        <!-- <el-form-item label="逻辑库位" prop="warehouseIds">
+        <el-form-item label="逻辑库位" prop="warehouseIds">
          <el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
            <el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
          </el-select>
-        </el-form-item> -->
-        <el-form-item label="逻辑库位" prop="warehouseId">
+        </el-form-item>
+        <!-- <el-form-item label="逻辑库位" prop="warehouseId">
          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
            style="width: 100%; display: inline-block; width: 200px;" clearable />
-        </el-form-item>
+        </el-form-item> -->
        <el-form-item label="产品名称" prop="itemName">
          <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
            @keyup.enter.native="handleQuery" />
@@ -448,7 +448,7 @@ export default {
        fetchOutputList({
          ...this.queryParams,
          ...this.baseQueryParams,
-          // warehouseIds: this.warehouseIds.join(','),
+          warehouseIds: this.warehouseIds.join(','),
        }),
      ]).then(([lossList, outputList]) => {
        this.lossList = lossList
--- a/klp-ui/src/views/wms/report/template/day.vue
+++ b/klp-ui/src/views/wms/report/template/day.vue
@@ -14,15 +14,15 @@
          <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
            @keyup.enter.native="handleQuery" />
        </el-form-item>
-        <!-- <el-form-item label="逻辑库位" prop="warehouseIds">
+        <el-form-item label="逻辑库位" prop="warehouseIds">
          <el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
            <el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
          </el-select>
-        </el-form-item> -->
-        <el-form-item label="逻辑库位" prop="warehouseId">
+        </el-form-item>
+        <!-- <el-form-item label="逻辑库位" prop="warehouseId">
          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
            style="width: 100%; display: inline-block; width: 200px;" clearable />
-        </el-form-item>
+        </el-form-item> -->
        <el-form-item label="产品名称" prop="itemName">
          <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
            @keyup.enter.native="handleQuery" />
@@ -341,7 +341,7 @@ export default {
        fetchOutputList({
          ...this.queryParams,
          ...this.baseQueryParams,
-          // warehouseIds: this.warehouseIds.join(','),
+          warehouseIds: this.warehouseIds.join(','),
        }),
      ]).then(([lossList, outputList]) => {
        this.lossList = lossList
--- a/klp-ui/src/views/wms/report/template/mands.vue
+++ b/klp-ui/src/views/wms/report/template/mands.vue
@@ -42,15 +42,15 @@
          <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
            @keyup.enter.native="handleQuery" />
        </el-form-item>
-        <!-- <el-form-item label="逻辑库位" prop="warehouseIds">
+        <el-form-item label="逻辑库位" prop="warehouseIds">
          <el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
            <el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
          </el-select>
-        </el-form-item> -->
-        <el-form-item label="逻辑库位" prop="warehouseId">
+        </el-form-item>
+        <!-- <el-form-item label="逻辑库位" prop="warehouseId">
          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
            style="width: 100%; display: inline-block; width: 200px;" clearable />
-        </el-form-item>
+        </el-form-item> -->
        <el-form-item label="产品名称" prop="itemName">
          <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
            @keyup.enter.native="handleQuery" />
@@ -452,7 +452,7 @@ export default {
        fetchOutputList({
          ...this.queryParams,
          ...this.baseQueryParams,
-          // warehouseIds: this.warehouseIds.join(','),
+          warehouseIds: this.warehouseIds.join(','),
        }),
      ]).then(([lossList, outputList]) => {
        // 将mergeCoils中存在的卷剔除
--- a/klp-ui/src/views/wms/report/template/month.vue
+++ b/klp-ui/src/views/wms/report/template/month.vue
@@ -14,15 +14,15 @@
          <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
            @keyup.enter.native="handleQuery" />
        </el-form-item>
-        <!-- <el-form-item label="逻辑库位" prop="warehouseIds">
+        <el-form-item label="逻辑库位" prop="warehouseIds">
          <el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
            <el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
          </el-select>
-        </el-form-item> -->
-        <el-form-item label="逻辑库位" prop="warehouseId">
+        </el-form-item>
+        <!-- <el-form-item label="逻辑库位" prop="warehouseId">
          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
            style="width: 100%; display: inline-block; width: 200px;" clearable />
-        </el-form-item>
+        </el-form-item> -->
        <el-form-item label="产品名称" prop="itemName">
          <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
            @keyup.enter.native="handleQuery" />
@@ -414,7 +414,7 @@ export default {
        fetchOutputList({
          ...this.queryParams,
          ...this.baseQueryParams,
-          // warehouseIds: this.warehouseIds.join(','),
+          warehouseIds: this.warehouseIds.join(','),
        }),
      ]).then(([lossList, outputList]) => {
        this.lossList = lossList
--- a/klp-ui/src/views/wms/report/template/out.vue
+++ b/klp-ui/src/views/wms/report/template/out.vue
@@ -20,15 +20,15 @@
          <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
            @keyup.enter.native="handleQuery" />
        </el-form-item>
-        <!-- <el-form-item label="逻辑库位" prop="endTime">
+        <el-form-item label="逻辑库位" prop="endTime">
          <el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
            <el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
          </el-select>
-        </el-form-item> -->
-        <el-form-item label="逻辑库位" prop="warehouseId">
+        </el-form-item>
+        <!-- <el-form-item label="逻辑库位" prop="warehouseId">
          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
            style="width: 100%; display: inline-block; width: 200px;" clearable />
-        </el-form-item>
+        </el-form-item> -->
        <el-form-item label="产品名称" prop="endTime">
          <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
            @keyup.enter.native="handleQuery" />
@@ -208,7 +208,7 @@ export default {
      fetchOutputList({
        ...this.queryParams,
        ...this.baseQueryParams,
-        // warehouseIds: this.warehouseIds.join(','),
+        warehouseIds: this.warehouseIds.join(','),
      }).then((resList) => {
        this.list = resList
        this.loading = false
--- a/klp-ui/src/views/wms/report/template/team.vue
+++ b/klp-ui/src/views/wms/report/template/team.vue
@@ -24,15 +24,15 @@
          <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
            @keyup.enter.native="handleQuery" />
        </el-form-item>
-        <!-- <el-form-item label="逻辑库位">
+        <el-form-item label="逻辑库位">
          <el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
            <el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
          </el-select>
-        </el-form-item> -->
-        <el-form-item label="逻辑库位" prop="warehouseId">
+        </el-form-item>
+        <!-- <el-form-item label="逻辑库位" prop="warehouseId">
          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
            style="width: 100%; display: inline-block; width: 200px;" clearable />
-        </el-form-item>
+        </el-form-item> -->
        <el-form-item label="产品名称">
          <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
            @keyup.enter.native="handleQuery" />
@@ -326,7 +326,7 @@ export default {
        fetchOutputList({
          ...this.queryParams,
          ...this.baseQueryParams,
-          // warehouseIds: this.warehouseIds.join(','),
+          warehouseIds: this.warehouseIds.join(','),
        }),
      ]).then(([lossList, outputList]) => {
        this.lossList = lossList
--- a/klp-ui/src/views/wms/report/template/year.vue
+++ b/klp-ui/src/views/wms/report/template/year.vue
@@ -14,15 +14,15 @@
          <el-input style="width: 200px;" v-model="queryParams.currentCoilNo" placeholder="请输入当前钢卷号" clearable
            @keyup.enter.native="handleQuery" />
        </el-form-item>
-        <!-- <el-form-item label="逻辑库位" prop="warehouseIds">
+        <el-form-item label="逻辑库位" prop="warehouseIds">
          <el-select v-model="warehouseIds" collapse-tags multiple placeholder="请选择逻辑库位" style="width: 200px;">
            <el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" />
          </el-select>
-        </el-form-item> -->
-        <el-form-item label="逻辑库位" prop="warehouseId">
+        </el-form-item>
+        <!-- <el-form-item label="逻辑库位" prop="warehouseId">
          <warehouse-select v-model="queryParams.warehouseId" placeholder="请选择仓库/库区/库位"
            style="width: 100%; display: inline-block; width: 200px;" clearable />
-        </el-form-item>
+        </el-form-item> -->
        <el-form-item label="产品名称" prop="itemName">
          <el-input style="width: 200px;" v-model="queryParams.itemName" placeholder="请输入产品名称" clearable
            @keyup.enter.native="handleQuery" />
@@ -312,7 +312,7 @@ export default {
        fetchOutputList({
          ...this.queryParams,
          ...this.baseQueryParams,
-          // warehouseIds: this.warehouseIds.join(','),
+          warehouseIds: this.warehouseIds.join(','),
        }),
      ]).then(([lossList, outputList]) => {
        this.lossList = lossList