Merge branch 'master' of http://192.168.1.149:10010/r/高精2.0

src/api/Inventory/SubPartCome.js

@@ -1,13 +1,13 @@
 import request from '@/utils/request'
 // 替换单查询
-export function searchSubstitutedCard(...params) {
+export function searchSubstitutedCard(data1, data2, data3, data4) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '库存管理_替换件_替换单查询',
-      param: `替换单编号_check=${params[0]}&替换单编号=${params[1]}&替换件名称_check=${params[2]}&替换件名称=${params[3]}`
+      param: '替换单编号_check=' + data1 + '&替换单编号=' + data2 + '&替换件名称_check=' + data3 + '&替换件名称=' + data4
     }
   })
 }

src/views/Inventory/Inboundscanning/index.vue

@@ -219,17 +219,21 @@ export default {
           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: '零件入库成功!'
+            if (this.tableData[i].innumber === '0') {
+              this.$message.error('请输入正确数量')
+            } else {
+              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(() => {

src/views/Inventory/InventoryCheck/index.vue

@@ -310,7 +310,7 @@
           </el-table>
         </el-card>
       </el-tab-pane>
-      <el-tab-pane label="采购采购" name="second">
+      <el-tab-pane label="采购" name="second">
         <el-card v-show="purchaseshow">
           <el-radio-group
             v-model="radio"

src/views/Inventory/PickingList/index.vue

@@ -831,12 +831,13 @@ export default {
       this.dialogFormVisible = true
       this.purchaseDetailNum = row.采购合同明细流水号
       this.materialLocate = row.物料与货位对照流水号
-      this.enableOut = row.货位存量
+      this.enableOut = row.货位存量 - row.待出库数量
     },
     execaddListDetail(formName) {
       if (this.pickingListNumberx === '') {
         this.$message.error('请选择领料单')
       } else if (this.form2.OutNumber === '' || this.form2.OutNumber > this.enableOut) {
+        console.log(this.enableOut)
         this.$message.error('请正确输入领用数量')
       } else {
         this.$refs[formName].validate((valid) => {