From 3d528941af47b2828483e06626649971876f79ce Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <jin982011>
Date: Wed, 9 Apr 2025 14:13:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=93=E5=AD=98=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/wms/inventory/inventory-api.ts   |  48 ++++
 .../business/wms/inventory/inventory-const.ts |  11 +
 .../src/constants/support/table-id-const.ts   | 106 ++++----
 .../wms/base/address/address-list.vue         |   2 +-
 .../business/wms/base/area/area-list.vue      |   2 +-
 .../wms/base/customer/customer-list.vue       |   2 +-
 .../business/wms/base/item/item-list.vue      |   2 +-
 .../wms/base/location/location-list.vue       |   2 +-
 .../business/wms/base/stock/stock-list.vue    |   2 +-
 .../business/wms/inventory/inventory-list.vue | 226 ++++++++++++++++++
 .../business/wms/receive/asn/asn-list.vue     |   2 +-
 .../wms/receive/asn/receive-detail-list.vue   |   2 +-
 .../wms/receive/asnTask/asn-task-list.vue     |   2 +-
 13 files changed, 347 insertions(+), 62 deletions(-)
 create mode 100644 nc_wms_web/src/api/business/wms/inventory/inventory-api.ts
 create mode 100644 nc_wms_web/src/api/business/wms/inventory/inventory-const.ts
 create mode 100644 nc_wms_web/src/views/business/wms/inventory/inventory-list.vue

diff --git a/nc_wms_web/src/api/business/wms/inventory/inventory-api.ts b/nc_wms_web/src/api/business/wms/inventory/inventory-api.ts
new file mode 100644
index 0000000..64df95f
--- /dev/null
+++ b/nc_wms_web/src/api/business/wms/inventory/inventory-api.ts
@@ -0,0 +1,48 @@
+/**
+ * 库存信息 api 封装
+ *
+ * @Author:    霍锦
+ * @Date:      2024-12-06 17:24:53
+ * @Copyright  友仓
+ */
+import {postRequest, getRequest} from '/@/lib/axios';
+
+export const inventoryApi = {
+
+    /**
+     * 分页查询  @author  霍锦
+     */
+    queryPage: (param: object) => {
+        return postRequest('/inventory/queryPage', param);
+    },
+
+    /**
+     * 增加  @author  霍锦
+     */
+    add: (param: object) => {
+        return postRequest('/inventory/add', param);
+    },
+
+    /**
+     * 修改  @author  霍锦
+     */
+    update: (param: object) => {
+        return postRequest('/inventory/update', param);
+    },
+
+
+    /**
+     * 删除  @author  霍锦
+     */
+    delete: (inventoryId: number) => {
+        return getRequest('/inventory/delete', {inventoryId});
+    },
+
+    /**
+     * 批量删除  @author  霍锦
+     */
+    batchDelete: (idList: number[]) => {
+        return postRequest('/inventory/batchDelete', idList);
+    },
+
+};
diff --git a/nc_wms_web/src/api/business/wms/inventory/inventory-const.ts b/nc_wms_web/src/api/business/wms/inventory/inventory-const.ts
new file mode 100644
index 0000000..93c1160
--- /dev/null
+++ b/nc_wms_web/src/api/business/wms/inventory/inventory-const.ts
@@ -0,0 +1,11 @@
+/**
+ * 库存信息 枚举
+ *
+ * @Author:    霍锦
+ * @Date:      2024-12-06 17:24:53
+ * @Copyright  友仓
+ */
+
+
+export default {
+};
\ No newline at end of file
diff --git a/nc_wms_web/src/constants/support/table-id-const.ts b/nc_wms_web/src/constants/support/table-id-const.ts
index 0e41be3..d459388 100644
--- a/nc_wms_web/src/constants/support/table-id-const.ts
+++ b/nc_wms_web/src/constants/support/table-id-const.ts
@@ -17,61 +17,61 @@ let businessOAInitTableId = 30000;
 
 let businessERPInitTableId = 40000;
 
-let businessBASEInitTableId = 50000;
+let businessWMSInitTableId = 50000;
 
