1.内箱核对添加音效
2.产品绑定优化
3.核对送检优化
4.界面优化
5.AGV送检
6.核对送检线体选择
7.AGV呼叫
已修改6个文件
179 ■■■■ 文件已修改
H5/Cpdbsj.aspx 62 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/Cpbdsj.js 104 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/Nxhd.js 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Nxhd.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Images/Style.css 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Mst.master 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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>
H5/Js/Cpbdsj.js
@@ -1,4 +1,5 @@
var vm = new Vue({

var vm = new Vue({
    el: '#app',
    data: function () {
        return {
@@ -31,6 +32,7 @@
            actions: [],//列表的值
            xtName: "",//线体名称
            xtNum: "",//线体编号
            agvChecked: false,//是否勾选AGV
        }
    },
    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到xtNum字段
            console.log("选择的线体编号:", this.xtNum);
            this.xtName = action.name;  // 绑定name到xtName字段
            this.show = false;
            console.log(item);
            // 正则匹配第一个方括号内容
            this.modeInfo.Xt = item;
        },
        //获取可呼叫AGV的线体
        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;
            }
        }
    }
})
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;
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>
Images/Style.css
@@ -586,7 +586,7 @@
/*全局按钮缩小*/
.van-nav-bar__left, .van-nav-bar__right {
    font-size: .25rem;
    font-size: .30rem;
}
/*调整搜索框字体的高度和大小*/
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>