零件导入，零件分配，车间采购系统

2018-12-10 19:42:03 +08:00
parent 081758df73
commit 4581c2db7a
21 changed files with 497 additions and 371 deletions
--- a/src/views/TechnologyCenter/ImportChangeParts/index.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/index.vue
@@ -161,7 +161,6 @@ export default {
            classificationCode
          console.log(this.worksheet[j].M2.v.substring(0, 1))
          if (this.worksheet[j].M2.v.substring(0, 1) === '9') {
-            console.log('哈哈哈哈哈')
            const response = await isExit(this.projectValue, this.worksheet[j].F2.v)
            const res = response.data
            if (res[0].Column1 === 0) {
@@ -198,9 +197,6 @@ export default {
                } else {
                  if (machineNum && groupNum) {
                    await sleep(50)
-                    if (classificationCode) {
-                      drawingNum += '-' + classificationCode
-                    }
                    await this.insertToSQL(establishment, proofread, review, date, machineName, machineNum, componentName, componentNum, groupNum, contractNum, pageNum, totalNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
                  } else {
                    this.loading = false
@@ -232,9 +228,13 @@ export default {
        if (groupNum.indexOf('MX') > -1) {
          const response = await importBasics(establishment, proofread, review, date, this.projectName, machineNum, machineName, componentName, componentNum, groupNum, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
          const res = response.data
+          console.log(res)
          if (res[0].result === '0') {
            this.$notify.error(`${drawingNum}导入失败`)
          }
+          if (res[0].result === '2') {
+            this.$notify.error(`${drawingNum}导入重复`)
+          }
        } else {
          const response = await importPurcharse(establishment, proofread, review, date, this.projectName, machineNum, machineName, componentName, componentNum, groupNum, contractNum, totalNum, pageNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
          const res = response.data
--- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
@@ -544,7 +544,8 @@ export default {
          for (let i = 0; i < this.tableDataAll.length; i++) {
            const data = this.tableDataAll[i]
            const total = parseInt(data.备件数量) + parseInt(data.装机数量) * parseInt(data.部件数量)
-            const resp = await transferMX1(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, 1, data.是否传递, data.序号, data.id, data.前id)
+            console.log(data.前id, data.前图号或者型号)
+            const resp = await transferMX1(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, 1, data.是否传递, data.序号, data.id, data.前id, data.前图号或者型号)
            await sleep(10)
            if (resp.data[0].result === '0') {
              this.err++
--- a/src/views/TechnologyCenter/ImportParts/index.vue
+++ b/src/views/TechnologyCenter/ImportParts/index.vue
@@ -167,54 +167,57 @@ export default {
            this.disabled = false
            return
          } else {
-            console.log(this.worksheet[j], 2222)
-            this.worksheet[j].G1 ? establishment = this.worksheet[j].G1.v : establishment = ''
-            this.worksheet[j].I1 ? proofread = this.worksheet[j].I1.v : proofread = ''
-            this.worksheet[j].L1 ? review = this.worksheet[j].L1.v : review = ''
-            this.worksheet[j].P1 ? date = this.worksheet[j].P1.v : date = ''
-            this.worksheet[j].Q1 ? pageNum = parseInt(this.worksheet[j].Q1.v.replace(/[^0-9]/ig, '')) : pageNum = ''
-            this.worksheet[j].C2 ? machineName = this.worksheet[j].C2.v : machineName = ''
-            this.worksheet[j].F2 ? machineNum = this.worksheet[j].F2.v : machineNum = ''
-            this.worksheet[j].J2 ? componentName = this.worksheet[j].J2.v : componentName = ''
-            this.worksheet[j].P2 ? componentNum = this.worksheet[j].P2.v : componentNum = ''
-            this.worksheet[j].Q2 ? totalNum = parseInt(this.worksheet[j].Q2.v.replace(/[^0-9]/ig, '')) : totalNum = ''
-            this.worksheet[j].R2 ? contractNum = this.worksheet[j].R2.v : contractNum = ''
-            this.worksheet[j].M2 ? groupNum = this.worksheet[j].M2.v : groupNum = ''
-            for (let i = 0; i < 999; i++) {
-              const attr = i + 4
-              drawingNum = this.worksheet[j][`B${attr}`] ? this.worksheet[j][`B${attr}`].v : ''
-              name = this.worksheet[j][`D${attr}`] ? this.worksheet[j][`D${attr}`].v : ''
-              type = this.worksheet[j][`F${attr}`] ? this.worksheet[j][`F${attr}`].v : ''
-              material = this.worksheet[j][`J${attr}`] ? this.worksheet[j][`J${attr}`].v : ''
-              spareNum = this.worksheet[j][`L${attr}`] ? this.worksheet[j][`L${attr}`].v : ''
-              useNum = this.worksheet[j][`M${attr}`] ? this.worksheet[j][`M${attr}`].v : ''
-              manufacturer = this.worksheet[j][`O${attr}`] ? this.worksheet[j][`O${attr}`].v : ''
-              remarks = this.worksheet[j][`Q${attr}`] ? this.worksheet[j][`Q${attr}`].v : ''
-              classificationCode = this.worksheet[j][`R${attr}`] ? this.worksheet[j][`R${attr}`].v : ''
-              console.log(drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode, 2222222222)
-              if (!drawingNum && !name && !type && !material && !spareNum && !useNum && !manufacturer && !remarks && !classificationCode) { // 当图号、名称、规格、材料、备件数量、装机数量、制造商、备注、分类码都为空时，循环终止，防止向数据库中插入多余且无用的数据
-                break
-              } else {
-                if (machineNum && groupNum) {
-                  await sleep(50)
-                  if (classificationCode) {
-                    drawingNum += '-' + classificationCode
-                  }
-                  await this.insertToSQL(establishment, proofread, review, date, machineName, machineNum, componentName, componentNum, groupNum, contractNum, pageNum, totalNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
+            if (this.worksheet[j].M2.v.substring(0, 1) !== '9') {
+              this.worksheet[j].G1 ? establishment = this.worksheet[j].G1.v : establishment = ''
+              this.worksheet[j].I1 ? proofread = this.worksheet[j].I1.v : proofread = ''
+              this.worksheet[j].L1 ? review = this.worksheet[j].L1.v : review = ''
+              this.worksheet[j].P1 ? date = this.worksheet[j].P1.v : date = ''
+              this.worksheet[j].Q1 ? pageNum = parseInt(this.worksheet[j].Q1.v.replace(/[^0-9]/ig, '')) : pageNum = ''
+              this.worksheet[j].C2 ? machineName = this.worksheet[j].C2.v : machineName = ''
+              this.worksheet[j].F2 ? machineNum = this.worksheet[j].F2.v : machineNum = ''
+              this.worksheet[j].J2 ? componentName = this.worksheet[j].J2.v : componentName = ''
+              this.worksheet[j].P2 ? componentNum = this.worksheet[j].P2.v : componentNum = ''
+              this.worksheet[j].Q2 ? totalNum = parseInt(this.worksheet[j].Q2.v.replace(/[^0-9]/ig, '')) : totalNum = ''
+              this.worksheet[j].R2 ? contractNum = this.worksheet[j].R2.v : contractNum = ''
+              this.worksheet[j].M2 ? groupNum = this.worksheet[j].M2.v : groupNum = ''
+              for (let i = 0; i < 999; i++) {
+                const attr = i + 4
+                drawingNum = this.worksheet[j][`B${attr}`] ? this.worksheet[j][`B${attr}`].v : ''
+                name = this.worksheet[j][`D${attr}`] ? this.worksheet[j][`D${attr}`].v : ''
+                type = this.worksheet[j][`F${attr}`] ? this.worksheet[j][`F${attr}`].v : ''
+                material = this.worksheet[j][`J${attr}`] ? this.worksheet[j][`J${attr}`].v : ''
+                spareNum = this.worksheet[j][`L${attr}`] ? this.worksheet[j][`L${attr}`].v : ''
+                useNum = this.worksheet[j][`M${attr}`] ? this.worksheet[j][`M${attr}`].v : ''
+                manufacturer = this.worksheet[j][`O${attr}`] ? this.worksheet[j][`O${attr}`].v : ''
+                remarks = this.worksheet[j][`Q${attr}`] ? this.worksheet[j][`Q${attr}`].v : ''
+                classificationCode = this.worksheet[j][`R${attr}`] ? this.worksheet[j][`R${attr}`].v : ''
+                if (!drawingNum && !name && !type && !material && !spareNum && !useNum && !manufacturer && !remarks && !classificationCode) { // 当图号、名称、规格、材料、备件数量、装机数量、制造商、备注、分类码都为空时，循环终止，防止向数据库中插入多余且无用的数据
+                  break
                } else {
-                  this.loading = false
-                  this.disabled = false
-                  this.$notify.error(`请确认导入文件是否正确`)
-                  return
+                  if (machineNum && groupNum) {
+                    await sleep(50)
+                    if (classificationCode) {
+                      drawingNum += '-' + classificationCode
+                    }
+                    await this.insertToSQL(establishment, proofread, review, date, machineName, machineNum, componentName, componentNum, groupNum, contractNum, pageNum, totalNum, drawingNum, name, type, material, spareNum, useNum, manufacturer, remarks, classificationCode)
+                  } else {
+                    this.loading = false
+                    this.disabled = false
+                    this.$notify.error(`请确认导入文件是否正确`)
+                    return
+                  }
                }
              }
+            } else {
+              this.$notify.error('禁止导入整改组')
+              break
            }
          }
          this.itemFile.splice(j, 1)
          this.worksheet.splice(j, 1)
+          this.err === 0 ? this.$message.success(`导入完成`) : this.$message.error(`导入失败零件个数为${this.err}，请检查文件是否正确`)
        }
        this.loading = false
-        this.err === 0 ? this.$message.success(`导入完成`) : this.$message.error(`导入失败零件个数为${this.err}，请检查文件是否正确`)
        this.projectChange(this.projectName) // 调用查询机床方法，通过watch属性检测变化会自动得到下面表格的值。
      } catch (e) {
        console.log(e)
--- a/src/views/TechnologyCenter/ImportParts/specificationData.vue
+++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue
@@ -487,8 +487,9 @@ export default {
          if (this.groupValue.indexOf('MX') > -1) {
            for (let i = 0; i < this.tableDataAll.length; i++) {
              const data = this.tableDataAll[i]
+              console.log(data)
              const total = parseInt(data.备件数量) + parseInt(data.装机数量) * parseInt(data.部件数量)
-              const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, 1, data.是否传递, data.序号, data.id)
+              const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id)
              await sleep(10)
              if (resp.data[0].result === '0') {
                this.err++
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -28,7 +28,7 @@
          :value="item.value"/>
      </el-select>

-      <el-button icon="el-icon-search" type="success" size="small" @click="getTableData">查询</el-button>
+      <el-button icon="el-icon-search" type="success" size="small" @click="pageCurrentWB = 1;pageSizeWB = 10;pageCurrent = 1;pageSize = 10;getTableData()">查询</el-button>
    </el-card>
    <el-card v-if="groupName && groupName.indexOf('MX') > -1">
      <el-table
@@ -158,7 +158,6 @@
              size="mini"
              type="danger"
              icon="el-icon-delete"
-              disabled
              @click="handleDelete(scope.row)">删除</el-button>
          </template>
        </el-table-column>
@@ -244,6 +243,10 @@ export default {
    },
    groupValue(val) {
      if (val) {
+        this.pageCurrentWB = 1
+        this.pageSizeWB = 10
+        this.pageCurrent = 1
+        this.pageSize = 10
        this.getTableData()
      }
    }