| WebTM/App_Data/MssqlReportData.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebTM/App_Data/MssqlReportData.cs
@@ -19,7 +19,7 @@ //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;"; //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//chæµè¯ //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YLæµè¯ public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YSJæµè¯ //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YSJæµè¯ //public const string SqlConnStr = "Data Source=10.11.18.195;Initial Catalog=HX_LMESsys_test;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;"; //æ¯è«å° //public const string SqlConnStr = "Data Source=30.10.7.6;Initial Catalog=HX_LMESsys_test;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;"; //æ¯è«å° //public const string SqlConnStr = "Data Source=192.168.0.245;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//å¸ å¨ @@ -30,7 +30,7 @@ //public const string SqlConnStr = "Data Source=192.168.0.175;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//é çªè¯ºæµè¯ //public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//å¯è´å¥ç¹ //public const string SqlConnStr = "Data Source=192.168.0.199;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ççª //public const string SqlConnStr = "Data Source=192.168.2.10;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ä¹è±çµæº public const string SqlConnStr = "Data Source=192.168.2.10;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ä¹è±çµæº //public const string SqlConnStr = "Data Source=192.168.1.8;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//添康ç§æ //public const string SqlConnStr = "Data Source=192.168.6.5;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//èæ
@@ -2376,6 +2376,17 @@ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] }, success: function (result) { if (result.count == 1) { option.data.forEach((item) => { for (let itemobj in item) { if (item[itemobj] == null) { item[itemobj] = ""; } if (item[itemobj].length > 0) { // å设å段å为field item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºå符串 } } }); table.exportFile(ins.config.id, option.data, "xls"); } else { layer.alert("å½å模å没æ导åºæé!", { icon: 5 }); WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html
@@ -589,7 +589,7 @@ , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": "" , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": "" , "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false , "HSubStdEmpAvg_S": 0, "æ å工价": 0 , "HSubStdEmpAvg_S": 0, "æ å工价": 0,"HYDCoefficient": 0 }]; var HModName = "Gy_RoutingBill"; //#endregion @@ -618,6 +618,7 @@ , { field: 'HTechnologyParameter', title: 'å·¥èºåæ°', edit: 'text' } , { field: 'HProcPrice', title: '工价', edit: 'text' } , { field: 'æ å工价', title: 'æ å工价' } , { field: 'HYDCoefficient', title: '约å½ç³»æ°', edit: 'text' } , { field: 'HRemark', title: 'å¤æ³¨', edit: 'text' } , { field: 'HSupID', title: 'ä¾åºåID', hide: true } , { field: 'ä¾åºå代ç ', title: 'ä¾åºå代ç ', edit: 'text', width: 110, event: "CheckHSupID" } @@ -1210,7 +1211,7 @@ , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": "" , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": "" , "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false , "HSubStdEmpAvg_S": 0, "æ å工价": 0 , "HSubStdEmpAvg_S": 0, "æ å工价": 0, "HYDCoefficient": 0 }; switch (obj.event) { case 'btn-AddLine': @@ -1399,13 +1400,14 @@ //table.render(option) } break; case 'HProcPrice': //工价 if (data.HProcPrice != 0) { case 'HWorkQty': //约å½ç³»æ° if (localStorage["HBenchmarkValue"] != undefined && localStorage["HBenchmarkValue"] != null && data.HWorkQty > 0) { obj.update({ HWorkQty: (data.æ å工价 / value).toFixed(2) HYDCoefficient: (localStorage["HBenchmarkValue"] / data.HWorkQty).toFixed(6) }); } break; } }) @@ -2257,7 +2259,7 @@ , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": "" , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": "" , "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false , "HSubStdEmpAvg_S": 0, "æ å工价": 0 , "HSubStdEmpAvg_S": 0, "æ å工价": 0, "HYDCoefficient": 0 }) j++; } @@ -2275,6 +2277,7 @@ option.data[i]["工段"] = checkStatus.data[j]["工段å称"]; option.data[i]["æ å工价"] = checkStatus.data[j]["æ å工价"]; option.data[i]["HWorkQty"] = option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["æ å工价"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"]; option.data[i]["HYDCoefficient"] = (localStorage["HBenchmarkValue"] / (option.data[i]["HProcPrice"] != 0 ? (checkStatus.data[j]["æ å工价"] / option.data[i]["HProcPrice"]).toFixed(2) : option.data[i]["HWorkQty"])).toFixed(6)//约å½ç³»æ°=åºåå¼/å°æ¶äº§è½ j++; } } @@ -2309,6 +2312,8 @@ , "工段": OptionData[0].工段å称 , "æ å工价": OptionData[0].æ å工价 , "HWorkQty": obj.data.HProcPrice != 0 ? (OptionData[0].æ å工价 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty , "HYDCoefficient": (localStorage["HBenchmarkValue"] / (obj.data.HProcPrice != 0 ? (OptionData[0].æ å工价 / obj.data.HProcPrice).toFixed(2) : obj.data.HWorkQty)).toFixed(6) }) OptionData = []; } @@ -2707,6 +2712,7 @@ option.data[i]["HProcID_S"] = data.data[j]["HProcMulID"]; option.data[i]["工段"] = data.data[j]["工段å称"]; option.data[i]["æ å工价"] = WorkCente[j]["æ å工价"]; option.data[i]["HYDCoefficient"] = (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6); j++; } @@ -2730,7 +2736,7 @@ , "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": "" , "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": "" , "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false , "HSubStdEmpAvg_S": 0, "æ å工价": 0 , "HSubStdEmpAvg_S": 0, "æ å工价": 0, "HYDCoefficient": 0 }) j++; } @@ -2747,6 +2753,7 @@ option.data[i]["HProcID_S"] = data.data[j]["HProcMulID"]; option.data[i]["工段"] = data.data[j]["工段å称"]; option.data[i]["æ å工价"] = WorkCente[j]["æ å工价"]; option.data[i]["HYDCoefficient"] = (localStorage["HBenchmarkValue"] / option.data[i]["HWorkQty"]).toFixed(6); j++; } } @@ -2851,7 +2858,7 @@ , "HQCSchemeID_Proc": d.data[i].HQCSchemeID_Proc, "HQCSchemeNumber_Proc": d.data[i].转åºæ£éªæ¹æ¡ä»£ç , "HQCSchemeName_Proc": d.data[i].转åºæ£éªæ¹æ¡ , "HQCSchemeID_Patrol": d.data[i].HQCSchemeID_Patrol, "HQCSchemeNumber_Patrol": d.data[i].å·¡æ£æ£éªæ¹æ¡ä»£ç , "HQCSchemeName_Patrol": d.data[i].å·¡æ£æ£éªæ¹æ¡ , "HQCFst": d.data[i].HQCFst == 1 ? true : false, "HQCProc": d.data[i].HQCProc == 1 ? true : false, "HQCPatrol": d.data[i].HQCPatrol == 1 ? true : false, "HMaterToSourceCtrl": d.data[i].HMaterToSourceCtrl == 1 ? true : false , "HSubStdEmpAvg_S": d.data[i].人å产è½, "æ å工价": d.data[i].æ å工价 , "HSubStdEmpAvg_S": d.data[i].人å产è½, "æ å工价": d.data[i].æ å工价, "HYDCoefficient": d.data[i].约å½ç³»æ° } ) } WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html
@@ -80,6 +80,12 @@ <input type="text" class="layui-input ForFilteringSchemes" name="HModel" id="HModel"> </div> </div> <div class="layui-inline"> <label class="layui-form-label" style="width: 85px;">åºåå¼</label> <div class="layui-input-block" style="margin-left: 120px;"> <input type="text" class="layui-input ForFilteringSchemes" name="HBenchmarkValue" id="HBenchmarkValue"> </div> </div> </div> <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;"> <div class="layui-inline"> @@ -503,6 +509,7 @@ Get_HProject(); //æ¥è¯¢å½åç»å½ç¨æ·æ没æå¨å½å模å设置é»è®¤è¿æ»¤æ¹æ¡ get_DefaultModule(); $("#HBenchmarkValue").val(localStorage["HBenchmarkValue"]) } //#endregion @@ -2033,6 +2040,10 @@ } //#endregion $("#HBenchmarkValue").on("input", function (e) { localStorage["HBenchmarkValue"] = e.delegateTarget.value;//åºåå¼ï¼ç¨äºæ·»åº·è®¡ç®çº¦å½ç³»æ°ï¼åºåå¼/å°æ¶äº§è½ }); //#endregion ////éèå设置 //function get_HideColumn() {
