From 408b576b8aa155c9f7c8b919be3cd82be52a1da8 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 25 十一月 2025 08:52:44 +0800
Subject: [PATCH] 1.标准代码更新（2025-11-25）
---
H5/Js/Cpbdsj.js | 411 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 389 insertions(+), 22 deletions(-)
diff --git a/H5/Js/Cpbdsj.js b/H5/Js/Cpbdsj.js
index e6e21c6..938f14f 100644
--- a/H5/Js/Cpbdsj.js
+++ b/H5/Js/Cpbdsj.js
@@ -1,4 +1,5 @@
-锘縱ar vm = new Vue({
+锘�
+var vm = new Vue({
el: '#app',
data: function () {
return {
@@ -27,6 +28,14 @@
//}
],
DAA001: [],
+ show: false,//鍒楄〃灞曠ず
+ actions: [],//鍒楄〃鐨勫��
+ xtName: "",//绾夸綋鍚嶇О
+ xtNum: "",//绾夸綋缂栧彿
+ AgvDw: "",//AGV鐐逛綅
+ agvChecked: false,//鏄惁鍕鹃�堿GV
+ showAgvDw: false,//鐐逛綅灞曠ず
+ actionsAgvDw: [],//鍒楄〃AGV鐐逛綅
}
},
mounted() {
@@ -37,6 +46,17 @@
};
},
methods: {
+ handleAgvPositions(positionStr) {
+ if (!positionStr) return [];
+
+ // 妫�鏌ユ槸鍚﹀瓨鍦ㄩ�楀彿锛屽鏋滀笉瀛樺湪鍒欒繑鍥炵┖鏁扮粍
+ if (!positionStr.includes(',')) return [];
+
+ // 灏嗗瓧绗︿覆鎸夐�楀彿鍒嗗壊骞惰浆鎹负閫夐」鏁扮粍
+ return positionStr.split(',').map(pos => ({
+ name: pos.trim() // 鍘婚櫎鍙兘鐨勭┖鏍�
+ }));
+ },
getKbBarInfo() {
var that = this;
that.isLoading = true;
@@ -46,17 +66,41 @@
}, false)
.then(function (res) {
var json = res;
+
if (json.status == 0) {
+ console.log(json.data.tbBillList.kbBarInfo[0].agvPostion);
that.KbBarInfo = json.data.tbBillList.kbBarInfo[0];
that.DAA001 = that.KbBarInfo.daA001;
that.KbBarMxInfo = json.data.tbBillList.kbBarMxInfo;
that.$refs.XBar.focus();
that.XbarInfo = [];
that.XBar = "";
+
+ // 妫�鏌ユ槸鍚﹀瓨鍦ㄩ�楀彿
+ //const agvPosition = json.data.tbBillList.kbBarInfo[0].agvPostion;
+ //that.AgvDw = agvPosition.includes(',') ? agvPosition.split(',')[0] : '';
+ const agvPostion = json.data && json.data.tbBillList && json.data.tbBillList.kbBarInfo &&
+ json.data.tbBillList.kbBarInfo[0] && json.data.tbBillList.kbBarInfo[0].agvPostion;
+
+ if (agvPostion != null) {
+ const agvPostionStr = String(agvPostion);
+ that.AgvDw = agvPostionStr.split(',')[0];
+ that.actionsAgvDw = that.handleAgvPositions(agvPostionStr);
+ } else {
+ that.AgvDw = null;
+ that.actionsAgvDw = null;
+ }
+
}
else {
that.$playSound('error');
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$refs.KbBar.focus();
that.KbBar = "";
}
@@ -65,7 +109,13 @@
.catch(function (error) {
that.isLoading = false;
that.$playSound('error');
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$refs.KbBar.focus();
that.KbBar = "";
});
@@ -91,17 +141,29 @@
// 妫�鏌ユ槸鍚﹁秴杩囪绠辨暟
if (that.XbarInfo.length >= that.Xvalue) {
that.$playSound('error');
- that.$toast.fail(`宸茶揪鍒拌绠辨暟闄愬埗(${that.Xvalue})`);
+ //that.$toast.fail(`宸茶揪鍒拌绠辨暟闄愬埗(${that.Xvalue})`);
+ that.$dialog.alert({
+ message: `宸茶揪鍒拌绠辨暟闄愬埗(${that.Xvalue})`,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.XBar = "";
return;
}
//寰呰鏁�
- var Dvalue = (that.KbBarInfo.oldqty || 0) - +(that.KbBarInfo.ySum || 0)
+ var Dvalue = (that.KbBarInfo.quantity || 0) - +(that.KbBarInfo.ySum || 0)
// 妫�鏌ユ槸鍚﹁秴杩囪绠辨暟
if (that.Xvalue > Dvalue) {
that.$playSound('error');
- that.$toast.fail(`瑁呯鏁�(${that.Xvalue}) 涓嶈兘澶т簬 鍗℃澘寰呰鏁�(${Dvalue})`);
+ //that.$toast.fail(`瑁呯鏁�(${that.Xvalue}) 涓嶈兘澶т簬 鍗℃澘寰呰鏁�(${Dvalue})`);
+ that.$dialog.alert({
+ message: `瑁呯鏁�(${that.Xvalue}) 涓嶈兘澶т簬 鍗℃澘寰呰鏁�(${Dvalue})`,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.XBar = "";
return;
}
@@ -110,7 +172,13 @@
const isExist = that.XbarInfo.some(item => item.iteM_BARCODE === that.XBar);
if (isExist) {
that.$playSound('error');
- that.$toast.fail("璇ョ鏉＄爜宸插瓨鍦紝璇峰嬁閲嶅鎵弿");
+ //that.$toast.fail("璇ョ鏉＄爜宸插瓨鍦紝璇峰嬁閲嶅鎵弿");
+ that.$dialog.alert({
+ message: "璇ョ鏉＄爜宸插瓨鍦紝璇峰嬁閲嶅鎵弿",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.XBar = "";
return;
}
@@ -126,19 +194,40 @@
var json = res;
if (json.status == 0) {
that.XbarInfo.push(json.data.tbBillList.xBarInfo[0]);
+ that.$playSound('success');
that.$refs.XBar.focus();
that.XBar = "";
+
+ // 妫�鏌ユ槸鍚﹁秴杩囪绠辨暟
+ if (that.XbarInfo.length >= that.Xvalue) {
+ that.$refs.LsBar.focus();
+ }
+
}
else {
that.$playSound('error');
- that.$toast.fail(json.message);
+ that.XBar = "";
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
+ that.XBar = "";
that.$playSound('error');
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
});
},
productBinding() {
@@ -177,7 +266,13 @@
}
else {
that.$playSound('error');
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$refs.ZsBar.focus();
that.ZsBar = null;
that.ZsBar = null;
@@ -188,7 +283,13 @@
.catch(function (error) {
that.isLoading = false;
that.$playSound('error');
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$refs.ZsBar.focus();
that.ZsBar = null;
that.ZsBar = null;
@@ -234,26 +335,49 @@
}
else {
that.$playSound('error');
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
that.$playSound('error');
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
});
}
} else {
that.$playSound('error');
- that.$toast.fail("鏈壘鍒板尮閰嶇殑绠辨潯鐮�");
+ //that.$toast.fail("鏈壘鍒板尮閰嶇殑绠辨潯鐮�");
+ that.$dialog.alert({
+ message: "鏈壘鍒板尮閰嶇殑绠辨潯鐮�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
}
that.LsBar = ""; // 娓呯┖杈撳叆妗�
},
- GetWeightByXt() {
-
+ handleClear() {
+ this.KbBar = "";
+ this.XBar = "";
+ this.LsBar = "";
+ this.DAA001 = [];
+ this.XbarInfo = [];
+
},
// 鏂板鏂规硶锛氭彁浜ゆ墍鏈夊凡鏍稿鐨勬暟鎹�
@@ -279,7 +403,13 @@
that.getKbBarInfo();
} else {
that.$playSound('error');
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.XbarInfo = [];
that.XBar = "";
that.LsBar = "";
@@ -290,7 +420,13 @@
.catch(function (error) {
that.isLoading = false;
that.$playSound('error');
- that.$toast.fail("缁戝畾澶辫触锛岃閲嶈瘯锛�");
+ //that.$toast.fail("缁戝畾澶辫触锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
});
},
handleSubmit() {
@@ -307,12 +443,18 @@
}
// 璁＄畻鍙鏁板拰宸茶鏁�
- const oldqty = +(that.KbBarInfo.oldqty || 0);
+ const oldqty = +(that.KbBarInfo.quantity || 0);
const ySum = +(that.KbBarInfo.ySum || 0);
if (oldqty !== ySum) {
that.$playSound('error');
- that.$toast.fail(`瑁呮澘鏈畬鎴愶紝寰呰鏁帮細${oldqty - ySum}`);
+ //that.$toast.fail(`瑁呮澘鏈畬鎴愶紝寰呰鏁帮細${oldqty - ySum}`);
+ that.$dialog.alert({
+ message: `瑁呮澘鏈畬鎴愶紝寰呰鏁帮細${oldqty - ySum}`,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
return;
}
@@ -333,16 +475,241 @@
that.$refs.KbBar.focus();
} else {
that.$playSound('error');
- that.$toast.fail(json.message);
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
that.$playSound('error');
- that.$toast.fail("鎻愪氦澶辫触锛岃閲嶈瘯锛�");
+ //that.$toast.fail("鎻愪氦澶辫触锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
that.$refs.KbBar.focus();
});
},
+
+ onSelect(action) {
+ 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;
+ },
+
+ onSelectAgvDw(action) {
+ this.AgvDw = action.name;
+ this.showAgvDw = false;
+ },
+
+ selectDW() {
+ this.showAgvDw = true;
+ },
+
+ //鑾峰彇鍙懠鍙獳GV鐨勭嚎浣�
+ selectXt() {
+ this.show = true;
+ var that = this;
+ that.actions = [];
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/GetAgvXt', {
+ selectKey: that.selectKey,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+
+ if (json.data.tbBillList.length <= 0) {
+ that.$toast.fail("娌℃湁鍙敤鐨勬暟鎹�");
+ that.$playSound('error');
+ } else {
+ that.itemInfo = json.data.tbBillList;
+ that.actions = json.data.tbBillList.map(item => {
+ return {
+ name: item.name,
+ lineNo: item.line_no, // 鏂板
+ agvPostion: item.agvPostion
+ };
+ });
+ }
+ }
+ else {
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$playSound('error');
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ //that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "缃戠粶閿欒锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$playSound('error');
+ console.log(error);
+ });
+ },
+
+ //AGV閫佹
+ handleAGVInspection() {
+
+ //this.$toast.fail("鍔熻兘寮�鍙戞祴璇曚腑锛�");
+ //return;
+
+ if (this.isLoading) {
+ return;
+ }
+
+
+ var that = this;
+ if (that.agvChecked === false)
+ {
+ that.$playSound('error');
+ that.$toast.fail("AGV閫佹璇峰厛鍕鹃�� AGV");
+ return;
+ }
+
+ if (!that.KbBar) {
+ that.$playSound('error');
+ that.$toast.fail("璇峰厛鎵弿鍗℃澘鏉＄爜");
+ return;
+ }
+
+ if (!that.AgvDw) {
+ that.$playSound('error');
+ that.$toast.fail("璇峰厛閫夋嫨AGV鐐逛綅");
+ return;
+ }
+
+ // 璁＄畻鍙鏁板拰宸茶鏁�
+ const oldqty = +(that.KbBarInfo.quantity || 0);
+ const ySum = +(that.KbBarInfo.ySum || 0);
+
+ if (oldqty !== ySum) {
+ that.$playSound('error');
+ //that.$toast.fail(`瑁呮澘鏈畬鎴愶紝寰呰鏁帮細${oldqty - ySum}`);
+ that.$dialog.alert({
+ message: `瑁呮澘鏈畬鎴愶紝寰呰鏁帮細${oldqty - ySum}`,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ return;
+ }
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/handleAGVInspection', {
+ KbBar: that.KbBar,
+ userAccount: that.userInfo.loginAccount,
+ AgvDw: that.AgvDw
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.$playSound('success');
+ that.$notify({ type: 'success', message: json.message });
+ } else {
+ that.$playSound('error');
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
+ //that.$toast.fail("AGV閫佹澶辫触锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "AGV閫佹澶辫触锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$refs.KbBar.focus();
+ });
+ },
+
+ //AGV鍛煎彨
+ handleAGVCall() {
+ //this.$toast.fail("鍔熻兘寮�鍙戞祴璇曚腑锛�");
+ //return;
+
+ if (this.isLoading) {
+ return;
+ }
+
+ var that = this;
+ if (!that.xtNum) {
+ that.$playSound('error');
+ that.$toast.fail("璇峰厛閫夋嫨绾夸綋");
+ return;
+ }
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/handleAGVCall', {
+ XtNum: that.xtNum,
+ userAccount: that.userInfo.loginAccount,
+ AgvDw: that.AgvDw
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.$playSound('success');
+ that.$notify({ type: 'success', message: json.message });
+ } else {
+ that.$playSound('error');
+ //that.$toast.fail(json.message);
+ that.$dialog.alert({
+ message: json.message,
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
+ //that.$toast.fail("AGV鍛煎彨澶辫触锛岃閲嶈瘯锛�");
+ that.$dialog.alert({
+ message: "AGV鍛煎彨澶辫触锛岃閲嶈瘯锛�",
+ theme: 'round-button',
+ }).then(() => {
+ // on close
+ });
+ that.$refs.KbBar.focus();
+ });
+ }
+
+
}
})
\ No newline at end of file
--
Gitblit v1.9.3