From 1f017a1ebe252ef945e42dc868ac8c24e2b6d534 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期四, 21 八月 2025 17:35:49 +0800
Subject: [PATCH] pda报工选择投料接口变更
---
pages/product/report/index.vue | 7 ++-
common/http.api.js | 1
pages/product/report/seachPersonnelNo.vue | 98 ++++++++++++++++++++++++++-----------------------
3 files changed, 57 insertions(+), 49 deletions(-)
diff --git a/common/http.api.js b/common/http.api.js
index 2f91a18..6ccf29c 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -509,6 +509,7 @@
cancelDTAOfWorkApplication: (params = {}) => vm.$u.get('/mes/product/cancelDTAOfWorkApplication', params),
selInputPartInfoPDA: (params = {}) => vm.$u.get('/mes/stock/selInputPartInfoPDA', params),
fuzzyQuery: (params = {}) => vm.$u.get('mes/applyPart/fuzzyQuery', params),
+ getStockNoPageByWorkstationId: (params = {}) => vm.$u.get('/mes/stock/getStockNoPageByWorkstationId', params),
},
// 杞﹂棿璁㈠崟涓嬪彂
WorkshopOrderIssued: {
diff --git a/pages/product/report/index.vue b/pages/product/report/index.vue
index ac3a2e4..2c90dc9 100644
--- a/pages/product/report/index.vue
+++ b/pages/product/report/index.vue
@@ -235,7 +235,7 @@
},
reportProductionVolumelist: {},
- FeedInputProductionVolumeList: {}, //鎶曟枡浜ч噺
+ FeedInputProductionVolumeList: [], //鎶曟枡浜ч噺
personList: [],
canSelectPerson: false,
rules: {
@@ -328,7 +328,7 @@
this.$u.toast("鎻愪氦鎴愬姛");
this.InventoryReceiptList.unshift(this.form.productOutputList[0]);
this.reportProductionVolumelist = {},
- this.FeedInputProductionVolumeList = {}, //鎶曟枡浜ч噺
+ this.FeedInputProductionVolumeList = [], //鎶曟枡浜ч噺
this.form.FeedInputProductionVolume = null, //鎶曟枡浜ч噺
this.form.reportProductionVolume = null, //姹囨姤浜ч噺
console.log("this.InventoryReceiptList", this.InventoryReceiptList);
@@ -397,7 +397,8 @@
return;
}
uni.navigateTo({
- url: "/pages/product/report/seachPersonnelNo?moOn=" + this.form.moOn,
+ url: "/pages/product/report/seachPersonnelNo?moOn=" + this.form.moOn + "&workstationId=" + this.form.workstationId,
+
});
},
diff --git a/pages/product/report/seachPersonnelNo.vue b/pages/product/report/seachPersonnelNo.vue
index 93ceea5..fba4584 100644
--- a/pages/product/report/seachPersonnelNo.vue
+++ b/pages/product/report/seachPersonnelNo.vue
@@ -10,11 +10,11 @@
<!-- 妯＄硦鏌ヨ鎺ㄨ崘鍒楄〃 -->
<view v-if="recommendations.length > 0" class="recommendation-list">
- <view class="recommendation-item" v-for="item in recommendations" :key="item.lotBatchNo"
+ <view class="recommendation-item" v-for="item in recommendations" :key="item.ifsBatchNo"
@click="selectRecommendation(item)">
<view class="recommendation-line">
<text class="recommendation-label">鎵瑰彿:</text>
- <text class="recommendation-value">{{ item.lotBatchNo }}</text>
+ <text class="recommendation-value">{{ item.ifsBatchNo }}</text>
</view>
<!-- <view class="recommendation-line">
<text class="recommendation-label">闆朵欢鎻忚堪:</text>
@@ -124,6 +124,7 @@
productInputList: [],
recommendations: [], // 鎺ㄨ崘鍒楄〃鏁版嵁
moOn: "",
+ workstationId: "",
};
},
onLoad() {
@@ -146,64 +147,68 @@
},
onLoad(option) {
console.log(option.moOn); // 杈撳嚭: value1
- this.moOn = option.moOn;
+ this.moOn = option.moOn;
+ this.workstationId = option.workstationId;
},
methods: {
// 鏄剧ず鎺ㄨ崘鍒楄〃
showRecommendations() {
// 褰撹緭鍏ユ鑾峰緱鐒︾偣涓斾负绌烘椂锛屾樉绀洪粯璁ゆ帹鑽�
- if (!this.keywords.trim()) {
- this.loadDefaultRecommendations();
- }
+ // if (!this.keywords.trim()) {
+ // this.loadDefaultRecommendations();
+ // }
},
- // 鍔犺浇榛樿鎺ㄨ崘
- loadDefaultRecommendations() {
- // 璋冪敤API鑾峰彇榛樿鎺ㄨ崘鏁版嵁
- this.$u.api.cancelReporting
- .fuzzyQuery()
- .then((res) => {
- console.log('榛樿鎺ㄨ崘缁撴灉:', res.data);
- this.recommendations = res.data || [];
- })
- .catch((err) => {
- console.error('鑾峰彇榛樿鎺ㄨ崘澶辫触:', err);
- this.recommendations = [];
- });
- },
+ // // 鍔犺浇榛樿鎺ㄨ崘
+ // loadDefaultRecommendations() {
+ // // 璋冪敤API鑾峰彇榛樿鎺ㄨ崘鏁版嵁
+ // this.$u.api.cancelReporting
+ // .fuzzyQuery()
+ // .then((res) => {
+ // console.log('榛樿鎺ㄨ崘缁撴灉:', res.data);
+ // this.recommendations = res.data || [];
+ // })
+ // .catch((err) => {
+ // console.error('鑾峰彇榛樿鎺ㄨ崘澶辫触:', err);
+ // this.recommendations = [];
+ // });
+ // },
// 閫夋嫨鎺ㄨ崘椤�
selectRecommendation(item) {
console.log('閫夋嫨鎺ㄨ崘椤�:', item);
console.log('閫夋嫨鎺ㄨ崘椤�:', this.moOn);
- this.$u.api.cancelReporting
- .selInputPartInfoPDA({
- outBatchNo: item.lotBatchNo,
- partNo: item.partNo,
- moOn: this.moOn,
- })
- .then((res) => {
- const list = {
- suppliedQuantity: res.data.suppliedQuantity,
- ifsBatchNo: res.data.ifsBatchNo,
- partNo: res.data.partNo,
- partName: res.data.partName,
- locationNo: res.data.locationNo,
- ifsLineItemNo: res.data.ifsLineItemNo,
- serialNo: res.data.serialNo,
- engChgLevel: res.data.engChgLevel,
- ifsWdr: res.data.waivDevRejNo,
- activitySeq: res.data.activitySeq,
- };
- this.detailedList = list;
+ // this.$u.api.cancelReporting
+ // .selInputPartInfoPDA({
+ // outBatchNo: item.lotBatchNo,
+ // partNo: item.partNo,
+ // moOn: this.moOn,
+ // })
+ // .then((res) => {
+ // const list = {
+ // suppliedQuantity: res.data.suppliedQuantity,
+ // ifsBatchNo: res.data.ifsBatchNo,
+ // partNo: res.data.partNo,
+ // partName: res.data.partName,
+ // locationNo: res.data.locationNo,
+ // ifsLineItemNo: res.data.ifsLineItemNo,
+ // serialNo: res.data.serialNo,
+ // engChgLevel: res.data.engChgLevel,
+ // ifsWdr: res.data.waivDevRejNo,
+ // activitySeq: res.data.activitySeq,
+ // };
+ // this.detailedList = list;
+ // this.showModal = true;
+ // // 娓呯┖杈撳叆妗嗗拰鎺ㄨ崘鍒楄〃
+ // this.keywords = '';
+ // this.recommendations = [];
+ // });
+ this.detailedList = item;
+ this.detailedList.suppliedQuantity = item.availableStockQuantity;
this.showModal = true;
// 娓呯┖杈撳叆妗嗗拰鎺ㄨ崘鍒楄〃
this.keywords = '';
this.recommendations = [];
- });
- // this.detailedList = item;
- // this.detailedList.ifsBatchNo = item.lotBatchNo;
- // this.showModal = true;
},
updateArray(arr, newObj) {
@@ -232,8 +237,9 @@
search(value) {
if (value) {
this.$u.api.cancelReporting
- .fuzzyQuery({
- lotBatchNo: value,
+ .getStockNoPageByWorkstationId({
+ ifsBatchNo: value,
+ workstationId: this.workstationId,
})
.then((res) => {
console.log('妯＄硦鏌ヨ缁撴灉:', res.data);
--
Gitblit v1.9.3