-let businessRECEIVEInitTableId = 60000;
 
 export const TABLE_ID_CONST = {
-  /**
-   * 业务
-   */
-  BUSINESS: {
-    OA: {
-      NOTICE: businessOAInitTableId + 1, //通知公告
-      ENTERPRISE: businessOAInitTableId + 2, //企业信息
-      ENTERPRISE_EMPLOYEE: businessOAInitTableId + 3, //企业员工
-      ENTERPRISE_BANK: businessOAInitTableId + 4, //企业银行
-      ENTERPRISE_INVOICE: businessOAInitTableId + 5, //企业发票
-    },
-    ERP: {
-      GOODS: businessERPInitTableId + 1, //商品管理
-    },
-    BASE:{
-      AREA:businessBASEInitTableId+1,//库区
-      LOCATION:businessBASEInitTableId+2,//库位
-      ITEM:businessBASEInitTableId+3,//商品
-      STOCK:businessBASEInitTableId+4,//容器
-      ADDRESS:businessBASEInitTableId+5,//地址
-      CUSTOMER:businessBASEInitTableId+6,//客户
-    },
-    RECEIVE:{
-      ASN:businessRECEIVEInitTableId+1,//入库单
-      ASN_DETAIL:businessRECEIVEInitTableId+2,//入库明细
-      ASN_TASK:businessRECEIVEInitTableId+3,//入库详情
-    }
-  },
+    /**
+     * 业务
+     */
+    BUSINESS: {
+        OA: {
+            NOTICE: businessOAInitTableId + 1, //通知公告
+            ENTERPRISE: businessOAInitTableId + 2, //企业信息
+            ENTERPRISE_EMPLOYEE: businessOAInitTableId + 3, //企业员工
+            ENTERPRISE_BANK: businessOAInitTableId + 4, //企业银行
+            ENTERPRISE_INVOICE: businessOAInitTableId + 5, //企业发票
+        },
+        ERP: {
+            GOODS: businessERPInitTableId + 1, //商品管理
+        },
+        WMS: {
+            AREA: businessWMSInitTableId + 1,//库区
+            LOCATION: businessWMSInitTableId + 2,//库位
+            ITEM: businessWMSInitTableId + 3,//商品
+            STOCK: businessWMSInitTableId + 4,//容器
+            ADDRESS: businessWMSInitTableId + 5,//地址
+            CUSTOMER: businessWMSInitTableId + 6,//客户
 
-  /**
-   * 系统
-   */
-  SYSTEM: {
-    EMPLOYEE: systemInitTableId + 1, //员工
-    MENU: systemInitTableId + 2, //菜单
-    POSITION:systemInitTableId + 3, //职位
-  },
-  /**
-   * 支撑
-   */
-  SUPPORT: {
-    CONFIG: supportInitTableId + 1, //参数配置
-    DICT: supportInitTableId + 2, //字典
-    SERIAL_NUMBER: supportInitTableId + 3, //单号
-    OPERATE_LOG: supportInitTableId + 4, //请求监控
-    HEART_BEAT: supportInitTableId + 5, //心跳
-    LOGIN_LOG: supportInitTableId + 6, //登录日志
-    RELOAD: supportInitTableId + 7, //reload
-    HELP_DOC: supportInitTableId + 8, //帮助文档
-    JOB: supportInitTableId + 9, //Job
-    JOB_LOG: supportInitTableId + 10, //JobLog
-  },
+            ASN: businessWMSInitTableId + 7,//入库单
+            ASN_DETAIL: businessWMSInitTableId + 8,//入库明细
+            ASN_TASK: businessWMSInitTableId + 9,//入库详情
+
+            INVENTORY: businessWMSInitTableId + 10,//库存
+        }
+    },
+
+    /**
+     * 系统
+     */
+    SYSTEM: {
+        EMPLOYEE: systemInitTableId + 1, //员工
+        MENU: systemInitTableId + 2, //菜单
+        POSITION: systemInitTableId + 3, //职位
+    },
+    /**
+     * 支撑
+     */
+    SUPPORT: {
+        CONFIG: supportInitTableId + 1, //参数配置
+        DICT: supportInitTableId + 2, //字典
+        SERIAL_NUMBER: supportInitTableId + 3, //单号
+        OPERATE_LOG: supportInitTableId + 4, //请求监控
+        HEART_BEAT: supportInitTableId + 5, //心跳
+        LOGIN_LOG: supportInitTableId + 6, //登录日志
+        RELOAD: supportInitTableId + 7, //reload
+        HELP_DOC: supportInitTableId + 8, //帮助文档
+        JOB: supportInitTableId + 9, //Job
+        JOB_LOG: supportInitTableId + 10, //JobLog
+    },
 };
