From 65fd6feeeda0fba59dd93f2ea1a39311e5293289 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 18 八月 2025 09:52:13 +0800
Subject: [PATCH] 1.内箱核对添加音效 2.产品绑定优化 3.核对送检优化 4.界面优化 5.AGV送检 6.核对送检线体选择 7.AGV呼叫
---
Images/Style.css | 2
H5/Nxhd.aspx | 2
H5/Js/Cpbdsj.js | 104 ++++++++++++++++++++++++++++++----
H5/Cpdbsj.aspx | 62 +++++++++++++++-----
Mst.master | 2
H5/Js/Nxhd.js | 7 ++
6 files changed, 148 insertions(+), 31 deletions(-)
diff --git a/H5/Cpdbsj.aspx b/H5/Cpdbsj.aspx
index cfeaf59..91deba5 100644
--- a/H5/Cpdbsj.aspx
+++ b/H5/Cpdbsj.aspx
@@ -51,6 +51,12 @@
flex: 1; /* 绛夊垎鍓╀綑绌洪棿 */
min-width: 0; /* 闃叉鍐呭婧㈠嚭 */
}
+
+ .van-checkbox__icon--checked .van-icon
+ {
+ color: #ffffff !important;
+ }
+
</style>
</asp:Content>
@@ -82,7 +88,7 @@
<div class="si-status__left">
<span class="si-status__label">鍙鏁�</span>
</div>
- <div class="si-status__right">{{KbBarInfo.oldqty||0}}</div>
+ <div class="si-status__right">{{KbBarInfo.quantity||0}}</div>
</div>
<div class="si-status-box si-status--error">
@@ -90,7 +96,7 @@
<span class="si-status__label">寰呰鏁�</span>
</div>
<div class="si-status__right">
- {{ ((+(KbBarInfo.oldqty || 0) - +(KbBarInfo.ySum || 0)) || 0) }}
+ {{ ((+(KbBarInfo.quantity || 0) - +(KbBarInfo.ySum || 0)) || 0) }}
</div>
</div>
</div>
@@ -134,15 +140,25 @@
autofocus="true">
</van-field>
+
<van-field
ref="LsBar"
v-model="LsBar"
label="浜у搧鏉＄爜"
+ class="custom-label-field"
placeholder="璇锋壂浜у搧鏉＄爜"
@keyup.enter.native="checkProductBarcode"
autofocus="true">
+ <template #extra>
+ <span style="margin-right:8px">AGV</span>
+ <van-checkbox
+ v-model="agvChecked"
+ shape="round"
+ icon-size="18px">
+ </van-checkbox>
+ </template>
</van-field>
-
+
<van-field
ref="xtName"
v-model="xtName"
@@ -150,20 +166,34 @@
placeholder="璇烽�夋嫨绾垮埆"
autofocus="true"
@click.native="selectXt">
+ <template #button >
+ <van-button
+ style="background-color: #ffcc00;border-color: #ffcc00;color: white"
+ class="action-button reset-button"
+ @click.stop="handleAGVCall"
+ >鍛煎彨</van-button>
+ </template>
</van-field>
+ <div style="height: 10px"></div>
<!-- 淇敼鍚庣殑鎸夐挳瀹瑰櫒 -->
- <div class="button-container">
- <van-button
- type="warning"
- class="action-button reset-button"
- @click.native="handleClear"
- >閲嶇疆</van-button>
- <van-button
- type="info"
- class="action-button submit-button"
- @click.native="handleSubmit"
- >閫佹</van-button>
- </div>
+ <div class="button-container">
+ <van-button
+ type="warning"
+ class="action-button reset-button"
+ @click.native="handleClear"
+ >閲嶇疆</van-button>
+ <van-button
+ type="primary"
+ class="action-button"
+ @click.native="handleAGVInspection"
+ >閫佹</van-button>
+ <!-- style="background-color: #27f83f;border-color: #27f83f;color: white" -->
+ <van-button
+ type="info"
+ class="action-button submit-button"
+ @click.native="handleSubmit"
+ >鎻愪氦</van-button>
+ </div>
</van-cell-group>
</div>
@@ -223,5 +253,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Cpbdsj.js?<%=121111114211 %>"></script>
+ <script src="Js/Cpbdsj.js?<%=12111111421511 %>"></script>
</asp:Content>
\ No newline at end of file
diff --git a/H5/Js/Cpbdsj.js b/H5/Js/Cpbdsj.js
index f43b7c5..dd9009b 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 {
@@ -31,6 +32,7 @@
actions: [],//鍒楄〃鐨勫��
xtName: "",//绾夸綋鍚嶇О
xtNum: "",//绾夸綋缂栧彿
+ agvChecked: false,//鏄惁鍕鹃�堿GV
}
},
mounted() {
@@ -101,7 +103,7 @@
}
//寰呰鏁�
- 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');
@@ -130,8 +132,15 @@
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');
@@ -257,7 +266,12 @@
},
handleClear() {
-
+ this.KbBar = "";
+ this.XBar = "";
+ this.LsBar = "";
+ this.DAA001 = [];
+ this.XbarInfo = [];
+
},
// 鏂板鏂规硶锛氭彁浜ゆ墍鏈夊凡鏍稿鐨勬暟鎹�
@@ -311,7 +325,7 @@
}
// 璁＄畻鍙鏁板拰宸茶鏁�
- const oldqty = +(that.KbBarInfo.oldqty || 0);
+ const oldqty = +(that.KbBarInfo.quantity || 0);
const ySum = +(that.KbBarInfo.ySum || 0);
if (oldqty !== ySum) {
@@ -349,12 +363,11 @@
});
},
- onSelect(item) {
+ onSelect(action) {
+ this.xtNum = action.lineNo; // 缁戝畾line_no鍒皒tNum瀛楁
+ console.log("閫夋嫨鐨勭嚎浣撶紪鍙凤細", this.xtNum);
+ this.xtName = action.name; // 缁戝畾name鍒皒tName瀛楁
this.show = false;
- console.log(item);
- // 姝ｅ垯鍖归厤绗竴涓柟鎷彿鍐呭
- this.modeInfo.Xt = item;
-
},
//鑾峰彇鍙懠鍙獳GV鐨勭嚎浣�
selectXt() {
@@ -376,9 +389,8 @@
that.itemInfo = json.data.tbBillList;
that.actions = json.data.tbBillList.map(item => {
return {
- name: item.daaInfo, // 鎷兼帴瀛楁
- subname:"[绾夸綋鍚嶇О][]"
-
+ name: item.name,
+ lineNo: item.line_no // 鏂板
};
});
}
@@ -397,6 +409,74 @@
});
},
+ //AGV閫佹
+ handleAGVInspection() {
+
+ this.$toast.fail("鍔熻兘寮�鍙戞祴璇曚腑锛�");
+ return;
+
+ if (this.isLoading) {
+ return;
+ }
+
+ var that = this;
+ if (!that.KbBar) {
+ that.$playSound('error');
+ that.$toast.fail("璇峰厛鎵弿鍗℃澘鏉＄爜");
+ return;
+ }
+
+ // 璁＄畻鍙鏁板拰宸茶鏁�
+ const oldqty = +(that.KbBarInfo.quantity || 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/handleAGVInspection', {
+ 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 });
+ } 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();
+ });
+ },
+
+ //AGV鍛煎彨
+ handleAGVCall() {
+ this.$toast.fail("鍔熻兘寮�鍙戞祴璇曚腑锛�");
+ return;
+
+ if (this.isLoading) {
+ return;
+ }
+
+ var that = this;
+ if (!that.xtNum) {
+ that.$playSound('error');
+ that.$toast.fail("璇峰厛閫夋嫨绾夸綋");
+ return;
+ }
+ }
+
}
})
\ No newline at end of file
diff --git a/H5/Js/Nxhd.js b/H5/Js/Nxhd.js
index c761c81..4b350ad 100644
--- a/H5/Js/Nxhd.js
+++ b/H5/Js/Nxhd.js
@@ -45,6 +45,7 @@
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
that.$refs.ZsBar.focus();
that.ZsBar = "";
that.ZsBarInfo = [];
@@ -55,6 +56,7 @@
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
that.$refs.ZsBar.focus();
that.ZsBar = "";
that.ZsBarInfo = [];
@@ -70,10 +72,12 @@
var that = this;
if (that.ZsBar.length <= 0) {
that.$toast.fail("鍚庣洊鐮佷笉鑳戒负绌猴紒");
+ that.$playSound('error');
return;
}
if (that.LsBar.length <= 0) {
that.$toast.fail("绠辩爜涓嶈兘涓虹┖锛�");
+ that.$playSound('error');
return;
}
@@ -88,12 +92,14 @@
if (json.status == 0) {
// that.scanInfo = json.data.tbBillList;
that.$notify({ type: 'success', message: json.message });
+ that.$playSound('success');
that.$refs.ZsBar.focus();
that.ZsBar = null;
that.LsBar = null;
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
that.$refs.ZsBar.focus();
that.ZsBar = null;
that.LsBar = null;
@@ -104,6 +110,7 @@
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
that.$refs.ZsBar.focus();
that.ZsBar = null;
that.LsBar = null;
diff --git a/H5/Nxhd.aspx b/H5/Nxhd.aspx
index 44d803a..36d0880 100644
--- a/H5/Nxhd.aspx
+++ b/H5/Nxhd.aspx
@@ -155,5 +155,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Nxhd.js?<%=111 %>"></script>
+ <script src="Js/Nxhd.js?<%=1111 %>"></script>
</asp:Content>
\ No newline at end of file
diff --git a/Images/Style.css b/Images/Style.css
index dc02823..ba53a0b 100644
--- a/Images/Style.css
+++ b/Images/Style.css
@@ -586,7 +586,7 @@
/*鍏ㄥ眬鎸夐挳缂╁皬*/
.van-nav-bar__left, .van-nav-bar__right {
- font-size: .25rem;
+ font-size: .30rem;
}
/*璋冩暣鎼滅储妗嗗瓧浣撶殑楂樺害鍜屽ぇ灏�*/
diff --git a/Mst.master b/Mst.master
index c7642fe..4de648e 100644
--- a/Mst.master
+++ b/Mst.master
@@ -14,7 +14,7 @@
<script src="/scripts/config.js?<%=123611118 %>"></script>
<link href="/scripts/vant/vant.css" rel="stylesheet" />
<script src="/scripts/vant/vant.js"></script>
- <link href="/Images/Style.css?<%=169950 %>" rel="stylesheet" />
+ <link href="/Images/Style.css?<%=169951 %>" rel="stylesheet" />
<script src="/Scripts/uni.webview.1.5.2.js"></script>
<asp:ContentPlaceHolder ID="head" runat="server">
</asp:ContentPlaceHolder>
--
Gitblit v1.9.3