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

wtt

2024-05-27 b88798effc5f7fa83505e39d92e50529efdb8433

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

 WebTM/WebTM.csproj

@@ -321,11 +321,82 @@
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBill.html" />
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBillList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ColorClassList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CheckNoteItem.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_MaintainLev.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PreventErrMould.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemMethodEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemClassEdit.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemMethodList.html" />
    <Content Include="views\基础资料\基础资料\Gy_DotCheckItemClassList.html" />
    <Content Include="views\模治具管理\模具其他入库单\Sc_MouldOtherInBillList_PDA.html" />
    <Content Include="views\模治具管理\模具其他入库单\Sc_MouldOtherInBill_PDA.html" />
    <Content Include="views\模治具管理\模具其他出库单\Sc_MouldOtherOutBillList_PDA.html" />
    <Content Include="views\模治具管理\模具其他出库单\Sc_MouldOtherOutBill_PDA.html" />
    <Content Include="views\模治具管理\模具报废入库单\Sc_MouldScrapInBill_PDA.html" />
    <Content Include="views\模治具管理\模具报废出库单\Sc_MouldScrapOutBill_PDA.html" />
    <Content Include="views\模治具管理\模具报废出库单\Sc_MouldScrapOutBillList_PDA.html" />
    <Content Include="views\模治具管理\模具报废入库单\Sc_MouldScrapInBillList_PDA.html" />
    <Content Include="views\模治具管理\模具改制入库单\Sc_MouldRepairInBillList_PDA.html" />
    <Content Include="views\模治具管理\模具改制入库单\Sc_MouldRepairInBill_PDA.html" />
    <Content Include="views\模治具管理\模具改制出库单\Sc_MouldRepairOutBill_PDA.html" />
    <Content Include="views\模治具管理\模具改制出库单\Sc_MouldRepairOutBillList_PDA.html" />
    <Content Include="views\模治具管理\模具生产退库单\Sc_MouldProdBackBill_PDA.html" />
    <Content Include="views\模治具管理\模具生产退库单\Sc_MouldProdBackBillList_PDA.html" />
    <Content Include="views\模治具管理\模具生产领用单\Sc_MouldProdOutBillList_PDA.html" />
    <Content Include="views\模治具管理\器具报表\Sc_MouldLifeUseReport.html" />
    <Content Include="views\模治具管理\模具生产领用单\Sc_MouldProdOutBill_PDA.html" />
    <Content Include="views\模治具管理\模具调拨\Sc_MouldProdMoveBillList_PDA.html" />
    <Content Include="views\模治具管理\模具调拨\Sc_MouldProdMoveBill_PDA.html" />
    <Content Include="views\模治具管理\模具采购入库单\Sc_MouldProdInBill_PDA.html" />
    <Content Include="views\模治具管理\模具采购入库单\Sc_MouldProdInBillList_PDA.html" />
    <Content Include="views\模治具管理\模治具点检保养\Sc_MouldDotCheckBill_PDA.html" />
    <Content Include="views\生产管理\异常反馈单\OA_ErrMsgBackSignBill_BrushCard.html" />
    <Content Include="views\采购管理\采购合同\Add_Edit_Cg_ContractBillList.html" />
    <Content Include="views\采购管理\采购合同\Cg_ContractBillList.html" />
    <Content Include="views\销售管理\销售合同\Add_Edit_Xs_ContractBillList.html" />
    <Content Include="views\销售管理\销售合同\Xs_ContractBillList.html" />
    <Content Include="views\生产管理\报工台工序\开工\Sc_SwipeCardStart.html" />
    <Content Include="views\设备管理\设备停机单\Sb_EquipStopBillList_PDA.html" />
    <Content Include="views\设备管理\设备停机单\Sb_EquipStopBill_PDA.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBillList_PDA.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBill_PDA.html" />
    <Content Include="views\质量管理\库存检验单\QC_Add_Edit_StockCheckBill.html" />
    <Content Include="views\质量管理\库存检验单\QC_StockCheckBillList.html" />
    <Content Include="views\质量管理\车间自检单\QC_Add_Edit_WorkSelfCheckBill.html" />
    <Content Include="views\质量管理\车间自检单\QC_WorkSelfCheckBillList.html" />
    <Content Include="views\车间管理\产线\222.jpg" />
    <Content Include="views\车间管理\产线\Add_Edit_Gy_WorkDay.html" />
    <Content Include="views\车间管理\产线\Gy_WorkDay.html" />
    <Content Include="views\车间管理\产线\MES_AssemblyTraceability.html" />
    <Content Include="views\车间管理\产线\MES_AssemblyTraceabilityList.html" />
    <Content Include="views\车间管理\产线\MES_ProductionLinePackaging.html" />
    <Content Include="views\车间管理\产线\MES_ProductionLinePackagingList.html" />
    <Content Include="views\车间管理\产线\ProcessWIPReport.html" />
    <Content Include="views\车间管理\产线\RetrospectionCustomerReport.html" />
    <Content Include="views\车间管理\产线\Sc_GroupOrderBill.html" />
    <Content Include="views\车间管理\产线\Sc_GroupOrderBillCacheList.html" />
    <Content Include="views\车间管理\产线\Sc_GroupOrderBillList.html" />
    <Content Include="views\车间管理\产线\Sc_PackUnionBillCacheList.html" />
    <Content Include="views\车间管理\产线\Sc_ProcessReportList_Last.html" />
    <Content Include="views\车间管理\产线\Sc_StationInBillList.html" />
    <Content Include="views\车间管理\产线\test.html" />
    <Content Include="views\车间管理\启动点检单\Sc_WorkBeginDotCheckBill.html" />
    <Content Include="views\车间管理\启动点检单\Sc_WorkBeginDotCheckBillList.html" />
    <Content Include="views\设备管理\设备停机单\Sb_EquipStopBill.html" />
    <Content Include="views\设备管理\设备停机单\Sb_EquipStopBillList.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBill.html" />
    <Content Include="views\设备管理\设备开机单\Sb_EquipBeginBillList.html" />
    <Content Include="views\车间管理\工序流转卡\Sc_ProcessExchangeArrangement_PG.html" />
    <Content Include="views\车间管理\报表分析\Kf_PressurizedWaterNoOutReport.html" />
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBill.html" />
    <Content Include="views\车间管理\启动点检单\Gy_WorkBeginDotCheckListBillList.html" />
    <Content Include="views\车间管理\防错验证\Gy_MaterPreventErrMouldBill.html" />
    <Content Include="views\车间管理\防错验证\Gy_MaterPreventErrMouldBillList.html" />
    <Content Include="views\车间管理\防错验证\Qc_PreventErrMouldCheckBill.html" />
    <Content Include="views\车间管理\防错验证\Qc_PreventErrMouldCheckBillList.html" />
    <Content Include="views\车间管理\报表分析\Kf_PressurizedWaterNoOutReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POOrderReceiveDaySumReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POOrderReceiveSumReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POOrderBillSumReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POInStockBillSumReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POMaterialPriceReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POOrderBillProcessSumReport.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_Gy_TaskClass.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_Gy_ProjectClass.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ColorClass.html" />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -3,12 +3,13 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
   /* var WEBURL = "http://localhost/API/"; */            //颜晓军本地配置
    //var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:81/API/";    //王彬本地配置
    /*var WEBURL = "http://localhost:8083/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:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW

 WebTM/layuiadmin/zgqCustom/zgqCustom.js

@@ -33,6 +33,14 @@
    return fmt;
}

//判断一个字符串是否为日期
function isValidDate(dateString) {
    // å°†æ—¥æœŸå­—符串转换为日期对象
    var date = new Date(dateString);
    // å¦‚果转换后的日期与原日期不一致，则不是有效日期
    return !isNaN(date.getTime());
}

/**
 *判断手机还是电脑，电脑返回true，手机返回false
 *by zgq

 WebTM/views/Ä£Öξ߹ÜÀí/ÉÏÄ£µ¥/Sc_MouldLowerBillEdit_PDA.html

@@ -503,8 +503,9 @@
            //条形码回车方法
            function txtHBarCode_KeyDown(HBarCode) {
                var BillNoType2 = HBarCode.substr(0, 2);
                var BillNoType3 = HBarCode.substr(0, 3);
                var BillNoType3 = HBarCode.substr(0, 5);
                var BillNoType4 = HBarCode.substr(0, 4);
                var BillNoType5 = HBarCode.substr(0, 8);

                var index = layer.load();
                $.ajax({
@@ -538,6 +539,7 @@
                                //器具档案
                                case "MJD":
                                case "PAK":
                                case "https":
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HMouldID": data.hmainid,
                                        "HMouldNumber": data.模具编号,
@@ -562,6 +564,35 @@
                                    break;
                            }

                            if (BillNoType5.length == 8) {
                                BillNoType5 = BillNoType5.substr(0, 4) + "-" + BillNoType5.substr(4, 2) + "-" + BillNoType5.substr(6, 2);
                            }

                            if (isValidDate(BillNoType5)) {
                                form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                    "HProcExchBillNo": data.单据号,
                                    "HProcExchInterID": data.hmainid,
                                    "HProcExchEntryID": data.HEntryID,
                                    "HICMOBillNo": data.任务单号,
                                    "HICMOInterID": data.hicmointerid,
                                    "HICMOEntryID": data.HICMOEntryID
                                });
                            }

                            switch (BillNoType5) {
                                //流转卡
                                case "GXLX":
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HProcExchBillNo": data.单据号,
                                        "HProcExchInterID": data.hmainid,
                                        "HProcExchEntryID": data.HEntryID,
                                        "HICMOBillNo": data.任务单号,
                                        "HICMOInterID": data.hicmointerid,
                                        "HICMOEntryID": data.HICMOEntryID
                                    });
                                    break;
                            }

                            $("#HBarCode").val("");
                            layer.close(index);
                        }

 WebTM/views/Ä£Öξ߹ÜÀí/ÉÏÄ£µ¥/Sc_MouldUpperBillEdit_PDA.html

@@ -504,8 +504,9 @@
            //条形码回车方法
            function txtHBarCode_KeyDown(HBarCode) {
                var BillNoType2 = HBarCode.substr(0, 2);
                var BillNoType3 = HBarCode.substr(0, 3);
                var BillNoType3 = HBarCode.substr(0, 5);
                var BillNoType4 = HBarCode.substr(0, 4);
                var BillNoType5 = HBarCode.substr(0, 8);

                var index = layer.load();
                $.ajax({
@@ -540,6 +541,7 @@
                                  //器具档案
                                case "MJD":
                                case "PAK":
                                case "https":
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HMouldID": data.hmainid,
                                        "HMouldNumber": data.模具编号,
@@ -565,6 +567,36 @@
                            }



                            if (BillNoType5.length == 8) {
                                BillNoType5 = BillNoType5.substr(0, 4) + "-" + BillNoType5.substr(4, 2) + "-" + BillNoType5.substr(6, 2);
                            }

                            if (isValidDate(BillNoType5)) {
                                form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                    "HProcExchBillNo": data.单据号,
                                    "HProcExchInterID": data.hmainid,
                                    "HProcExchEntryID": data.HEntryID,
                                    "HICMOBillNo": data.任务单号,
                                    "HICMOInterID": data.hicmointerid,
                                    "HICMOEntryID": data.HICMOEntryID
                                });
                            }

                            switch (BillNoType5) {
                                //流转卡
                                case "GXLX":
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                        "HProcExchBillNo": data.单据号,
                                        "HProcExchInterID": data.hmainid,
                                        "HProcExchEntryID": data.HEntryID,
                                        "HICMOBillNo": data.任务单号,
                                        "HICMOInterID": data.hicmointerid,
                                        "HICMOEntryID": data.HICMOEntryID
                                    });
                                    break;
                            }

                         

                            $("#HBarCode").val("");

 WebTM/views/Ä£Öξ߹ÜÀí/Æ÷¾ß±¨±í/Sc_MouldLifeUseReport.html

File was renamed from WebTM/views/Ä£Öξ߹ÜÀí/Æ÷¾ß±¨±í/Sc_MouldLifeUseReport .html
@@ -193,11 +193,13 @@
            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
             
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));

                //初始化表格
                set_InitGrid();
                //查询
                get_FastQuery(1);
               get_FastQuery(1);
                //Organ();
            }
            //#endregion
@@ -222,7 +224,7 @@
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Sc_MouldLifeUseReport/list',
                    url: GetWEBURL() + '/Sc_MouldLifeUseReport/GetSc_MouldLifeUseReport',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "userid": sessionStorage["Czybm"]},
                    success: function (data1) {

 WebTM/views/²É¹º¹ÜÀí/²É¹º±¨±í/Cg_POInStockBillSumReport.html

@@ -5,16 +5,16 @@
    <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">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <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>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -195,7 +195,8 @@

            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {
             
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));

                //初始化表格
                set_InitGrid();
@@ -225,7 +226,7 @@
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Cg_POInStockBillSumReport/list',
                    url: GetWEBURL() + '/YF_PayMentBill/GetCg_POInStockBillSumReport',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "userid": sessionStorage["Czybm"]},
                    success: function (data1) {
@@ -368,21 +369,21 @@

           
                //逻辑审核方法
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //方法所在页面和方法名
                    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            table.exportFile(ins.config.id, option.data, "xls");
                        } else {
                            layer.alert("当前模块没有导出权限!", { icon: 5 });
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
                //$.ajax({
                //    type: "GET",
                //    url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //方法所在页面和方法名
                //    data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
                //    success: function (result) {
                //        if (result.count == 1) {
                //            table.exportFile(ins.config.id, option.data, "xls");
                //        } else {
                //            layer.alert("当前模块没有导出权限!", { icon: 5 });
                //        }
                //    }, error: function () {
                //        layer.alert("接口请求失败!", { icon: 5 });
                //    }
                //});
            
            //#endregion

            //#region éšè—åˆ—设置

 WebTM/views/²É¹º¹ÜÀí/²É¹º±¨±í/Cg_POMaterialPriceReport.html

@@ -151,7 +151,7 @@
                //加载数据到网格
                get_FastQuery();
                //DisPlay_HideColumn();
                set_Graphics();
                //set_Graphics();
            }

            //初始化表格
@@ -194,7 +194,7 @@
                var HType = $("#HType").val();
                var wait = layer.load();//遮罩
                $.ajax({
                    url: GetWEBURL() + '/LEMS/POMaterialPriceReport',
                    url: GetWEBURL() + '/YF_PayMentBill/POMaterialPriceReport',
                    type: "GET",
                    async: false,
                    data: { "DateYear": DateYear, "HType": HType, "user": sessionStorage["HUserName"] },

 WebTM/views/²É¹º¹ÜÀí/²É¹º±¨±í/Cg_POOrderBillProcessSumReport.html

File was renamed from WebTM/views/²É¹º¹ÜÀí/²É¹º±¨±í/Cg_POOrderBillProcessSumReport .html
@@ -234,7 +234,7 @@
                //进入页面显示的缓存列表
                $.ajax({
                   
                    url: GetWEBURL() + '/Xs_SeReport/Xs_SeOrderBillProcessSumReportList',
                    url: GetWEBURL() + '/YF_PayMentBill/Cg_POOrderBillProcessSumReport',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {

 WebTM/views/²É¹º¹ÜÀí/²É¹º±¨±í/Cg_POOrderBillSumReport.html

@@ -529,7 +529,7 @@
                var HType = $("#HType").val();
                var wait = layer.load();//遮罩
                $.ajax({
                    url: GetWEBURL() + '/LEMS/SeOutStockReportList',
                    url: GetWEBURL() + '/YF_PayMentBill/Cg_POOrderBillSumReport',
                    type: "GET", 
                    async: false,
                    data: { "DateYear": DateYear, "HType": HType, "user": sessionStorage["HUserName"] },

 WebTM/views/²É¹º¹ÜÀí/²É¹º±¨±í/Cg_POOrderReceiveDaySumReport.html

@@ -226,7 +226,7 @@
                //进入页面显示的缓存列表
                $.ajax({
                   
                    url: GetWEBURL() + '/Cg_POInStockBillSumReport/Cg_POOrderReceiveDaySumReport',
                    url: GetWEBURL() + '/YF_PayMentBill/Cg_POOrderReceiveDaySumReport',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {

 WebTM/views/²É¹º¹ÜÀí/²É¹º±¨±í/Cg_POOrderReceiveSumReport.html

@@ -141,7 +141,7 @@
            //查询条件
            var sWhere = "";
            var option = [];
            var HModName = "Cg_POOrderBillSumReport";
            var HModName = "Cg_POOrderReceiveSumReport";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = [];

@@ -226,7 +226,7 @@
                //进入页面显示的缓存列表
                $.ajax({
                   
                    url: GetWEBURL() + '/YF_PayMentBill/Cg_POOrderReceiveSumReport',
                    url: GetWEBURL() + '/YF_PayMentBill/Cg_POOrderReceiveDaySumReport',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {