1

zrg

6 天以前 7fab50e365d752189a25d56bce9dbaa15c098d7a

1

 WebTM/WebTM.csproj.user

@@ -6,7 +6,7 @@
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <NameOfLastUsedPublishProfile>D:\智云LMes\MESWMS-LayUI\WebTM\Properties\PublishProfiles\SWETM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\工作代码\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\智云迈思\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -5,15 +5,15 @@
    //var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/API/";        //杜贺本地配置
    //var WEBURL = "http://localhost:81/API/"           //翁涛涛本地配置
    var WEBURL = "http://localhost:8082/API/";        //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/";          //陈镐哲本地配置
    // var WEBURL = "http://localhost:8082/API/";        //张瑞广本地配置
    // var WEBURL = "http://localhost:81/API/";          //陈镐哲本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //李林俊本地配置
    //var WEBURL = "http://localhost:8080/API/";        //王仪本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
   /* var WEBURL = "http://localhost:8082/LuBaoAPI/";  //余思杰本地配置*/
    //var WEBURL = "http://localhost:81/API/";            // é™ˆé•å“²æœ¬åœ°é…ç½®*/
    var WEBURL = "http://localhost:81/API/";            // é™ˆé•å“²æœ¬åœ°é…ç½®*/
     //var WEBURL = "http://localhost:8082/LuBaoAPI/";  //李林俊本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //奥邦

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_WorkStationList.html

@@ -381,8 +381,8 @@
                                    //OptionData = checkStatus.data[0];
                                    obj.update({
                                        "HMaterID": checkStatus.data[0].HItemID
                                        , "HMaterName": checkStatus.data[0].物料代码
                                        , "HMaterNumber": checkStatus.data[0].物料名称
                                        , "HMaterName": checkStatus.data[0].物料名称
                                        , "HMaterNumber": checkStatus.data[0].物料代码
                                    })
                                    layer.close(index);//关闭弹窗
                                }
@@ -390,8 +390,8 @@
                                    if (typeof (OptionData) != "undefined" && OptionData != [] && OptionData.length!=0) {
                                        obj.update({
                                            "HMaterID": OptionData.HItemID
                                            , "HMaterName": OptionData.物料代码
                                            , "HMaterNumber": OptionData.物料名称
                                            , "HMaterName": OptionData.物料名称
                                            , "HMaterNumber": OptionData.物料代码
                                        })
                                        OptionData = [];
                                    }

 WebTM/views/³É±¾¹ÜÀí/ÆÚ³õÔÚ²úÆ·±í/Gy_WIPBal_Excel.html

@@ -225,7 +225,8 @@
                    , { field: '工序代码', title: '工序代码', width: 120 }
                    , { field: '工序名称', title: '工序名称', width: 120 }
                    , { field: '期初金额', title: '期初金额', width: 120}
                    , { field: '期初数量', title: '期初数量', width: 120}
                    , { field: '期初数量', title: '期初数量', width: 120 }
                    , { field: '拼板数', title: '拼板数', width: 120 }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                ]]
            };

 WebTM/views/Ä£Öξ߹ÜÀí/Æ÷¾ßµã¼ì¹æ³Ìµ¥/Sc_MouldDotCheckRuleBillEdit.html

@@ -587,7 +587,7 @@
                    id: 'mainTable'
                    , elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: false
                    , limit: 50
                    , totalRow: true
                    , cellMinWidth: 120
                    , height: 500
@@ -893,7 +893,7 @@
                                                HDotCheckItem: checkStatus.data[i].点检项目名称,
                                                HDotCheckItemClassID: checkStatus.data[i].HDotCheckItemClassID,
                                                HDotCheckItemClassName: checkStatus.data[i].点检项目分类名称,

                                                HStdDotCheckResult: "OK"
                                            });
                                        }


 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdBackBillEdit.html

