diff --git a/src/api/Inventory/GenneralPart.js b/src/api/Inventory/GenneralPart.js
new file mode 100644
index 00000000..f60553b3
--- /dev/null
+++ b/src/api/Inventory/GenneralPart.js
@@ -0,0 +1,48 @@
+import request from '@/utils/request'
+// 查询零件入库情况
+export function searchTable(partnumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'MES_机加工MES_库存管理_入库模块_零件基础信息查询_根据零件图号',
+      param: '零件图号=' + partnumber + '=string'
+    }
+  })
+}
+// 仓库查询
+export function getinventory() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '库存管理_货位主文件_仓库查询'
+    }
+  })
+}
+// 货位查询
+export function getlocate(housenumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '库存管理_货位主文件_查询数据',
+      param: '仓库流水号=' + housenumber + '=int'
+    }
+  })
+}
+// 修改入库数量
+export function insertOne(num0, num1, people, num4, num5, num6, num7) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: 'MES_机加工MES_库存管理_入库模块_增加入库信息_修改入库数量',
+      param: '工艺计划流水号=' + num0 + '=int&入库数量=' + num1 + '=int&收件人员编号=' + people + '=int&送件人员编号=1001' + '&漆塑=' + num4 + '&仓库流水号=' + num5 + '&货位流水号=' + num6 + '&备注=' + num7
+    }
+  })
+}
diff --git a/src/api/Inventory/PartOut.js b/src/api/Inventory/PartOut.js
index ee193210..c92c3998 100644
--- a/src/api/Inventory/PartOut.js
+++ b/src/api/Inventory/PartOut.js
@@ -1,14 +1,14 @@
 import request from '@/utils/request'
 
 // 领料单查询
-export function searchList(listNumber) {
+export function searchList(listNumber_check, listNumber) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间装配管理_领料单_领料单查询',
-      param: '领料单编号=' + listNumber
+      param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber
     }
   })
 }
@@ -24,6 +24,18 @@ export function searchListDetail(listNumber) {
     }
   })
 }
+// 领料单明细出库
+export function ListDetailOut(listNumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间装配管理_领料单_领料单明细出库',
+      param: '领料单明细流水号=' + listNumber
+    }
+  })
+}
 // 外购件零件出库
 export function PurchasePart(data1, data2, data3, data4, data5) {
   return request({
diff --git a/src/api/Inventory/PickingList.js b/src/api/Inventory/PickingList.js
index dffc6797..9302dc39 100644
--- a/src/api/Inventory/PickingList.js
+++ b/src/api/Inventory/PickingList.js
@@ -136,14 +136,14 @@ export function dropListDetail(DetailNumberx) {
   })
 }
 // 增加领料单明细
-export function addListDetail(PickingListNumberx, projectnumber, machinenumber, teamNumber, project, machine, team, materialName, materialNumber, materialType, outNumber, partType, Note, data1, data2, data3, data4, data5, data6) {
+export function addListDetail(PickingListNumberx, projectnumber, machinenumber, teamNumber, project, machine, team, materialName, materialNumber, materialType, outNumber, partType, Note, data1, data2, data3, data4, data5, data6, data7) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '车间装配管理_领料单_领料单明细增加',
-      param: '领料单流水号=' + PickingListNumberx + '&项目流水号=' + projectnumber + '&机床流水号=' + machinenumber + '&组件流水号=' + teamNumber + '&项目名称=' + project + '&机床图号=' + machine + '&组号=' + team + '&物料名称=' + materialName + '&物料型号=' + materialNumber + '&物料规格=' + materialType + '&出库数量=' + outNumber + '&零件类型=' + partType + '&备注=' + Note + '&工艺计划流水号=' + data1 + '&收件信息ID=' + data2 + '&组件零件流水号=' + data3 + '&采购合同明细流水号=' + data4 + '&货位流水号=' + data5 + '&车间外购=' + data6
+      param: '领料单流水号=' + PickingListNumberx + '&项目流水号=' + projectnumber + '&机床流水号=' + machinenumber + '&组件流水号=' + teamNumber + '&项目名称=' + project + '&机床图号=' + machine + '&组号=' + team + '&物料名称=' + materialName + '&物料型号=' + materialNumber + '&物料规格=' + materialType + '&出库数量=' + outNumber + '&零件类型=' + partType + '&备注=' + Note + '&工艺计划流水号=' + data1 + '&收件信息ID=' + data2 + '&组件零件流水号=' + data3 + '&采购合同明细流水号=' + data4 + '&货位流水号=' + data5 + '&车间外购=' + data6 + '&物料与货位对照流水号=' + data7
     }
   })
 }
