From d9c3ebc6a1ac052243d48b02d04d5a14480e1648 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 25 九月 2025 17:31:48 +0800
Subject: [PATCH] 工序出站汇报添加继续汇报下一道功能，直接调拨bug修复
---
pages/zhijiediaobo/form.vue | 4 +-
manifest.json | 4 +-
pages/gongxuOut/form.vue | 82 +++++++++++++++++++++++++++++++++++++----
3 files changed, 78 insertions(+), 12 deletions(-)
diff --git a/manifest.json b/manifest.json
index c4187d1..a841d55 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "鏅轰簯LMES",
"appid" : "__UNI__B002F49",
"description" : "",
- "versionName" : "1.0.89",
- "versionCode" : 189,
+ "versionName" : "1.0.91",
+ "versionCode" : 191,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/gongxuOut/form.vue b/pages/gongxuOut/form.vue
index 7938abf..27a3014 100644
--- a/pages/gongxuOut/form.vue
+++ b/pages/gongxuOut/form.vue
@@ -647,6 +647,13 @@
this.getEditData(e.linterid, e.HBillNo)
} else {
this.getNewData()
+ if(e.HBarCode){
+ this.hform.HBarCode=e.HBarCode
+ setTimeout(() => {
+ this.toInCode(e);
+ }, 1000)
+ }
+
}
this.getHMaterList()
this.getHProcList()
@@ -657,6 +664,7 @@
this.getHCenterList()
this.getDefValByUser()
+
},
methods: {
//閫変腑鍏ㄩ儴鏂囨湰
@@ -1753,18 +1761,22 @@
} else {
uni.showModal({
title: '鎻愮ず',
- content: res.data.Message + '銆傛槸鍚︾户缁柊澧烇紵(鐐瑰嚮鍙栨秷杩斿洖涓婄骇椤甸潰)',
+ content: res.data.Message + '銆傛槸鍚︾户缁柊澧炰笅涓�閬撳伐搴忥紵(鐐瑰嚮鍙栨秷杩斿洖鏂板椤甸潰)',
success: (res) => {
if (res.confirm) {
console.log('鐢ㄦ埛鐐瑰嚮纭畾');
- uni.redirectTo({
- url: '/pages/gongxuOut/form?OperationType=1'
- })
+ this.getNextProc()
+ // uni.redirectTo({
+ // url: '/pages/gongxuOut/form?OperationType=1'
+ // })
} else if (res.cancel) {
console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
- setTimeout(() => {
- uni.navigateBack();
- }, 50)
+ // setTimeout(() => {
+ // uni.navigateBack();
+ // }, 50)
+ uni.redirectTo({
+ url: '/pages/gongxuOut/form?OperationType=1'
+ })
}
}
});
@@ -1897,7 +1909,61 @@
}
}
});
- }
+ },
+ getNextProc(){
+ uni.request({
+ url: this.serverUrl + '/LEMS/MES_Sc_ProcessExchangeBillQuerySub_Json',
+ method: 'GET',
+ dataType: "json",
+ data: {
+ sWhere:this.hform.HProcExchHinteID
+ },
+ success: (res) => {
+ console.log(1, res);
+ if (res.data.count == 1) {
+ let processList = res.data.data
+
+ // 1. 鍏堣繃婊ゅ嚭 HSEQNumber === 'N' 鐨勬暟鎹�
+ processList = processList.filter(item => item.HSEQNumber === this.hform.HSEQNumber);
+
+ //褰撳墠宸ュ簭缂栧彿
+ const currentIndex = processList.findIndex(item => item["宸ュ簭鍙�"] === this.hform.HProcNo);
+ // 鑾峰彇涓嬩竴涓伐搴忥紙濡傛灉瀛樺湪锛�
+ const nextProcess = currentIndex !== -1 && currentIndex < processList.length - 1
+ ? processList[currentIndex + 1] : null;
+ if(!nextProcess){
+ uni.showToast({
+ title: '娌℃湁涓嬩竴閬撳伐搴忓嵆灏嗚烦杞柊澧為〉闈�',
+ icon: 'none'
+ })
+ uni.redirectTo({
+ url: '/pages/gongxuOut/form?OperationType=1'
+ })
+ }else{
+ this.hform.HProcNo=nextProcess["宸ュ簭鍙�"];
+ const HNextBarCode = this.hform.HBarCode+"@"+this.hform.HProcNo+"@"+this.hform.HSEQNumber
+ uni.redirectTo({
+ url: '/pages/gongxuOut/form?OperationType=1&HBarCode='+HNextBarCode
+ })
+ }
+ }else{
+ console.log(res);
+ uni.showToast({
+ title: '鑾峰彇涓嬩竴閬撳伐搴忓け璐�',
+ icon: 'none'
+ })
+ }
+
+ },
+ fail: (res) => {
+ console.log(res);
+ uni.showToast({
+ title: '鎺ュ彛璇锋眰澶辫触',
+ icon: 'none'
+ })
+ },
+ });
+ }
}
}
</script>
diff --git a/pages/zhijiediaobo/form.vue b/pages/zhijiediaobo/form.vue
index 5c11a7c..530d756 100644
--- a/pages/zhijiediaobo/form.vue
+++ b/pages/zhijiediaobo/form.vue
@@ -426,7 +426,7 @@
arrayHOrgName: [], // 缁勭粐
arrayHOrgValue: [], // 缁勭粐瀵瑰簲ID
arrayHWHInName: [], // 璋冨叆浠撳簱
- HHWHInNameList: [],
+ HWHInNameList: [],
arrayHStockPlaceInName: [], //璋冨叆浠撲綅
HStockPlaceInNameList: [],
@@ -879,7 +879,7 @@
success: (res) => {
if (res.data.count == 1) {
this.HWHNameList = res.data.data
- this.HHWHInNameList = res.data.data
+ this.HWHInNameList = res.data.data
for (var i = 0; i < res.data.data.length; i++) {
this.arrayHWHName[i] = res.data.data[i].浠撳簱鍚嶇О
this.arrayHWHInName[i] = res.data.data[i].浠撳簱鍚嶇О
--
Gitblit v1.9.1