@@ -335,7 +335,7 @@
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
        }).use(['index', 'form', 'laydate', 'table', 'element', 'tableSelect'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
@@ -343,7 +343,9 @@
                , table = layui.table
                , form = layui.form
                , laydate = layui.laydate
                , element = layui.element;
                , element = layui.element
                , tableSelect = layui.tableSelect;

            var HModName = "Sc_MouldProdBackBillEdit";
            var HBillType = "3803";
            var HInterID = $('#HInterID').val()
@@ -1695,7 +1697,84 @@
            table.on('tool(mainTable)', function (obj) {
                set_GridDelete(obj);    //行内删除
                set_GridCellCheck(obj); //行内快捷键筛选
                //#region 
                //下拉搜索框
                tableSelect.render({
                    elem: 'td[data-field="HMaterNumber"] .layui-table-edit',
                    searchKey: '模具名称,模具编号',
                    sWhere: " ",//table搜索sWhere条件
                    ajaxSelect: function (sWhere) {
                        var data = [];
                        var ModRightNameSelect = 'Gy_MouldFileList';
                        $.ajax({
                            url: GetWEBURL() + '/Gy_Mould/page',
                            type: "GET",
                            async: false,
                            data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"], "page": 1, "size": 5 },
                            success: function (data1) {
                                if (data1.count>0) {
                                    data = data1.data
                                }
                            },
                            error: function () {
                                layer.alert('获取列表失败！', { icon: 15, title: '通信错误' });
                            }
                        });
                        return data;
                    },//设置前端分页时可以设置的
                    table: {
                        cols: [[
                            { type: 'radio', fixed: 'left' },
                            { field: 'hmainid', title: 'hmainid', hide: true },
                            , { field: '模具名称', title: '模具名称' }
                            , { field: '模具编号', title: '模具编号' }
                            , { field: '模具型号', title: '器具型号' }
                            , { field: 'HWhID', title: 'HWhID', hide: true }
                            , { field: '默认仓库', title: '默认仓库' }
                            , { field: 'HSPID', title: 'HSPID', hide: true }
                            , { field: '默认仓位', title: '默认仓位' }
                            , { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true }
                            , { field: '计量单位代码', title: '计量单位代码', sort: true }
                            , { field: '计量单位', title: '计量单位', sort: true }
                        ]],
                        page: true,
                        limit: 5,
                        //limits: [5]
                    },
                    done: function (elem, data) {
                        $(".layui-table-edit").blur();//单元格失去焦点
                        if (typeof (OptionData) != "undefined" && OptionData != []) {
                            obj.update({
                                "HMaterID": OptionData["hmainid"]
                                , "HMaterCode": data.data[0]["模具编号"]
                                , "HMaterName": data.data[0]["模具名称"]

                                , "HMaterModel": data.data[0]["模具型号"]
                                , "HUnitID": data.data[0]["HUnitID"]
                                , "HUnitNumber": data.data[0]["计量单位代码"]
                                , "HUnitName": data.data[0]["计量单位"]
                                , "HWHID": data.data[0]["HWhID"]
                                , "HWHName": data.data[0]["默认仓库"]
                                , "HWHNumber": data.data[0]["默认仓库代码"]
                                , "HSPID": data.data[0]["HSPID"]
                                , "HSPName": data.data[0]["默认仓位"]
                                , "HSPNumber": data.data[0]["默认仓位代码"]
                                , "HDesignLife": 0
                                , "HLeaveLife": 0
                                , "HQty": 1
                                , "HMoney": 0
                            })

                            table.render(option);
                        }
                        



                        //setTableByHMater(obj, data);
                    }
                })
                //#endregion
                var data = obj.data;
                if (obj.event == 'HDate') {
                    var field = $(this).data('field');

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdInBillEdit.html

@@ -385,7 +385,7 @@
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element', 'layer'], function () {
        }).use(['index', 'form', 'laydate', 'table', 'element', 'layer','tableSelect'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
@@ -395,6 +395,7 @@
                , laydate = layui.laydate
                , element = layui.element
                , layer = layui.layer
                , tableSelect = layui.tableSelect;
            //查询条件
            var option = [];
            var option1 = [];
@@ -448,7 +449,7 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;;
                var AddRow = table.cache['mainTable'];
                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 1, "HQty": 1, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
                console.log(NewRow);
                switch (obj.event) {
                    //新增一行
@@ -1035,7 +1036,7 @@
                //获取最大单据号
                get_MAXNum();
                $('#check-btn').addClass('layui-btn-disabled').attr('disabled', true);
                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 1, "HQty": 1, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
                table.render(option);
            }
            //获取最大单据号
@@ -1059,7 +1060,7 @@
            function set_EditFromGrid(linterid) {
                set_EditForm(linterid);  //编辑获取表头
                set_EditGrid(linterid);  //编辑获取表体
                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 1, "HQty": 1, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
                table.render(option);
            }
            //编辑获取表头
@@ -1254,7 +1255,7 @@
                                        var rowIndex = $(obj.tr).attr("data-index") * 1;  //attr("data-index")用于获取该tr元素上data-index属性的值*1转换类型然后赋值给rowIndex
                                        for (var i = 0; i < checkStatus.data.length; i++) {  //判断选中的数据的长度  ç”¨äºŽéåŽ†checkStatus.data数组中的每个元素
                                            if (rowIndex + i >= option.data.length) {           //判断rowIndex + i的索引超出了option.data数组的长度，说明option.data数组需要扩展以包含更多行
                                                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 1, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
                                                var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 1, "HQty": 1, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
                                                table.cache["mainTable"].push(NewRow);    //创建新的包含数组  ä¼ å…¥table.cache["mainTable"]数组
                                                option.data = table.cache["mainTable"];  //把传入 table.cache["mainTable"]数组的值赋值给option.data çš„属性
                                                table.render(option);//渲染界面
@@ -1266,7 +1267,7 @@
                                            option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID;
                                            option.data[rowIndex + i].HUnitCode = checkStatus.data[i].计量单位代码;
                                            option.data[rowIndex + i].HUnitName = checkStatus.data[i].计量单位;
                                            option.data[rowIndex + i].HWHID = checkStatus.data[i].HWHID;
                                            option.data[rowIndex + i].HWHID = checkStatus.data[i].HWhID;
                                            option.data[rowIndex + i].HWHName = checkStatus.data[i].默认仓库;
                                            option.data[rowIndex + i].HWHCode = checkStatus.data[i].默认仓库代码;
                                            option.data[rowIndex + i].HSPID = checkStatus.data[i].HSPID;
@@ -1518,6 +1519,85 @@
                        return false;
                    }
                })
                //#region 
                //下拉搜索框
                tableSelect.render({
                    elem: 'td[data-field="HMaterCode"] .layui-table-edit',
                    searchKey: '模具名称,模具编号',
                    sWhere: " ",//table搜索sWhere条件
                    ajaxSelect: function (sWhere) {
                        console.log("sWhere", sWhere)
                        var data = [];
                        var ModRightNameSelect = 'Gy_MouldFileList';
                        $.ajax({
                            url: GetWEBURL() + '/Gy_Mould/page',
                            type: "GET",
                            async: false,
                            data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"], "page":1, "size": 5},
                            success: function (data1) {
                                if (data1.count  >0) {
                                    data = data1.data
                                }
                            },
                            error: function () {
                                layer.alert('获取列表失败！', { icon: 15, title: '通信错误' });
                            }
                        });
                        return data;
                    },//设置前端分页时可以设置的
                    table: {
                        cols: [[
                            { type: 'radio', fixed: 'left' },
                            { field: 'hmainid', title: 'hmainid', hide: true },
                            , { field: '模具名称', title: '模具名称' }
                            , { field: '模具编号', title: '模具编号' }
                            , { field: '模具型号', title: '器具型号' }
                            , { field: 'HWhID', title: 'HWhID', hide: true}
                            , { field: '默认仓库', title: '默认仓库' }
                            , { field: 'HSPID', title: 'HSPID', hide: true }
                            , { field: '默认仓位', title: '默认仓位' }
                            , { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true }
                            , { field: '计量单位代码', title: '计量单位代码', sort: true }
                            , { field: '计量单位', title: '计量单位', sort: true }
                        ]],
                        page: true,
                        limit: 5,
                        //limits: [5]
                    },
                    done: function (elem, data) {
                        $(".layui-table-edit").blur();//单元格失去焦点
                        obj.update({
                            "HMaterID": data.data[0]["hmainid"]
                            , "HMaterCode": data. data[0]["模具编号"]
                            , "HMaterName": data. data[0]["模具名称"]

                            , "HMaterSpec": data.data[0]["模具型号"]
                            , "HUnitID": data.data[0]["HUnitID"]
                            , "HUnitCode": data.data[0]["计量单位代码"]
                            , "HUnitName": data.data[0]["计量单位"]
                            , "HWHID": data.data[0]["HWhID"]
                            , "HWHName": data.data[0]["默认仓库"]
                            , "HWHCode": data.data[0]["默认仓库代码"]
                            , "HSPID": data.data[0]["HSPID"]
                            , "HSPName": data.data[0]["默认仓位"]
                            , "HSPCode": data.data[0]["默认仓位代码"]

                            , "HDesignLife": 0
                            , "HLeaveLife": 0
                            , "HQty": 1
                            , "HMoney": 0
                        })

                        table.render(option);



                        //setTableByHMater(obj, data);
                    }
                })
                //#endregion


                //双击
                $('.layui-table-box tbody td[data-field="HMaterCode"]').off('dblclick').on('dblclick', function () {
                    //页面层-自定义
@@ -1589,6 +1669,7 @@
                    obj.event = "";
                });
            }

            //?
            function f_alert(sMsg) {
                layer.alert(sMsg, { icon: 5 });

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdOutBillEdit.html

@@ -335,7 +335,7 @@
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
        }).use(['index', 'form', 'laydate', 'table', 'element', 'tableSelect'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
@@ -343,7 +343,9 @@
                , table = layui.table
                , form = layui.form
                , laydate = layui.laydate
                , element = layui.element;
                , element = layui.element
                , tableSelect = layui.tableSelect;

            var HModName = "Sc_MouldProdOutBillEdit";
            var HBillType = "3802";
            var HInterID = $('#HInterID').val()
@@ -1696,7 +1698,81 @@
            table.on('tool(mainTable)', function (obj) {
                set_GridDelete(obj);    //行内删除
                set_GridCellCheck(obj); //行内快捷键筛选
                //#region 
                //下拉搜索框
                tableSelect.render({
                    elem: 'td[data-field="HMaterNumber"] .layui-table-edit',
                    searchKey: '模具名称,模具编号',
                    sWhere: " ",//table搜索sWhere条件
                    ajaxSelect: function (sWhere) {
                        var data = [];
                        var ModRightNameSelect = 'Gy_MouldFileList';
                        $.ajax({
                            url: GetWEBURL() + '/Gy_Mould/page',
                            type: "GET",
                            async: false,
                            data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"], "page": 1, "size": 5 },
                            success: function (data1) {
                                if (data1.count > 0) {
                                    data = data1.data
                                }
                            },
                            error: function () {
                                layer.alert('获取列表失败！', { icon: 15, title: '通信错误' });
                            }
                        });
                        return data;
                    },//设置前端分页时可以设置的
                    table: {
                        cols: [[
                            { type: 'radio', fixed: 'left' },
                            { field: 'hmainid', title: 'hmainid', hide: true },
                            , { field: '模具名称', title: '模具名称' }
                            , { field: '模具编号', title: '模具编号' }
                            , { field: '模具型号', title: '器具型号' }
                            , { field: 'HWhID', title: 'HWhID', hide: true }
                            , { field: '默认仓库', title: '默认仓库' }
                            , { field: 'HSPID', title: 'HSPID', hide: true }
                            , { field: '默认仓位', title: '默认仓位' }
                            , { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true }
                            , { field: '计量单位代码', title: '计量单位代码', sort: true }
                            , { field: '计量单位', title: '计量单位', sort: true }
                        ]],
                        page: true,
                        limit: 5,
                        //limits: [5]
                    },
                    done: function (elem, data) {
                        $(".layui-table-edit").blur();//单元格失去焦点
                        obj.update({
                            "HMaterID": data.data[0]["hmainid"]
                            , "HMaterNumber": data.data[0]["模具编号"]
                            , "HMaterName": data.data[0]["模具名称"]

                            , "HMaterModel": data.data[0]["模具型号"]
                            , "HUnitID": data.data[0]["HUnitID"]
                            , "HUnitNumber": data.data[0]["计量单位代码"]
                            , "HUnitName": data.data[0]["计量单位"]
                            , "HWHID": data.data[0]["当前仓库ID"]
                            , "HWHName": data.data[0]["当前仓库"]
                            , "HWHNumber": data.data[0]["当前仓库代码"]
                            , "HSPID": data.data[0]["当前仓位ID"]
                            , "HSPName": data.data[0]["当前仓位"]
                            , "HSPNumber": data.data[0]["当前仓位代码"]
                            , "HDesignLife": 0
                            , "HLeaveLife": 0
                            , "HQty": 1
                            , "HMoney": 0
                        })

                        table.render(option);



                        //setTableByHMater(obj, data);
                    }
                })
                //#endregion
                var data = obj.data;
                if (obj.event == 'HDate') {
                    var field = $(this).data('field');
@@ -1910,6 +1986,8 @@
                                }
                            })
                        }

                        
                        obj.event = "";
                        return false;
                    }

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldScrapOutBill.html

@@ -405,7 +405,7 @@
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element', 'util'], function () {
        }).use(['index', 'form', 'laydate', 'table', 'element', 'util', 'tableSelect'], function () {

            //#region å…¬ç”¨å˜é‡
            var $ = layui.$
@@ -415,7 +415,9 @@
                , form = layui.form
                , laydate = layui.laydate
                , element = layui.element
                , util = layui.util;
                , util = layui.util
                , tableSelect = layui.tableSelect;

            var option;
            var sBillType = "3832";
            var HModName = "Sc_MouldScrapOutBillEdit";
@@ -800,6 +802,81 @@
            table.on('tool(mainTable)', function (obj) {
                set_GridDelete(obj);   //行内删除
                set_GridCellCheck(obj); //行内快捷键筛选
                //#region 
                //下拉搜索框
                tableSelect.render({
                    elem: 'td[data-field="HMaterCode"] .layui-table-edit',
                    searchKey: '模具名称,模具编号',
                    sWhere: " ",//table搜索sWhere条件
                    ajaxSelect: function (sWhere) {
                        var data = [];
                        var ModRightNameSelect = 'Gy_MouldFileList';
                        $.ajax({
                            url: GetWEBURL() + '/Gy_Mould/page',
                            type: "GET",
                            async: false,
                            data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"], "page": 1, "size": 5 },
                            success: function (data1) {
                                if (data1.count > 0) {
                                    data = data1.data
                                }
                            },
                            error: function () {
                                layer.alert('获取列表失败！', { icon: 15, title: '通信错误' });
                            }
                        });
                        return data;
                    },//设置前端分页时可以设置的
                    table: {
                        cols: [[
                            { type: 'radio', fixed: 'left' },
                            { field: 'hmainid', title: 'hmainid', hide: true },
                            , { field: '模具名称', title: '模具名称' }
                            , { field: '模具编号', title: '模具编号' }
                            , { field: '模具型号', title: '器具型号' }
                            , { field: 'HWhID', title: 'HWhID', hide: true }
                            , { field: '默认仓库', title: '默认仓库' }
                            , { field: 'HSPID', title: 'HSPID', hide: true }
                            , { field: '默认仓位', title: '默认仓位' }
                            , { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true }
                            , { field: '计量单位代码', title: '计量单位代码', sort: true }
                            , { field: '计量单位', title: '计量单位', sort: true }
                        ]],
                        page: true,
                        limit: 5,
                        //limits: [5]
                    },
                    done: function (elem, data) {
                        $(".layui-table-edit").blur();//单元格失去焦点
                        obj.update({
                            "HMaterID": data.data[0]["hmainid"]
                            , "HMaterCode": data.data[0]["模具编号"]
                            , "HMaterName": data.data[0]["模具名称"]

                            , "HMaterSpec": data.data[0]["模具型号"]
                            , "HUnitID": data.data[0]["HUnitID"]
                            , "HUnitCode": data.data[0]["计量单位代码"]
                            , "HUnitName": data.data[0]["计量单位"]
                            , "HWHID": data.data[0]["当前仓库ID"]
                            , "HWHName": data.data[0]["当前仓库"]
                            , "HWHCode": data.data[0]["当前仓库代码"]
                            , "HSPID": data.data[0]["当前仓位ID"]
                            , "HSPName": data.data[0]["当前仓位"]
                            , "HSPCode": data.data[0]["当前仓位代码"]
                            , "HDesignLife": 0
                            , "HLeaveLife": 0
                            , "HQty": 1
                            , "HMoney": 0
                        })

                        //table.render(option);



                        //setTableByHMater(obj, data);
                    }
                })
                //#endregion
            });

            //表体监听单元格编辑
@@ -1724,9 +1801,11 @@
                                }
                            });
                        }
                        
                        obj.event = "";
                        return false;
                    }
                    
                })
                //双击
                $('.layui-table-box tbody td[data-field="HMaterCode"]').off('dblclick').on('dblclick', function () {

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_MouldFileList.html

@@ -607,27 +607,16 @@
                                        case 'Int64':
                                        case 'double':
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , totalRow: true
                                , height: 'full-50'
                                , page: false //开启分页
                                , limit: 50
                                , limits: [50, 500, 2000, 5000]
                                , cols: [col]
                                , data: data1.data
                                , done: function (res, curr, count) {
                                    soulTable.render(this);
                                }
                            };
                            
                            option.cols = [col];
                            option.data = data1.data;
                            optionPage.count = data1.count;//改变列表数据总数
                            laypage.render(optionPage);                          
                            //列设置
@@ -1291,7 +1280,7 @@
                var openType = params[params[0]]; //从参数中获取 æ‰“开方式  1直接打开 2其它页面通过选择按钮打开
                var addSWhere = "";
                if (typeof(openType) != "undefined") {
                    addSWhere = " and ä½œåºŸäºº = '' and å…³é—­äºº = '' and å®¡æ ¸äºº <> '' and ç¦ç”¨æ ‡è®° !='Y'";
                    addSWhere = " and ä½œåºŸäºº = '' and å…³é—­äºº = '' and å®¡æ ¸äºº <> ''";
                }
                return addSWhere;
            }

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_Add_MouldDotCheckBillList.html

