物料下发/物料取消下发页面

yyb

2025-10-22 aaa8efda7a2697cf36e7021a1c5d94f3a541b387

物料下发/物料取消下发页面

 common/http.api.js

@@ -518,9 +518,10 @@
            // 检查校验
            // checkRawPart: (params = {}) => vm.$u.post('/mes/product/checkRawPart/' + params.operationTaskId, params),
            // 检验零件
            checkRawPartPDA: (params = {}) => vm.$u.get('/mes/product/checkRawPartPDA/' +  params.outBatchNo + '/' + params
                .workstationId+ '/' + params
                .operationTaskId),
            // checkRawPartPDA: (params = {}) => vm.$u.get('/mes/product/checkRawPartPDA/' +  params.outBatchNo + '/' + params
            //     .workstationId+ '/' + params
            //     .operationTaskId),
            checkRawPartPDA: (params = {}) => vm.$u.get('/mes/product/checkRawPartPDA/' +  params.outBatchNo),
            // 提交
            feeding: (params = {}) => vm.$u.post('/mes/feeding', params),
            // 查询工单
@@ -528,7 +529,9 @@
            // 根据工单id查询物料
            getMoMaterial: (params = {}) => vm.$u.get('/mes/operationTask/getMoMaterial', params),
            // 查询工作台
            selWorkStation: (params = {}) => vm.$u.post('/mes/operationTask/selWorkStation', params)
            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),
        },
        // 车间订单取消下发
        WorkshopOrderCancellationIssued: {
@@ -540,6 +543,8 @@
            getReturnInfo: (params = {}) => vm.$u.post('/mes/feeding/getReturnInfo', params),
            // 确认取消下发
            feeding: (params = {}) => vm.$u.put('/mes/feeding', params),
            rejectPDA: (params = {}) => vm.$u.put('/mes/feeding/rejectPDA', params),

        },
        // 移库
        shiftingParking: {

 pages/product/WorkshopOrderCancellationIssued/comp.vue

@@ -23,10 +23,10 @@
                                    <view class="_label-name">行号：</view>
                                </view>
                                <view class="_content">
                                    {{ item.value0 }}
                                    {{ item.ifsLineItemNo }}
                                </view>
                            </view>
                            <view class="row-list">
                            <!-- <view class="row-list">
                                <view class="_label">
                                    <view class="_label-icon-2"> </view>
                                    <view class="_label-name">下发至库位：</view>
@@ -34,7 +34,7 @@
                                <view class="_content">
                                    {{ item.value1 }}
                                </view>
                            </view>
                            </view> -->
                            <view class="row-list">
                                <view class="_label">
                                    <view class="_label-icon-1"> </view>
@@ -53,7 +53,7 @@
                                    {{ item.partName }}
                                </view>
                            </view>
                            <view class="row-list">
                            <!-- <view class="row-list">
                                <view class="_label">
                                    <view class="_label-icon-2"> </view>
                                    <view class="_label-name">零件下发数量：</view>
@@ -70,7 +70,7 @@
                                <view class="_content">
                                    {{ item.value5 }}
                                </view>
                            </view>
                            </view> -->
                        </view>
                    </view>
                </u-cell-group>

 pages/product/WorkshopOrderCancellationIssued/index.vue

@@ -29,7 +29,7 @@
            ></u-icon>
          </view>
        </view>
        <view class="packing-registration-param-item param-extra">
        <!-- <view class="packing-registration-param-item param-extra">
          <view class="packing-registration-param-item-left">
            <text class="item-one">工单</text>
          </view>
@@ -79,7 +79,7 @@
              size="28"
            ></u-icon>
          </view>
        </view>
        </view> -->
        <view class="packing-registration-param-item param-extra">
          <view class="packing-registration-param-item-left">
            <text class="item-one">取消下发记录：</text>
@@ -246,14 +246,14 @@
    uni.$off("scan"); // 每次进来先 移除全局自定义事件监听器
    uni.$on("scan", function (data) {
      console.log("onscan");
      if (that.registerInfo.workstationId == "") {
        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);
@@ -329,9 +329,9 @@
        return;
      }
      // 处理确认逻辑
      this.$u.api.WorkshopOrderCancellationIssued.feeding([
        this.modalList,
      ]).then((res) => {
      this.$u.api.WorkshopOrderCancellationIssued.rejectPDA(
        this.modalList
      ).then((res) => {
        console.log("res", res);
        if (res.code === 0) {
          this.$u.toast("提交成功");
@@ -413,14 +413,15 @@
        feedingWorkstationId: workstationId,
        operationTaskId: operationTaskId,
      };
      this.$u.api.WorkshopOrderCancellationIssued.checkReturnPartPDA(obj).then(
        (res) => {
          console.log("res", res);
          if (res.code === 0) {
            this.getHandymanItem(obj);
          }
        }
      );
     this.getReturnInfo(obj);
      // this.$u.api.WorkshopOrderCancellationIssued.checkReturnPartPDA(obj).then(
      //   (res) => {
      //     console.log("res", res);
      //     if (res.code === 0) {
      //       this.getHandymanItem(obj);
      //     }
      //   }
      // );
    },
    //   获取基本信息
    getReturnInfo(obj) {

 pages/product/WorkshopOrderIssued/comp.vue

@@ -23,10 +23,10 @@
                                    <view class="_label-name">行号：</view>
                                </view>
                                <view class="_content">
                                    {{ item.value0 }}
                                    {{ item.ifsLineItemNo }}
                                </view>
                            </view>
                            <view class="row-list">
                            <!-- <view class="row-list">
                                <view class="_label">
                                    <view class="_label-icon-2"> </view>
                                    <view class="_label-name">下发至库位：</view>
@@ -34,7 +34,7 @@
                                <view class="_content">
                                    {{ item.value1 }}
                                </view>
                            </view>
                            </view> -->
                            <view class="row-list">
                                <view class="_label">
                                    <view class="_label-icon-1"> </view>
@@ -53,7 +53,7 @@
                                    {{ item.partName }}
                                </view>
                            </view>
                            <view class="row-list">
                            <!-- <view class="row-list">
                                <view class="_label">
                                    <view class="_label-icon-2"> </view>
                                    <view class="_label-name">零件下发数量：</view>
@@ -70,7 +70,7 @@
                                <view class="_content">
                                    {{ item.value5 }}
                                </view>
                            </view>
                            </view> -->
                        </view>
                    </view>
                </u-cell-group>
@@ -123,10 +123,10 @@
                }, 1000);
            },
            getlist() {
                this.$u.api.WorkshopOrderIssued.getMoMaterial({
                this.$u.api.WorkshopOrderIssued.getMoMaterialByMoId({
                    current: this.pageNum,
                    size: this.pageSize,
                    operationTaskId: this.operationTaskId
                    id: this.operationTaskId
                }).then((res) => {
                    console.log("res", res);
                    this.list = res.data;
@@ -144,11 +144,11 @@
                    this.list = [];
                    this.pageSize = 10;
                    this.$u.api.WorkshopOrderIssued
                        .getMoMaterial({
                        .getMoMaterialByMoId({
                            current: this.pageNum,
                            size: this.pageSize,
                            partNo: value,
                            operationTaskId: this.operationTaskId
                            id: this.operationTaskId
                        })
                        .then((res) => {
                            console.log("res", res);

 pages/product/WorkshopOrderIssued/index.vue

@@ -3,7 +3,7 @@
  <view class="page">
    <view class="packing-registration-bg" />
    <u-navbar
      title="订单下发"
      title="物料下发"
      :background="background"
      :border-bottom="false"
      :title-bold="true"
@@ -18,18 +18,18 @@
          </view>
          <view class="packing-registration-param-item-right">
            <text class="item-one item-two" @click="seachPersonnelNo()">{{
              registerInfo.moNo == "" ? "点击选择" : registerInfo.moNo
              registerInfo.ifsOrderNo == "" ? "点击选择" : registerInfo.ifsOrderNo
            }}</text>
            <u-icon
              name="arrow-right"
              color="#687792"
              size="28"
              @click="seachPersonnelNo()"
              v-show="registerInfo.moNo == ''"
              v-show="registerInfo.ifsOrderNo == ''"
            ></u-icon>
          </view>
        </view>
        <view class="packing-registration-param-item param-extra">
        <!-- <view class="packing-registration-param-item param-extra">
          <view class="packing-registration-param-item-left">
            <text class="item-one">工单</text>
          </view>
@@ -45,8 +45,8 @@
              v-show="registerInfo.optaskNo == ''"
            ></u-icon>
          </view>
        </view>
        <view class="packing-registration-param-item param-extra">
        </view> -->
        <!-- <view class="packing-registration-param-item param-extra">
          <view class="packing-registration-param-item-left">
            <text class="item-one">机台</text>
          </view>
@@ -79,10 +79,10 @@
              size="28"
            ></u-icon>
          </view>
        </view>
        </view> -->
        <view class="packing-registration-param-item param-extra">
          <view class="packing-registration-param-item-left">
            <text class="item-one">子件</text>
            <text class="item-one">物料结构</text>
          </view>
          <view class="packing-registration-param-item-right">
            <text class="item-one item-two" @click="seachComp()">{{
@@ -225,7 +225,7 @@
      registerInfo: {
        operationTaskId: "",
        id: "",
        moNo: "",
        ifsOrderNo: "",
        partNo: "",
        partName: "",
        optaskNo: "",
@@ -252,14 +252,14 @@
        });
        return;
      }
      if (that.registerInfo.workstationId == "") {
        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);
@@ -318,9 +318,9 @@
        return;
      }
      // 处理确认逻辑
      this.$u.api.WorkshopOrderIssued.feeding({
      this.$u.api.WorkshopOrderIssued.feedingPDA({
        feedingFrom: "stocker",
        operationTaskId: this.registerInfo.operationTaskId,
        moId: this.registerInfo.id,
        feeds: [
          {
            ...this.modalList,
@@ -377,7 +377,7 @@
      (this.registerInfo = {
        operationTaskId: "",
        id: val.id,
        moNo: val.moNo,
        ifsOrderNo: val.ifsOrderNo,
        partNo: "",
        partName: "",
        optaskNo: "",
@@ -396,8 +396,12 @@
    },
    //子件
    seachComp() {
      if (this.registerInfo.optaskNo == "") {
        this.$u.toast("请选择工单号");
      // if (this.registerInfo.optaskNo == "") {
      //   this.$u.toast("请选择工单号");
      //   return;
      // }
      if (this.registerInfo.ifsOrderNo == "") {
        this.$u.toast("请选择订单号");
        return;
      }
      console.log("子件");
@@ -405,12 +409,12 @@
      uni.navigateTo({
        url:
          "/pages/product/WorkshopOrderIssued/comp?operationTaskId=" +
          encodeURIComponent(JSON.stringify(this.registerInfo.operationTaskId)),
          encodeURIComponent(JSON.stringify(this.registerInfo.id)),
      });
    },
    //工单
    seachWork() {
      if (this.registerInfo.moNo == "") {
      if (this.registerInfo.ifsOrderNo == "") {
        this.$u.toast("请选择订单号");
        return;
      }
@@ -428,8 +432,8 @@
      const { workstationId, operationTaskId } = this.registerInfo;
      const obj = {
        outBatchNo: BN,
        workstationId: workstationId,
        operationTaskId: operationTaskId,
        // workstationId: workstationId,
        // operationTaskId: operationTaskId,
      };
      this.$u.api.WorkshopOrderIssued.checkRawPartPDA(obj).then((res) => {
        console.log("res", res);

 pages/product/report/orderList.vue

@@ -23,7 +23,7 @@
                                    <view class="_label-name">订单号：</view>
                                </view>
                                <view class="_content">
                                    {{ item.moNo }}
                                    {{ item.ifsOrderNo }}
                                </view>
                            </view>
                            <view class="row-list">

 pages/sys/home/index.vue

@@ -42,16 +42,16 @@
                        //     url: '/pages/product/receive/index',
                        //     icon: 'three'
                        // },
                        // {
                        //     name: '车间订单下发',
                        //     url: '/pages/product/WorkshopOrderIssued/index',
                        //     icon: 'four'
                        // },
                        // {
                        //     name: '车间取消下发',
                        //     url: '/pages/product/WorkshopOrderCancellationIssued/index',
                        //     icon: 'five'
                        // },
                        {
                            name: '物料下发',
                            url: '/pages/product/WorkshopOrderIssued/index',
                            icon: 'four'
                        },
                        {
                            name: '物料取消下发',
                            url: '/pages/product/WorkshopOrderCancellationIssued/index',
                            icon: 'five'
                        },
                    ]
                },
                {