Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

chenhaozhe

2026-04-14 909594494a1e9b6b4e8919c0268c2aebec16151b

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾_СÎÀ/Cj_ProcessItemStationPlatform_UnbindList.html

@@ -53,6 +53,18 @@
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBarcode_ZX" id="HBarcode_ZX" onfocus="this.select();">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:110px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:110px;">
                                    </div>
                                </div>

                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -185,7 +197,7 @@
            var titleData = ["hmainid","hsubid","HProdOrgID"];

            //#region ã€åŠ¨æ€èŽ·å–模块名称】
            var HModuleType = "";
            var HModuleType = "Cj_ProcessItemStationPlatform_UnbindList";
            //通过单据类型，从数据库动态获取单据模块命名,引用js文件 PageTitle.js
            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
            //#endregion
@@ -316,8 +328,10 @@
            //SN码回车方法
            $('#HBarcode_SN').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    get_FastQuery(2);
                }
                    //get_FastQuery(2);
                    $('#HBarcode_SN').val($('#HBarcode_SN').val() + ',')
                    //console.log($('#HBarcode_SN').val());
                }               
            });

            //栈板码回车方法
@@ -340,6 +354,8 @@

            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
                $("#HBeginDate").val(Format(new Date(new Date() - (1000 * 60 * 60 * 24 * 7)), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化表格
                set_InitGrid();
                //查询
@@ -453,6 +469,8 @@
                var HBarcode_SN = $("#HBarcode_SN").val();  //SN号
                var HBarcode_ZB = $("#HBarcode_ZB").val();  //栈板码
                var HBarcode_ZX = $("#HBarcode_ZX").val();  //中箱码
                var HDate = $("#HBeginDate").val();//开始日期
                var HDate1 = $("#HEndDate").val();//结束日期

                //任意字段过滤
                var ColName = $("#ColName").val();//复选框
@@ -531,16 +549,30 @@
                    sWhere += " and å·¥å•ç¼–号 like '%" + HICMOBillNo + "%'";
                }

                //if (HBarcode_SN) {
                //    sWhere += " and DSN like '%" + HBarcode_SN + "%'";
                //}
                if (HBarcode_SN) {
                    sWhere += " and DSN like '%" + HBarcode_SN + "%'";
                    HBarcode_SN = HBarcode_SN.substring(0, HBarcode_SN.length - 1)
                    HBarcode_SN = HBarcode_SN.replace(/，/g, ',')
                        .split(',')
                        .map(item => `'${item.trim()}'`)
                        .join(',');

                    console.log("处理结果:", HBarcode_SN);
                    sWhere += " and DSN in (" + HBarcode_SN + ")";
                }
                if (HBarcode_ZB) {
                    sWhere += "and  æ ˆæ¿ç  like '%" + HBarcode_ZB + "%'";

                }
                if (HBarcode_ZX) {
                    sWhere += "and  ä¸­ç®±ç  like '%" + HBarcode_ZX + "%'";

                }
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),生产日期, 23) >= '" + HDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),生产日期, 23) <= '" + HDate1 + "'";
                }

                get_Display(sWhere);
@@ -554,6 +586,8 @@
                $("#HBarcode_SN").val("");
                $("#HBarcode_ZB").val("");
                $("#HBarcode_ZX").val("");
                $("#HBeginDate").val(Format(new Date(new Date() - (1000 * 60 * 60 * 24 * 7)), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");