common/http.api.js

@@ -532,6 +532,8 @@
            selWorkStation: (params = {}) => vm.$u.post('/mes/operationTask/selWorkStation', params),
            getMoMaterialByMoId: (params = {}) => vm.$u.get('/mes/operationTask/getMoMaterialByMoId', params),
            feedingPDA: (params = {}) => vm.$u.post('/mes/feeding/feedingPDA', params),
            // 查询工单
            getManuOrder: (params = {}) => vm.$u.get('/mes/plan/manufacturingmatissue/getManuOrder', params),
        },
        // 车间订单取消下发
        WorkshopOrderCancellationIssued: {

 pages/product/WorkshopOrderIssued/index.vue

@@ -18,7 +18,9 @@
          </view>
          <view class="packing-registration-param-item-right">
            <text class="item-one item-two" @click="seachPersonnelNo()">{{
              registerInfo.ifsOrderNo == "" ? "点击选择" : registerInfo.ifsOrderNo
              registerInfo.ifsOrderNo == ""
                ? "点击选择"
                : registerInfo.ifsOrderNo
            }}</text>
            <u-icon
              name="arrow-right"
@@ -245,22 +247,6 @@
    uni.$off("scan"); // 每次进来先 移除全局自定义事件监听器
    uni.$on("scan", function (data) {
      console.log("onscan");
      if (that.registerInfo.partNo == "") {
        uni.showToast({
          icon: "none",
          title: "请先选择子件！",
          duration: 2 * 1000,
        });
        return;
      }
      // if (that.registerInfo.workstationId == "") {
      //   uni.showToast({
      //     icon: "none",
      //     title: "请先选择机台！",
      //     duration: 2 * 1000,
      //   });
      //   return;
      // }
      if (data.code) {
        //扫码成功后的回调，你可以写自己的逻辑代码在这里
        console.log("扫码结果：", data.code);
@@ -268,13 +254,33 @@
        that.codeInfoId = codeInfo.id;
        if (codeInfo.PN) {
          if (that.registerInfo.partNo != codeInfo.PN) {
            this.$u.toast("当前子件和扫码子件不一致！");
            this.$u.toast("当前物料结构和扫码物料结构不一致！");
            return;
          }
          // 扫描报工单二维码
          that.scanHandle(codeInfo);
          that.$forceUpdate();
          // that.getHandelList();
        }
        if (codeInfo.moOn) {
          this.$u.api.WorkshopOrderIssued.getManuOrder({
            moOn: codeInfo.moOn,
          }).then((res) => {
            if (res.code === 0) {
              that.registerInfo = {
                operationTaskId: "",
                id: res.data.id,
                ifsOrderNo: res.data.ifsOrderNo,
                partNo: "",
                partName: "",
                optaskNo: "",
                workstationId: "",
                ifsLineItemNo: "",
              };
            }
          })
          .catch((err) => {
          })
        }
      }
    });
@@ -492,7 +498,7 @@
  }

  .packing-registration-param-view {
    height: 550rpx;
    height: 350rpx;
    background-color: #fff;
    border-radius: 10rpx;
    padding: 0rpx 23rpx;

 pages/product/cancelReport/index.vue

@@ -5,8 +5,8 @@
        <u-navbar title="取消报工" :background="background" :border-bottom="false" :title-bold="true" title-color="#000"
            back-icon-color="#000" />
        <u-form :model="form" ref="uForm" :label-width="280" :rules="rules" :error-type="['toast']" class="uForm">
            <u-form-item label="订单号" :border-bottom="false" prop="moNo">
                <u-input v-model="form.moNo" type="select" placeholder="点击选择" @click="openList" />
            <u-form-item label="订单号" :border-bottom="false" prop="ifsOrderNo">
                <u-input v-model="form.ifsOrderNo" type="select" placeholder="点击选择" @click="openList" />
            </u-form-item>
            <u-form-item label="工单" :border-bottom="false" prop="optaskNo">
                <u-input v-model="form.optaskNo" type="select" placeholder="点击选择" @click="seachWork" />
@@ -16,7 +16,7 @@
        <view class="wrap">
            <scroll-view class="finishProductIn-locno-scroll-list" scroll-y="true">
                <u-cell-group class="finishProductIn-locno-scroll-list-group" :border="false">
                    <view class="content" v-for="(item, index) in list" :key="item.moNo" :index="index"
                    <view class="content" v-for="(item, index) in list" :key="item.ifsOrderNo" :index="index"
                        @click="cancelReport(item, index)">
                        <view class="content-header">
                            <view class="content-header-title">{{ index + 1 }}</view>
@@ -121,7 +121,7 @@
                    backgroundRepeat: "no-repeat",
                },
                form: {
                    moNo: "",
                    ifsOrderNo: "",
                    optaskNo: "",
                    id: "",
                },
@@ -153,7 +153,7 @@
        methods: {
            //工单
            seachWork() {
                if (this.form.moNo == "") {
                if (this.form.ifsOrderNo == "") {
                    this.$u.toast("请选择订单号");
                    return;
                }
@@ -172,12 +172,12 @@
                });
            },
            setNo(val) {
                this.form.moNo = val.moNo;
                this.form.ifsOrderNo = val.ifsOrderNo;
                this.form.id = val.id;
            },
            // 回显扫码的信息-报工单
            saveForm(val) {
                // if (this.form.moNo == "") {
                // if (this.form.ifsOrderNo == "") {
                //     uni.showToast({
                //         icon: "none",
                //         title: "请先选择订单号！",
@@ -185,7 +185,7 @@
                //     });
                //     return;
                // }
                // if (this.form.moNo != val.moNo) {
                // if (this.form.ifsOrderNo != val.ifsOrderNo) {
                //     uni.showToast({
                //         icon: "none",
                //         title: "扫描的二维码与该订单不一致",