1.巡检新增工位扫描
2.生产报工优化
3.生产领料条码打印优化
4.产品绑定送检新增AGV
5.产品绑定提交优化
已修改12个文件
230 ■■■■ 文件已修改
H5/Cpbd.aspx 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Cpdbsj.aspx 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/IPQC_XJ/Add.aspx 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/Cpbdsj.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/IPQC_XJ/Add.js 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/My.js 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/Scbg.js 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/Scll.js 76 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/My.aspx 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Qtck.aspx 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Scbg.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Scll.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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>
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>
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>
H5/Js/Cpbdsj.js
@@ -27,6 +27,8 @@
                //}
            ],
            DAA001: [],
            show: false,//列表展示
            actions: [],//列表的值
        }
    },
    mounted() {
@@ -344,5 +346,7 @@
                    that.$refs.KbBar.focus();
                });
        },
    }
})
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)
            })
        },
    }
})
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({
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() {
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;
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>
H5/Qtck.aspx
@@ -47,6 +47,7 @@
  :right-icon-size="19"
     v-model="itemNo"
  v-focus.noKeyboard
     disabled
></van-field>
   <van-field
  value=""
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>
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>