From 65e595c85e7ff31252c651f05949b711209f45ec Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期一, 22 十二月 2025 09:49:31 +0800
Subject: [PATCH] 称重逻辑调整
---
H5/Js/Cpbdsj.js | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/H5/Js/Cpbdsj.js b/H5/Js/Cpbdsj.js
index 56de108..12758c9 100644
--- a/H5/Js/Cpbdsj.js
+++ b/H5/Js/Cpbdsj.js
@@ -28,6 +28,7 @@
//}
],
DAA001: [],
+ DAA015: "",
show: false,//鍒楄〃灞曠ず
actions: [],//鍒楄〃鐨勫��
xtName: "",//绾夸綋鍚嶇О
@@ -71,6 +72,8 @@
console.log(json.data.tbBillList.kbBarInfo[0].agvPostion);
that.KbBarInfo = json.data.tbBillList.kbBarInfo[0];
that.DAA001 = that.KbBarInfo.daA001;
+ that.DAA015 = that.KbBarInfo.daA015;
+ console.log(that.KbBarInfo)
that.KbBarMxInfo = json.data.tbBillList.kbBarMxInfo;
that.$refs.XBar.focus();
that.XbarInfo = [];
@@ -202,7 +205,6 @@
if (that.XbarInfo.length >= that.Xvalue) {
that.$refs.LsBar.focus();
}
-
}
else {
that.$playSound('error');
@@ -313,6 +315,21 @@
if (matchedItem.is_hedui === "1") {
that.$toast("宸叉牳瀵�");
} else {
+ console.log(that.DAA015);
+ if ((that.DAA015) === "462") {
+ that.$set(matchedItem, 'is_hedui', "1");
+ // 鍙牴鎹渶瑕佽缃� weight锛岃繖閲屼繚鎸佷负绌�/涓嶅彉
+ that.$playSound('success');
+ that.$notify({ type: 'success', message: "鏍稿鎴愬姛" });
+ that.LsBar = "";
+ // 妫�鏌ユ槸鍚︽墍鏈夎閮藉凡鏍稿
+ const allChecked = that.XbarInfo.every(item => item.is_hedui === "1");
+ if (allChecked && that.XbarInfo.length > 0 && that.XbarInfo.length === that.Xvalue) {
+ that.submitAllChecked();
+ }
+ // 鐩存帴杩斿洖锛屼笉璋冪敤 GetWeightByXt
+ return;
+ }
that.AxiosHttp("post", 'Womdaa/GetWeightByXt', {
LsBar: that.LsBar,
@@ -503,6 +520,11 @@
this.xtNum = action.lineNo; // 缁戝畾line_no鍒皒tNum瀛楁
console.log("閫夋嫨鐨勭嚎浣撶紪鍙凤細", this.xtNum);
this.xtName = action.name; // 缁戝畾name鍒皒tName瀛楁
+ if (action.agvPostion != null) {
+ const agvPostionStr = String(action.agvPostion);
+ this.AgvDw = agvPostionStr.split(',')[0];
+ this.actionsAgvDw = this.handleAgvPositions(agvPostionStr);
+ }
this.show = false;
},
@@ -536,7 +558,8 @@
that.actions = json.data.tbBillList.map(item => {
return {
name: item.name,
- lineNo: item.line_no // 鏂板
+ lineNo: item.line_no, // 鏂板
+ agvPostion: item.agvPostion
};
});
}
@@ -670,7 +693,8 @@
that.isLoading = true;
that.AxiosHttp("post", 'Womdaa/handleAGVCall', {
XtNum: that.xtNum,
- userAccount: that.userInfo.loginAccount
+ userAccount: that.userInfo.loginAccount,
+ AgvDw: that.AgvDw
}, false)
.then(function (res) {
var json = res;
--
Gitblit v1.9.3