1

llj

2026-02-24 50ceb8be38852f1a32825a7d172bd9a4d4db241d

1

 WebTM/WebTM.csproj

@@ -204,9 +204,13 @@
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBackBill_CheckList_PDA.html" />
    <Content Include="views\WMS扫码模块\销售出库\Kf_SellOutBackBill_Check_PDA.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_Car.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CostCenter.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CostItem.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_Driver.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ItemMoney.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CarList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CostCenter.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CostItem.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_DriverList.html" />
    <Content Include="views\基础资料\公用基础资料\Cg_ContractTransportBillEdit.html" />
    <Content Include="views\包装出入库明细\Kf_PackStockDetailQuery.html" />
@@ -662,6 +666,7 @@
    <Content Include="views\成本管理\成本费用单\CB_ItemMoneyBillList.html" />
    <Content Include="views\成本管理\成本费用单\CB_ItemMoneyBillEdit.html" />
    <Content Include="views\成本管理\费用单引入\CB_CostProjectImport.html" />
    <Content Include="views\成本管理\费用单引入\CB_CostAccounting.html" />
    <Content Include="views\成本管理\费用单引入\CB_ItemMoneyBillImport.html" />
    <Content Include="views\成本管理\费用单引入\CB_ItemMoneyBill_Excel.html" />
    <Content Include="views\条码明细\Kf_MateOutBillList_CodeDetail.html" />

 WebTM/WebTM.csproj.user

@@ -5,9 +5,9 @@
    <NameOfLastUsedPublishProfile>D:\工作代码\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <NameOfLastUsedPublishProfile>D:\智云LMes\MESWMS-LayUI\WebTM\Properties\PublishProfiles\SWETM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\GitHub\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 WebTM/views/»ù´¡×ÊÁÏ/³É±¾»ù´¡×ÊÁÏ/Add_Edit_Gy_CostAverageType.html

@@ -40,8 +40,8 @@
                                lay-submit="" lay-filter="set_SaveBill">保存</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit=""
                                lay-filter="Cancel">退出</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button"
                                lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">审核</button>
                            <!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button"
                                lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">审核</button>-->
                        </div>
                    </div>
                    <div class="layui-form-item" style="padding-top: 10px;">
