From c6fd16350612b8aef7a04bfbebf6ee3c591a88ae Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期三, 22 十月 2025 17:43:44 +0800
Subject: [PATCH] 调整物料下发和取消下发
---
pages/product/WorkshopOrderIssued/index.vue | 68 +++++++++++++++++++---------------
1 files changed, 38 insertions(+), 30 deletions(-)
diff --git a/pages/product/WorkshopOrderIssued/index.vue b/pages/product/WorkshopOrderIssued/index.vue
index 221d6f4..51c7221 100644
--- a/pages/product/WorkshopOrderIssued/index.vue
+++ b/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,11 +225,12 @@
registerInfo: {
operationTaskId: "",
id: "",
- moNo: "",
+ ifsOrderNo: "",
partNo: "",
partName: "",
optaskNo: "",
workstationId: "",
+ ifsLineItemNo: "",
},
// 涓嬪彂璁板綍鍒楄〃
hasScanSnList: [],
@@ -252,21 +253,21 @@
});
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);
let codeInfo = JSON.parse(data.code);
that.codeInfoId = codeInfo.id;
- if (codeInfo.partNo) {
- if (that.registerInfo.partNo != codeInfo.partNo) {
+ if (codeInfo.PN) {
+ if (that.registerInfo.partNo != codeInfo.PN) {
this.$u.toast("褰撳墠瀛愪欢鍜屾壂鐮佸瓙浠朵笉涓�鑷达紒");
return;
}
@@ -318,9 +319,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,
@@ -370,6 +371,7 @@
compNo(val) {
this.registerInfo.partNo = val.partNo;
this.registerInfo.partName = val.partName;
+ this.registerInfo.ifsLineItemNo = val.ifsLineItemNo;
},
// 璁㈠崟鍙峰洖鏄�
setNo(val) {
@@ -377,11 +379,12 @@
(this.registerInfo = {
operationTaskId: "",
id: val.id,
- moNo: val.moNo,
+ ifsOrderNo: val.ifsOrderNo,
partNo: "",
partName: "",
optaskNo: "",
workstationId: "",
+ ifsLineItemNo: "",
}),
(this.machineList = []);
this.machineIndex = null;
@@ -396,8 +399,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 +412,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;
}
@@ -424,17 +431,18 @@
},
// 鎵爜鍚庢暟鎹洖鏄�
scanHandle(val) {
- const { outBatchNo } = val;
+ const { BN } = val;
const { workstationId, operationTaskId } = this.registerInfo;
const obj = {
- outBatchNo: outBatchNo,
- workstationId: workstationId,
- operationTaskId: operationTaskId,
+ outBatchNo: BN,
+ // workstationId: workstationId,
+ // operationTaskId: operationTaskId,
};
this.$u.api.WorkshopOrderIssued.checkRawPartPDA(obj).then((res) => {
console.log("res", res);
if (res.code === 0) {
(res.data.workstationId = workstationId), (this.modalList = res.data);
+ this.modalList.ifsLineItemNo = this.registerInfo.ifsLineItemNo;
this.showModal = true;
}
});
--
Gitblit v1.9.3