From bc1dda419b3cef845ed90f6c31c6bda82743e19a Mon Sep 17 00:00:00 2001 From: yangle <admin@YINMOU> Date: 星期四, 07 三月 2024 10:19:16 +0800 Subject: [PATCH] 器具档案列表 增加 左边树形 器具分类,点击分类,根据分类来过滤,方便选择 器具档案里,增加字段 HMouldClass varchar(50) 器具类型 下拉框 (模具、工装、夹具、刀具、检具、周转器具、其他) --- WebAPI/Controllers/MateOutController.cs | 313 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 282 insertions(+), 31 deletions(-) diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs index f5f8a03..872a2e4 100644 --- a/WebAPI/Controllers/MateOutController.cs +++ b/WebAPI/Controllers/MateOutController.cs @@ -547,6 +547,9 @@ websLsmain.HBillNo = lsmain[0].HBillNo; websLsmain.HDeptID = lsmain[0].HDeptID; websLsmain.HEmpID = lsmain[0].HEmpID; + websLsmain.HKeeperID = lsmain[0].HKeeperID; + websLsmain.HSecManagerID = lsmain[0].HSecManagerID; + websLsmain.HBillerID = lsmain[0].HBillerID; websLsmain.HRemark = lsmain[0].HRemark; websLsmain.HMaker = lsmain[0].HMaker; websLsmain.HBillType = "1204";//鍥哄畾鍊� @@ -1347,10 +1350,19 @@ #region 鐧藉澂鍙戝竷姹囨�绘姤琛� [Route("MaterOutSumReport/MaterOutSumReport_Cloth")] [HttpGet] - public object MaterOutSumReport_Cloth(string sWhere) + public object MaterOutSumReport_Cloth(string sWhere, string user) { try { + if (!DBUtility.ClsPub.Security_Log("Kf_MaterOutSumReport_Cloth", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + //鍙嶅簭鍒楀寲浼犻�掔殑鍊� MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString()); @@ -1414,10 +1426,19 @@ #region 鐧藉澂鍙戝竷鏄庣粏鎶ヨ〃 [Route("MaterOutEntryReport/MaterOutEntryReport_Cloth")] [HttpGet] - public object MaterOutEntryReport_Cloth(string sWhere) + public object MaterOutEntryReport_Cloth(string sWhere, string user) { try { + if (!DBUtility.ClsPub.Security_Log("Kf_MaterOutEntryReport_Cloth", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + //鍙嶅簭鍒楀寲浼犻�掔殑鍊� MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString()); @@ -1477,10 +1498,19 @@ #region 鏌撳巶姹囨�绘姤琛� [Route("ProdProcessSumReport/ProdProcessSumReport_DyeColor")] [HttpGet] - public object ProdProcessSumReport_DyeColor(string sWhere) + public object ProdProcessSumReport_DyeColor(string sWhere, string user) { try { + if (!DBUtility.ClsPub.Security_Log("Kf_ProdProcessSumReport_DyeColor", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + //鍙嶅簭鍒楀寲浼犻�掔殑鍊� MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString()); @@ -1533,10 +1563,19 @@ #region 鏌撳巶鏄庣粏鎶ヨ〃 [Route("ProdProcessEntryReport/ProdProcessEntryReport_DyeColor")] [HttpGet] - public object ProdProcessEntryReport_DyeColor(string sWhere,string sProcessNo) + public object ProdProcessEntryReport_DyeColor(string sWhere,string sProcessNo,string user) { try { + if (!DBUtility.ClsPub.Security_Log("Kf_ProdProcessEntryReport_DyeColor", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + //鍙嶅簭鍒楀寲浼犻�掔殑鍊� MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString()); @@ -1582,10 +1621,19 @@ #region 鏌撳巶浜ч噺鎶ヨ〃 [Route("ProdProcessSumReport/ProdProcessSumReport_DyeColor_third")] [HttpGet] - public object ProdProcessSumReport_DyeColor_third(string sWhere) + public object ProdProcessSumReport_DyeColor_third(string sWhere,string user) { try { + if (!DBUtility.ClsPub.Security_Log("Kf_ProdProcessSumReport_DyeColor_third", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + //鍙嶅簭鍒楀寲浼犻�掔殑鍊� MaterOutSumReport com = JsonConvert.DeserializeObject<MaterOutSumReport>(sWhere.ToString()); @@ -1629,10 +1677,19 @@ #region 鐑樺共瀹氬瀷鍑虹珯 [Route("ProdProcessSumReport/Kf_DryFinalizeOutReport")] [HttpGet] - public object Kf_DryFinalizeOutReport(string sWhere) + public object Kf_DryFinalizeOutReport(string sWhere, string user) { try { + if (!DBUtility.ClsPub.Security_Log("Kf_DryFinalizeOutReport", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + ds = oCN.RunProcReturn($"select * from h_v_Kf_DryFinalizeOutReport where 1=1 "+sWhere, "h_v_Kf_DryFinalizeOutReport"); //鑾峰彇鍒楀悕 @@ -1666,10 +1723,19 @@ #region 涓婃祮瀹氬瀷鍑虹珯 [Route("ProdProcessSumReport/Kf_SizingFinalizeOutReport")] [HttpGet] - public object Kf_SizingFinalizeOutReport(string sWhere) + public object Kf_SizingFinalizeOutReport(string sWhere, string user) { try { + if (!DBUtility.ClsPub.Security_Log("Kf_SizingFinalizeOutReport", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + ds = oCN.RunProcReturn($"select * from h_v_Kf_SizingFinalizeOutReport where 1=1 " + sWhere, "h_v_Kf_SizingFinalizeOutReport"); //鑾峰彇鍒楀悕 @@ -1703,10 +1769,19 @@ #region 鍒锋瘺鍑虹珯 [Route("ProdProcessSumReport/Kf_BrushingOutReport")] [HttpGet] - public object Kf_BrushingOutReport(string sWhere) + public object Kf_BrushingOutReport(string sWhere, string user) { try { + if (!DBUtility.ClsPub.Security_Log("Kf_BrushingOutReport", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + ds = oCN.RunProcReturn($"select * from h_v_Kf_BrushingOutReport where 1=1 " + sWhere, "h_v_Kf_BrushingOutReport"); //鑾峰彇鍒楀悕 @@ -1740,10 +1815,19 @@ #region 鑹插澂鐑厜鍑虹珯 [Route("ProdProcessSumReport/Kf_ColorBlankLustringOutReport")] [HttpGet] - public object Kf_ColorBlankLustringOutReport(string sWhere) + public object Kf_ColorBlankLustringOutReport(string sWhere, string user) { try { + if (!DBUtility.ClsPub.Security_Log("Kf_ColorBlankLustringOutReport", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + ds = oCN.RunProcReturn($"select * from h_v_Kf_ColorBlankLustringOutReport where 1=1 " + sWhere, "h_v_Kf_ColorBlankLustringOutReport"); //鑾峰彇鍒楀悕 @@ -1778,46 +1862,55 @@ #region 鍘嬫按鍑虹珯 姣涘皷鍑虹珯 [Route("ProdProcessSumReport/Kf_PressurizedWaterOutReport")] [HttpGet] - public object Kf_PressurizedWaterOutReport(string sWhere,string HBillType) + public object Kf_PressurizedWaterOutReport(string sWhere,string HBillType,string user) { try { + if (!DBUtility.ClsPub.Security_Log(HBillType, 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + switch (HBillType) { - case "Kf_PressurizedWaterOutReport": + case "Kf_PressurizedWaterOutReport"://姣涘皷 鍘嬫按鍑虹珯 ds = oCN.RunProcReturn($"select * from h_v_Kf_PressurizedWaterOutReport where 1=1 " + sWhere, "h_v_Kf_PressurizedWaterOutReport"); break; - case "Kf_HairtipReport": + case "Kf_HairtipReport"://姣涘皷 姣涘皷鍑虹珯 ds = oCN.RunProcReturn($"select * from h_v_Kf_HairtipReport where 1=1 " + sWhere, "h_v_Kf_HairtipReport"); break; - case "Kf_DigitalSprayPaintingReport": + case "Kf_DigitalSprayPaintingReport"://姣涘皷 鏁扮爜鍠疯姳鍑虹珯 ds = oCN.RunProcReturn($"select * from h_v_Kf_DigitalSprayPaintingReport where 1=1 " + sWhere, "h_v_Kf_DigitalSprayPaintingReport"); break; - case "Kf_ShrinkBrushReport": + case "Kf_ShrinkBrushReport"://鍚庢暣浜屽彿 缂╁埛鍑虹珯 ds = oCN.RunProcReturn($"select * from h_v_Kf_ShrinkBrushReport where 1=1 " + sWhere, "h_v_Kf_ShrinkBrushReport"); break; - case "Kf_FinalizeTheDesignOutReport": + case "Kf_FinalizeTheDesignOutReport"://鍚庢暣浜屽彿 瀹氬瀷鍑虹珯 ds = oCN.RunProcReturn($"select * from h_v_Kf_FinalizeTheDesignOutReport where 1=1 " + sWhere, "h_v_Kf_FinalizeTheDesignOutReport"); break; - case "Kf_LustringOutReport": + case "Kf_LustringOutReport"://鍚庢暣浜屽彿 鐑厜鍑虹珯 ds = oCN.RunProcReturn($"select * from h_v_Kf_LustringOutReport where 1=1 " + sWhere, "h_v_Kf_LustringOutReport"); break; - case "Kf_ShrinkBrushOutReport": + case "Kf_ShrinkBrushOutReport"://鍚庢暣涓�鍙� 缂╁埛鍑虹珯 ds = oCN.RunProcReturn($"select * from h_v_Kf_ShrinkBrushOutReport where 1=1 " + sWhere, "h_v_Kf_ShrinkBrushOutReport"); break; - case "Kf_FinalizeOutReport": + case "Kf_FinalizeOutReport"://鍚庢暣涓�鍙� 瀹氬瀷鍑虹珯 ds = oCN.RunProcReturn($"select * from h_v_Kf_FinalizeOutReport where 1=1 " + sWhere, "h_v_Kf_FinalizeOutReport"); break; - case "Kf_LustringReport": + case "Kf_LustringReport"://鍚庢暣涓�鍙� 鐑厜鍑虹珯 ds = oCN.RunProcReturn($"select * from h_v_Kf_LustringReport where 1=1 " + sWhere, "h_v_Kf_LustringReport"); break; - case "Kf_ShrinkBrushTeReport": + case "Kf_ShrinkBrushTeReport"://鐗规暣 缂╁埛鍑虹珯 ds = oCN.RunProcReturn($"select * from h_v_Kf_ShrinkBrushTeReport where 1=1 " + sWhere, "h_v_Kf_ShrinkBrushTeReport"); break; - case "Kf_EmbossingOutReport": + case "Kf_EmbossingOutReport"://鐗规暣 鍘嬭姳鍑虹珯 ds = oCN.RunProcReturn($"select * from h_v_Kf_EmbossingOutReport where 1=1 " + sWhere, "h_v_Kf_EmbossingOutReport"); break; - case "Kf_StereoscopicFlowerOutReport": + case "Kf_StereoscopicFlowerOutReport"://鐗规暣 绔嬩綋鑺卞瀷鏈哄嚭绔� ds = oCN.RunProcReturn($"select * from h_v_Kf_StereoscopicFlowerOutReport where 1=1 " + sWhere, "h_v_Kf_StereoscopicFlowerOutReport"); break; } @@ -1858,10 +1951,19 @@ /// <returns></returns> [Route("MateOutController/GetKf_MateOutSumReport_QiaoYi_Json")] [HttpGet] - public object GetKf_MateOutSumReport_QiaoYi_Json(string sWhere) + public object GetKf_MateOutSumReport_QiaoYi_Json(string sWhere, string user) { try { + if (!DBUtility.ClsPub.Security_Log("Kf_MateOutSumReport_QiaoYi", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + ds = oCN.RunProcReturn("exec h_p_Kf_MateOutSumReport_QiaoYi " + sWhere, "h_p_Kf_MateOutSumReport_QiaoYi"); if (ds == null || ds.Tables[0].Rows.Count == 0) { @@ -1906,10 +2008,20 @@ #region (鐢熶骇璁㈠崟缁村害)瀹㈡埛璁㈠崟鎶ヨ〃 [Route("MaterOutEntryReport/sc_ICOMReportList")] [HttpGet] - public object sc_ICOMReportList(string sWhere,string HBeginDate,string HEndDate) + public object sc_ICOMReportList(string sWhere,string HBeginDate,string HEndDate, string user) { try { + if (!DBUtility.ClsPub.Security_Log("sc_ICOMReportList", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + + string sql = "exec h_p_sc_ICOMReport '"+ sWhere + "','"+ HBeginDate + "','"+ HEndDate + "'"; ds = oCN.RunProcReturn(sql, "h_p_sc_ICOMReport"); @@ -1985,13 +2097,72 @@ } #endregion - #region 鐢熶骇鍏ュ簱鎶ヨ〃 - [Route("MaterOutEntryReport/sc_ICOMRKReport")] + #region 娴佽浆鍗℃湭鍏ュ簱鎶ヨ〃 + [Route("MaterOutEntryReport/Sc_ProcExchangeNoInReport")] [HttpGet] - public object sc_ICOMRKReport(string sWhere) + public object Sc_ProcExchangeNoInReport(string sWhere, string HBeginDate, string HEndDate, string user) { try { + if (!DBUtility.ClsPub.Security_Log("Sc_ProcExchangeNoInReport", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + + string sql = "exec h_p_Sc_ProcExchangeNoInReport '" + sWhere + "','" + HBeginDate + "','" + HEndDate + "'"; + + ds = oCN.RunProcReturn(sql, "h_p_Sc_ProcExchangeNoInReport"); + + DataTable dt = ds.Tables[0]; + + //鑾峰彇鍒楀悕 + List<object> columnNameList = new List<object>(); + //娣诲姞鍒楀悕 + 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.list = columnNameList; + objJsonResult.data = dt; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + #region 鐢熶骇鍏ュ簱鎶ヨ〃 + [Route("MaterOutEntryReport/sc_ICOMRKReport")] + [HttpGet] + public object sc_ICOMRKReport(string sWhere, string user) + { + try + { + if (!DBUtility.ClsPub.Security_Log("sc_ICOMRKReport", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + string sql = "select * from h_v_sc_ICOMRKReport where 1=1 " + sWhere + " order by 鏃ユ湡 "; ds = oCN.RunProcReturn(sql, "h_v_sc_ICOMRKReport"); @@ -2013,6 +2184,67 @@ objJsonResult.Message = "Sucess锛�"; objJsonResult.list = columnNameList; objJsonResult.data = dt; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + #region 涓嶈壇鍘熷洜鍒嗘瀽鎶ヨ〃 + /// <summary> + /// 杩斿洖涓嶈壇鍘熷洜鍒嗘瀽鎶ヨ〃鍒楄〃 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Sc_BadReasonReport/list")] + [HttpGet] + public object list(string sWhere, string user) + { + try + { + if (!DBUtility.ClsPub.Security_Log("Sc_BadReasonReport", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + + List<object> columnNameList = new List<object>(); + + if (sWhere == null || sWhere.Equals("")) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "璇烽�夋嫨鏈夋晥骞翠唤"; + return objJsonResult; + } + else + { + ds = oCN.RunProcReturn("exec h_p_Sc_BadReasonReport '" + sWhere + "'", "h_p_Sc_BadReasonReport"); + } + + //娣诲姞鍒楀悕 + 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 e) @@ -2076,17 +2308,27 @@ public string HProductName { get; set; } public string HOtherSearch { get; set; } public string HEmpName { get; set; } + public string sWheres { get; set; } } [Route("MaterOutEntryReport/SC_DayRkReport")] [HttpGet] - public object SC_DayRkReport(string sWhere,int num) + public object SC_DayRkReport(string sWhere,int num, string user) { try { - DayRkReport DayRkReportList = JsonConvert.DeserializeObject<DayRkReport>(sWhere); + if (!DBUtility.ClsPub.Security_Log("SC_DayRkReport", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + + DayRkReport DayRkReportList = JsonConvert.DeserializeObject<DayRkReport>(sWhere); string sql = $"exec h_p_Gy_DayRkReport '{DayRkReportList.HBeginDate}','{DayRkReportList.HEndDate}','{DayRkReportList.HMaterNumber}'" + - $",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}','{DayRkReportList.HOtherSearch}'"; + $",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}','{DayRkReportList.HOtherSearch}','{DayRkReportList.HEmpName}','{DayRkReportList.sWheres}'"; //string sql = $"exec h_p_Gy_DayRkReport '{DayRkReportList.HBeginDate}','{DayRkReportList.HEndDate}','{DayRkReportList.HMaterNumber}'" + // $",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}'"; @@ -2155,10 +2397,19 @@ } [Route("MaterOutEntryReport/SemiFinishedProductsReportList")] [HttpGet] - public object SemiFinishedProductsReportList(string sWhere, int num) + public object SemiFinishedProductsReportList(string sWhere, int num, string user) { try { + if (!DBUtility.ClsPub.Security_Log("SemiFinishedProductsReportList", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + SemiFinishedProductsReport DayRkReportList = JsonConvert.DeserializeObject<SemiFinishedProductsReport>(sWhere); string sql = $"exec h_p_sc_SemiFinishedProductsReport '{DayRkReportList.HBeginDate}','{DayRkReportList.HEndDate}','{DayRkReportList.HMaterNumber}'" + -- Gitblit v1.9.1