@@ -373,9 +373,9 @@
                    success: function (result) {
                        if (result.code == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data[0];
                            var IsHStopflag = data.禁用标记;
                            var IsHStopflag = data.禁用标志;
                            //禁用标记
                            if (IsHStopflag) {
                            if (IsHStopflag=="Y") {
                                $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
                            }
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值

 WebTM/views/³É±¾¹ÜÀí/·ÑÓõ¥ÒýÈë/CB_CostAccounting.html

New file
@@ -0,0 +1,373 @@
<!DOCTYPE html>
<html>
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>费用单引入</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>

    <style type="text/css">
        .loader {
            border: 8px solid #f3f3f3; /* Light grey */
            border-top: 8px solid #3498db; /* Blue */
            border-radius: 50%;
            width: 50px;
            height: 50px;
            animation: spin 2s linear infinite;
        }
        input.layui-input.layui-unselect {
            padding-right: 0;
        }
    </style>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <h1 style="text-align: center; padding: 30px 0;"><b>成本核算</b></h1>
                            <div class="layui-colla-item" style="padding-top:20px;">
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">组织</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HProdORGID" id="HProdORGID" lay-verify="HProdORGID" disabled>-->
                                            <!--动态渲染组织-->
                                        <!--</select>
                                    </div>
                                </div>-->
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">引入类型</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        
                                        <select name="HType" id="HType" lay-verify="HType">
                                            <option value="1" selected="selected">成本核算</option>
                                            <!--<option value="2">费用成本引入</option>-->
                                            
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">å¹´</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        
                                        <select name="HYear" id="HYear" lay-verify="HYear">
                                            <option value="2023">2023å¹´</option>
                                            <option value="2024">2024å¹´</option>
                                            <option value="2025">2025å¹´</option>
                                            <option value="2026" selected="selected">2026å¹´</option>
                                            <option value="2027">2027å¹´</option>
                                            <option value="2028">2028å¹´</option>
                                            <option value="2029">2029å¹´</option>
                                            <option value="2030">2030å¹´</option>
                                            <option value="2031">2031å¹´</option>
                                            <option value="2032">2032å¹´</option>
                                            <option value="2033">2033å¹´</option>
                                            <option value="2034">2034å¹´</option>
                                            <option value="2035">2035å¹´</option>
                                            <option value="2036">2036å¹´</option>
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">月</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HMonth" id="HMonth" lay-verify="HMonth">
                                            <option value="1">1月</option>
                                            <option value="2">2月</option>
                                            <option value="3">3月</option>
                                            <option value="4">4月</option>
                                            <option value="5">5月</option>
                                            <option value="6">6月</option>
                                            <option value="7">7月</option>
                                            <option value="8">8月</option>
                                            <option value="9">9月</option>
                                            <option value="10">10月</option>
                                            <option value="11">11月</option>
                                            <option value="12">12月</option>
                                        </select>
                                        
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">生产车间</label>
                                    <div class="layui-input-block" style="margin-left: 77px;">
                                        <input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                        <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;margin-right: 3px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    </div>
                                </div>-->
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn_Import" id="btn_Import" style="padding:0 30px;margin-left:50px;">开始引入</button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn_Cancel" id="btn_Cancel" style="padding:0 20px">退出</button>
                            </div>
                            <div class="layui-colla-item" style="height:600px;margin-top:20px;">
                                <font size="5" color="blue" id="HRemark"></font>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script type="text/javascript">
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element', 'tableSelect'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , tableSelect = layui.tableSelect;
            var HModName = "CB_CostAccounting";
            var HMaker = sessionStorage["HUserName"]
            var HStockOrgID = sessionStorage["OrganizationID"]  //组织ID
            //#endregion

            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            if (sessionStorage.login != "login") {
                layer.confirm("登录失效，请重新登录！", {
                    icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
                }, function () { window.location.href = "../../user/login.html"; });
            }
            //#region åˆå§‹åŒ–界面

            set_ClearBill();

            function set_ClearBill() {
                // èŽ·å–当前日期
                var currentDate = new Date();
                var currentYear = currentDate.getFullYear();
                var currentMonth = currentDate.getMonth() + 1; // æœˆä»½ä»Ž0开始，所以要+1

                // è®¾ç½®é»˜è®¤é€‰ä¸­å½“前年份
                var yearSelect = document.getElementById('HYear');
                if (yearSelect) {
                    yearSelect.value = currentYear;
                }

                // è®¾ç½®é»˜è®¤é€‰ä¸­å½“前月份
                var monthSelect = document.getElementById('HMonth');
                if (monthSelect) {
                    monthSelect.value = currentMonth;
                }
                //部门输入框
                tableSelect.render({
                    elem: '#HWorkShopIDName',//输入框dom选择
                    searchKey: '部门名称,HItemID',//查询的列名
                    sWhere: " and ç¦ç”¨æ ‡è®° = '' and è½¦é—´æ ‡è®° = 'Y' ",//table搜索sWhere条件 //默认筛选项
                    ajaxSelect: function (sWhere) {
                        var data = '';
                        $.ajax({
                            url: GetWEBURL() + '/Gy_Department/list',
                            type: "GET",
                            data: { "sWhere": sWhere, "user": HMaker, "Organization": sessionStorage["Organization"] },
                            async: false,
                            success: function (data1) {
                                if (data1.count == 1) {
                                    data = data1.data
                                }
                            },
                            error: function () {
                                layer.alert('获取列表失败！', { icon: 15, title: '通信错误' });
                            }
                        });
                        return data;
                    },//设置前端分页时可以设置的
                    table: {
                        //url: GetWEBURL() + 'Gy_Supplier/page',
                        //where: { user: '翁涛涛', Organization: '浙江智云迈思' },
                        cols: [[
                            { type: 'radio', fixed: 'left' },//需要加这个fixed属性不然点击checkbox会触发行点击导致无法正确点击
                            { field: 'HItemID', title: 'HItemID' },
                            { field: '部门名称', title: '部门名称' },
                        ]],
                        page: true,
                        limit: 5,
                        limits: [5]
                    },
                    done: function (elem, data) {
                        if (data != []) {
                            $("#HWorkShopIDName").val(data.data[0]['部门名称']);
                            $("#HWorkShopID").val(data.data[0]['HItemID']);
                        }

                    }
                })
                Organ();
            }
            //生产车间
            form.on('submit(btnHWorkShopID)', function (data) {
                btnHWorkShopID();
            });

            //#endregion

            //#region å¼€å§‹è´¹ç”¨å¼•å…¥
            form.on('submit(btn_Import)', function (data) {
                if (set_ModCheck("CB_ItemMoneyBillImport") == true) {
                    var index = layer.open({
                        type: 1, // page å±‚类型
                        area: ['20%', '20%'],
                        shade: 0.6, // é®ç½©é€æ˜Žåº¦
                        shadeClose: false, // ç‚¹å‡»é®ç½©åŒºåŸŸï¼Œä¸å…³é—­å¼¹å±‚
                        maxmin: false, // ä¸å…è®¸å…¨å±æœ€å°åŒ–
                        anim: 0, // 0-6 çš„动画形式，-1 ä¸å¼€å¯
                        content: '<div style="padding: 12px;">正在运算,请耐心等待!!!<div class="loader" style="height:10px;width:10px;"></div></div>'
                    });
                    setTimeout(function () {
                        set_Calculate(data);
                        layer.close(index);
                        layer.close(index1);
                    }, 1000)
                }
                
            });

            //权限判定
            function set_ModCheck(ModRightNameCheck) {
                var Permission = false;
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //方法所在页面和方法名
                    async: false,
                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            Permission = true;
                        } else {
                            layer.alert("当前模块没有权限!", { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                return Permission;
            }

            function set_Calculate() {
                //var HWorkShopID = $("#HWorkShopID").val();
                //if (HWorkShopID == 0) {
                //    layer.close(ajaxLoad);
                //    layer.msg("请选择部门");
                //    return
                //}
                var HMonth = $("#HMonth").val();
                var HYear = $("#HYear").val();
                var Type = $("#HType").val();
                //欠料运算
                
                var sql = `exec h_p_CB_ItemMoneyBillImport ${HYear},${HMonth},${Type},'${HMaker}',${HStockOrgID}`;
                var startTime = new Date().getTime();
                $.ajax({
                    url: GetWEBURL() + '/Gy_SOPBillList/WindowPrintList',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sql },
                    success: function (data1) {
                        // è®¡ç®—请求花费的时间
                        var endTime = new Date().getTime();
                        var executionTime = endTime - startTime; // æ¯«ç§’
                        var executionTimeInSeconds = (executionTime / 1000).toFixed(2); // è½¬æ¢ä¸ºç§’并保留两位小数
                        if (data1.count == 1) {
                            layer.msg("完成费用引入");
                            // åŒæ ·ä½¿ç”¨setTimeout延迟显示执行时间（在错误处理中也计算时间）
                            setTimeout(function () {
                                layer.msg("执行时间: " + executionTimeInSeconds + " ç§’");
                                layer.close(ajaxLoad);
                            }, 1000);
                        } else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //#region èŽ·å–组织
            function Organ() {
                //获取登录页组织列
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetOrganizations",
                    success: function (result) {
                        var Organization = "";
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
                            }
                            $("#HProdORGID").append(Organization);
                            $("#HProdORGID").val(sessionStorage["OrganizationID"])
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#endregion

            //#region é€€å‡º
            form.on('submit(btn_Cancel)', function () {
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    Pub_Close(2);
                });
            })
            //#endregion

            //#region é€‰æ‹©ç”Ÿäº§è½¦é—´
            function btnHWorkShopID() {
                var HOrgName = $(".layui-form-select input").val();
                layer.open({
                    type: 2 //类型
                    , skin: 'layui-layer-rim'//加上边框
                    , area: ['90%', '90%']//大小
                    , title: '生产车间列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_DepartmentList.html?Type=1&HOrgName=' + HOrgName, 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        //获取数据
                        $("#HWorkShopID").val(checkStatus.data[0].HItemID);//车间id
                        $("#HWorkShopIDName").val(checkStatus.data[0].部门名称);//车间名称
                        /*get_WriteConfigFile();*/
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }
            //#endregion
        });
        function GetHDeptNameValue(obj)  //返回采购部门
        {
            $("#HWorkShopID").val(obj[0].HItemID);//车间id
            $("#HWorkShopIDName").val(obj[0].部门名称);//车间名称
        }
        //以上为layui模块
        //此处方法涉及到被外部页面parent.方法名调用的必须放在Layui方法外部
    </script>
</body>
</html>

 WebTM/views/ÖÊÁ¿¹ÜÀí/³ö³§¼ìÑéµ¥/QC_OutCompCheckBill.html

@@ -424,11 +424,11 @@
                    </div>

                    <!--表体信息-->
                    <div class="layui-tab layui-tab-card">
                    <div class="layui-tab layui-tab-card" lay-filter="bottomTable">
                        <ul class="layui-tab-title">
                            <li class="layui-this">检验项目</li>
                            <li>抽样检验</li>
                            <li>检测值</li>
                            <li lay-id="1" class="layui-this">检验项目</li>
                            <li lay-id="2">抽样检验</li>
                            <li lay-id="3">检测值</li>
                        </ul>
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
@@ -1740,7 +1740,10 @@
                } else {
                    isFristClick = false;
                }

                //自动跳转到检测值页签
                if (sessionStorage["OrganizationID"] != "100007") {
                    element.tabChange('bottomTable', '3');  //跳转页签
                }
            });

            //行内事件--检验项目

 WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBill.html

@@ -304,11 +304,11 @@
                        </div>
                    </div>
                    <!--<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>-->
                    <div class="layui-tab layui-tab-card">
                    <div class="layui-tab layui-tab-card"  lay-filter="bottomTable">
                        <ul class="layui-tab-title">
                            <li class="layui-this">检验项目</li>
                            <li>抽样检验</li>
                            <li>检测值</li>
                            <li lay-id="1" class="layui-this">检验项目</li>
                            <li lay-id="2">抽样检验</li>
                            <li lay-id="3">检测值</li>
                        </ul>
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
@@ -3167,6 +3167,10 @@
                } else {
                    isFristClick = false;
                }
                //自动跳转到检测值页签
                if (sessionStorage["OrganizationID"] != "100007") {
                    element.tabChange('bottomTable', '3');  //跳转页签
                }
            });
            //#endregion


 WebTM/views/ÖÊÁ¿¹ÜÀí/À´ÁϼìÑéµ¥/QC_Add_Edit_POStockInCheckBillList.html

@@ -447,11 +447,11 @@
                        </div>
                    </div>
                    <!--<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>-->
                    <div class="layui-tab layui-tab-card">
                    <div class="layui-tab layui-tab-card" lay-filter="bottomTable">
                        <ul class="layui-tab-title">
                            <li class="layui-this">检验项目</li>
                            <li>抽样检验</li>
                            <li>检测值</li>
                            <li lay-id="1" class="layui-this">检验项目</li>
                            <li lay-id="2">抽样检验</li>
                            <li lay-id="3">检测值</li>
                        </ul>
                        <div class="layui-tab-content">
                            <div class="layui-tab-item layui-show">
@@ -3536,7 +3536,10 @@
                } else {
                    isFristClick = false;
                }

                //自动跳转到检测值页签
                if (sessionStorage["OrganizationID"] != "100007") {
                    element.tabChange('bottomTable', '3');  //跳转页签
                }
            });
            //#endregion


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

