diff --git a/src/views/base-data/stock/index.vue b/src/views/base-data/stock/index.vue
index 0fcf2fa..6d6b745 100644
--- a/src/views/base-data/stock/index.vue
+++ b/src/views/base-data/stock/index.vue
@@ -117,6 +117,18 @@
             </el-select>
           </el-form-item>
 
+          <el-form-item label="点位">
+            <el-select v-model="form.point" @focus="findByPoint" clearable value-key="id" filterable style="width:180px"
+                       placeholder="请选择点位">
+              <el-option
+                v-for="point in pointList"
+                :key="point.id"
+                :label="point.code"
+                :value="point"></el-option>
+            </el-select>
+          </el-form-item>
+
+
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -204,7 +216,6 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import DonMessage from "@/utils/message";
 import {getToken} from "@/utils/auth";
 import {getAres} from "@/api/area";
 import ContainerIn from "@/views/base-data/stock/containerIn.vue";
@@ -218,7 +229,7 @@ const defaultForm = {
   stockType: null,
   code: null,
   pid: null,
-  pointId: null,
+  point: null,
   subCount: null,
   name: null,
   typeId: null,
@@ -261,6 +272,7 @@ export default {
       //地标点数据
       fileList: [],
       areas: [],
+      pointList: [],
       ContainerIn: {
         containerCode: '',
         position: ''
@@ -286,6 +298,7 @@ export default {
   },
   mounted() {
     this.getArea();
+    this.findByPoint();
   },
   methods: {
     handleSuccess(response, file, fileList, crud) {
@@ -333,6 +346,11 @@ export default {
         })
       })
     },
+    findByPoint() {
+      queryPointList({status: 'FREE'}).then(res => {
+        this.pointList = res
+      })
+    },
     toContainerIn(data) {
       this.$refs.containerIn.dialogVisible = true
       this.$refs.containerIn.containerInClick(data);
diff --git a/src/views/business-data/asnDetail/index.vue b/src/views/business-data/asnDetail/index.vue
index cb05453..dc95cba 100644
--- a/src/views/business-data/asnDetail/index.vue
+++ b/src/views/business-data/asnDetail/index.vue
@@ -211,7 +211,7 @@
         <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
       </div>
     </el-dialog>
-    <!--满料入库组件-->
+    <!--原材料入库组件-->
     <el-dialog :visible.sync="manliao" title="原材料入库" width="400px" :before-close="doManLiaoCancel">
       <el-form ref="manLiaoform" :model="BindStock" :rules="manLiaoRules" size="small" label-width="80px">
         <el-form-item label="MO" prop="itemCode">