From dd098e645e6b70e11f8dc97eb0df32c365debcb5 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 26 Aug 2024 12:01:10 +0800
Subject: [PATCH] =?UTF-8?q?HL-5614=20=E4=B8=8A=E6=9E=B6=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=BA=A2=E5=87=BA=E5=BA=93=E4=BD=8D=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/location/index.ts                 |  6 ++++
 .../strategy/upShelfStrategy/AddForm.vue      | 33 ++++++++++++-------
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/api/wms/location/index.ts b/src/api/wms/location/index.ts
index df0ef46bb..d50614a7e 100644
--- a/src/api/wms/location/index.ts
+++ b/src/api/wms/location/index.ts
@@ -154,3 +154,9 @@ export const selectConfigToLocation = async (params) => {
 export const getLocationByCodes = async (params) => {
   return await request.get({ url: `/wms/location/listByCodes`, params })
 }
+
+
+// 查询库位组列表
+export const getLocationByOverflowAreaTypeByConfig = async (params) => {
+  return await request.get({ url: `/wms/location/queryLocationByOverflowAreaTypeByConfig`, params })
+}
\ No newline at end of file
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index 31fed6cd8..7f0f4e9a2 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -446,10 +446,10 @@
               </el-form-item>
             </el-col>
             <!-- 溢出库位 -->
-            <!-- <el-col key="溢出库位col" :span="24">
+            <el-col key="溢出库位col" :span="24">
               <el-form-item key="溢出库位formItem" label="溢出库位"  prop="warehouse" >
                   <el-select key="溢出库位Value"
-                    v-model="formData.configuration.OverFlowLocation"
+                    v-model="formData.configuration.overflowLocationCode"
                     placeholder="请选择溢出库位"
                     style="flex: 1;margin-left: 10px;"
                     clearable
@@ -457,14 +457,14 @@
                     collapse-tags
                   >
                     <el-option
-                      v-for="cur in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)"
-                      :key="'溢出库位Value'+cur.value"
-                      :label="cur.label"
-                      :value="cur.value"
+                      v-for="cur in options.overflowLocationCodes"
+                      :key="'溢出库位Value'+cur.code"
+                      :label="cur.code"
+                      :value="cur.code"
                     />
                   </el-select>
               </el-form-item>
-            </el-col> -->
+            </el-col>
             <!-- 优先空位库 -->
             <el-col key="优先空位库col" :span="24">
               <el-form-item key="优先空位库formItem" label="优先空位库">
@@ -597,7 +597,7 @@ import { getCustomerList } from '@/api/wms/customer'
 import { getWarehouseList } from '@/api/wms/warehouse'
 import { getAreaList } from '@/api/wms/areabasic'
 import { getLocationgroupList } from '@/api/wms/locationgroup'
-import { getLocationList } from '@/api/wms/location'
+import { getLocationList,getLocationByOverflowAreaTypeByConfig } from '@/api/wms/location'
 import * as RuleApi from '@/api/wms/rule'
 import * as WarehouseApi from '@/api/wms/warehouse'
 import { Warehouse } from '@/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data'
@@ -679,7 +679,7 @@ const formData = ref({
     // 列排序方向
     ColumOrder: 'ASC',
     //溢出库位
-    OverFlowLocation:''
+    overflowLocationCode:''
   }
 })
 // 验证规则
@@ -748,7 +748,8 @@ const options = reactive({
   ],
   //仓库列表
   warehouseList: [],
-  originWarehouseList: []
+  originWarehouseList: [],
+  overflowLocationCodes:[]
 })
 // 弹窗按钮
 const Butttondata = ref([
@@ -1276,11 +1277,21 @@ const resetForm = () => {
       // 列排序方向
       ColumOrder: 'ASC',
       //溢出库位
-      OverFlowLocation:''
+      overflowLocationCode:''
     }
   }
 }
 
+
+// 获取溢出库位
+const getOverflowLocationCodes = async ()=>{
+  let overflowLocationCodes =  await getLocationByOverflowAreaTypeByConfig({})
+  options.overflowLocationCodes = overflowLocationCodes || []
+
+}
+
+getOverflowLocationCodes()
+
 </script>
 <style scoped lang="scss">
 .item {