From aaa8efda7a2697cf36e7021a1c5d94f3a541b387 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期三, 22 十月 2025 16:19:50 +0800
Subject: [PATCH] 物料下发/物料取消下发页面
---
pages/product/WorkshopOrderIssued/index.vue | 56 ++++++++++--------
pages/product/WorkshopOrderCancellationIssued/index.vue | 43 +++++++-------
pages/product/WorkshopOrderCancellationIssued/comp.vue | 10 +-
pages/product/WorkshopOrderIssued/comp.vue | 18 +++---
pages/sys/home/index.vue | 20 +++---
common/http.api.js | 13 +++-
pages/product/report/orderList.vue | 2
7 files changed, 86 insertions(+), 76 deletions(-)
diff --git a/common/http.api.js b/common/http.api.js
index 600f10c..07fd756 100644
--- a/common/http.api.js
+++ b/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: {
diff --git a/pages/product/WorkshopOrderCancellationIssued/comp.vue b/pages/product/WorkshopOrderCancellationIssued/comp.vue
index a8ae055..400b772 100644
--- a/pages/product/WorkshopOrderCancellationIssued/comp.vue
+++ b/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>
diff --git a/pages/product/WorkshopOrderCancellationIssued/index.vue b/pages/product/WorkshopOrderCancellationIssued/index.vue
index 4102cfa..e50244c 100644
--- a/pages/product/WorkshopOrderCancellationIssued/index.vue
+++ b/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) {
diff --git a/pages/product/WorkshopOrderIssued/comp.vue b/pages/product/WorkshopOrderIssued/comp.vue
index a8ae055..c15aeda 100644
--- a/pages/product/WorkshopOrderIssued/comp.vue
+++ b/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);
diff --git a/pages/product/WorkshopOrderIssued/index.vue b/pages/product/WorkshopOrderIssued/index.vue
index ca0c4df..e017de1 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,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);
diff --git a/pages/product/report/orderList.vue b/pages/product/report/orderList.vue
index 23d574a..727e174 100644
--- a/pages/product/report/orderList.vue
+++ b/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">
diff --git a/pages/sys/home/index.vue b/pages/sys/home/index.vue
index ec7b3af..1f33f17 100644
--- a/pages/sys/home/index.vue
+++ b/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'
+ },
]
},
{
--
Gitblit v1.9.3