From 63e5a1095c2a976551f8241d6045b0612bcb5441 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期二, 03 二月 2026 14:31:36 +0800
Subject: [PATCH] 订单取消下发扫码校验

---
 pages/product/WorkshopOrderCancellationIssued/index.vue |   58 +++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/pages/product/WorkshopOrderCancellationIssued/index.vue b/pages/product/WorkshopOrderCancellationIssued/index.vue
index e50244c..1aa157c 100644
--- a/pages/product/WorkshopOrderCancellationIssued/index.vue
+++ b/pages/product/WorkshopOrderCancellationIssued/index.vue
@@ -114,10 +114,10 @@
               </view>
               <view class="row-list">
                 <view class="_label">
-                  <view class="_label-name">鍙栨秷涓嬪彂鏁伴噺锛�</view>
+                  <view class="_label-name">鍙栨秷鏁伴噺锛�</view>
                 </view>
                 <view class="_content">
-                  {{ item.suppliedQuantity }}
+                  {{ item.stockQuantity }}
                 </view>
               </view>
             </view>
@@ -133,6 +133,7 @@
       :show-confirm-button="true"
       @confirm="confirm"
       @cancel="cancel"
+
     >
       <view class="popup-content">
         <view class="packing-registration-param">
@@ -181,12 +182,12 @@
             </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">
                 <u-input
                   class="item-one item-two"
-                  v-model="modalList.returnQuantity"
+                  v-model="modalList.stockQuantity"
                 />
               </view>
             </view>
@@ -259,11 +260,31 @@
         console.log("鎵爜缁撴灉锛�", data.code);
         let codeInfo = JSON.parse(data.code);
         that.codeInfoId = codeInfo.id;
-        if (codeInfo) {
-          // 鎵弿鎶ュ伐鍗曚簩缁寸爜
-          that.scanHandle(codeInfo);
-          that.$forceUpdate();
-        }
+		if (codeInfo.PN) {
+		  // 鎵弿鎶ュ伐鍗曚簩缁寸爜
+		  that.scanHandle(codeInfo);
+		  that.$forceUpdate();
+		  // that.getHandelList();
+		}
+		if (codeInfo.moOn) {
+			console.log('1111111111')
+		  this.$u.api.WorkshopOrderIssued.getManuOrder({
+		    moOn: codeInfo.moOn,
+		  }).then((res) => {
+			  console.log('111111111',res)
+		    if (res.code === 0) {
+				that.registerInfo = {
+				  operationTaskId: "",
+				  id:res.data.id,
+				  moNo: res.data.ifsOrderNo,
+				  optaskNo: "",
+				  workstationId: "",
+				}
+		    }
+		  })
+		  .catch((err) => {
+		  })
+		}
       }
     });
   },
@@ -323,8 +344,8 @@
         this.$refs.uModal.clearLoading(); // 娓呴櫎鍔犺浇鐘舵��
         return;
       }
-      if (!this.modalList.returnQuantity) {
-        this.$u.toast("璇疯緭鍏ュ彇娑堜笅鍙戞暟閲�");
+      if (!this.modalList.stockQuantity) {
+        this.$u.toast("璇疯緭鍏ュ彇娑堟暟閲�");
         this.$refs.uModal.clearLoading(); // 娓呴櫎鍔犺浇鐘舵��
         return;
       }
@@ -337,8 +358,8 @@
           this.$u.toast("鎻愪氦鎴愬姛");
           this.showModal = false;
           const obj = {
-            suppliedQuantity: this.modalList.suppliedQuantity,
-            outBatchNo: this.modalList.returnQuantity,
+            stockQuantity: this.modalList.stockQuantity,
+            outBatchNo: this.modalList.outBatchNo,
           };
           this.hasScanSnList.push(obj);
         }
@@ -406,12 +427,11 @@
     },
     // 鎵爜鍚庢暟鎹洖鏄�
     scanHandle(val) {
-      const { outBatchNo } = val;
-      const { workstationId, operationTaskId } = this.registerInfo;
+      const { BN } = val;
+      const { id } = this.registerInfo;
       const obj = {
-        outBatchNo: outBatchNo,
-        feedingWorkstationId: workstationId,
-        operationTaskId: operationTaskId,
+        outBatchNo: BN,
+        moId: id,
       };
      this.getReturnInfo(obj);
       // this.$u.api.WorkshopOrderCancellationIssued.checkReturnPartPDA(obj).then(
@@ -483,7 +503,7 @@
   }
 
   .packing-registration-param-view {
-    height: 450rpx;
+    height: 200rpx;
     background-color: #fff;
     border-radius: 10rpx;
     padding: 0rpx 23rpx;

--
Gitblit v1.9.3