diff --git a/nc_wms_web/src/views/business/wms/base/address/address-list.vue b/nc_wms_web/src/views/business/wms/base/address/address-list.vue
index 466ec87..2733f21 100644
--- a/nc_wms_web/src/views/business/wms/base/address/address-list.vue
+++ b/nc_wms_web/src/views/business/wms/base/address/address-list.vue
@@ -63,7 +63,7 @@
         </a-button>
       </div>
       <div class="smart-table-setting-block">
-        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.BASE.ADDRESS" :refresh="queryData"/>
+        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.WMS.ADDRESS" :refresh="queryData"/>
       </div>
     </a-row>
     <!---------- 表格操作行 end ----------->
diff --git a/nc_wms_web/src/views/business/wms/base/area/area-list.vue b/nc_wms_web/src/views/business/wms/base/area/area-list.vue
index 279b2f4..2c37c06 100644
--- a/nc_wms_web/src/views/business/wms/base/area/area-list.vue
+++ b/nc_wms_web/src/views/business/wms/base/area/area-list.vue
@@ -55,7 +55,7 @@
         </a-button>
       </div>
       <div class="smart-table-setting-block">
-        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.BASE.AREA" :refresh="queryData"/>
+        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.WMS.AREA" :refresh="queryData"/>
       </div>
     </a-row>
     <!---------- 表格操作行 end ----------->
diff --git a/nc_wms_web/src/views/business/wms/base/customer/customer-list.vue b/nc_wms_web/src/views/business/wms/base/customer/customer-list.vue
index 9b968bb..13cef1a 100644
--- a/nc_wms_web/src/views/business/wms/base/customer/customer-list.vue
+++ b/nc_wms_web/src/views/business/wms/base/customer/customer-list.vue
@@ -55,7 +55,7 @@
         </a-button>
       </div>
       <div class="smart-table-setting-block">
-        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.BASE.CUSTOMER" :refresh="queryData"/>
+        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.WMS.CUSTOMER" :refresh="queryData"/>
       </div>
     </a-row>
     <!---------- 表格操作行 end ----------->
diff --git a/nc_wms_web/src/views/business/wms/base/item/item-list.vue b/nc_wms_web/src/views/business/wms/base/item/item-list.vue
index 9fb46a8..c978cb8 100644
--- a/nc_wms_web/src/views/business/wms/base/item/item-list.vue
+++ b/nc_wms_web/src/views/business/wms/base/item/item-list.vue
@@ -68,7 +68,7 @@
         </a-button>
       </div>
       <div class="smart-table-setting-block">
-        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.BASE.ITEM" :refresh="queryData"/>
+        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.WMS.ITEM" :refresh="queryData"/>
       </div>
     </a-row>
     <!---------- 表格操作行 end ----------->
diff --git a/nc_wms_web/src/views/business/wms/base/location/location-list.vue b/nc_wms_web/src/views/business/wms/base/location/location-list.vue
index 0f917c4..c6ae7c6 100644
--- a/nc_wms_web/src/views/business/wms/base/location/location-list.vue
+++ b/nc_wms_web/src/views/business/wms/base/location/location-list.vue
@@ -90,7 +90,7 @@
 
       </div>
       <div class="smart-table-setting-block">
-        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.BASE.LOCATION" :refresh="queryData"/>
+        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.WMS.LOCATION" :refresh="queryData"/>
       </div>
     </a-row>
     <!---------- 表格操作行 end ----------->
diff --git a/nc_wms_web/src/views/business/wms/base/stock/stock-list.vue b/nc_wms_web/src/views/business/wms/base/stock/stock-list.vue
index 042d888..f92d580 100644
--- a/nc_wms_web/src/views/business/wms/base/stock/stock-list.vue
+++ b/nc_wms_web/src/views/business/wms/base/stock/stock-list.vue
@@ -74,7 +74,7 @@
         </a-button>
       </div>
       <div class="smart-table-setting-block">
-        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.BASE.STOCK" :refresh="queryData"/>
+        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.WMS.STOCK" :refresh="queryData"/>
       </div>
     </a-row>
     <!---------- 表格操作行 end ----------->
