WebTM/App_Data/MssqlReportData.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/WebTM.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/layuiadmin/Scripts/webConfig.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/index.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBill_Add.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBill_Excel.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebTM/views/车间管理/工序流转/MES_StationInBill_PDA_QiaoYi.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebTM/App_Data/MssqlReportData.cs
@@ -18,7 +18,8 @@ //public const string SqlConnStr = "Data Source=10.0.2.9;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=.;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;";//YLæµè¯ 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;";//å¸ å¨ //public const string SqlConnStr = "Data Source=192.168.1.251;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ä¹ä¸ //public const string SqlConnStr = "Data Source=192.168.16.53;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//é¾å±±æ±½é //public const string SqlConnStr = @"Data Source=192.168.0.193\SWE2014;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//丸äºå°å WebTM/WebTM.csproj
@@ -205,6 +205,7 @@ <Content Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\xmlLBM_Sc_ProcExchSendWorkBillList.aspx" /> <Content Include="views\åºç¡èµæ\å ¬ç¨åºç¡èµæ\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" /> <Content Include="views\æ¡ç æç»\Kf_BarCodeDetailQuery.html" /> <Content Include="views\ç产管ç\æ¥è®¡ååºç¡èµæ\Cg_PODemandPlanConfigBill_Excel.html" /> <Content Include="views\ç³»ç»ç®¡ç\æé®è®¾ç½®\Xt_ModuleButtonSet.html" /> <Content Include="views\计å管ç\å·¥èºè·¯çº¿\Gy_RoutingBillListQuery.html" /> <Content Include="views\车é´ç®¡ç\å·¥åºæµè½¬å¡\Sc_ProcessExchangeBill_Change.html" /> WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,8 +6,8 @@ //var WEBURL = "http://localhost:8080/API/"; //颿忬å°é ç½® //var WEBURL = "http://localhost/WEBAPI/"; //é¢å®¶å°å¼æºæ¬å°é ç½® //var WEBURL = "http://localhost:8082/lubao"; //颿忬å°é ç½® //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°é ç½® var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°é ç½® var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°é ç½® //var WEBURL = "http://localhost:8082/API/"; //æè´ºæ¬å°é ç½® //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ä½ææ°æ¬å°é ç½® //var WEBURL = "http://10.1.4.155/API/"; //æ±ä¸°å®¢æ·NEW //var WEBURL = "http://47.96.97.237/API/"; //æºäºæå¡å¨ @@ -20,6 +20,7 @@ //var WEBURL = "http://192.168.80.90:9090/API/"; //å®çæå¡å¨ //var WEBURL = "http://192.168.16.53:8081/API/"; //é¾å±±æ±½é //var WEBURL = "http://122.227.158.218:8090/API/"; //é¾å±±æ±½é å¤ç½ //var WEBURL = "http://192.168.0.244:8082/API/"; //å¸ å¨å ç½ return WEBURL } WebTM/views/index.html
@@ -348,6 +348,7 @@ <dl class="layui-nav-child"> <dd><a lay-href="ç产管ç/æ¥è®¡ååºç¡èµæ/Gy_WorkWarehouseBillList.html" style="margin: 0 0 0 13px;">车é´ä»åºå¯¹ç §å表</a></dd> <dd><a lay-href="ç产管ç/æ¥è®¡ååºç¡èµæ/Cg_PODemandPlanConfigBillList.html" style="margin: 0 0 0 13px;">ææè®¡åä¿¡æ¯å表</a></dd> <!--<dd><a lay-href="ç产管ç/æ¥è®¡ååºç¡èµæ/Cg_PODemandPlanConfigBill_Excel.html" style="margin: 0 0 0 13px;">å¯¼å ¥</a></dd>--> <dd><a lay-href="ç产管ç/æ¥è®¡ååºç¡èµæ/JIT_NeedMaterPlanConfigBillList.html" style="margin: 0 0 0 13px;">è¦æè®¡åä¿¡æ¯å表</a></dd> </dl> </dd> WebTM/views/Éú²ú¹ÜÀí/Èռƻ®»ù´¡×ÊÁÏ/Cg_PODemandPlanConfigBillList.html
@@ -76,6 +76,7 @@ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>å设置</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Excel"><i class="layui-icon layui-icon-delete"></i>Excelå¯¼å ¥</button> <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button> </div> </script> @@ -133,7 +134,11 @@ break; //å é¤ case 'set_DeleteBill': set_DeleteBill(); break; //å设置 break; //å¯¼å ¥ case 'set_Excel': set_Excel(); break; //å设置 case 'set_HideColumn': get_HideColumn(); break; case 'btn-back': set_Back(); @@ -512,6 +517,22 @@ } } //å¯¼å ¥ function set_Excel() { layer.open({ type: 2 , skin: 'layui-layer-rim' //å ä¸è¾¹æ¡ , area: ['100%', '100%'] , title: 'ææè®¡åä¿¡æ¯å表-å¯¼å ¥' , shift: 0//å¼¹åºå¨ç» , content: '../æ¥è®¡ååºç¡èµæ/Cg_PODemandPlanConfigBill_Excel.html' , end: function () { //å·æ°é¡µé¢, location.reload(); } }) } //#region æ°å¢ function set_AddNew() { layer.open({ WebTM/views/Éú²ú¹ÜÀí/Èռƻ®»ù´¡×ÊÁÏ/Cg_PODemandPlanConfigBill_Add.html
@@ -423,7 +423,7 @@ form.val("formData", { //formTest å³ class="layui-form" æå¨å ç´ å±æ§ lay-filter="" 对åºçå¼ "HBillNo": d.data[0].åæ®å· , "HInterID": d.data[0].hmainid , "HPRDORGID": d.data[0].ç»ç» , "HPRDORGID": d.data[0].HOrgID }); var rowdata = []; WebTM/views/Éú²ú¹ÜÀí/Èռƻ®»ù´¡×ÊÁÏ/Cg_PODemandPlanConfigBill_Excel.html
New file @@ -0,0 +1,272 @@ <!DOCTYPE html> <html> <head> <meta charset="utf-8" /> <title>ææè®¡åä¿¡æ¯å¯¼å ¥</title> <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> <style> .main-btn { /*头é¨ä¸»æé®*/ padding: 0 2px; /*è°æ´æé®å·¦å³ç©ºé大å°*/ height: 30px; line-height: 30px; } .btn-title { font-size: 16px; } /* 鲿¢ä¸ææ¡ç䏿å表被éè---å¿ é¡»è®¾ç½®--- */ .layui-table-cell { overflow: visible !important; } /* 使å¾ä¸ææ¡ä¸åå æ ¼å好åé */ td .layui-form-select { margin-top: -10px; margin-left: -15px; margin-right: -15px; } .layui-form-item .layui-inline { margin-top: 5px; margin-bottom: 5px; margin-right: 0px; } .layui-form-label { width: 25%; } </style> </head> <body> <div class="layui-fluid" style="padding: 0;"> <div class="layui-card" style="padding: 2px;background-color: #efefef;"> <div class="layui-card-body" style="padding: 1px;"> <form class="layui-form" action="" lay-filter="formData" style="background-color:white;"> <div style="padding: 10px; "> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">å¯¼å ¥æ°æ®</button> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">éåº</button> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">æä»¶ä¸ä¼ </button> </div> <div class="layui-tab" lay-filter="tab-POStockInBill"> <div class="layui-tab-content"> <!--åºæ¬ä¿¡æ¯--> <div class="layui-tab-item layui-show"> <div class="layui-form-item" style="padding-top: 10px;"> </div> </div> </div> </div> <table class="" id="mainTable" lay-filter="mainTable"></table> <script type="text/html" id="toolbarDemo"> <div class="layui-btn-container"> </div> </script> </form> </div> </div> </div> </body> </html> <script type="text/html" id="barDemo"> <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">å é¤</a> </script> <script> layui.config({ base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾ }).extend({ index: 'lib/index' //ä¸»å ¥å£æ¨¡å }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], function () { //#region å ¬ç¨åé var $ = layui.$ , admin = layui.admin , layer = layui.layer , table = layui.table , form = layui.form , element = layui.element , laypage = layui.laypage , laydate = layui.laydate , util = layui.util , tree = layui.tree , util = layui.util , upload = layui.upload var option = []; //#endregion //#region è¿å ¥é¡µé¢å³å è½½ //åå§åçé¢ set_ClearBill(); //#endregion //#region 触åäºä»¶ï¼å æ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç //æä»¶ä¸ä¼ upload.render({ elem: '#UpLoad', url: GetWEBURL() + '/Cg_PODemandPlanConfigBill/Cg_PODemandPlanConfigBill_Excel', contentType: 'application/json', exts: 'xls|xlsx', //å 许ä¸ä¼ çç±»å //data: { // "WorkBookName": function () { // return $("#WorkBookName").val(); // }, // "HOrgID": function () { // return sessionStorage["OrganizationID"]; // } //}, //before: function (data) { // loadIndex = layer.load(2); // this.data = { // "WorkBookName": $("#WorkBookName").val(), // "HOrgID": sessionStorage["OrganizationID"] // } //}, done: function (data1) { if (data1.count == 1) { option.data = data1.data; table.render(option); } else { layer.alert(data1.code + data1.Message, { icon: 5 }); } }, error: function (err) { debugger layer.alert('å¯¼å ¥åºç°å¼å¸¸', { icon: 2 }); } }); //å¯¼å ¥ ä¿åæ°æ® form.on('submit(btnSave)', function (data) { if ($("input[name='SqlAppend']").prop("checked")) { set_AddNew(data); } else { if (table.cache["mainTable"] != null) { set_AddNew(data); } else { layer.msg("æ æ°æ®,请å å¯¼å ¥æ°æ®!"); } } }) //éåº form.on('submit(Cancel)', function () { Pub_Close(1); }) //#endregion //#region æ¤é¡µé¢ææçæ¹æ³ //#region åå§åçé¢ function set_ClearBill() { //åå§åè¡¨æ ¼ set_InitGrid(); } //#endregion //åå§åè¡¨æ ¼ function set_InitGrid() { option = { elem: '#mainTable' , toolbar: '#toolbarDemo' , height: 'full-120' , page: true , cellMinWidth: 90 , limit: 50 , limits: [50, 500, 5000, 20000] , loading: false , cols: [[ { type: 'checkbox', fixed: 'left' } , { field: 'ç»ç»ç¼ç ', title: 'ç»ç»ç¼ç ', width: 120 } , { field: 'ç»ç»', title: 'ç»ç»', width: 120 } , { field: 'ä¾åºå代ç ', title: 'ä¾åºå代ç ', width: 120 } , { field: 'ä¾åºå', title: 'ä¾åºå', width: 120 } , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 120 } , { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 120 } , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 120 } , { field: '计éåä½', title: '计éåä½', width: 120 } , { field: 'JITç©æåç±»', title: 'JITç©æåç±»', width: 120 } , {field: 'JITæå¨å®å ¨åºåé', title: 'æå¨å®å ¨åºåé', width: 120 } , { field: 'JITç©æéæ±ä¾è´§å¨æ', title: 'ç©æéæ±ä¾è´§å¨æ', width: 120 } , { field: 'JITæè´§ç»æµæ¹é', title: 'JITæè´§ç»æµæ¹é', width: 120 } , { field: 'JITæè´§æ¹é对åºå¨æï¼å¤©ï¼', title: 'JITæè´§æ¹é对åºå¨æï¼å¤©ï¼', width: 120 } , { field: 'JITä¾è´§æåæï¼å¤©ï¼', title: 'JITä¾è´§æåæï¼å¤©ï¼', width: 120 } , { field: 'JITå°è´§åç½®æï¼å¤©ï¼', title: 'JITå°è´§åç½®æï¼å¤©ï¼', width: 120 } , { field: 'JITéè´§æ§å¶å¤©æ°', title: 'JITéè´§æ§å¶å¤©æ°', width: 120 } , { field: 'JITæå°èµ·éé', title: 'JITæå°èµ·éé', width: 120 } , { field: '夿³¨', title: '夿³¨', width: 120 } , { fixed: 'right', title: 'æä½', toolbar: '#barDemo' } ]] }; //渲æé¡µé¢ table.render(option); //DisPlay_HideColumn(); } //å¯¼å ¥(ä¿å) function set_AddNew(data) { var num = []; for (var i = 0; i < table.cache["mainTable"].length; i++) { if (table.cache["mainTable"][i] != "") { table.cache["mainTable"][i].LAY_TABLE_INDEX = i; num.push(table.cache["mainTable"][i]) } } //data.field.HOrgID = sessionStorage["OrganizationID"];//ç»ç» //var sMainStr = JSON.stringify(data.field); var sSubStr = JSON.stringify(num); var sMainSub = sSubStr + ';' + sessionStorage["HUserName"]; var index = layer.load(); $.ajax({ type: "POST", url: GetWEBURL() + "/Cg_PODemandPlanConfigBill/Cg_PODemandPlanConfigBill_btnSave", async: true, data: { "sMainSub": sMainSub }, dataType: "json", success: function (data) { if (data.count == 1) { layer.close(index); layer.msg(data.Message); option.data = null; table.cache["mainTable"] = null; table.render(option); } else { layer.close(index); layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨æç¤º" }); } }, error: function (err) { layer.close(index); layer.msg("é误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨æç¤º" }); } }); } //#endregion }); </script> WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationInBill_PDA_QiaoYi.html
@@ -1044,7 +1044,7 @@ "HPRDOrg": data.ç»ç», "HPRDOrgID": data.ç»ç», "HmaterOutqty": data.åºç«æ°é, "HQty": result.data.length > 1 ? (result.data[0].æµè½¬å¡æ°é < result.data[1].åºç«å ³èæ°é ? data.æµè½¬å¡æ°é: result.data[1].åºç«å ³èæ°é): data.æµè½¬å¡æ°é, "HQty": result.data.length > 1 ? (result.data[1].è¿ç«å ³èæ°é == 0 ? (result.data[0].åºç«å ³èæ°é == 0 ? result.data[0].æµè½¬å¡æ°é : result.data[0].åºç«å ³èæ°é) : result.data[0].æµè½¬å¡æ°é < result.data[1].è¿ç«å ³èæ°é ? data.æµè½¬å¡æ°é : result.data[1].è¿ç«å ³èæ°é) : data.æµè½¬å¡æ°é, });