| WebTM/views/基础资料/生产基础资料/Gy_Process.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/计划管理/工艺路线/Gy_RoutingBillCheckQuery.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_Process.html
@@ -1190,7 +1190,7 @@ var openType = params[params[0]]; //ä»åæ°ä¸è·å æå¼æ¹å¼ 1ç´æ¥æå¼ 2å ¶å®é¡µé¢éè¿éæ©æé®æå¼ var HOrgID = params[params[1]]; if (typeof (openType) != "undefined") { return " and æç»æ è®° = 'Y' and ç¦ç¨æ è®° = 'Y'"; return " and æç»æ è®° = 'Y' and ç¦ç¨æ è®° != 'Y'"; } return ""; } WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html
@@ -72,6 +72,11 @@ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">åå®¡æ ¸</button> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CloseBill" id="set_CloseBill">å ³é</button> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">åå ³é</button> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_Copy" id="set_Copy">å¤å¶</button> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckFlowInfo" id="set_CheckFlowInfo">æ¥ç审æ¹è¿åº¦</button> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill_Flow" id="set_CheckBill_Flow">å¤çº§å®¡æ ¸</button> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck_Flow" id="set_AbandonCheck_Flow">å¤çº§åå®¡æ ¸</button> <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_RejectCheck_Flow" id="set_RejectCheck_Flow">驳å</button> </div> <div class="layui-tab" lay-filter="tab-POStockInBill"> <ul class="layui-tab-title" lay-filter="tab-all"> @@ -787,6 +792,7 @@ $("#HInterID").val(d.data[0].HInterID); $("#HBillNo").val(d.data[0].HBillNo); $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd")); } }); } @@ -988,6 +994,29 @@ set_CancelCloseBill(data); }); //æ¥ç审æ¹è¿åº¦ form.on('submit(set_CheckFlowInfo)', function (data) { set_CheckFlowInfo(); }); //å¤çº§å®¡æ ¸ form.on('submit(set_CheckBill_Flow)', function (data) { set_CheckBill_Flow(0); }); //å¤çº§åå®¡æ ¸ form.on('submit(set_AbandonCheck_Flow)', function (data) { set_CheckBill_Flow(1); }); //驳å form.on('submit(set_RejectCheck_Flow)', function (data) { set_RejectCheck_Flow(); }); //å¤å¶ form.on('submit(set_Copy)', function (data) { set_Copy(); }); //æ¯å¦é»è®¤å·¥èº form.on('checkbox(checkboxHStandard)', function (data) { @@ -1342,11 +1371,24 @@ //ä¿åæäº¤ form.on('submit(btnSave)', function (data) {//æäº¤ if (AllowLoadData(data)) { set_AddNew(data); const procNos = table.cache["mainTable"].map(item => item.HProcNo); if (isSortedAscending(procNos)) { if (AllowLoadData(data)) { set_AddNew(data); } } else { layer.msg('è¯·æ³¨ææµæ°´å·æ¬¡åº'); } }); // 彿°ï¼å¤ææ°ç»æ¯å¦ä»å°å°å¤§æåº function isSortedAscending(arr) { for (let i = 0; i < arr.length - 1; i++) { if (arr[i] > arr[i + 1]) { return false; } } return true; } //éåº form.on('submit(btnEdit)', function (data) { if (params[1] != null) { @@ -1865,6 +1907,128 @@ }) } //#region å¤çº§ åå®¡æ ¸/å®¡æ ¸æ°æ® function set_CheckBill_Flow(num) { var InterID = $("#HInterID").val(); if (InterID != 0) { //é»è¾å®¡æ ¸æ¹æ³ $.ajax({ type: "GET", url: GetWEBURL() + "/Gy_Routing/AuditFlow", //æ¹æ³æå¨é¡µé¢åæ¹æ³å data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] }, success: function (result) { if (result.count == 1) { layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () { // å¾å°frameç´¢å¼ var index = layer.getFrameIndex(window.name); //å ³éå½åframe layer.close(index); //ä¿®æ¹ä¸ºååå·æ°çé¢ $("#btnSearch").trigger('click'); }); } else { layer.alert(result.code + result.Message, { icon: 5 }); } }, error: function () { layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 }); } }); } else { layer.msg('è¯·éæ©è¯·éæ©å¨å®¡æ¹æµçåæ®å®¡æ ¸ï¼'); } } //#endregion //#region 驳å function set_RejectCheck_Flow() { var InterID = $("#HInterID").val(); if (InterID != 0) { //é»è¾å®¡æ ¸æ¹æ³ $.ajax({ type: "GET", url: GetWEBURL() + "/Gy_Routing/RejectCheckFlow", //æ¹æ³æå¨é¡µé¢åæ¹æ³å data: { "HInterID": InterID, "CurUserID": sessionStorage["Czybm"] }, success: function (result) { if (result.count == 1) { layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () { // å¾å°frameç´¢å¼ var index = layer.getFrameIndex(window.name); //å ³éå½åframe layer.close(index); }); //ä¿®æ¹ä¸ºååå·æ°çé¢ $("#btnSearch").trigger('click'); } else { layer.alert(result.code + result.Message, { icon: 5 }); } }, error: function () { layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 }); } }); } else { layer.msg('è¯·éæ©å¨å®¡æ¹æµç忮驳åï¼'); } } //#endregion //#region å¤å¶ function set_Copy() { //å¶å人 $("#HMaker").val(sessionStorage["HUserName"]); $("#hmakers").val(sessionStorage["HUserName"]); $("#hmakedate").val(Format(new Date(), "yyyy-MM-dd")); $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd")); //设置hinterid $.ajax({ url: GetWEBURL() + "/Web/GetMAXNum", type: "GET", async: false, data: { "HBillType": '3301' }, success: function (d) { $("#HInterID").val(d.data[0].HInterID); $("#HBillNo").val(d.data[0].HBillNo); $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); } }); OperationType = 2; } //#endregion //#region æ¥ç审æ¹è¿åº¦ function set_CheckFlowInfo() { var InterID = $("#HInterID").val(); if (InterID != 0) { layer.open({ type: 2 , area: ['70%', '70%'] , title: '忮审æ¹è¿åº¦' , closeBtn: 1 , shade: 0.6 //é®ç½©éæåº¦ , maxmin: true //å è®¸å ¨å±æå°å , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯ , content: '../../ç³»ç»ç®¡ç/å¤çº§å®¡æ¹/审æ¹è¿åº¦/Xt_CheckFlowProgressList.html?linterid=' + InterID + '&HSouceBillType=3301' , resize: false, end: function () { ////ä¿®æ¹ä¸ºååå·æ°çé¢ //if (get_needClose_Bar == 0) { // $("#btnSearch").trigger('click'); //} else if (get_needClose_Bar == 1) { // $("#get_needClose").trigger('click'); //} } , cancel: function () { } }) } else { layer.msg('è¯·éæ©æ£ç¡®æ°æ®æ¥çï¼'); } } //#endregion //è¡å å é¤å¿«æ·é® function set_GridCellCheck(obj) { $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) { WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillCheckQuery.html
@@ -944,13 +944,14 @@ function set_RejectCheck_Flow(tableName) { var checkStatus = table.checkStatus(tableName) , data = checkStatus.data; if (checkStatus.data.length === 1) { var InterID = data[0].hmainid.toString(); if (checkStatus.data.length !=0 ) { var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//å°å¯¹è±¡æ°ç»idæåå»é var queryString = uniqueIds.join(",");//å°idsåææ°ç» //é»è¾å®¡æ ¸æ¹æ³ $.ajax({ type: "GET", url: GetWEBURL() + "/Gy_Routing/RejectCheckFlow", //æ¹æ³æå¨é¡µé¢åæ¹æ³å data: { "HInterID": InterID, "CurUserID": sessionStorage["Czybm"] }, url: GetWEBURL() + "/Gy_Routing/RejectAllCheckFlow", //æ¹æ³æå¨é¡µé¢åæ¹æ³å data: { "HInterIDS": queryString, "CurUserID": sessionStorage["Czybm"] }, success: function (result) { if (result.count == 1) { layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () { WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html
@@ -1594,7 +1594,7 @@ return data; } //#endregin //#endregion //#region åèµ·å®¡æ¹ function set_startCheckBill() { WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html
@@ -2424,7 +2424,7 @@ //#region 导åºExecel function get_Export() { var ModRightNameCheck = "Cj_StationOutBillList_ExportExcel"; var data = getExportData(); //é»è¾å®¡æ ¸æ¹æ³ $.ajax({ type: "GET", @@ -2432,7 +2432,6 @@ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] }, success: function (result) { if (result.count == 1) { var data = option.data data.forEach((item) => { for (let itemobj in item) { if (item[itemobj] == null) { @@ -2458,6 +2457,156 @@ } //#endregion //#region è·åå¯¼åºæ°æ® function getExportData() { var data;;//导åºçæ°æ® var ajaxLoad = layer.load(); if (typeof (params[params[0]]) != "undefined" && lookDownBar == 0) { $("#HProcExchBillNo").val(params[params[0]]); $("#HBeginDate").val("1990-01-01"); $("#HEndDate").val("2200-12-30"); lookDownBar = 1; } var HStatus = $("select[name='HStatus']").val();//ç¶æ var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ var HEndDate = $("#HEndDate").val();//ç»ææ¥æ var HWorkBillNo = $("#HWorkBillNo").val(); var HBillNo = $("#HBillNo").val(); var HProcExchBillNo = $("#HProcExchBillNo").val(); var checkHWasterQty = $("input[name='checkHWasterQty']").prop("checked");//å¤éæ¡ var ColName = $("#ColName").val();//å¤éæ¡ var Comparator = $("#Comparator").val(); var ColContent = $("#ColContent").val(); var ColName1 = $("#ColName1").val();//å¤éæ¡ var Comparator1 = $("#Comparator1").val(); var ColContent1 = $("#ColContent1").val(); var HNumber = $("#HNumber").val(); //产å代ç å³ç©æç¼ç var HName = $("#HName").val(); //å½åå·¥åº var HEmpNumber = $("#HEmpNumber").val(); //æä½å代ç var HEmpName = $("#HEmpName").val(); //æä½ååç§° if (ColName != 0 && Comparator != 0) { var com = ""; switch (Comparator) { case "7": com = "like'%" + ColContent + "%'"; break; case "8": com = "like'%" + ColContent + "'"; break; case "9": com = "like'" + ColContent + "%'"; break; case "10": com = "not like'%" + ColContent + "%'"; break; default: com = "" + Comparator + "'" + ColContent + "'"; break; } sWhere += " and " + ColName + " " + com; } if (ColName1 != 0 && Comparator1 != 0) { var com = ""; switch (Comparator1) { case "7": com = "like'%" + ColContent1 + "%'"; break; case "8": com = "like'%" + ColContent1 + "'"; break; case "9": com = "like'" + ColContent1 + "%'"; break; case "10": com = "not like'%" + ColContent1 + "%'"; break; default: com = "" + Comparator1 + "'" + ColContent1 + "'"; break; } sWhere += " and " + ColName1 + " " + com; } if (HBeginDate) { sWhere += " and CONVERT(varchar(100),åºç«æ¶é´, 23) >= '" + HBeginDate + "'"; } if (HEndDate) { sWhere += " and CONVERT(varchar(100),åºç«æ¶é´, 23) <= '" + HEndDate + "'"; } if (HWorkBillNo) { sWhere += " and ä»»å¡å like '%" + HWorkBillNo + "%'"; } if (HBillNo) { sWhere += " and åæ®å· like '%" + HBillNo + "%'"; } if (HProcExchBillNo) { sWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'"; } if (HProcExchBillNo) { sWhere += " and å·¥åºæµè½¬å¡å· like '%" + HProcExchBillNo + "%'"; } if (checkHWasterQty) { sWhere += " and æ¥åºæ°é>0 "; } if (HNumber) { sWhere += " and 产å代ç like '%" + HNumber + "%'"; } if (HName) { sWhere += " and å½åå·¥åº like '%" + HName + "%'"; } if (HEmpNumber) { sWhere += " and æä½å代ç like '%" + HEmpNumber + "%'"; } if (HEmpName) { sWhere += " and æä½å like '%" + HEmpName + "%'"; } if (HStatus) { switch (HStatus) { case '-1': //å ¨é¨ sWhere += ""; break; case '0': //æªå®¡æ ¸ sWhere += " and å®¡æ ¸äºº='"; break; case '1': //å·²å®¡æ ¸ sWhere += " and å®¡æ ¸äºº<>'"; break; case '2': //å·²å ³é sWhere += " and å ³é人<>'"; default: } } sWhere += " and HBillSubType<>'SUB'"; //æ¥è¯¢è¯å¥ $.ajax({ url: GetWEBURL() + '/Cj_StationOutBill/get_Display', type: "GET", async: false, data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": "3791" }, success: function (data1) { if (data1.count == 1) { data = data1.data;//ååæ®µæ°æ® layer.close(ajaxLoad); //layer.alert("æ¥è¯¢æå", { icon: 1 }); } else { layer.close(ajaxLoad); layer.alert(data1.code + data1.Message, { icon: 5 }); } }, error: function () { layer.close(ajaxLoad); layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 }); } }); sWhere = ""; return data; } //#endregion //åææ¾ç¤ºä¸ææ¡ function ColFilter() { var Organization = '<option value="0" selected="selected" ></option>';