diff --git a/nc_wms_web/src/views/business/wms/inventory/inventory-list.vue b/nc_wms_web/src/views/business/wms/inventory/inventory-list.vue
new file mode 100644
index 0000000..bd955ee
--- /dev/null
+++ b/nc_wms_web/src/views/business/wms/inventory/inventory-list.vue
@@ -0,0 +1,226 @@
+<!--
+  * 库存信息
+  *
+  * @Author:    霍锦
+  * @Date:      2024-12-06 17:24:53
+  * @Copyright  友仓
+-->
+<template>
+  <!---------- 查询表单form begin ----------->
+  <a-form class="smart-query-form">
+    <a-row class="smart-query-form-row">
+      <a-form-item label="物料" class="smart-query-form-item">
+        <ItemSelect v-model:value="queryForm.itemId" :disabledFlag="true" @change="changeItemSelect"/>
+      </a-form-item>
+
+      <a-form-item label="库位" class="smart-query-form-item">
+        <LocationSelect v-model:value="queryForm.locationId" :disabledFlag="true" @change="changeLocationSelect"/>
+      </a-form-item>
+
+      <a-form-item label="容器" class="smart-query-form-item">
+        <StockSelect v-model:value="queryForm.stockId" :disabled-flag="true" @change="changeStockSelect"/>
+      </a-form-item>
+      <a-form-item class="smart-query-form-item">
+        <a-button type="primary" @click="onSearch" class="smart-margin-left10" v-privilege="'inventory:query'">
+          <template #icon>
+            <SearchOutlined/>
+          </template>
+          查询
+        </a-button>
+        <a-button @click="resetQuery" class="smart-margin-left10" v-privilege="'inventory:query'">
+          <template #icon>
+            <ReloadOutlined/>
+          </template>
+          重置
+        </a-button>
+      </a-form-item>
+    </a-row>
+  </a-form>
+  <!---------- 查询表单form end ----------->
+
+  <a-card size="small" :bordered="false" :hoverable="true">
+    <!---------- 表格操作行 begin ----------->
+    <a-row class="smart-table-btn-block">
+      <div class="smart-table-operate-block">
+
+
+      </div>
+      <div class="smart-table-setting-block">
+        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.WMS.INVENTORY" :refresh="queryData"/>
+      </div>
+    </a-row>
+    <!---------- 表格操作行 end ----------->
+
+    <!---------- 表格 begin ----------->
+    <a-table
+        size="small"
+        :dataSource="tableData"
+        :columns="columns"
+        rowKey="inventoryId"
+        bordered
+        :loading="tableLoading"
+        :pagination="false"
+        :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
+    >
+      <template #bodyCell="{ text, record, column }">
+
+
+        <template v-if="column.dataIndex === 'action'">
+          <div class="smart-table-operate">
+          </div>
+        </template>
+      </template>
+    </a-table>
+    <!---------- 表格 end ----------->
+
+    <div class="smart-query-table-page">
+      <a-pagination
+          showSizeChanger
+          showQuickJumper
+          show-less-items
+          :pageSizeOptions="PAGE_SIZE_OPTIONS"
+          :defaultPageSize="queryForm.pageSize"
+          v-model:current="queryForm.pageNum"
+          v-model:pageSize="queryForm.pageSize"
+          :total="total"
+          @change="queryData"
+          @showSizeChange="queryData"
+          :show-total="(total:number) => `共${total}条`"
+      />
+    </div>
+
+  </a-card>
+</template>
+<script setup lang="ts">
+import {reactive, ref, onMounted} from 'vue';
+import {inventoryApi} from '/@/api/business/wms/inventory/inventory-api';
+import {PAGE_SIZE_OPTIONS} from '/@/constants/common-const';
+import {smartSentry} from '/@/lib/smart-sentry';
+import TableOperator from '/@/components/support/table-operator/index.vue';
+import {TABLE_ID_CONST} from "/@/constants/support/table-id-const";
+import StockSelect from "/@/views/business/wms/base/stock/stock-select.vue";
+import ItemSelect from "/@/views/business/wms/base/item/item-select.vue";
+import LocationSelect from "/@/views/business/wms/base/location/location-select.vue";
+// ---------------------------- 表格列 ----------------------------
+
+const columns = ref([
+  {
+    title: '库存id',
+    dataIndex: 'inventoryId',
+    ellipsis: true,
+  },
+  {
+    title: '物料编码',
+    dataIndex: 'itemCode',
+    ellipsis: true,
+  },
+  {
+    title: '物料名称',
+    dataIndex: 'itemName',
+    ellipsis: true,
+  },
+  {
+    title: '库位',
+    dataIndex: 'locationCode',
+    ellipsis: true,
+  },
+  {
+    title: '容器',
+    dataIndex: 'stockCode',
+    ellipsis: true,
+  },
+  {
+    title: '数量',
+    dataIndex: 'quantity',
+    ellipsis: true,
+  },
+  {
+    title: '占用数',
+    dataIndex: 'queuedQuantity',
+    ellipsis: true,
+  },
+  {
+    title: '日期',
+    dataIndex: 'createTime',
+    ellipsis: true,
+  }
+]);
+
+// ---------------------------- 查询数据表单和方法 ----------------------------
+
+const queryFormState = {
+  itemId: undefined,//物料
+  locationId: undefined,//库位
+  stockId: undefined,//容器
+  pageNum: 1,
+  pageSize: 10,
+};
+// 查询表单form
+const queryForm = reactive({...queryFormState});
+// 表格加载loading
+const tableLoading = ref(false);
+// 表格数据
+const tableData = ref([]);
+// 总数
+const total = ref(0);
+
+// 重置查询条件
+function resetQuery() {
+  let pageSize = queryForm.pageSize;
+  Object.assign(queryForm, queryFormState);
+  queryForm.pageSize = pageSize;
+  queryData();
+}
+
+// 搜索
+function onSearch() {
+  queryForm.pageNum = 1;
+  queryData();
+}
+
+//选择物料
+function changeItemSelect(selectValue: any) {
+  if (selectValue) {
+    queryForm.itemId = selectValue.itemId;
+  }
+}
+
+//选择容器
+function changeStockSelect(selectValue: any) {
+  if (selectValue) {
+    queryForm.stockId = selectValue.stockId;
+  }
+}
+
+//选择库位
+function changeLocationSelect(selectValue: any) {
+  if (selectValue) {
+    queryForm.locationId = selectValue.locationId;
+  }
+}
+
+
+// 查询数据
+async function queryData() {
+  tableLoading.value = true;
+  try {
+    let queryResult = await inventoryApi.queryPage(queryForm);
+    tableData.value = queryResult.data.list;
+    total.value = queryResult.data.total;
+  } catch (e) {
+    smartSentry.captureError(e);
+  } finally {
+    tableLoading.value = false;
+  }
+}
+
+// 选择表格行
+const selectedRowKeyList = ref([]);
+
+function onSelectChange(selectedRowKeys: any) {
+  selectedRowKeyList.value = selectedRowKeys;
+}
+
+
+onMounted(queryData);
+</script>
diff --git a/nc_wms_web/src/views/business/wms/receive/asn/asn-list.vue b/nc_wms_web/src/views/business/wms/receive/asn/asn-list.vue
index 48927da..6e44dc7 100644
--- a/nc_wms_web/src/views/business/wms/receive/asn/asn-list.vue
+++ b/nc_wms_web/src/views/business/wms/receive/asn/asn-list.vue
@@ -49,7 +49,7 @@
         </a-button>
       </div>
       <div class="smart-table-setting-block">
