diff --git a/fe/PC/public/version.json b/fe/PC/public/version.json
index 74ca106c0..e04eacc4e 100644
--- a/fe/PC/public/version.json
+++ b/fe/PC/public/version.json
@@ -1,3 +1,3 @@
 {
-    "version": "1.0.72"
+    "version": "1.0.73"
 }
\ No newline at end of file
diff --git a/fe/PC/src/components/StepsCountPlanForm/index.vue b/fe/PC/src/components/StepsCountPlanForm/index.vue
index b9fc53917..8a4e921c9 100644
--- a/fe/PC/src/components/StepsCountPlanForm/index.vue
+++ b/fe/PC/src/components/StepsCountPlanForm/index.vue
@@ -404,12 +404,11 @@ export default {
       // let _list = JSON.parse(JSON.stringify(this.$isTableColumns.Location));
       let _list = JSON.parse(JSON.stringify(this.$isTableColumns.CountPlanByAddLocation));
       _list.forEach(item => {
-        // 如果是pda类型盘点，库位类型 则使用 locationTypeForPADPlan 枚举（区别为线边库位为不可选）
+        // 如果是pda类型盘点，库位类型 则使用 locationTypeForPADPlan 枚举（区别为线边库位为不可选）,库位禁止选择
         // 如果是Excel类型盘点，库位类型 则使用 locationTypeForExcelPlan 枚举（区别为原材料库位为不可选）
         if(item.prop == 'type'){
-          // todo:暂时
           item.filters = this.CreateFormData.requestType == 2 ? 'locationTypeForPADPlan' : 'locationTypeForExcelPlan'
-          // item.filters = this.CreateFormData.requestType == 2 ? 'locationTypeForPADPlan' : 'locationType'
+          item.disabled = this.CreateFormData.requestType == 2 ? true : false
         }
       });
       return _list
@@ -450,18 +449,27 @@ export default {
       return () => {
         list.SkipCount = (oldSkipCount - 1) * list.MaxResultCount;
         this.tableLoading = true;
-        // 盘点库存 过滤线边仓数据 20230703更新
+        // 盘点库存 过滤线边仓数据 20231005更新
+        let _filter = {}
         // 如果是Excel盘点类型(this.CreateFormData.requestType == 1)，过滤原材料2
-        // 如果不是Excel盘点类型(this.CreateFormData.requestType != 1)，过滤线边仓数据5
-        // todo://暂时
-        let type_value = this.CreateFormData.requestType == 1 ? '2' : '5'
-        // let type_value = this.CreateFormData.requestType == 1 ? null : '5'
-        let _filter = {
-          action: "!=",
-          column: "type",
-          logic: "And",
-          value: type_value,
-          hide:true
+        if(this.CreateFormData.requestType == 1){
+          _filter = {
+            action: "!=",
+            column: "type",
+            logic: "And",
+            value: '2',
+            hide:true
+          }
+        }
+        // 如果是pda盘点类型(this.CreateFormData.requestType != 1)，只能是原材料2
+        else{
+          _filter = {
+            action: "==",
+            column: "type",
+            logic: "And",
+            value: '2',
+            hide:true
+          }
         }
         // 库位筛选，默认去掉的库位代码
         let _filter_code = {
@@ -472,7 +480,7 @@ export default {
           hide: true
         }
         if(this.pageListLocation.condition.filters.length <= 0){
-          if(type_value)this.pageListLocation.condition.filters.push(_filter)
+          this.pageListLocation.condition.filters.push(_filter)
           this.pageListLocation.condition.filters.push(_filter_code)
         }
         // code多选处理   20230705更新
diff --git a/fe/PC/src/components/conditionFilters/index.vue b/fe/PC/src/components/conditionFilters/index.vue
index 73febd884..66ed7b139 100644
--- a/fe/PC/src/components/conditionFilters/index.vue
+++ b/fe/PC/src/components/conditionFilters/index.vue
@@ -42,6 +42,7 @@
                     v-for="(item, index) in tableColumnsOptions(tableColumns)"
                     :key="index"
                     :label="item.label"
+                    :disabled="item.disabled"
                     :value="
                       item.showProp
                         ? item.prop + '.' + item.showProp