1.工序报工优化

小小儁爺

2024-08-29 7846034cd1a7f19f4f2c7c955542ee4f85bbb14a

1.工序报工优化

 src/api/WorkOrder.js

@@ -196,6 +196,15 @@
  })
}

// 生产开报工：报工/外协(发料/收料)时获取设备/外协供应商数据返回接口
export function MesOrderStepDeviceCusstomer(data) {
  return request({
    url: 'WorkOrder/MesOrderStepDeviceCusstomer',
    method: 'get',
    params: data
  })
}

// 生产开报工,报工提交
export function SavaMesOrderStepReport(data) {
  return request({

 src/views/produce/stepReport.vue

@@ -670,6 +670,12 @@
            align="center"
          />
          <el-table-column
            prop="eqp_name"
            label="设备/供应商"
            show-tooltip-when-overflow
            align="center"
          />
          <el-table-column
            prop="plan_qty"
            label="任务数量"
            show-tooltip-when-overflow
@@ -882,7 +888,7 @@
import {
  EditOrderNgStepSeave,
  MesOrderNgStepSearch,
  MesOrderNgSubStepSearch,
  MesOrderNgSubStepSearch, MesOrderStepDeviceCusstomer,
  MesOrderStepSearch, MesOrderStepStart,
  MesOrderWxStepSearch, SavaMesOrderStepIn, SavaMesOrderStepOut, SavaMesOrderStepReport
} from '@/api/WorkOrder'
@@ -1076,11 +1082,11 @@
      const { data: res3 } = await DefectPermissions() // 缺陷
      this.defectArr = res3

      const { data: res4 } = await EqpPermissions() // 设备
      this.eqpArr = res4

      const { data: res5 } = await CustomerPermissions() // 往来单位
      this.wxArr = res5
      // const { data: res4 } = await EqpPermissions() // 设备
      // this.eqpArr = res4
      //
      // const { data: res5 } = await CustomerPermissions() // 往来单位
      // this.wxArr = res5

      const { data: res6 } = await PrentOrganizationNoCompany()// 无公司的组织下拉
      this.wkshopcodeArr = res6
@@ -1237,6 +1243,18 @@
    },
    // 生产开报工：报工/外协(发料/收料)时条件判断及数据返回接口
    async getMesOrderStepStart(OperType, SelectType, wocode, stepcode) {
      const data2 = {
        OperType, wocode, stepcode
      }

      const { data: res2 } = await MesOrderStepDeviceCusstomer(data2)
      if (OperType === 'ZZ') {
        this.eqpArr = res2
      }
      if (OperType === 'WX') {
        this.wxArr = res2
      }

      const data = {
        OperType, SelectType, wocode, stepcode
      }
@@ -1366,12 +1384,23 @@
                badqty: i.badqty
              })
            })

            // let stepprice = null
            //
            // if (this.activeName === '生产列表') {
            //   stepprice = this.eqpArr.find(i => i.code === this.dialogForm.eqpcode) ? this.eqpArr.find(i => i.code === this.dialogForm.eqpcode).eqpprice : this.dialogForm.stepprice
            // }
            //
            // if (this.activeName === '外协发料' || this.activeName === '外协收料') {
            //   stepprice = this.wxArr.find(i => i.code === this.dialogForm.wxcode) ? this.wxArr.find(i => i.code === this.dialogForm.wxcode).eqpprice : this.dialogForm.stepprice
            // }

            const data = {
              mesordercode: this.dialogForm.wo_code,
              partcode: this.dialogForm.partnumber,
              stepseq: this.dialogForm.seq,
              stepcode: this.dialogForm.stepcode,
              stepprice: this.dialogForm.stepprice,
              stepprice: this.eqpArr.find(i => i.code === this.dialogForm.eqpcode) ? this.eqpArr.find(i => i.code === this.dialogForm.eqpcode).eqpprice : this.dialogForm.stepprice,
              eqpcode: this.dialogForm.eqpcode,
              inbarcode,
              reckway: this.dialogForm.reckway,
@@ -1489,7 +1518,7 @@
              partcode: this.dialogForm.partnumber,
              stepseq: this.dialogForm.seq,
              stepcode: this.dialogForm.stepcode,

              stepprice: this.wxArr.find(i => i.code === this.dialogForm.wxcode) ? this.wxArr.find(i => i.code === this.dialogForm.wxcode).eqpprice : this.dialogForm.stepprice,
              wxcode: this.dialogForm.wxcode,
              inbarcode,
              inuser: this.dialogForm.inuser,