@@ -67,7 +67,7 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料代码*</label>
                                                <div class="layui-input-block" style="margin-left: 77px;">
                                                    <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="width: 60%;display: inline-block;">
                                                    <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" style="width: 60%;display: inline-block;" placeholder="请选择蓝牙物料信息">
                                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater" id="btnSearchMater" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                    </button>
@@ -395,6 +395,11 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        var materName = checkStatus.data[0].物料名称;
                        if (!materName || materName.indexOf('蓝牙') === -1) {
                            layer.msg('请选择蓝牙物料！物料名称中必须包含"蓝牙"字样', { icon: 5 });
                            return; // ä¸å…³é—­å¼¹çª—，让用户重新选择
                        }
                        //获取数据
                        $("#HMaterID").val(checkStatus.data[0].HItemID);//物料id
                        $("#HMaterName").val(checkStatus.data[0].物料名称);//物料名称

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

@@ -547,8 +547,17 @@
                    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.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 + "%'";
@@ -556,12 +565,12 @@
                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 + "'";
                }
                //if (HDate) {
                //    sWhere += " and CONVERT(varchar(100),生产日期, 23) >= '" + HDate + "'";
                //}
                //if (HDate1) {
                //    sWhere += " and CONVERT(varchar(100),生产日期, 23) <= '" + HDate1 + "'";
                //}

                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存

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

@@ -335,7 +335,12 @@
            if (event.keyCode == 13) {
                var HBarCode = $('#HBarCode_SN').val();
                if (event.keyCode == 13) {

                    if (HBarCode.length !== 20) {
                        layer.msg("条码长度必须为20位！当前长度：" + HBarCode.length, { icon: 5 });
                        $("#HBarCode_SN").val("");
                        $("#HBarCode_SN").focus();
                        return false;
                    }
                    if (!checkHSNAndDate(HBarCode)) {
                        return
                    }