diff --git a/src/utils/request.js b/src/utils/request.js
index 78c32f0b..13b4ff36 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -10,9 +10,14 @@ export const name = `OP8888`
 export const upload = `http://123.56.95.229:8411/submit/uploadFile.ashx`
 export const download = `http://123.56.95.229:8411/submit/downloadFile.ashx`
 const service = axios.create({
+<<<<<<< HEAD
+  // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
+=======
 
   baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
 
+>>>>>>> 3b215d048bf49b3019c70e80ff7dbd7ebd5869a4
   timeout: 1500000 // 请求超时时间
 })
 
diff --git a/src/views/Inventory/genneralPart/index.vue b/src/views/Inventory/GenneralPart/index.vue
similarity index 98%
rename from src/views/Inventory/genneralPart/index.vue
rename to src/views/Inventory/GenneralPart/index.vue
index facdccf5..bbd1b774 100644
--- a/src/views/Inventory/genneralPart/index.vue
+++ b/src/views/Inventory/GenneralPart/index.vue
@@ -90,7 +90,7 @@
 </template>
 
 <script>
-import { searchTable, insertOne, getinventory, getlocate } from '@/api/Inventory/Inboundscanning'
+import { searchTable, insertOne, getinventory, getlocate } from '@/api/Inventory/GenneralPart'
 import { mapGetters } from 'vuex'
 import { wsuri, name } from '@/utils/request'
 import print from '@/vendor/print'
@@ -245,7 +245,7 @@ export default {
       this.locateName = []
       this.locateNumber = ''
       if (this.inventoryNumber) {
-        this.getSelect(getlocate, ['货位名称'], 'locateName', this.inventoryNumber)
+        this.getSelect(getlocate, ['货位名称', '货位流水号'], 'locateName', this.inventoryNumber)
       }
     }
   }
diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue
index 73910d98..3458f705 100644
--- a/src/views/Inventory/Inboundscanning/index.vue
+++ b/src/views/Inventory/Inboundscanning/index.vue
@@ -212,18 +212,22 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        for (let i = 0; i < this.tableData.length; i++) {
-          if (this.tableData[i].innumber > this.tableData[i].plannumber) {
-            this.tableData[i].innumber = this.tableData[i].plannumber
-          }
-          insertOne(this.tableData[i].工艺计划流水号, this.tableData[i].innumber, this.PeopleNumber, this.tableData[i].capture, this.inventoryNumber, this.locateNumber, this.tableData[i].note).then(response => {
-            this.$message({
-              type: 'success',
-              message: '零件入库成功!'
+        if (this.locateNumber === '') {
+          this.$message.error('请选择货位')
+        } else {
+          for (let i = 0; i < this.tableData.length; i++) {
+            if (this.tableData[i].innumber > this.tableData[i].plannumber) {
+              this.tableData[i].innumber = this.tableData[i].plannumber
+            }
+            insertOne(this.tableData[i].工艺计划流水号, this.tableData[i].innumber, this.PeopleNumber, this.tableData[i].capture, this.inventoryNumber, this.locateNumber, this.tableData[i].note).then(response => {
+              this.$message({
+                type: 'success',
+                message: '零件入库成功!'
+              })
+            }).then(() => {
+              this.Empty()
             })
-          }).then(() => {
-            this.Empty()
-          })
+          }
         }
       }).catch(() => {
         this.$message({
diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue
index 0a544c0a..c36d6457 100644
--- a/src/views/Inventory/InventoryCheck/index.vue
+++ b/src/views/Inventory/InventoryCheck/index.vue
@@ -72,7 +72,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" min-width="120">
               <template slot-scope="scope" align="center">
-                <el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="searchBasicPartRecord(scope.row)">选择</el-button>
+                <el-button size="small" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @click="searchBasicPartRecord(scope.row)">选择</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -114,11 +114,6 @@
                 {{ scope.row.入库时间 ? scope.row.入库时间.split(' ')[0] : '' }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" min-width="120">
-              <template slot-scope="scope" align="center">
-                <el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
-              </template>
-            </el-table-column>
           </el-table>
           <el-table
             v-loading="listLoading2"
@@ -151,11 +146,6 @@
                 {{ scope.row.出库备注 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" min-width="120">
-              <template slot-scope="scope" align="center">
-                <el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
-              </template>
-            </el-table-column>
           </el-table>
         </el-card>
       </el-tab-pane>
@@ -232,7 +222,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" min-width="120">
               <template slot-scope="scope" align="center">
-                <el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="searchGeneralPartRecord(scope.row)">选择</el-button>
+                <el-button size="small" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @click="searchGeneralPartRecord(scope.row)">选择</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -274,11 +264,6 @@
                 {{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" min-width="120">
-              <template slot-scope="scope" align="center">
-                <el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
-              </template>
-            </el-table-column>
           </el-table>
           <el-table
             v-loading="listLoading5"
@@ -306,11 +291,6 @@
                 {{ scope.row.领用者 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" min-width="120">
-              <template slot-scope="scope" align="center">
-                <el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
-              </template>
-            </el-table-column>
           </el-table>
         </el-card>
       </el-tab-pane>
@@ -385,7 +365,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" min-width="120">
               <template slot-scope="scope" align="center">
-                <el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="searchPurchasePartRecord(scope.row)">选择</el-button>
+                <el-button size="small" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @click="searchPurchasePartRecord(scope.row)">选择</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -427,11 +407,6 @@
                 {{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" min-width="120">
-              <template slot-scope="scope" align="center">
-                <el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
-              </template>
-            </el-table-column>
           </el-table>
           <el-table
             v-loading="listLoading8"
@@ -459,11 +434,6 @@
                 {{ scope.row.领用者 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" min-width="120">
-              <template slot-scope="scope" align="center">
-                <el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
-              </template>
-            </el-table-column>
           </el-table>
         </el-card>
       </el-tab-pane>
@@ -540,7 +510,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="200px">
               <template slot-scope="scope" align="center">
-                <el-button size="mini" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="standardselecting(scope.row)" >选择</el-button>
+                <el-button size="mini" type="warning" icon="el-icon-tickets" style="margin: 0 0 0 0px" @click="standardselecting(scope.row)" >选择</el-button>
                 <el-button size="mini" type="primary" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="changesafeAmount(scope.row)">修改</el-button>
               </template>
             </el-table-column>
@@ -595,11 +565,6 @@
                 {{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" min-width="120">
-              <template slot-scope="scope" align="center">
-                <el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
-              </template>
-            </el-table-column>
           </el-table>
           <el-table
             v-loading="listLoading11"
@@ -627,11 +592,6 @@
                 {{ scope.row.领用者 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" min-width="120">
-              <template slot-scope="scope" align="center">
-                <el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">选择</el-button>
-              </template>
-            </el-table-column>
           </el-table>
         </el-card>
       </el-tab-pane>
diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue
index 3510735f..dbf8dfc0 100644
--- a/src/views/Inventory/InventoryManagement/index.vue
+++ b/src/views/Inventory/InventoryManagement/index.vue
@@ -32,7 +32,7 @@
         </el-table-column>
         <el-table-column label="联系人" align="center">
           <template slot-scope="scope">
-            {{ scope.row.联系人 }}
+            {{ scope.row.姓名 }}
           </template>
         </el-table-column>
         <el-table-column label="备注" width="180" align="center">
@@ -52,10 +52,6 @@
               icon="el-icon-edit"
               type="primary"
               @click="handleEdit(scope.row)">修改</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" min-width="100" align="center" fixed="right">
-          <template slot-scope="scope">
             <el-button
               size="mini"
               type="danger"
diff --git a/src/views/Inventory/PartOut/index.vue b/src/views/Inventory/PartOut/index.vue
index f5a151bb..d8acc84e 100644
--- a/src/views/Inventory/PartOut/index.vue
+++ b/src/views/Inventory/PartOut/index.vue
@@ -84,7 +84,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="80">
           <template slot-scope="scope">
-            <el-button size="small" type="primary" icon="el-icon-back" style="margin: 0 0 0 0px" @click="partOut(scope.row)">出库</el-button>
+            <el-button :disabled="scope.row.是否出库" size="small" type="primary" icon="el-icon-back" style="margin: 0 0 0 0px" @click="partOut(scope.row)">出库</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -93,7 +93,7 @@
 </template>
 
 <script>
-import { searchList, searchListDetail, PurchasePart, BasicPart, WorkShopPart } from '@/api/Inventory/PartOut'
+import { searchList, searchListDetail, PurchasePart, BasicPart, WorkShopPart, ListDetailOut } from '@/api/Inventory/PartOut'
 import { mapGetters } from 'vuex'
 export default {
   data() {
@@ -113,6 +113,7 @@ export default {
       tableDataPicking: [], // 领料单明细表格
       listNumber: '',
       pickingListNumber: null, // 领料单编号
+      pickingListNumber_check: 1,
       pickingListNumberx: '', // 领料单流水号
       picikingPeople: '', // 领料人流水号
       partProjectNumber: '', // 项目流水号
@@ -144,8 +145,14 @@ export default {
     },
     // 查询领料单
     searchListinfor() {
+      if (this.pickingListNumber === null) {
+        this.pickingListNumber_check = 0
+      }
       this.listLoading = true
-      searchList(this.pickingListNumber).then(response => {
+      searchList(this.pickingListNumber_check, this.pickingListNumber).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          response.data[i].领料时间 = response.data[i].领料时间.substring(0, response.data[i].领料时间.length - 8)
+        }
         this.tableData1 = response.data
         this.listLoading = false
       })
@@ -154,7 +161,11 @@ export default {
     searchListDetailt() {
       this.listLoading1 = true
       searchListDetail(this.pickingListNumberx).then(response => {
-        this.tableDataPicking = response.data
+        const data = response.data
+        for (let i = 0; i < data.length; i++) {
+          data[i].是否出库 === '1' ? data[i].是否禁用 = true : data[i].是否禁用 = false
+        }
+        this.tableDataPicking = data
         this.listLoading1 = false
       })
     },
@@ -171,12 +182,14 @@ export default {
       if (row.车间外购 === 1) {
         WorkShopPart(row.采购合同明细流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
           if (response.data[0].result === '1') {
+            ListDetailOut(row.领料单明细流水号)
             this.$message.success('出库成功')
           } else { this.$message.error('出库失败') }
         })
       } else if (row.零件类型 === 1 || row.零件类型 === 2) {
         PurchasePart(row.组件零件流水号, this.getpicikingPeople, row.出库数量, row.货位流水号, row.备注).then(response => {
           if (response.data[0].result === '1') {
+            ListDetailOut(row.领料单明细流水号)
             this.$message.success('出库成功')
           } else { this.$message.error('出库失败') }
         })
@@ -184,9 +197,11 @@ export default {
         BasicPart(row.工艺计划流水号, row.出库数量, row.收件信息ID, row.备注).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('出库成功')
+            ListDetailOut(row.领料单明细流水号)
           } else { this.$message.error('增加失败') }
         })
       }
+      this.searchListDetailt()
     }
   }
 }
diff --git a/src/views/Inventory/PickingList/index.vue b/src/views/Inventory/PickingList/index.vue
index 544e7aee..e7a21162 100644
--- a/src/views/Inventory/PickingList/index.vue
+++ b/src/views/Inventory/PickingList/index.vue
@@ -168,11 +168,21 @@
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
+        <el-table-column label="数量" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.批次数量 }}
+          </template>
+        </el-table-column>
         <el-table-column label="库存数量" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.可出库数量 }}
           </template>
         </el-table-column>
+        <el-table-column label="待出库数量" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.待出库数量 }}
+          </template>
+        </el-table-column>
         <el-table-column label="零件图号" align="center" min-width="80">
           <template slot-scope="scope" align="center">
             {{ scope.row.零件图号 }}
@@ -240,11 +250,21 @@
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
+        <el-table-column label="数量" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.数量 }}
+          </template>
+        </el-table-column>
         <el-table-column label="零件数量" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.货位存量 }}
           </template>
         </el-table-column>
+        <el-table-column label="待出库数量" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.待出库数量 }}
+          </template>
+        </el-table-column>
         <el-table-column label="零件类型" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.类型名称 }}
@@ -307,11 +327,21 @@
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
+        <el-table-column label="数量" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.数量 }}
+          </template>
+        </el-table-column>
         <el-table-column label="零件数量" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.货位存量 }}
           </template>
         </el-table-column>
+        <el-table-column label="待出库数量" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.待出库数量 }}
+          </template>
+        </el-table-column>
         <el-table-column label="零件类型" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.类型名称 }}
