1.定时任务修改

小小儁爺

2026-05-06 d149f4806af2f91669f27737a179bb15278e01bd

 src/views/workOrder/workOrderList.vue

@@ -1553,6 +1553,22 @@
                  <el-form-item label="工单数量:" class="formContent">
                    {{ formApprove.plan_qty }}
                  </el-form-item>
                  <el-form-item label="打印人员:" class="formContent">
                    <!--                  {{ localStorage.getItem('username') }}-->
                    {{ formApprove.routename }}
                  </el-form-item>
                  <el-form-item label="打印时间:" class="formContent">
                    {{ formApprove.lm_date }}
                  </el-form-item>
                  <!--                  <br>-->
                  <!--                  <div style="width:98%;margin-left: 1%;border-bottom: 1px solid #000" />-->
                  <!--                  <br>-->
                  <!--                  <el-form-item label="子件备注:" class="formContent" style="width: 100%">-->
                  <!--                    {{ formApprove.memo }}-->
                  <!--                  </el-form-item>-->
                  <!--                  <el-form-item label="规格型号:" class="formContent" style="width: 100%">-->
                  <!--                    {{ formApprove.bomsubspec }}-->
                  <!--                  </el-form-item>-->

                  <!--                  <el-form-item label="客户名称:" class="formContent">-->
                  <!--                    {{ formApprove.priuserdefnvc1 }}-->
@@ -1576,18 +1592,13 @@
                  <!--                <el-form-item label="工艺路线:" class="formContent">-->
                  <!--                  {{ formApprove.routename }}-->
                  <!--                </el-form-item>-->
                  <el-form-item label="打印人员:" class="formContent">
                    <!--                  {{ localStorage.getItem('username') }}-->
                    {{ formApprove.routename }}
                  </el-form-item>
                  <el-form-item label="打印时间:" class="formContent">
                    {{ formApprove.lm_date }}
                  </el-form-item>

                </div>
              </el-form>
            </div>
            <div
              id="qrCode0"
              :key="formApprove.mesordercode"
              style="width: 22%;height:90px;
                        margin-top: 20px;
                        overflow-y: scroll;display: flex;
@@ -1719,11 +1730,23 @@
                  <el-form-item label="打印时间:" class="formContent">
                    {{ formApprove.lm_date }}
                  </el-form-item>

                  <!--                  <br>-->
                  <!--                  <div style="width:98%;margin-left: 1%;border-bottom: 1px solid #000" />-->
                  <!--                  <br>-->
                  <!--                  <el-form-item label="子件备注:" class="formContent" style="width: 100%">-->
                  <!--                    {{ formApprove.memo }}-->
                  <!--                  </el-form-item>-->
                  <!--                  <el-form-item label="规格型号:" class="formContent" style="width: 100%">-->
                  <!--                    {{ formApprove.bomsubspec }}-->
                  <!--                  </el-form-item>-->

                </div>
              </el-form>
            </div>
            <div
              id="qrCode1"
              :key="formApprove.mesordercode"
              style="width: 22%;height:90px;
                        margin-top: 20px;
                        overflow-y: scroll;display: flex;
@@ -2496,9 +2519,8 @@
      </div>

      <div v-for="(i,index) in formData3" :key="index" class="customDiv">

        <!--        ref="dialogForm"-->
        <el-form
          ref="dialogForm"
          inline
          :model="i"
          label-width="110px"
@@ -2756,7 +2778,7 @@
  AddUpdateMesOrder, AddUpdateMesOrderList, DeleteMesOrder,
  MesBadOrderSearch, MesOrderDistribution, MesOrderNewStepContent, MesOrderProcessSopSearch,
  MesOrderSearch, MesOrderSopSearch, UpdateMesOrderStepListSearch,
  UpdateMesOrderStepSearch
  UpdateMesOrderStepSearch, MesOrderNewStepListContent
} from '@/api/WorkOrder'
import { PartSelect } from '@/api/ProductModel'
import { PrentOrganization, PrentOrganizationNoCompany, StepData } from '@/api/GeneralBasicData'
@@ -2764,7 +2786,12 @@
import ElDragSelect from '@/components/DragSelect'
import { MesOrderPrintSearch } from '@/api/GridReport' // base on element-ui
import DateType from '@/components/DateType'
import { PartSelectRpute, PartSelectRputeList, RouteSelectStep, RouteSelectStepList } from '@/api/basicSettings'
import {
  PartSelectRpute,
  PartSelectRputeList,
  RouteSelectStep,
  RouteSelectStepList
} from '@/api/basicSettings'
import { DeviceSopSearch } from '@/api/DeviceManager'