-        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.RECEIVE.ASN" :refresh="queryData"/>
+        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.WMS.ASN" :refresh="queryData"/>
       </div>
     </a-row>
     <!---------- 表格操作行 end ----------->
diff --git a/nc_wms_web/src/views/business/wms/receive/asn/receive-detail-list.vue b/nc_wms_web/src/views/business/wms/receive/asn/receive-detail-list.vue
index a0e1e51..3913ecd 100644
--- a/nc_wms_web/src/views/business/wms/receive/asn/receive-detail-list.vue
+++ b/nc_wms_web/src/views/business/wms/receive/asn/receive-detail-list.vue
@@ -42,7 +42,7 @@
           批量移除
         </a-button>
 
-        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.RECEIVE.ASN_DETAIL" :refresh="queryData"/>
+        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.WMS.ASN_DETAIL" :refresh="queryData"/>
       </div>
 
     </div>
diff --git a/nc_wms_web/src/views/business/wms/receive/asnTask/asn-task-list.vue b/nc_wms_web/src/views/business/wms/receive/asnTask/asn-task-list.vue
index ca9204e..54a747f 100644
--- a/nc_wms_web/src/views/business/wms/receive/asnTask/asn-task-list.vue
+++ b/nc_wms_web/src/views/business/wms/receive/asnTask/asn-task-list.vue
@@ -27,7 +27,7 @@
           批量退货
         </a-button>
 
-        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.RECEIVE.ASN_TASK" :refresh="queryData"/>
+        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.WMS.ASN_TASK" :refresh="queryData"/>
       </div>
 
     </div>