From 0f7cfd3e4bf160d6aba48514c89a1aae723ed5a7 Mon Sep 17 00:00:00 2001 From: yxj <yxj@hz-kingdee.com> Date: 星期三, 02 四月 2025 16:59:53 +0800 Subject: [PATCH] 新增齐套分析、提料运算(通过齐套表进行运算)调用方法 --- WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs | 67 +++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 1 deletions(-) diff --git a/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs index 6455b57..ada5822 100644 --- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs +++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs @@ -1,4 +1,5 @@ 锘縰sing DBUtility; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; @@ -26,6 +27,7 @@ { try { + List<object> columnNameList = new List<object>(); if (!DBUtility.ClsPub.Security_Log("Sb_EquipMaintainPlanBillList", 1, false, user)) { objJsonResult.code = "0"; @@ -46,11 +48,19 @@ ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipMaintainPlan"); } - + //娣诲姞鍒楀悕 + foreach (DataColumn col in ds.Tables[0].Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucess锛�"; objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; return objJsonResult; } catch (Exception ex) @@ -69,6 +79,59 @@ public static DataSet Sb_EquipMaintainPlanBillList_s(string sWhere) { return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipMaintainPlanBillList ", "h_v_Sb_EquipMaintainPlanBillList"); + } + #endregion + + #region 璁惧淇濆吇璁″垝琛ㄥ垎椤垫煡璇� + [Route("Sb_EquipMaintainPlanBill/GetEquipMaintainPlanBillListPage")] + [HttpGet] + public object GetEquipMaintainPlanBillListPage(string sWhere, string user, int page, int size) + { + try + { + List<object> columnNameList = new List<object>(); + //缂栬緫鏉冮檺 + if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipMaintainPlanBillList", 3, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + sWhere = sWhere.Replace("'", "''"); + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("exec h_p_Sc_EquipMaintainPlanListPage " + page + "," + size + ",''", "h_p_Sc_EquipMaintainPlanListPage"); + } + else + { + ds = oCN.RunProcReturn("exec h_p_Sc_EquipMaintainPlanListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_Sc_EquipMaintainPlanListPage"); + } + + //娣诲姞鍒楀悕 + foreach (DataColumn col in ds.Tables[0].Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + objJsonResult.code = "1"; + objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString()); + objJsonResult.Message = "Sucess锛�"; + objJsonResult.list = columnNameList; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } } #endregion @@ -113,6 +176,8 @@ UserName = oItem.HMaker; //鍒跺崟浜� oItem.HBillType = "3902"; oItem.HBillSubType = "3902"; + oItem.HMainSourceInterID = oItem.HMouldMaintainRuleID; + oItem.HMainSourceBillNo = oItem.HMouldMaintainRuleNo; //oItem.HInterID =0; //oItem.HBillNo = ""; -- Gitblit v1.9.1