From fa6e9dafca9a987c0ad03e70cf2fc0d04bd7cc16 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 05 五月 2025 15:52:27 +0800
Subject: [PATCH] 1.生产补料/超领，新增防抖控制，防止条码重复扫描。 2.现场收料功能完成
---
H5/Js/Scbl.js | 6
H5/Xcsl.aspx | 84 ++++++++------
H5/Js/Xcsl.js | 241 ++++++----------------------------------
H5/Scbl.aspx | 2
4 files changed, 91 insertions(+), 242 deletions(-)
diff --git a/H5/Js/Scbl.js b/H5/Js/Scbl.js
index cbfdb80..9f00599 100644
--- a/H5/Js/Scbl.js
+++ b/H5/Js/Scbl.js
@@ -109,7 +109,11 @@
});
},
getBarcode() {
-
+ // 娣诲姞闃叉姈鍒ゆ柇
+ if (this.isLoading) {
+ return;
+ }
+
//this.barcode = value;
var that = this;
diff --git a/H5/Js/Xcsl.js b/H5/Js/Xcsl.js
index ac17cad..e250b2b 100644
--- a/H5/Js/Xcsl.js
+++ b/H5/Js/Xcsl.js
@@ -16,7 +16,9 @@
XbarInfo: [],
DAA001: [],
DAANum: "",
- ItemDetail: [],
+ xcslItemList: [], //鏉愭枡鍒楄〃
+ xcslWjsBarList: [],//鏈帴鏀跺垪琛�
+ xcslYjsBarList: [],//宸叉帴鏀跺垪琛�
}
},
mounted() {
@@ -27,83 +29,32 @@
};
},
methods: {
- getKbBarInfo() {
+ GetItemsXcsl() {
var that = this;
- that.isLoading = true;
- that.AxiosHttp("post", 'Womdaa/getKbBarInfo', {
- Xt: that.GX,
- Kbbarcode: that.KbBar
- }, false)
- .then(function (res) {
- var json = res;
- if (json.status == 0) {
- 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.$toast.fail(json.message);
- that.$refs.KbBar.focus();
- that.KbBar = "";
- }
- that.isLoading = false;
- })
- .catch(function (error) {
- that.isLoading = false;
- that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
- that.$refs.KbBar.focus();
- that.KbBar = "";
- });
- },
- getXBarInfo() {
- var that = this;
- if (that.KbBar.length <= 0) {
- that.$toast.fail("鍗℃澘鏉＄爜涓嶈兘涓虹┖锛�");
- that.$refs.KbBar.focus();
- that.XBar = "";
- return;
- }
if (that.DAA001.length <= 0) {
- that.$toast.fail("鎸囦护宸ュ崟涓嶈兘涓虹┖锛�");
- that.$refs.KbBar.focus();
- that.XBar = "";
- return;
- }
-
- // 妫�鏌ユ槸鍚﹁秴杩囪绠辨暟
- if (that.XbarInfo.length >= that.Xvalue) {
- that.$toast.fail(`宸茶揪鍒拌绠辨暟闄愬埗(${that.Xvalue})`);
- that.XBar = "";
- return;
- }
-
- // 妫�鏌ユ潯鐮佹槸鍚﹀凡瀛樺湪
- const isExist = that.XbarInfo.some(item => item.iteM_BARCODE === that.XBar);
- if (isExist) {
- that.$toast.fail("璇ョ鏉＄爜宸插瓨鍦紝璇峰嬁閲嶅鎵弿");
- that.XBar = "";
+ that.$toast.fail("宸ュ崟鍗曞彿涓嶈兘涓虹┖锛�");
+ that.$refs.DAA001.focus();
return;
}
that.isLoading = true;
- that.AxiosHttp("post", 'Womdaa/getXBarInfo', {
- Kbbarcode: that.KbBar,
- DAA001: that.DAA001,
- Xbarcode: that.XBar
+ that.AxiosHttp("post", 'Womdaa/GetItemsXcsl', {
+ daa001: that.DAA001
}, 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 = "";
+ that.DAANum = json.data.tbBillList.gD_Num;
+ that.xcslItemList = json.data.tbBillList.xcslItemList;
+ that.xcslWjsBarList = json.data.tbBillList.xcslWjsBarList;
+ that.xcslYjsBarList = json.data.tbBillList.xcslYjsBarList;
+ that.$refs.Bar.focus();
}
else {
that.$toast.fail(json.message);
+ that.$refs.DAA001.focus();
+ that.DAA001 = "";
}
that.isLoading = false;
})
@@ -112,167 +63,49 @@
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
});
},
-
-
- productBinding() {
- var that = this;
- if (that.ZsBar.length <= 0) {
- that.$toast.fail("杩芥函鐮佷笉鑳戒负绌猴紒");
+ ScanXcsl() {
+ // 娣诲姞闃叉姈鍒ゆ柇
+ if (this.isLoading) {
return;
}
- if (that.LsBar.length <= 0) {
- that.$toast.fail("鍚庣洊鐮佷笉鑳戒负绌猴紒");
+
+ var that = this;
+ if (that.Bar.length <= 0) {
+ that.$toast.fail("鐗╂枡鏉＄爜涓嶈兘涓虹┖锛�");
+ that.$refs.Bar.focus();
+ return;
+ }
+
+
+ if (that.DAA001.length <= 0) {
+ that.$toast.fail("宸ュ崟鍗曞彿涓嶈兘涓虹┖锛�");
+ that.$refs.DAA001.focus();
return;
}
that.isLoading = true;
- that.AxiosHttp("post", 'Womdaa/ProductBinding', {
- ZsBar: that.ZsBar,
- LsBar: that.LsBar,
- userName: that.userInfo.loginAccount,
+ that.AxiosHttp("post", 'Womdaa/ScanXcsl', {
+ DAA001: that.DAA001,
+ Bar: that.Bar,
+ userAccount: that.userInfo.loginAccount,
}, false)
.then(function (res) {
var json = res;
if (json.status == 0) {
// that.scanInfo = json.data.tbBillList;
that.$notify({ type: 'success', message: json.message });
- that.$refs.ZsBar.focus();
- that.ZsBar = null;
- that.ZsBar = null;
+ that.GetItemsXcsl();
}
else {
that.$toast.fail(json.message);
- that.$refs.ZsBar.focus();
- that.ZsBar = null;
- that.ZsBar = null;
}
-
that.isLoading = false;
+ that.$refs.Bar.focus();
+ that.Bar = "";
})
.catch(function (error) {
that.isLoading = false;
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.$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.$set(matchedItem, 'is_hedui', "1");
- that.$notify({ type: 'success', message: "鏍稿鎴愬姛" });
- that.LsBar = "";
- // 妫�鏌ユ槸鍚︽墍鏈夎閮藉凡鏍稿
- const allChecked = that.XbarInfo.every(item => item.is_hedui === "1");
- if (allChecked && that.XbarInfo.length > 0) {
- that.submitAllChecked();
- }
- }
- } else {
- that.$toast.fail("鏈壘鍒板尮閰嶇殑绠辨潯鐮�");
- }
-
- that.LsBar = ""; // 娓呯┖杈撳叆妗�
- },
-
- // 鏂板鏂规硶锛氭彁浜ゆ墍鏈夊凡鏍稿鐨勬暟鎹�
- submitAllChecked() {
- 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.$notify({ type: 'success', message: json.message });
- that.getKbBarInfo();
- } else {
- 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.$toast.fail("缁戝畾澶辫触锛岃閲嶈瘯锛�");
- });
- },
- handleSubmit() {
- var that = this;
- if (!that.KbBar) {
- that.$toast.fail("璇峰厛鎵弿鍗℃澘鏉＄爜");
- return;
- }
-
- // 璁＄畻鍙鏁板拰宸茶鏁�
- const oldqty = +(that.KbBarInfo.oldqty || 0);
- const ySum = +(that.KbBarInfo.ySum || 0);
-
- if (oldqty !== ySum) {
- 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.$notify({ type: 'success', message: json.tbBillList.message });
- // 娓呯┖鏁版嵁
- that.KbBar = "";
- that.XbarInfo = [];
- that.KbBarInfo = [];
- that.$refs.KbBar.focus();
- } else {
- that.$toast.fail(json.message);
- }
- that.isLoading = false;
- })
- .catch(function (error) {
- that.isLoading = false;
- that.$toast.fail("鎻愪氦澶辫触锛岃閲嶈瘯锛�");
- that.$refs.KbBar.focus();
});
},
}
diff --git a/H5/Scbl.aspx b/H5/Scbl.aspx
index 2c6bbbd..3f496b4 100644
--- a/H5/Scbl.aspx
+++ b/H5/Scbl.aspx
@@ -120,5 +120,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Scbl.js?<%=1231811 %>"></script>
+ <script src="Js/Scbl.js?<%=12318111 %>"></script>
</asp:Content>
diff --git a/H5/Xcsl.aspx b/H5/Xcsl.aspx
index 1069911..69fb4af 100644
--- a/H5/Xcsl.aspx
+++ b/H5/Xcsl.aspx
@@ -70,8 +70,8 @@
v-model="DAA001"
label="鎸囦护宸ュ崟"
placeholder="鎸囦护宸ュ崟"
+ @keyup.enter.native="GetItemsXcsl"
autofocus="true"
- readonly
>
</van-field>
@@ -86,9 +86,9 @@
<van-field
ref="Bar"
v-model="Bar"
- label="绠辨潯鐮�"
- placeholder="璇锋壂澶栫鐮�"
- @keyup.enter.native="getXBarInfo"
+ label="鐗╂枡鏉＄爜"
+ placeholder="璇锋壂鐗╂枡鏉＄爜"
+ @keyup.enter.native="ScanXcsl"
autofocus="true">
</van-field>
@@ -99,63 +99,75 @@
<van-tab title="鏉愭枡鍒楄〃" class="mySolid font">
<van-row>
<van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
- <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
<van-col span="4">澶囨枡鏁�</van-col>
<van-col span="4">鎺ユ敹鏁�</van-col>
+ <van-col span="8" class="text-left padding-left">鎵�灞炲崟鎹�</van-col>
</van-row>
- <van-row v-for="(itm,index) in ItemDetail.items" :key="index">
+ <van-row v-for="(itm,index) in xcslItemList" :key="index">
<van-col span="8" class="text-left padding-left">
- <div class="blue-text">{{itm.itemNo}}</div>
- <div>{{itm.itemName}}</div>
+ <div class="blue-text">{{itm.item_no}}</div>
+ <div>{{itm.item_name}}</div>
</van-col>
+ <van-col span="4" class="blue-text">{{itm.bL_Num}}</van-col>
+ <van-col span="4" class="blue-text">{{itm.jS_Num}}</van-col>
<van-col span="8" class="text-left padding-left">
- <div>{{itm.itemModel}}</div>
+ <div>{{itm.item_out_no}}</div>
</van-col>
- <van-col span="4" class="blue-text">{{itm.dsQty}}</van-col>
- <van-col span="4" class="blue-text">{{itm.dsQty}}</van-col>
</van-row>
</van-tab>
<van-tab title="鏈帴鏀跺垪琛�" class="mySolid font">
<van-row>
- <van-col span="7" class="text-left padding-left">鏉＄爜</van-col>
- <van-col span="7" class="text-left padding-left">鐗╂枡</van-col>
- <van-col span="7" class="text-left padding-left">瑙勬牸</van-col>
- <van-col span="3" >鏁伴噺</van-col>
+ <van-col span="5" class="text-left padding-left">鏉＄爜</van-col>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="3" class="text-left padding-left">鏁伴噺</van-col>
+ <van-col span="3" >浜哄憳</van-col>
+ <van-col span="5" >鏃堕棿</van-col>
</van-row>
<van-row
- v-for="(itm,index) in XbarInfo"
- :key="index"
- :style="{ background: itm.is_hedui === '1' ? '#e8f5e9 !important' : 'transparent' }">
- <van-col span="7" class="text-left padding-left">{{itm.iteM_BARCODE}}</van-col>
- <van-col span="7" class="text-left padding-left">
+ v-for="(itm,index) in xcslWjsBarList"
+ :key="index">
+ <van-col span="5" class="text-left padding-left">{{itm.iteM_BARCODE}}</van-col>
+ <van-col span="8" class="text-left padding-left">
<div class="blue-text">{{itm.item_no}}</div>
<div>{{itm.item_name}}</div>
</van-col>
- <van-col span="7" class="text-left padding-left">
- <div>{{itm.item_model}}</div>
+ <van-col span="3" class="text-left padding-left">
+ <div>{{itm.quantity}}</div>
</van-col>
- <van-col span="3" class="blue-text">{{itm.quantity}}</van-col>
+ <van-col span="3">
+ <div>{{itm.useR_NAME}}</div>
+ </van-col>
+ <van-col span="5">
+ <div>{{itm.create_date}}</div>
+ </van-col>
</van-row>
</van-tab>
- <van-tab title="宸叉帴鏀跺垪琛�" class="mySolid font">
+ <van-tab title="鏈帴鏀跺垪琛�" class="mySolid font">
<van-row>
- <van-col span="7" class="text-left padding-left">鏉＄爜</van-col>
- <van-col span="7" class="text-left padding-left">鐗╂枡</van-col>
- <van-col span="7" class="text-left padding-left">瑙勬牸</van-col>
- <van-col span="3" >鏁伴噺</van-col>
+ <van-col span="5" class="text-left padding-left">鏉＄爜</van-col>
+ <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+ <van-col span="3" class="text-left padding-left">鏁伴噺</van-col>
+ <van-col span="3" >鎺ユ敹浜�</van-col>
+ <van-col span="5" >鎺ユ敹鏃堕棿</van-col>
</van-row>
- <van-row v-for="(itm,index) in KbBarMxInfo" :key="index">
- <van-col span="7" class="text-left padding-left" >{{itm.iteM_BARCODE}}</van-col>
- <van-col span="7" class="text-left padding-left">
+ <van-row
+ v-for="(itm,index) in xcslYjsBarList"
+ :key="index">
+ <van-col span="5" class="text-left padding-left">{{itm.iteM_BARCODE}}</van-col>
+ <van-col span="8" class="text-left padding-left">
<div class="blue-text">{{itm.item_no}}</div>
<div>{{itm.item_name}}</div>
</van-col>
- <van-col span="7" class="text-left padding-left">
- <div>{{itm.item_model}}</div>
+ <van-col span="3" class="text-left padding-left">
+ <div>{{itm.quantity}}</div>
</van-col>
-
- <van-col span="3" class="blue-text">{{itm.quantity}}</van-col>
+ <van-col span="3">
+ <div>{{itm.useR_NAME}}</div>
+ </van-col>
+ <van-col span="5">
+ <div>{{itm.xcsL_CREATE_DATE}}</div>
+ </van-col>
</van-row>
</van-tab>
</van-tabs>
@@ -167,5 +179,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Xcsl.js?<%=1 %>"></script>
+ <script src="Js/Xcsl.js?<%=111 %>"></script>
</asp:Content>
\ No newline at end of file
--
Gitblit v1.9.3