From 99cda620b8e070ea621b1b6dfa8b555790186d89 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 01 八月 2025 08:38:17 +0800
Subject: [PATCH] 1.巡检新增工位扫描 2.生产报工优化 3.生产领料条码打印优化 4.产品绑定送检新增AGV 5.产品绑定提交优化
---
H5/My.aspx | 14 ++-
H5/Cpbd.aspx | 9 +-
H5/Js/My.js | 10 ++
H5/Scll.aspx | 2
H5/Js/Scll.js | 76 +++++++++---------
H5/Js/Cpbdsj.js | 4 +
H5/Cpdbsj.aspx | 9 +
H5/Js/Scbg.js | 24 ++++++
H5/Scbg.aspx | 2
H5/IPQC_XJ/Add.aspx | 20 +++-
H5/Js/IPQC_XJ/Add.js | 59 ++++++++++++++
H5/Qtck.aspx | 1
12 files changed, 169 insertions(+), 61 deletions(-)
diff --git a/H5/Cpbd.aspx b/H5/Cpbd.aspx
index fa882d2..4e1286d 100644
--- a/H5/Cpbd.aspx
+++ b/H5/Cpbd.aspx
@@ -1,4 +1,5 @@
-锘�<%@ Page Title="浜у搧缁戝畾" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="Cpbd.aspx.cs" Inherits="H5_Cpbd" %>
+锘�
+<%@ Page Title="浜у搧缁戝畾" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="Cpbd.aspx.cs" Inherits="H5_Cpbd" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
<style>
.si-status-box,
@@ -69,7 +70,7 @@
v-model="LsBar"
label="鍚庣洊鏉＄爜"
placeholder="璇锋壂鍚庣洊鐮�"
-<%-- @keyup.enter.native="getModel" --%>
+ @keyup.enter.native="productBinding"
autofocus="true">
</van-field>
@@ -129,7 +130,7 @@
</van-row>
</van-tab>
- <van-tab title="宸茬粦鏉＄爜" class="mySolid font">
+<%-- <van-tab title="宸茬粦鏉＄爜" class="mySolid font">
<van-row>
<van-col span="5">浜哄憳</van-col>
<van-col span="5">浜х嚎</van-col>
@@ -144,7 +145,7 @@
<van-col span="4" >{{itm.fQty}}</van-col>
<van-col span="5" >{{itm.sQty}}</van-col>
</van-row>
- </van-tab>
+ </van-tab>--%>
</van-tabs>
</div>
</asp:Content>
diff --git a/H5/Cpdbsj.aspx b/H5/Cpdbsj.aspx
index 6571905..ce50fb4 100644
--- a/H5/Cpdbsj.aspx
+++ b/H5/Cpdbsj.aspx
@@ -143,13 +143,14 @@
autofocus="true">
</van-field>
-<%-- <van-field
+ <van-field
ref="LsBar"
v-model="LsBar"
label="绾垮埆"
placeholder="璇烽�夋嫨绾垮埆"
- autofocus="true">
- </van-field>--%>
+ autofocus="true"
+ onclick="">
+ </van-field>
<!-- 淇敼鍚庣殑鎸夐挳瀹瑰櫒 -->
<div class="button-container">
<van-button
@@ -167,6 +168,8 @@
</van-cell-group>
</div>
+ <van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
+
<van-tabs color="#000" title-active-color="#0283EF">
<van-tab title="绠辨槑缁�" class="mySolid font">
<van-row>
diff --git a/H5/IPQC_XJ/Add.aspx b/H5/IPQC_XJ/Add.aspx
index 5b6a04b..03f3081 100644
--- a/H5/IPQC_XJ/Add.aspx
+++ b/H5/IPQC_XJ/Add.aspx
@@ -89,11 +89,15 @@
:right-icon-size="19"
v-model="selectKey"
><template #button>
- <van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
+ <van-button size="small" type="info" @click="getInfo" >閫夋嫨</van-button>
</template></van-field>
<van-action-sheet v-model="daashow" :actions="actions" @select="onSelect" ></van-action-sheet>
- <van-field label="鎸囦护宸ュ崟" colon="true" v-model="formData.lotNo" @keyup.enter.native="createByWomdaa" ></van-field>
+ <van-field label="鎸囦护宸ュ崟" colon="true" v-model="formData.lotNo" @keyup.enter.native="createByWomdaa" >
+ <template #button>
+ <van-button size="small" type="info" @click="scanOnH5DAA " >鎵弿</van-button>
+ </template>
+ </van-field>
<van-field label="妫�楠屾椂娈�" colon="true" v-model="formData.checkTimeSlot" readonly ></van-field>
<%-- <van-field label="鍒涘缓鏃堕棿" colon="true" v-model="formData.createDate" readonly ></van-field>
<van-field label="鍒涘缓浜�" colon="true" v-model="formData.createBy" readonly ></van-field>--%>
@@ -118,10 +122,16 @@
<div class="wrap-content">{{ remarks }}</div>
</template>
<template #button>
- <van-tag type="primary" style="font-size:15px" @click="updateRemarks(formData.guid)">杈撳叆</van-tag>
+ <%--<van-tag type="primary" style="font-size:15px" @click="updateRemarks(formData.guid)">杈撳叆</van-tag>--%>
+ <van-button size="small" type="info" @click="updateRemarks(formData.guid)" >杈撳叆</van-button>
</template>
</van-field>
- <van-field label="妫�楠屽伐浣�" colon="true" v-model="jyGw" @keyup.enter.native="selIpqcItemsByGw" ></van-field>
+ <van-field label="妫�楠屽伐浣�" colon="true" v-model="jyGw" @keyup.enter.native="selIpqcItemsByGw" >
+ <template #button>
+ <van-button size="small" type="info" @click="scanOnH5GW" >鎵弿</van-button>
+<%-- <van-tag type="primary" style="font-size:15px" @click="scanOnH5">鎵弿</van-tag>--%>
+ </template>
+ </van-field>
<van-dialog v-model="showDialog" title="涓嶅悎鏍兼弿杩�" :show-cancel-button="false" @confirm="remarksConfirm">
<van-field
v-model="remarks"
@@ -358,5 +368,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="../Js/IPQC_XJ/Add.js?<%=111111111113 %>"></script>
+ <script src="../Js/IPQC_XJ/Add.js?<%=111111111124 %>"></script>
</asp:Content>
diff --git a/H5/Js/Cpbdsj.js b/H5/Js/Cpbdsj.js
index 4860244..cab435f 100644
--- a/H5/Js/Cpbdsj.js
+++ b/H5/Js/Cpbdsj.js
@@ -27,6 +27,8 @@
//}
],
DAA001: [],
+ show: false,//鍒楄〃灞曠ず
+ actions: [],//鍒楄〃鐨勫��
}
},
mounted() {
@@ -344,5 +346,7 @@
that.$refs.KbBar.focus();
});
},
+
+
}
})
\ No newline at end of file
diff --git a/H5/Js/IPQC_XJ/Add.js b/H5/Js/IPQC_XJ/Add.js
index 954f9aa..0f6f4b0 100644
--- a/H5/Js/IPQC_XJ/Add.js
+++ b/H5/Js/IPQC_XJ/Add.js
@@ -52,7 +52,24 @@
}
},
mounted() {
- var that = this;
+ let that = this;
+ //璇诲彇鎵爜beg 2025-7-25
+ window.msgFromUniapp = function (arg) {
+ //alert(arg.txtName);
+ //alert("鎵爜鐨勭粨鏋�:" + arg.msg);
+ //alert("宸ヤ綅鐮�:" + that.jyGw);
+ if (arg.txtName === "GW") {
+ that.jyGw = arg.msg;
+ that.selIpqcItemsByGw();
+ }
+ else if (arg.txtName === "DAA") {
+ that.formData.lotNo = arg.msg;
+ that.createByWomdaa();
+ }
+
+
+ }
+ //璇诲彇鎵爜end
this.userInfo = {
loginGuid: this.GetLoginInfor().loginGuid,
loginAccount: this.GetLoginInfor().loginAccount,
@@ -60,7 +77,16 @@
this.formData.id = this.Request("id"),
this.formData.releaseNo = this.Request("releaseNo");
this.formData.lotNo = this.Request("lotNo");
+
+ ////璇诲彇鎵爜beg 2025-7-25
+ //let that = this;
+ //window.msgFromUniapp = function (arg) {
+ // alert("鎵爜鐨勭粨鏋�:" + arg.msg);
+ //}
+ ////璇诲彇鎵爜end
+
this.init();
+
},
methods: {
// 杈撳叆杩囨护
@@ -537,6 +563,7 @@
},
//妫�楠岄」鐩壂鎻忓伐浣嶅彲鍋氭楠�
selIpqcItemsByGw() {
+ //alert("寮�濮嬪伐浣�");
const that = this;
var guid1 = that.formData.guid;//涓昏〃id
return that.AxiosHttp("post", 'Ipqc/selIpqcItemsByGw', {
@@ -561,5 +588,35 @@
console.error('Refresh error:', error);
});
},
+
+ //鎵弿宸ヤ綅
+ scanOnH5GW() {
+ let sendData = {
+ Type: 'Scan',
+ txtName: 'GW',
+ Barcode: '',
+ Detail: '',
+ Ip: '',
+ Port: '',
+ }
+ uni.webView.postMessage({
+ data: JSON.stringify(sendData)
+ })
+ },
+
+ //鎵弿宸ュ崟
+ scanOnH5DAA() {
+ let sendData = {
+ Type: 'Scan',
+ txtName: 'DAA',
+ Barcode: '',
+ Detail: '',
+ Ip: '',
+ Port: '',
+ }
+ uni.webView.postMessage({
+ data: JSON.stringify(sendData)
+ })
+ },
}
})
\ No newline at end of file
diff --git a/H5/Js/My.js b/H5/Js/My.js
index 3e71506..f1a936a 100644
--- a/H5/Js/My.js
+++ b/H5/Js/My.js
@@ -71,10 +71,16 @@
// on cancel
});
},
+ //goMsg() {
+ // var that = this;
+ // window.location.href = "/H5/Message.aspx";
+ //},
goMsg() {
var that = this;
- window.location.href = "/H5/Message.aspx";
- },
+ uni.navigateTo({
+ url: "/pages/index/test/PrintInit?type=1",
+
+ });
goOrg() {
var that = this;
this.$dialog.confirm({
diff --git a/H5/Js/Scbg.js b/H5/Js/Scbg.js
index b12a9e1..cbafb1f 100644
--- a/H5/Js/Scbg.js
+++ b/H5/Js/Scbg.js
@@ -35,6 +35,30 @@
loginGuid: this.GetLoginInfor().loginGuid,
loginAccount: this.GetLoginInfor().loginAccount,
};
+
+ that.AxiosHttp("post", 'MesStaff/GetList', {
+ //name: that.userInfo.loginAccount,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.actions = json.data.tbBillList.map(item => {
+ return { name: item.staffName }
+ });
+
+ that.stafList = json.data.tbBillList;
+ }
+ else {
+ that.$toast.fail(json.message);
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ console.log(error);
+ });
+
},
methods: {
getInfo() {
diff --git a/H5/Js/Scll.js b/H5/Js/Scll.js
index 94a8b49..7545889 100644
--- a/H5/Js/Scll.js
+++ b/H5/Js/Scll.js
@@ -164,7 +164,7 @@
that.$notify({ type: 'success', message: json.message });
that.$playSound('success');
- that.sendMessage(json.data.tbBillList);
+ that.sendPrintMessage(json.data.tbBillList);
that.$refs.barcode.focus();
that.getModel();
@@ -183,43 +183,43 @@
},
- sendMessage(tbBillList) {
- const cfDetails = tbBillList.cfBarInfo.map(item => {
- return "! 0 200 200 210 1\r\n" +
- "PAGE - WIDTH 700 \r\n" +
- "BOX 0 0 700 180 0 \r\n" +
- `T 16 0 10 10 鐗╂枡缂栫爜锛歕r\n` +
- `T 55 3 120 10 ${item.iteM_NO}\r\n` +
- `T 16 0 310 10 ${item.item_name}\r\n` +
- "T 55 2 10 42 鐗╂枡瑙勬牸锛歕r\n" +
- `T 55 2 110 42 ${item.item_model}\r\n` +
- "T 16 0 10 78 鏁伴噺锛歕r\n" +
- `T 0 5 90 78 ${item.quantity}\r\n` +
- `T 16 5 180 78 ${item.barType}\r\n` +
- `BARCODE 128 1 25 35 350 130 ${item.iteM_BARCODE}\r\n` +
- `T 0 1 350 130 ${item.iteM_BARCODE}\r\n` +
- "T 55 0 10 125 鍒涘缓鏃堕棿锛歕r\n" +
- `T 55 0 120 125 ${item.creatE_DATE}\r\n` +
- "T 55 0 10 150 鎵撳嵃鏃堕棿锛歕r\n" +
- `T 55 0 120 150 ${item.print_date}\r\n` +
- "B QR 580 12 M 2 U 4\r\n" +
- `MA,${item.iteM_BARCODE}\r\n` +
- "ENDQR\r\nFORM\r\nPRINT\r\n";
- });
- //alert(cfDetails);
- let sendData = {
- Type: 'Bar',
- Barcode: tbBillList.cfBarInfo[0].iteM_BARCODE,
- Detail: cfDetails,
- Ip: tbBillList.printInfo[0].ip,
- Port: tbBillList.printInfo[0].port,
- }
- console.log('sendMessage 寮�濮�1:')
- console.log('sendMessage 寮�濮�2:' + JSON.stringify(sendData))
- uni.webView.postMessage({
- data: JSON.stringify(sendData)
- })
- },
+ //sendMessage(tbBillList) {
+ // const cfDetails = tbBillList.cfBarInfo.map(item => {
+ // return "! 0 200 200 210 1\r\n" +
+ // "PAGE - WIDTH 700 \r\n" +
+ // "BOX 0 0 700 180 0 \r\n" +
+ // `T 16 0 10 10 鐗╂枡缂栫爜锛歕r\n` +
+ // `T 55 3 120 10 ${item.iteM_NO}\r\n` +
+ // `T 16 0 310 10 ${item.item_name}\r\n` +
+ // "T 55 2 10 42 鐗╂枡瑙勬牸锛歕r\n" +
+ // `T 55 2 110 42 ${item.item_model}\r\n` +
+ // "T 16 0 10 78 鏁伴噺锛歕r\n" +
+ // `T 0 5 90 78 ${item.quantity}\r\n` +
+ // `T 16 5 180 78 ${item.barType}\r\n` +
+ // `BARCODE 128 1 25 35 350 130 ${item.iteM_BARCODE}\r\n` +
+ // `T 0 1 350 130 ${item.iteM_BARCODE}\r\n` +
+ // "T 55 0 10 125 鍒涘缓鏃堕棿锛歕r\n" +
+ // `T 55 0 120 125 ${item.creatE_DATE}\r\n` +
+ // "T 55 0 10 150 鎵撳嵃鏃堕棿锛歕r\n" +
+ // `T 55 0 120 150 ${item.print_date}\r\n` +
+ // "B QR 580 12 M 2 U 4\r\n" +
+ // `MA,${item.iteM_BARCODE}\r\n` +
+ // "ENDQR\r\nFORM\r\nPRINT\r\n";
+ // });
+ // //alert(cfDetails);
+ // let sendData = {
+ // Type: 'Bar',
+ // Barcode: tbBillList.cfBarInfo[0].iteM_BARCODE,
+ // Detail: cfDetails,
+ // Ip: tbBillList.printInfo[0].ip,
+ // Port: tbBillList.printInfo[0].port,
+ // }
+ // console.log('sendMessage 寮�濮�1:')
+ // console.log('sendMessage 寮�濮�2:' + JSON.stringify(sendData))
+ // uni.webView.postMessage({
+ // data: JSON.stringify(sendData)
+ // })
+ //},
//getPrintInfo() {
// var that = this;
diff --git a/H5/My.aspx b/H5/My.aspx
index 91a2481..b1cc18a 100644
--- a/H5/My.aspx
+++ b/H5/My.aspx
@@ -21,22 +21,24 @@
</dl>
</div>
<van-cell-group>
-<%-- <van-field
+ <%--<van-field
readonly
is-link
v-model="cardType"
label="鍒囨崲缁勭粐"
placeholder="绁堢Η鑲′唤"
@click="goOrg"
-></van-field>
+>
+
+ </van-field>--%>
<van-field
readonly
is-link
v-model="cardType"
- label="娑堟伅涓績"
- placeholder="15鏉�"
+ label="鎵撳嵃閰嶇疆"
+ placeholder=""
@click="goMsg()"
- ></van-field>--%>
+ ></van-field>
<van-field
readonly
@@ -53,6 +55,6 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
<script src="Js/comWebNav.js"></script>
- <script src="Js/My.js?<%=12345 %>"></script>
+ <script src="Js/My.js?<%=123451 %>"></script>
</asp:Content>
diff --git a/H5/Qtck.aspx b/H5/Qtck.aspx
index 1a48f8a..d1cdb55 100644
--- a/H5/Qtck.aspx
+++ b/H5/Qtck.aspx
@@ -47,6 +47,7 @@
:right-icon-size="19"
v-model="itemNo"
v-focus.noKeyboard
+ disabled
></van-field>
<van-field
value=""
diff --git a/H5/Scbg.aspx b/H5/Scbg.aspx
index 78ebfd8..b52bd29 100644
--- a/H5/Scbg.aspx
+++ b/H5/Scbg.aspx
@@ -131,5 +131,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Scbg.js?<%=12327 %>"></script>
+ <script src="Js/Scbg.js?<%=12328 %>"></script>
</asp:Content>
diff --git a/H5/Scll.aspx b/H5/Scll.aspx
index 8f21329..acf83ae 100644
--- a/H5/Scll.aspx
+++ b/H5/Scll.aspx
@@ -138,5 +138,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Scll.js?<%=123336154 %>"></script>
+ <script src="Js/Scll.js?<%=123336155 %>"></script>
</asp:Content>
\ No newline at end of file
--
Gitblit v1.9.3