export default {
@@ -3191,6 +3218,8 @@
          stepTableData: []// 工序表值
        })
      })

      const tempArr = []
      const { data: res3 } = await UpdateMesOrderStepListSearch(data3)
      console.log(res3, 321)
      res3.forEach((i, index) => {
@@ -3201,40 +3230,61 @@
          })
          this.formData3[index].stepTableData = i.stepdata
          this.formData3[index].stepSelectedValue = i.stepdata.map(j => j.stepcode)
        } else {
          tempArr.push({
            'wkshopcode': this.formData3[index].wkshopcode,
            'routecode': this.formData3[index].routecode,
            'partcode': this.formData3[index].partcode
          })
        }
      })

      const { data: res } = await PartSelectRputeList(partcodeArr)
      if (this.mesSetting.route) {
        res.forEach((i, index) => {
          if (i.routedata.length > 0) {
            this.formData3[index].routecodeArr = i.routedata
          }
        })
      } else {
      console.log(this.sourceType, '执行1', this.formData3)
      const tempArr2 = tempArr.filter((item, index) => {
        return tempArr.findIndex(i => i.partcode === item.partcode) === index
      })
      if (this.sourceType) { // 为true时，调用MesOrderNewStepListContent
        const { data: res } = await MesOrderNewStepListContent(tempArr2)
        this.formData3.forEach((i, index) => {
          if (i.stepTableData.length === 0) {
            i.stepTableData = res[index].stepdata
            i.stepSelectedValue = res[index].stepdata.length > 0 ? res[index].stepdata.map(j => j.stepcode) : []
          }
        })
      }
      // i.stepdata.forEach(j => {
      //   j.ratio = parseFloat(j.ratio) > 0 ? parseFloat(j.ratio) : 0
      //   j.sumqty = Math.round(parseFloat(i.canupdate_qty) * (1 + (parseFloat(j.ratio) > 0 ? parseFloat(j.ratio) / 100 : 0)))
      // })
      if (this.mesSetting.route) {
        const { data: res2 } = await RouteSelectStepList(data2)
        this.formData3.forEach((i, index) => {
          if (i.stepTableData.length === 0) {
            res2[index].stepdata.forEach(j => {
            const ind = res.findIndex(j => j.partcode === this.formData3[index].partcode)
            res[ind].stepdata.forEach(j => {
              j.ratio = parseFloat(j.ratio) > 0 ? parseFloat(j.ratio) : 0
              j.sumqty = Math.round(parseFloat(i.mesqty) * (1 + (parseFloat(j.ratio) > 0 ? parseFloat(j.ratio) / 100 : 0)))
            })
            i.stepTableData = res2[index].stepdata
            i.stepSelectedValue = res2[index].stepdata.length > 0 ? res2[index].stepdata.map(j => j.stepcode) : []
            this.formData3[index].stepTableData = res[ind].stepdata
            this.formData3[index].stepSelectedValue = res[ind].stepdata.length > 0 ? res[ind].stepdata.map(j => j.stepcode) : []
          }
        })
      } else { // 调用PartSelectRputeList
        const { data: res } = await PartSelectRputeList(partcodeArr)
        if (this.mesSetting.route) {
          res.forEach((i, index) => {
            if (i.routedata.length > 0) {
              this.formData3[index].routecodeArr = i.routedata
            }
          })
        } else {
          this.formData3.forEach((i, index) => {
            if (i.stepTableData.length === 0) {
              i.stepTableData = res[index].stepdata
              i.stepSelectedValue = res[index].stepdata.length > 0 ? res[index].stepdata.map(j => j.stepcode) : []
            }
          })
        }

        if (this.mesSetting.route) {
          const { data: res2 } = await RouteSelectStepList(data2)
          this.formData3.forEach((i, index) => {
            if (i.stepTableData.length === 0) {
              res2[index].stepdata.forEach(j => {
                j.ratio = parseFloat(j.ratio) > 0 ? parseFloat(j.ratio) : 0
                j.sumqty = Math.round(parseFloat(i.mesqty) * (1 + (parseFloat(j.ratio) > 0 ? parseFloat(j.ratio) / 100 : 0)))
              })
              i.stepTableData = res2[index].stepdata
              i.stepSelectedValue = res2[index].stepdata.length > 0 ? res2[index].stepdata.map(j => j.stepcode) : []
            }
          })
        }
      }

      // this.formData3 = this.multipleSelection
@@ -4144,6 +4194,9 @@
      this.formApprove.priuserdefnvc5 = row.priuserdefnvc5 ? row.priuserdefnvc5 : '/'
      this.formApprove.priuserdefnvc6 = row.priuserdefnvc6 ? row.priuserdefnvc6 : '/'

      this.formApprove.memo = row.memo || '/'
      this.formApprove.bomsubspec = row.bomsubspec || '/'

      this.formApprove.TopInventoryName = row.TopInventoryName || '/'

      this.formApprove.saleOrderCode = this.formApprove.saleOrderCode !== '' ? this.formApprove.saleOrderCode : saleOrderCode