@@ -969,7 +969,7 @@
                    id: 'mainTable'
                    , elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: false
                    , limit: 50
                    , totalRow: true
                    , cellMinWidth: 120
                    , height: 500

 WebTM/views/Éú²ú¹ÜÀí/¶©µ¥×´Ì¬·Ö²¼/Sc_OrderStateDistribution.html

@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html>

<head>
    <meta charset="utf-8" />
    <title>设备状态分布</title>
@@ -15,7 +16,7 @@
    <link href="../../../layuiadmin/layui/css/ReportPlatform.css" rel="stylesheet" />
    <style>
        /*树状图点击高亮变色*/
        .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
        .layui-tree-set-active>.layui-tree-entry .layui-tree-main {
            background: #aef0f7;
        }

@@ -23,17 +24,22 @@
            border: 1px solid #5FB878;
            height: 50px;
            border-radius: 5px;
            /*background: -webkit-gradient(linear, 0% 0%, 0% 50%,from(#262525), to(#262525));*/ /*谷歌*/
            /*background: -webkit-gradient(linear, 0% 0%, 0% 50%,from(#262525), to(#262525));*/
            /*谷歌*/
        }

        .bottomright {
            cursor: pointer; /*鼠标变成手指样式*/
            transition: all 0.1s; /*所有属性变化在0.6秒内执行动画*/
            cursor: pointer;
            /*鼠标变成手指样式*/
            transition: all 0.1s;
            /*所有属性变化在0.6秒内执行动画*/
        }

        .bottomright:hover {
           transform: scale(1.3); /*鼠标放上之后元素变成1.4倍大小*/
        }        
            transform: scale(1.3);
            /*鼠标放上之后元素变成1.4倍大小*/
        }

        .imgtitle {
            width: 70%;
            height: 50px;
@@ -57,13 +63,14 @@
            white-space: nowrap;
            text-overflow: ellipsis;
            overflow: hidden;
            }
        }

        .check1 {
            cursor: pointer; /*鼠标变成手指样式*/
            -webkit-transition: border linear .1s,-webkit-box-shadow linear .5s;
            border-color: rgba(0,148, 255,.75);
            -webkit-box-shadow: 0 0 18px rgba(0,148,255);
            cursor: pointer;
            /*鼠标变成手指样式*/
            -webkit-transition: border linear .1s, -webkit-box-shadow linear .5s;
            border-color: rgba(0, 148, 255, .75);
            -webkit-box-shadow: 0 0 18px rgba(0, 148, 255);
        }

        .prs {
@@ -80,7 +87,10 @@
            top: 6px;
        }

        .tr1-1, .tr1-2, .tr1-3, .tr1-4 {
        .tr1-1,
        .tr1-2,
        .tr1-3,
        .tr1-4 {
            margin-left: 3%;
            margin-top: 4%;
            height: 310px;
@@ -99,8 +109,42 @@
        .layui-icon {
            font-size: 20px;
        }

        .param-group {
            margin-bottom: 15px;
            border: 1px solid #e6e6e6;
            border-radius: 4px;
            overflow: hidden;
        }

        .group-title {
            background-color: #007dff;
            color: #fff;
            padding: 8px 12px;
            font-size: 32px;
            font-weight: bold;
        }

        .param-list {
            display: flex;
            flex-wrap: wrap;
            padding: 10px 20px;
            background-color: #f2f2f2;
        }

        .param-item {
            width: 24%;
            margin-bottom: 8px;
            font-size: 28px;
            color: #333;
        }

        .param-item span {
            color: #666;
        }
    </style>
</head>

<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
@@ -109,7 +153,8 @@
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-row">
                            <div class="layui-col-xs2 layui-inline" style="border: solid 1.5px #e0d6d64d;">
                                <div id="TreeTable" class="demo-tree demo-tree-box" style="height: 600px; overflow: scroll;"></div>
                                <div id="TreeTable" class="demo-tree demo-tree-box"
                                    style="height: 600px; overflow: scroll;"></div>
                            </div>
                            <div class="layui-col-xs9 layui-inline" style="border: solid 1.5px #e0d6d64d;">
                                <div id="btomleft" style="height:600px;display:block;overflow-y:auto;">
@@ -117,7 +162,8 @@
                                </div>
                            </div>
                            <div class="layui-col-xs1 layui-inline" style="border: solid 1.5px #e0d6d64d;">
                                <fieldset style="border: 1px solid #eee; box-shadow: 0 2px 5px 0 rgb(0 0 0 / 10%); height: 585px;">
                                <fieldset
                                    style="border: 1px solid #eee; box-shadow: 0 2px 5px 0 rgb(0 0 0 / 10%); height: 585px;">
                                    <legend style="color: #5FB878">操作台</legend>
                                    <div class="content4">
                                        <div class="layui-row layui-col-space10">
@@ -201,22 +247,32 @@
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-row layui-col-space10">
                                            <div class="layui-col-sm12 " onclick="showTechParam()">
                                                <div class="cnt bottomright">
                                                    <div class="btnM">
                                                        <span class="layui-icon layui-icon-layer imgicon"></span>
                                                    </div>
                                                    <span class="imgtitle">工艺参数</span>
                                                </div>
                                            </div>
                                        </div>
                                    </div>
                                </fieldset>
                            </div>
                        </div>
                        <div class="layui-row">
                            <div class="layui-col-xs3 layui-inline">
                                <div class="tr1-1" id="mychart11">   </div>
                                <div class="tr1-1" id="mychart11"> </div>
                            </div>
                            <div class="layui-col-xs3 layui-inline">
                                <div class="tr1-2" id="mychart22">   </div>
                                <div class="tr1-2" id="mychart22"> </div>
                            </div>
                            <div class="layui-col-xs3 layui-inline">
                                <div class="tr1-3" id="mychart3">   </div>
                                <div class="tr1-3" id="mychart3"> </div>
                            </div>
                            <div class="layui-col-xs3 layui-inline">
                                <div class="tr1-4" id="mychart4">   </div>
                                <div class="tr1-4" id="mychart4"> </div>
                            </div>
                        </div>
                    </form>
@@ -224,7 +280,10 @@
            </div>
        </div>
    </div>
    <!-- ç”¨äºŽé¢„渲染列表数据 é¡µé¢ä¸Šä¸æ˜¾ç¤º -->
    <div id="TechParamWrapper" style="padding: 10px; display: none;"></div>
</body>

</html>
<script>
    var wktag = 0;
@@ -233,6 +292,9 @@
    var HEquipName = "";//设备名称
    var HSourceID = "";//产线id
    var HDeptID = "";
    var Timer = null; // æ•°æ®è¯»å–定时器
    var EquipTechParamHtml = ''; // è®¾å¤‡å‚数弹窗渲染html
    var firstRunning = true;
    layui.config({
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
@@ -441,6 +503,22 @@
    });
    //#endregion

    //#region æ˜¾ç¤º å·¥è‰ºå‚数弹窗
    function showTechParam() {
        var TechParamPreLoading = document.getElementById("TechParamWrapper").innerHTML

        layer.open({
            skin: 'layui-layer-rim', //加上边框
            title: '查看设备工艺参数',
            type: 1,
            area: ['80%', '80%'], // å®½é«˜
            scrollbar: false,
            content: '<div id="TechParamWrapper-Modal" style="padding: 10px;">' + TechParamPreLoading + '</div>'
        });
    }
    //#endregon


    //工单列表选中
    function CheckBtom(obj, i) {
        workcode = $("#gd" + i + "").html(); //通过样式ID获取html内容(工单号)
@@ -456,15 +534,20 @@
        if (HEquipID != "" && HEquipID != null) {
            wktag = 1;
        }
        sWhere = {
            HDeptID: HDeptID
            , HSourceID: HSourceID
        // sWhere = {
        //     HDeptID: HDeptID
        //     , HSourceID: HSourceID,
        //     HEquipID: HEquipID
        // }
        // FourReport(JSON.stringify(sWhere));
        if (Timer.isRunning() == true) {
            Timer.stop()
        }
        FourReport(JSON.stringify(sWhere));
        Timer.start()
    }

    //查询 éƒ¨é—¨+产线 4个图表 èµ‹å€¼
    function FourReport(sWhere) {      
    function FourReport(sWhere) {
        $.ajax({
            url: GetWEBURL() + '/Sc_HEquipStateDistribution/Get_EquipStateDistribution_FourReport',
            type: "GET",
@@ -492,6 +575,8 @@
            }
        });
    }

    window.FourReport = FourReport;

    //柱状图
    function get_Histogram1(mychart11, chartData) {
@@ -654,7 +739,7 @@
        // æ›´æ–°å›¾è¡¨
        mychart22.setOption(option);
    }
 

    //饼图
    function get_Statistics(mychart3, chartData2) {
        // å¦‚æžœ chartData2 ä¸ºç©ºï¼Œæä¾›ä¸€ä¸ªâ€œæ— æ•°æ®â€æç¤º
@@ -1114,7 +1199,146 @@
        });
    }

    // è®¢å•è¯»å–定时器 é»˜è®¤1分钟读取一次
    function TimerClock(interval = 60000, immediate = true) {
        // ç§æœ‰å˜é‡ï¼šå­˜å‚¨å®šæ—¶å™¨ID
        let timerId = null;
        // ç§æœ‰å˜é‡ï¼šè®°å½•æ‰§è¡Œæ¬¡æ•°
        let executeCount = 0;
        // ç§æœ‰å˜é‡ï¼šæ ‡è®°å®šæ—¶å™¨æ˜¯å¦æ­£åœ¨è¿è¡Œ
        let isRunning = false;
        // ç§æœ‰å˜é‡: æ ‡è®°å®šæ—¶å™¨æ˜¯å¦ç¬¬ä¸€æ¬¡å¯åŠ¨ï¼Œå½“第一次启动(即通过点击卡片的方式访问数据时) éœ€è¦æ˜¾ç¤ºåŠ è½½ï¼Œå¼¹çª—中需要静默更新

        const task = () => {
            var EmptyHtml = '<div style="Width: 100%; text-align: center; font-size: 46px;">该设备没有工艺参数</div>'
            if (firstRunning) {
                var loadIndex = layui.layer.load(0, { shade: 0.3 });
            }
            $.ajax({
                url: GetWEBURL() + '/Web/getSB_EquipTechParamBillListByEquipID',
                type: "GET",
                data: { HEquipID: HEquipID },
                dataType: "json",
                success: function (data) {
                    if (data.code == 1) {
                        EquipTechParamHtml = "";
                        data.data.forEach(group => {
                            EquipTechParamHtml += `<div class="param-group">`;
                            EquipTechParamHtml += `<div class="group-title">${group['分组名称']}</div>`;
                            EquipTechParamHtml += `<div class="param-list">`;
                            group['参数列表'].forEach(param => {
                                EquipTechParamHtml += `<div class="param-item">${param.HTechParamName}:<span>${param.HResult}</span></div>`;
                            });
                            EquipTechParamHtml += `</div></div>`;
                        });

                        // èµ‹å€¼ç»™é¢„渲染模版
                        document.getElementById("TechParamWrapper").innerHTML = EquipTechParamHtml
                        // èµ‹å€¼ç»™æ¸²æŸ“模板
                        if (document.getElementById("TechParamWrapper-Modal")) {
                            document.getElementById("TechParamWrapper-Modal").innerHTML = EquipTechParamHtml
                        }

                        layui.layer.close(loadIndex);
                        firstRunning = false
                    } else {
                        document.getElementById("TechParamWrapper").innerHTML = EmptyHtml
                        // èµ‹å€¼ç»™æ¸²æŸ“模板
                        if (document.getElementById("TechParamWrapper-Modal")) {
                            document.getElementById("TechParamWrapper-Modal").innerHTML = EmptyHtml
                        }
                        if (firstRunning) {
                            layui.layer.close(loadIndex);
                        }
                    }
                },
                error: function (err) {
                    document.getElementById("TechParamWrapper").innerHTML = EmptyHtml
                    // èµ‹å€¼ç»™æ¸²æŸ“模板
                    if (document.getElementById("TechParamWrapper-Modal")) {
                        document.getElementById("TechParamWrapper-Modal").innerHTML = EmptyHtml
                    }
                    if (firstRunning) {
                        layui.layer.close(loadIndex);
                    }
                    return false;
                }
            });

            var sWhere = {
                HDeptID: HDeptID
                , HSourceID: HSourceID,
                HEquipID: HEquipID
            }
            window.FourReport(JSON.stringify(sWhere));
        }

        // å¯åŠ¨å®šæ—¶å™¨æ–¹æ³•
        this.start = function () {
            // é˜²æ­¢é‡å¤å¯åŠ¨
            if (isRunning) {
                console.log('定时器已在运行中');
                return;
            }

            if (immediate) {
                task();
            }

            // è®¾ç½®å®šæ—¶å™¨ï¼ˆinterval æ¯«ç§’执行一次）
            timerId = setInterval(() => {
                executeCount++;
                task();
                console.log(`定时器执行第 ${executeCount} æ¬¡`);
            }, interval);

            // æ›´æ–°çŠ¶æ€æ ‡è®°
            isRunning = true;
            // document.getElementById('status').textContent = '运行中';
            console.log(`定时器已启动，间隔：${interval} æ¯«ç§’`);
        };

        // åœæ­¢å®šæ—¶å™¨æ–¹æ³•
        this.stop = function () {
            // é˜²æ­¢é‡å¤åœæ­¢
            if (!isRunning) {
                console.log('定时器未运行');
                return;
            }

            firstRunning = true

            // æ¸…除定时器
            clearInterval(timerId);
            // é‡ç½®çŠ¶æ€
            timerId = null;
            isRunning = false;
            // document.getElementById('status').textContent = '已停止';
            console.log('定时器已停止');
        };

        // èŽ·å–当前定时器状态
        this.isRunning = function () {
            return isRunning;
        };
    }


    // é¡µé¢åŠ è½½å®Œæ¯•åŽè°ƒç”¨
    window.addEventListener('load', function () {
        console.log('页面所有资源都加载完成！');
        Timer = new TimerClock()
        console.log(Timer)
    });

    // é¡µé¢å¸è½½å‰è°ƒç”¨
    window.addEventListener('beforeunload', function (e) {
        if (Timer) {
            Timer.stop()
        }

        delete window.FourReport
    })
    //#endregion

</script>

 WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Xt_UserList.html

@@ -771,7 +771,10 @@
                    success: function (result) {
                        if (result.count == 1) {
                            if (result.data[0].sWhere == "1") {
                                res = " and å¯¹åº”CLOUD组织 = '" + $("#HUSEORGID").val() + "'";
                                if ($("#HUSEORGID").val() != "") {
                                    res = " and å¯¹åº”CLOUD组织 = '" + $("#HUSEORGID").val() + "'";
                                }
                                
                            } else {
                                res = result.data[0].sWhere;
                            }

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillSync.html

@@ -235,7 +235,7 @@
                set_ClearQuery();
                get_FastQuery();
                //初始化自动同步一次
                get_InSync_Batch2(option.data);
                //get_InSync_Batch2(option.data);
            }