From f18489adf4e97d1e0159c108ddbce4b22b5dce14 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Fri, 28 Jun 2024 10:52:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D=201=E3=80=81=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E8=AE=A1=E5=88=92=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=9A=84?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BF=BD=E7=95=A5=E5=90=8D=E5=8D=95=E3=80=81?=
 =?UTF-8?q?=E5=BA=93=E4=BD=8D=E5=BF=BD=E7=95=A5=E5=90=8D=E5=8D=95=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=9C=A8=E8=A1=A8=E5=A4=B4=E6=98=BE=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=BF=BD=E7=95=A5=E7=9A=84=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E3=80=81=E5=BA=93=E4=BD=8D=E6=B2=A1=E6=9C=89=E5=BF=BD?=
 =?UTF-8?q?=E7=95=A5=E7=9B=98=E7=82=B9=EF=BC=8C=E5=BA=94=E5=BF=BD=E7=95=A5?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../count/countPlanMain/countPlanMain.data.ts | 78 +++++++++----------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
index 9cffbf23b..3e0b98967 100644
--- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
+++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts
@@ -83,45 +83,45 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '物料忽略名单',
-    field: 'ignoreListOfItem',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        multiple:true,//是否可以多选
-        searchListPlaceholder: '请选择物料忽略名单', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '物料信息', // 查询弹窗标题
-        searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
-        searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
-      }
-    }
-  },
-  {
-    label: '库位忽略名单',
-    field: 'ignoreListOfLocation',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        multiple:true,//是否可以多选
-        searchListPlaceholder: '请选择库位忽略名单', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '库位信息', // 查询弹窗标题
-        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-        searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法
-        
-      }
-    }
-  },
+  // {
+  //   label: '物料忽略名单',
+  //   field: 'ignoreListOfItem',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       isSearchList: true, // 开启查询弹窗
+  //       multiple:true,//是否可以多选
+  //       searchListPlaceholder: '请选择物料忽略名单', // 输入框占位文本
+  //       searchField: 'code', // 查询弹窗赋值字段
+  //       searchTitle: '物料信息', // 查询弹窗标题
+  //       searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
+  //       searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法
+  //     }
+  //   }
+  // },
+  // {
+  //   label: '库位忽略名单',
+  //   field: 'ignoreListOfLocation',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       isSearchList: true, // 开启查询弹窗
+  //       multiple:true,//是否可以多选
+  //       searchListPlaceholder: '请选择库位忽略名单', // 输入框占位文本
+  //       searchField: 'code', // 查询弹窗赋值字段
+  //       searchTitle: '库位信息', // 查询弹窗标题
+  //       searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+  //       searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法
+  //
+  //     }
+  //   }
+  // },
   // {
   //   label: '盘点范围列表',
   //   field: 'scopeList',

From c41ff0fb3f18930d67f682587c1a6c4be8a8b62b Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Fri, 28 Jun 2024 11:33:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE(=E5=8C=85=E6=8B=AC?=
 =?UTF-8?q?=E5=B7=B2=E5=86=BB=E7=BB=93=EF=BC=8C=E5=B7=B2=E5=A4=B1=E6=95=88?=
 =?UTF-8?q?=E7=9A=84=E7=89=A9=E6=96=99)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/balance/index.ts                    | 12 ++++++++++++
 src/views/wms/inventoryManage/balance/index.vue |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts
index 68161dc16..839ac877a 100644
--- a/src/api/wms/balance/index.ts
+++ b/src/api/wms/balance/index.ts
@@ -41,6 +41,18 @@ export const getBalancePage = async (params) => {
     return await request.get({ url: `/wms/balance/page`, params })
   }
 }
+
+// 查询库存余额列表(包括已冻结，已失效的物料)
+export const getBalancePageAll = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/balance/seniorAll', data })
+  } else {
+    return await request.get({ url: `/wms/balance/pageAll`, params })
+  }
+}
+
 // 查询库存余额列表
 export const getBalancePageReturn= async (params) => {
   if (params.isSearch) {
diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue
index 8a372224e..595b8ceb1 100644
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@@ -88,7 +88,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: BalanceApi.getBalancePage // 分页接口
+  getListApi: BalanceApi.getBalancePageAll // 分页接口
 })
 
 // 获得表格的各种操作