From e4513b5abb10a008f82ca45805a1f568141b8390 Mon Sep 17 00:00:00 2001 From: zrg <z18737863051@163.com> Date: 星期二, 19 十一月 2024 10:10:51 +0800 Subject: [PATCH] 保养记录,点检记录,设备停机单,设备开机单,设备工艺参数点检表列表,故障登记单,派工单,维修记录单,维修验收单,维修签到单 后端更改数据库查询 --- WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs | 247 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 241 insertions(+), 6 deletions(-) diff --git a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs index 3edc204..708eb04 100644 --- a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs +++ b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs @@ -9,6 +9,7 @@ using System.Data.SqlClient; using System.Web.Http; using WebAPI.Models; +using SyntacticSugar.constant; namespace WebAPI.Controllers { @@ -131,6 +132,63 @@ return objJsonResult; } } + + #region 鍙戣揣閫氱煡鍗� 鏌ヨ-鍒嗛〉 + [Route("Xs_SeOutStockBill/list_byPage")] + [HttpGet] + public object list_byPag(string sWhere, string user, string Organization, int page, int size) + { + try + { + List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺 + //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄� + if (!DBUtility.ClsPub.Security_Log("Xs_SeOutStockBillQuery", 1, 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_IF_SeOutStockBillList " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_IF_SeOutStockBillList"); + } + else + { + ds = oCN.RunProcReturn("exec h_p_IF_SeOutStockBillList " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_IF_SeOutStockBillList"); + } + + //娣诲姞鍒楀悕 + 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 + + /// <summary> ///鍒犻櫎鍔熻兘 /// </summary> @@ -331,7 +389,7 @@ string HLinkPhone = mainList[0].HLinkPhone; string HSeOrderBillNo_M = mainList[0].HSeOrderBillNo_M; - ds = oCN.RunProcReturn("select * from h_v_IF_SeOutStockBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_IF_SeOutStockBillList"); + ds = oCN.RunProcReturn("select * from h_v_IF_SeOutStockBillList where hmainid=" + HInterID, "h_v_IF_SeOutStockBillList"); //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗 string s = ""; @@ -392,7 +450,7 @@ { //淇敼 DataSet dss; - dss = oCN.RunProcReturn("select * from h_v_IF_SeOutStockBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_IF_SeOutStockBillList"); + dss = oCN.RunProcReturn("select * from h_v_IF_SeOutStockBillList where hmainid=" + HInterID, "h_v_IF_SeOutStockBillList"); //鍒ゆ柇鏄惁鍙紪杈� if (dss.Tables[0].Rows[0]["瀹℃牳浜�"].ToString() != "" && dss.Tables[0].Rows[0]["瀹℃牳浜�"] != null) { @@ -412,7 +470,7 @@ } string sql = $@"update Xs_SeOutStockBillMain set " + - "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" + + "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" + ",HBillNo='" + HBillNo + "'" + ",HCusID='" + HCusID + "', HCurID='" + HCurID + "', HWHID = '" + HWHID + "',HExRate='" + HExRate + "',HEmpID='" + HEmpID + "',HSeOrderBillNo_M='" + HSeOrderBillNo_M + "',HManagerID='" + HManagerID + "',HDeptID='" + HDeptID + "',HOWNERID='" + HOWNERID + "',HAddress='" + HAddress + "',HProjectID='"+ HProjectID + "' where HInterID=" + HInterID; @@ -429,6 +487,30 @@ //鍙戣揣閫氱煡鐨� 鍙嶅啓 鏁伴噺鍒� 閿�鍞鍗� 鍏宠仈鏁伴噺 oCN.RunProcReturn("exec h_p_Xs_SeOutStockBillMain " + HInterID, "h_p_Xs_SeOutStockBillMain"); + + //鑷姩瀹℃牳璁剧疆 + if ((OperationType == 1 || OperationType == 2)) + { + objJsonResult.HInterID = HInterID.ToString(); //杩斿洖涓籌D + //绯荤粺鍙傛暟 鑷姩瀹℃牳 + string sReturn = ""; + if (oSystemParameter.ShowBill(ref sReturn) == true) + { + if (oSystemParameter.omodel.Xs_SeOutStockBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳 + { + objJsonResult.Verify = "Y"; + } + else + { + objJsonResult.Verify = "N"; + } + } + } + else if (OperationType == 3) + { + objJsonResult.HInterID = HInterID.ToString(); //杩斿洖涓籌D + objJsonResult.Verify = "N"; + } //淇濆瓨鍚庢帶鍒�========================================= @@ -1466,7 +1548,7 @@ [HttpGet] public object AuditXs_SeOutStockBill_Flow(int HInterID, int IsAudit, string CurUserName, string CurUserID) { - //string ModRightNameCheck = "Cg_POOrderBill_Check"; + //string ModRightNameCheck = "Xs_SeOutStockBill_Check"; DBUtility.ClsPub.CurUserName = CurUserName; try { @@ -1572,7 +1654,7 @@ #region 瀹℃牳鍓嶇殑鐩稿叧鍒ゆ柇 //瀹℃牳鍓嶆帶鍒�========================================= string sql1 = "exec h_p_Xs_SeOutStockBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + CurUserName + "'"; - ds = oCN.RunProcReturn(sql1, "h_p_Cg_POOrderBill_BeforeCheckCtrl"); + ds = oCN.RunProcReturn(sql1, "h_p_Xs_SeOutStockBill_BeforeCheckCtrl"); if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; @@ -1700,7 +1782,7 @@ { #region 鍙嶅鏍稿墠鐨勭浉鍏冲垽鏂� //鍙嶅鏍稿墠鎺у埗========================================= - DataSet ds = oCN.RunProcReturn("Exec h_p_Xs_SeOutStockBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + CurUserName + "'", "h_p_Cg_POOrderBill_BeforeUnCheckCtrl"); + DataSet ds = oCN.RunProcReturn("Exec h_p_Xs_SeOutStockBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + CurUserName + "'", "h_p_Xs_SeOutStockBill_BeforeUnCheckCtrl"); if (ds == null) { objJsonResult.code = "0"; @@ -1848,5 +1930,158 @@ } } #endregion + + #region 鍙戣揣閫氱煡鍗曚笅鎺ㄦ煡璇㈠垪琛� + [Route("Xs_SeOutStockBill/PushList")] + [HttpGet] + public object PushList(string HBillNo, string user) + { + try + { + List<object> columnNameList = new List<object>(); + + string sql = "select * from h_v_IF_SeOutStockBillList where 鍗曟嵁鍙� = '" + HBillNo + "' and 鐘舵�� = '宸插鏍�' and 鏁伴噺 - 宸插叧鑱旀暟閲� > 0"; + + + ds = oCN.RunProcReturn(sql, "h_v_IF_SeOutStockBillList"); + + if (ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = CodeConstant.FAIL; + objJsonResult.count = CountConstant.FAIL; + objJsonResult.Message = "鎵句笉鍒扮鍚堟潯浠跺崟鎹�!"; + objJsonResult.data = null; + return objJsonResult; + } + + + 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 = CodeConstant.SUCCEED; + objJsonResult.count = CountConstant.SUCCEED; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = CodeConstant.FAIL; + objJsonResult.count = CountConstant.FAIL; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + #region 鍙戣揣閫氱煡鍗曟煡璇㈠垪琛� + [Route("Xs_SeOutStockBill/QueryList")] + [HttpGet] + public object QueryList(string sWhere, string user) + { + try + { + List<object> columnNameList = new List<object>(); + //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄� + + if (!DBUtility.ClsPub.Security_Log("Xs_SeOutStockBillQuery", 1, false, user)) + { + objJsonResult.code = CodeConstant.FAIL; + objJsonResult.count = CountConstant.FAIL; + objJsonResult.Message = "鏃犳潈闄愭煡鐪�!"; + objJsonResult.data = null; + return objJsonResult; + } + string sql = "select * from h_v_Xs_SeOutStockBillQuery where 1 = 1 "; + + if (sWhere == "" || sWhere == null) + { + ds = oCN.RunProcReturn("select * from h_v_Xs_SeOutStockBillQuery order by hmainid desc", "h_v_Xs_SeOutStockBillQuery"); + } + else + { + ds = oCN.RunProcReturn(sql + sWhere + " order by hmainid desc", "h_v_Xs_SeOutStockBillQuery"); + } + + + + 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 = CodeConstant.SUCCEED; + objJsonResult.count = CountConstant.SUCCEED; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = CodeConstant.FAIL; + objJsonResult.count = CountConstant.FAIL; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + #region 鍙戣揣閫氱煡鍗曟煡璇㈠瓙鍒楄〃 + [Route("Xs_SeOutStockBill/QuerySubList")] + [HttpGet] + public object QuerySubList(string hmainid, string user) + { + try + { + List<object> columnNameList = new List<object>(); + //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄� + + if (!DBUtility.ClsPub.Security_Log("Xs_SeOutStockBillQuery", 1, false, user)) + { + objJsonResult.code = CodeConstant.FAIL; + objJsonResult.count = CountConstant.FAIL; + objJsonResult.Message = "鏃犳潈闄愭煡鐪�!"; + objJsonResult.data = null; + return objJsonResult; + } + string sql = "select * from h_v_Xs_SeOutStockBillQuerySub where hmainid = " + hmainid; + + ds = oCN.RunProcReturn(sql + " order by hsubid desc", "h_v_Xs_SeOutStockBillQuerySub"); + + + 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 = CodeConstant.SUCCEED; + objJsonResult.count = CountConstant.SUCCEED; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = CodeConstant.FAIL; + objJsonResult.count = CountConstant.FAIL; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion } } \ No newline at end of file -- Gitblit v1.9.1