lx

2018-11-23 13:23:25 +08:00
parent 5692d65e57
commit fc6495403a
10 changed files with 168 additions and 94 deletions
--- 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 {