From 6acdfc2c867d8fde898a4cc67bdefa2b97f03e3e Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期三, 09 七月 2025 10:58:54 +0800
Subject: [PATCH] 1.条码入库前拆分优化 2.其他入库优化
---
H5/Js/Cpbdsj.js | 271 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 252 insertions(+), 19 deletions(-)
diff --git a/H5/Js/Cpbdsj.js b/H5/Js/Cpbdsj.js
index 8569726..e6e21c6 100644
--- a/H5/Js/Cpbdsj.js
+++ b/H5/Js/Cpbdsj.js
@@ -9,12 +9,24 @@
},
KbBar: "",//鍗℃澘鏉＄爜
LsBar: "",//鍚庣洊娴佹按鏉＄爜
+ XBar: "",//绠辨潯鐮�
UserName: Cookies.get('loginName'),//鐢ㄦ埛鍚嶇О
KbBarInfo: [],
KbBarMxInfo: [],
GX: "G007:鏍稿閫佹",
Xvalue:4,
- ItemDetail:[],
+ XbarInfo: [
+ //{
+ // iteM_BARCODE: "", // 鏉＄爜
+ // item_no: "", // 鐗╂枡缂栧彿
+ // item_name: "", // 鐗╂枡鍚嶇О
+ // item_model: "", // 瑙勬牸鍨嬪彿
+ // quantity: 0, // 鏁伴噺
+ // is_hedui: "0", // 鏄惁鏍稿(1:宸叉牳瀵� 0:鏈牳瀵�),
+ // weight: "" // 浜у搧閲嶉噺
+ //}
+ ],
+ DAA001: [],
}
},
mounted() {
@@ -35,12 +47,15 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
-
- that.$refs.LsBar.focus();
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 = "";
}
else {
+ that.$playSound('error');
that.$toast.fail(json.message);
that.$refs.KbBar.focus();
that.KbBar = "";
@@ -49,16 +64,97 @@
})
.catch(function (error) {
that.isLoading = false;
+ that.$playSound('error');
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$refs.KbBar.focus();
+ that.KbBar = "";
+ });
+ },
+ getXBarInfo() {
+ var that = this;
+ if (that.KbBar.length <= 0) {
+ that.$playSound('error');
+ that.$toast.fail("鍗℃澘鏉＄爜涓嶈兘涓虹┖锛�");
+ that.$refs.KbBar.focus();
+ that.XBar = "";
+ return;
+ }
+
+ if (that.DAA001.length <= 0) {
+ that.$playSound('error');
+ that.$toast.fail("鎸囦护宸ュ崟涓嶈兘涓虹┖锛�");
+ that.$refs.KbBar.focus();
+ that.XBar = "";
+ return;
+ }
+
+ // 妫�鏌ユ槸鍚﹁秴杩囪绠辨暟
+ if (that.XbarInfo.length >= that.Xvalue) {
+ that.$playSound('error');
+ that.$toast.fail(`宸茶揪鍒拌绠辨暟闄愬埗(${that.Xvalue})`);
+ that.XBar = "";
+ return;
+ }
+
+ //寰呰鏁�
+ var Dvalue = (that.KbBarInfo.oldqty || 0) - +(that.KbBarInfo.ySum || 0)
+ // 妫�鏌ユ槸鍚﹁秴杩囪绠辨暟
+ if (that.Xvalue > Dvalue) {
+ that.$playSound('error');
+ that.$toast.fail(`瑁呯鏁�(${that.Xvalue}) 涓嶈兘澶т簬 鍗℃澘寰呰鏁�(${Dvalue})`);
+ that.XBar = "";
+ return;
+ }
+
+ // 妫�鏌ユ潯鐮佹槸鍚﹀凡瀛樺湪
+ const isExist = that.XbarInfo.some(item => item.iteM_BARCODE === that.XBar);
+ if (isExist) {
+ that.$playSound('error');
+ that.$toast.fail("璇ョ鏉＄爜宸插瓨鍦紝璇峰嬁閲嶅鎵弿");
+ that.XBar = "";
+ return;
+ }
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/getXBarInfo', {
+ KbBar: that.KbBar,
+ DAA001: that.DAA001,
+ userName: that.userInfo.loginAccount,
+ Xbarcode: that.XBar
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.XbarInfo.push(json.data.tbBillList.xBarInfo[0]);
+ that.$refs.XBar.focus();
+ that.XBar = "";
+ }
+ else {
+ that.$playSound('error');
+ that.$toast.fail(json.message);
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
});
},
productBinding() {
+
+ if (this.isLoading) {
+ return;
+ }
+
var that = this;
if (that.ZsBar.length <= 0) {
+ that.$playSound('error');
that.$toast.fail("杩芥函鐮佷笉鑳戒负绌猴紒");
return;
}
if (that.LsBar.length <= 0) {
+ that.$playSound('error');
that.$toast.fail("鍚庣洊鐮佷笉鑳戒负绌猴紒");
return;
}
@@ -73,12 +169,14 @@
var json = res;
if (json.status == 0) {
// that.scanInfo = json.data.tbBillList;
+ that.$playSound('success');
that.$notify({ type: 'success', message: json.message });
that.$refs.ZsBar.focus();
that.ZsBar = null;
that.ZsBar = null;
}
else {
+ that.$playSound('error');
that.$toast.fail(json.message);
that.$refs.ZsBar.focus();
that.ZsBar = null;
@@ -89,27 +187,162 @@
})
.catch(function (error) {
that.isLoading = false;
+ that.$playSound('error');
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
that.$refs.ZsBar.focus();
that.ZsBar = null;
that.ZsBar = null;
});
},
- //鎵撳嵃鏈烘敞閲�
- //selectPrinter(printer) {
- // this.selectedPrinter = printer.printerId; // 鏇存柊閫変腑鐨勬墦鍗版満缂栧彿
- //},
- //confirmSelection() {
- // if (this.selectedPrinter) {
- // alert(`鎮ㄩ�夋嫨浜嗘墦鍗版満锛�${this.selectedPrinter}`);
- // // 鍦ㄨ繖閲屽鐞嗛�夋嫨缁撴灉锛屼緥濡傝皟鐢ㄦ帴鍙ｆ垨鏇存柊鐘舵��
- // this.isPrinterPopupVisible = false; // 鍏抽棴寮圭獥
- // } else {
- // alert('璇烽�夋嫨涓�涓墦鍗版満锛�');
- // }
- //},
- //onPrinterSelected(value) {
- // console.log('褰撳墠閫変腑鐨勬墦鍗版満缂栧彿:', value);
- //},
+ checkProductBarcode() {
+
+ var that = this;
+ if (!that.LsBar) {
+ that.$playSound('error');
+ that.$toast.fail("璇疯緭鍏ヤ骇鍝佹潯鐮�");
+ return;
+ }
+
+ // 鍦╔barInfo涓煡鎵惧尮閰嶇殑鏉＄爜
+ const matchedItem = that.XbarInfo.find(item =>
+ item.iteM_BARCODE === that.LsBar
+ );
+
+ if (matchedItem) {
+ if (matchedItem.is_hedui === "1") {
+ that.$toast("宸叉牳瀵�");
+ } else {
+
+ that.AxiosHttp("post", 'Womdaa/GetWeightByXt', {
+ LsBar: that.LsBar,
+ userName: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ var weigth = json.data.tbBillList.weight;
+ that.$set(matchedItem, 'is_hedui', "1");
+ that.$set(matchedItem, 'weight', weigth);
+ 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();
+ }
+ }
+ else {
+ that.$playSound('error');
+ that.$toast.fail(json.message);
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ });
+ }
+ } else {
+ that.$playSound('error');
+ that.$toast.fail("鏈壘鍒板尮閰嶇殑绠辨潯鐮�");
+ }
+
+ that.LsBar = ""; // 娓呯┖杈撳叆妗�
+ },
+
+ GetWeightByXt() {
+
+ },
+
+ // 鏂板鏂规硶锛氭彁浜ゆ墍鏈夊凡鏍稿鐨勬暟鎹�
+ submitAllChecked() {
+
+ if (this.isLoading) {
+ return;
+ }
+
+ var that = this;
+ that.isLoading = true;
+
+ that.AxiosHttp("post", 'Womdaa/submitAllChecked', {
+ XbarInfo: that.XbarInfo,
+ KbBar: that.KbBar,
+ userName: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.$playSound('success');
+ that.$notify({ type: 'success', message: json.message });
+ that.getKbBarInfo();
+ } else {
+ that.$playSound('error');
+ that.$toast.fail(json.message);
+ that.XbarInfo = [];
+ that.XBar = "";
+ that.LsBar = "";
+ that.$refs.XBar.focus();
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
+ that.$toast.fail("缁戝畾澶辫触锛岃閲嶈瘯锛�");
+ });
+ },
+ handleSubmit() {
+
+ if (this.isLoading) {
+ return;
+ }
+
+ var that = this;
+ if (!that.KbBar) {
+ that.$playSound('error');
+ that.$toast.fail("璇峰厛鎵弿鍗℃澘鏉＄爜");
+ return;
+ }
+
+ // 璁＄畻鍙鏁板拰宸茶鏁�
+ const oldqty = +(that.KbBarInfo.oldqty || 0);
+ const ySum = +(that.KbBarInfo.ySum || 0);
+
+ if (oldqty !== ySum) {
+ that.$playSound('error');
+ that.$toast.fail(`瑁呮澘鏈畬鎴愶紝寰呰鏁帮細${oldqty - ySum}`);
+ return;
+ }
+
+ that.isLoading = true;
+ that.AxiosHttp("post", 'Womdaa/submitInspection', {
+ KbBar: that.KbBar,
+ userAccount: that.userInfo.loginAccount
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.$playSound('success');
+ that.$notify({ type: 'success', message: json.message });
+ // 娓呯┖鏁版嵁
+ that.KbBar = "";
+ that.XbarInfo = [];
+ that.KbBarInfo = [];
+ that.$refs.KbBar.focus();
+ } else {
+ that.$playSound('error');
+ that.$toast.fail(json.message);
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$playSound('error');
+ that.$toast.fail("鎻愪氦澶辫触锛岃閲嶈瘯锛�");
+ that.$refs.KbBar.focus();
+ });
+ },
}
})
\ No newline at end of file
--
Gitblit v1.9.3