@@ -525,7 +555,9 @@ export default {
       listLoadingx: '',
       purchaseDetailNum: '',
       dialogFormVisibleWork: false,
-      time: []
+      time: [],
+      materialLocate: '',
+      enableOut: ''
     }
   },
   computed: {
@@ -547,7 +579,7 @@ export default {
       console.log(this.picikingPeople)
     },
     searchMachine() { // 查询机床
-      if (this.ProjectValue === ' ') {
+      if (this.ProjectValue === null) {
         this.ProjectValue_check = 0
       }
       searchmachine(this.ProjectValue_check, this.ProjectValue).then(response => {
@@ -742,26 +774,28 @@ export default {
       this.materialName = row.零件名称
       this.materialType = row.零件类型名称
       this.materialNumber = row.零件图号
+      this.enableOut = row.可出库数量
     },
     addBasicListDetail(formName) {
       if (this.pickingListNumberx === '') {
         this.$message.error('请选择领料单')
-      } if (this.form.OutNumber === '') {
-        this.$message.error('请输入领用数量')
+      } else if (this.form.OutNumber === '' || this.form.OutNumber > this.enableOut) {
+        this.$message.error('请正确输入领用数量')
+      } else {
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.locatenumber, 0, this.materialLocate).then(response => {
+              if (response.data[0].result === '1') {
+                this.$message.success('增加成功')
+              } else {
+                this.$message.error('增加失败')
+              }
+            })
+            this.dialogFormVisible1 = false
+            this.searchListinfor()
+          }
+        })
       }
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form.OutNumber, this.partType, this.form.outNote, this.craftplannumber, this.receive, this.teamPart, this.locatenumber, 0).then(response => {
-            if (response.data[0].result === '1') {
-              this.$message.success('增加成功')
-            } else {
-              this.$message.error('增加失败')
-            }
-          })
-          this.dialogFormVisible1 = false
-          this.searchListinfor()
-        }
-      })
     },
     // 增加外购件领料单明细
     addListDetailinfor(row) {
@@ -782,16 +816,18 @@ export default {
       this.materialType = row.物料规格
       this.dialogFormVisible = true
       this.purchaseDetailNum = row.采购合同明细流水号
+      this.materialLocate = row.物料与货位对照流水号
+      this.enableOut = row.货位存量
     },
     execaddListDetail(formName) {
       if (this.pickingListNumberx === '') {
         this.$message.error('请选择领料单')
-      } else if (this.OutNumber === '') {
-        this.$message.error('请输入领用数量')
+      } else if (this.form2.OutNumber === '' || this.form2.OutNumber > this.enableOut) {
+        this.$message.error('请正确输入领用数量')
       } else {
         this.$refs[formName].validate((valid) => {
           if (valid) {
-            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form2.OutNumber, this.partType, this.form2.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 0).then(response => {
+            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form2.OutNumber, this.partType, this.form2.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 0, this.materialLocate).then(response => {
               if (response.data[0].result === '1') {
                 this.$message.success('增加成功')
               } else {
@@ -821,16 +857,19 @@ export default {
       this.materialType = row.物料规格
       this.dialogFormVisibleWork = true
       this.purchaseDetailNum = row.采购合同明细流水号
+      this.materialLocate = row.物料与货位对照流水号
+      this.enableOut = row.货位存量
+      console.log(this.enableOut)
     },
     addWorkshopListDetail(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.pickingListNumberx === '') {
             this.$message.error('请选择领料单')
-          } else if (this.OutNumber === '') {
-            this.$message.error('请输入领用数量')
+          } else if (this.form3.OutNumber === '' || this.form3.OutNumber > this.enableOut) {
+            this.$message.error('请正确输入领用数量')
           } else {
-            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form3.OutNumber, this.partType, this.form3.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 1).then(response => {
+            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.partProjectName, this.partMachineName, this.partGroupName, this.materialName, this.materialType, this.materialNumber, this.form3.OutNumber, this.partType, this.form3.outNote, this.craftplannumber, this.receive, this.teamPart, this.purchaseDetailNum, this.locatenumber, 1, this.materialLocate).then(response => {
               if (response.data[0].result === '1') {
                 this.$message.success('增加成功')
               } else {