From 43efa9e547e6c7dc79767571c0186707519e4702 Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期二, 25 十月 2022 23:47:05 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs | 300 ++++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 222 insertions(+), 78 deletions(-) diff --git a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs index 30db31b..fd4b567 100644 --- a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs +++ b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs @@ -16,51 +16,52 @@ private json objJsonResult = new json(); public DataSet ds = new DataSet(); SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); - public DLL.ClsGy_EquipFileMain BillNew0 = new DLL.ClsGy_EquipFileMain(); - public DLL.ClsGy_EquipFileMain BillOld0 = new DLL.ClsGy_EquipFileMain(); + public DLL.ClsGy_EquipFileMain BillNew0 = new DLL.ClsGy_EquipFileMain(); + public DLL.ClsGy_EquipFileMain BillOld0 = new DLL.ClsGy_EquipFileMain(); #region 璁惧妗f鍒楄〃 [Route("Gy_EquipFileMain/GetList")] [HttpGet] - public object GetList(string sWhere) + public object GetList(string sWhere, string user) { try { - //if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, true, user)) - //{ - // objJsonResult.code = "0"; - // objJsonResult.count = 0; - // objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺"; - // objJsonResult.data = null; - // return objJsonResult; - //} + if (!DBUtility.ClsPub.Security_Log("Gy_EquipFileList", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺"; + objJsonResult.data = null; + return objJsonResult; + } if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("select *from h_v_Gy_EquipFileMainList " + sWhere + "order by 鏃ユ湡 desc", "h_v_Gy_EquipFileMainList"); + ds = oCN.RunProcReturn("select * from h_v_Gy_EquipFileMainList " + sWhere + " order by hmainid desc", "h_v_Gy_EquipFileMainList"); } else { string sql1 = "select * from h_v_Gy_EquipFileMainList where 1 = 1 "; - string sql = sql1 + sWhere + "order by 鏃ユ湡 desc"; + string sql = sql1 + sWhere + " order by hmainid desc"; ds = oCN.RunProcReturn(sql, "h_v_Gy_EquipFileMainList"); } - if (ds == null || ds.Tables[0].Rows.Count == 0) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鏆傛棤鏁版嵁锛�"; - objJsonResult.data = null; - return objJsonResult; - } - else - { - objJsonResult.code = "1"; - objJsonResult.count = 1; - objJsonResult.Message = "Sucess锛�"; - objJsonResult.data = ds.Tables[0]; - return objJsonResult; - } + + //if (ds.Tables[0].Rows.Count != 0 || ds != null) + //{ + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + return objJsonResult; + //} + //else + //{ + //objJsonResult.code = "0"; + //objJsonResult.count = 0; + //objJsonResult.Message = "鏃犳暟鎹�"; + //objJsonResult.data = null; + //return objJsonResult; + //} } catch (Exception e) { @@ -77,8 +78,17 @@ #region [璁惧妗f鍒犻櫎鍔熻兘] [Route("Gy_EquipFileMain/Delete_EquipFile")] [HttpGet] - public object Delete_EquipFile(string HItemID) + public object Delete_EquipFile(string HItemID, string user) { + if (!DBUtility.ClsPub.Security_Log("Gy_EquipFile_Delete", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + string s = ""; Int64 lngBillKey = 0; lngBillKey = DBUtility.ClsPub.isLong(HItemID); @@ -93,23 +103,12 @@ DLL.ClsGy_EquipFileMain oBill = new DLL.ClsGy_EquipFileMain(); if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) { - bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo); - if (IsDete) - { - objJsonResult.code = "1"; - objJsonResult.count = 1; - objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; - objJsonResult.data = null; - return objJsonResult; - } - else - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; - objJsonResult.data = null; - return objJsonResult; - } + oCN.RunProc("Delete From Gy_EquipFileBillMain where HInterID=" + lngBillKey); + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍒犻櫎鎴愬姛"; + objJsonResult.data = null; + return objJsonResult; } else { @@ -165,30 +164,42 @@ string msg1 = _value.ToString(); string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); + string msg3 = sArray[1].ToString(); + string msg4 = sArray[2].ToString(); + + if (!DBUtility.ClsPub.Security_Log("Gy_EquipFile_Edit", 1, false, msg4)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } //鍙嶅簭鍒楀寲 msg2 = "[" + msg2.ToString() + "]"; List<Models.ClsGy_EquipFileMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_EquipFileMain>>(msg2); - string hbillno= list[0].HBillNo; + string hbillno = list[0].HBillNo; + string HYear = DateTime.Now.Year.ToString(); DateTime HDate = list[0].HDate; long HInterID = list[0].HInterID; - string HEquipFileNumber = list[0].HEquipFileNumber; + string HEquipFileNumber = list[0].HEquipFileNumber; string HEquipFileNo = list[0].HEquipFileNo; // varchar(50) //璁惧缂栫爜(鍞竴) string HName = list[0].HName; // 鈭� varchar(100) //璁惧鍚嶇О string HModel = list[0].HModel; // 鈭� varchar(100) //璁惧瑙勬牸 string HModel2 = list[0].HModel2; // 鈭� varchar(100) //璁惧鍨嬪彿 int HMaterID = list[0].HMaterID; // 鈭� int //瀵瑰簲鐗╂枡 int HUnitID = list[0].HUnitID; // 鈭� int //鍗曚綅 - DateTime HOutComDate = list[0].HOutComDate; // 鈭� datetime //璁惧鍑哄巶鏃ユ湡 + string HOutComDate = list[0].HOutComDate; // 鈭� datetime //璁惧鍑哄巶鏃ユ湡 string HOutComNo = list[0].HOutComNo; // 鈭� varchar(100) //璁惧鍑哄巶缂栧彿 int HDeptID = list[0].HDeptID; // 鈭� int //浣跨敤閮ㄩ棬锛坓y_Department锛� int HUseEmpID = list[0].HUseEmpID; //鈭� int //浣跨敤璐熻矗浜猴紙gy_Employee锛� int HRepairEmpID = list[0].HRepairEmpID; //鈭� int //缁存姢璐熻矗浜猴紙gy_Employee锛� string HAddress = list[0].HAddress; // 鈭� varchar(500) //瀹夎鍦扮偣 - DateTime HSetupDate = list[0].HSetupDate; //鈭� datetime //瀹夎鏃ユ湡 - DateTime HStartupDate = list[0].HStartupDate; //鈭� datetime //杩愯寮�濮嬫棩鏈� + string HSetupDate = list[0].HSetupDate; //鈭� datetime //瀹夎鏃ユ湡 + string HStartupDate = list[0].HStartupDate; //鈭� datetime //杩愯寮�濮嬫棩鏈� string HStatus = list[0].HStatus; // 鈭� varchar(20) //褰撳墠鐘舵�侊紙绌洪棽銆佸崰鐢ㄣ�佸姞宸ャ�佸叧鏈恒�佸紓甯稿仠鏈猴級 int HEquipFileTypeID = list[0].HEquipFileTypeID; //鈭� int //璁惧绫诲埆锛圙y_EquipFileType) string HProNum = list[0].HProNum; // 鈭� varchar(100) //宸ョ▼缂栫爜 @@ -197,6 +208,11 @@ string HLogo = list[0].HLogo; //鈭� varchar(50) //鍝佺墝 int HSellSupID = list[0].HSellSupID; // 鈭� int //渚涘簲鍟�(Gy_Supplier) int HMakeSupID = list[0].HMakeSupID; // int //鍒堕�犲晢 (Gy_Supplier) + string HMaker = msg4; + string HMakeDate = DateTime.Now.Date.ToString(); + int HEquipDotCheckRuleInterID = list[0].HEquipDotCheckRuleInterID; + int HEquipMaintainRuleInterID = list[0].HEquipMaintainRuleInterID; + int HSourceID = list[0].HSourceID; if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber)) { @@ -212,12 +228,11 @@ oCN.RunProc("Insert into Gy_EquipFileBillMain " + " (hbillno,HEquipFileNumber,HEquipFileNo,HName,HModel,HModel2,HMaterID,HUnitID,HOutComDate" + ",HOutComNo,HDeptID,HUseEmpID,HRepairEmpID,HAddress,HSetupDate,HStartupDate,HStatus," + - "HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate) " + + "HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate,HYear,HMaker,HMakeDate,HEquipMaintainRuleInterID,HEquipDotCheckRuleInterID,HSourceID) " + " Values('" + hbillno + "','" + HEquipFileNumber + "','" + HEquipFileNo + "','" + HName + "','" + HModel + "','" + HModel2 + "'," + HMaterID + "," + HUnitID + ",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HUseEmpID + "," + HRepairEmpID + ",'" + HAddress + "','" + HSetupDate + "','" + HStartupDate + "','" + HStatus + "'," + HEquipFileTypeID + ",'" + HProNum + - "','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID +",'3308','" + HDate + - "')", ref DBUtility.ClsPub.sExeReturnInfo); + "','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID + ",'3308','" + HDate + "','" + HYear + "','" + HMaker + "','" + HMakeDate + "','" + HEquipMaintainRuleInterID + "','" + HEquipDotCheckRuleInterID +"'," + HSourceID + ")", ref DBUtility.ClsPub.sExeReturnInfo); //淇敼涓婄骇涓洪潪鏈骇浠g爜 oCN.Commit(); objJsonResult.code = "1"; @@ -239,7 +254,7 @@ #endregion #region 璁惧妗f淇敼淇濆瓨 - + [Route("Gy_EquipFileMain/EditBill")] [HttpPost] public object EditBill([FromBody] JObject oMain) @@ -252,6 +267,16 @@ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string msg3 = sArray[1].ToString(); + string msg4 = sArray[2].ToString(); + + if (!DBUtility.ClsPub.Security_Log("Gy_EquipFile_Edit", 1, false, msg4)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } //鍙嶅簭鍒楀寲 msg2 = "[" + msg2.ToString() + "]"; @@ -265,14 +290,14 @@ string HModel2 = list[0].HModel2; // 鈭� varchar(100) //璁惧鍨嬪彿 int HMaterID = list[0].HMaterID; // 鈭� int //瀵瑰簲鐗╂枡 int HUnitID = list[0].HUnitID; // 鈭� int //鍗曚綅 - DateTime HOutComDate = list[0].HOutComDate; // 鈭� datetime //璁惧鍑哄巶鏃ユ湡 + string HOutComDate = list[0].HOutComDate; // 鈭� datetime //璁惧鍑哄巶鏃ユ湡 string HOutComNo = list[0].HOutComNo; // 鈭� varchar(100) //璁惧鍑哄巶缂栧彿 int HDeptID = list[0].HDeptID; // 鈭� int //浣跨敤閮ㄩ棬锛坓y_Department锛� int HUseEmpID = list[0].HUseEmpID; //鈭� int //浣跨敤璐熻矗浜猴紙gy_Employee锛� int HRepairEmpID = list[0].HRepairEmpID; //鈭� int //缁存姢璐熻矗浜猴紙gy_Employee锛� string HAddress = list[0].HAddress; // 鈭� varchar(500) //瀹夎鍦扮偣 - DateTime HSetupDate = list[0].HSetupDate; //鈭� datetime //瀹夎鏃ユ湡 - DateTime HStartupDate = list[0].HStartupDate; //鈭� datetime //杩愯寮�濮嬫棩鏈� + string HSetupDate = list[0].HSetupDate; //鈭� datetime //瀹夎鏃ユ湡 + string HStartupDate = list[0].HStartupDate; //鈭� datetime //杩愯寮�濮嬫棩鏈� string HStatus = list[0].HStatus; // 鈭� varchar(20) //褰撳墠鐘舵�侊紙绌洪棽銆佸崰鐢ㄣ�佸姞宸ャ�佸叧鏈恒�佸紓甯稿仠鏈猴級 int HEquipFileTypeID = list[0].HEquipFileTypeID; //鈭� int //璁惧绫诲埆锛圙y_EquipFileType) string HProNum = list[0].HProNum; // 鈭� varchar(100) //宸ョ▼缂栫爜 @@ -280,7 +305,13 @@ string HWorkArea = list[0].HWorkArea; //鈭� varchar(50) //浜у湴 string HLogo = list[0].HLogo; //鈭� varchar(50) //鍝佺墝 int HSellSupID = list[0].HSellSupID; // 鈭� int //渚涘簲鍟�(Gy_Supplier) - int HMakeSupID = list[0].HMakeSupID; // int //鍒堕�犲晢 (Gy_Supplier) + int HMakeSupID = list[0].HMakeSupID; // int //鍒堕�犲晢 (Gy_Supplier) + string HUpDater = msg4; + string HUpDateDate = DateTime.Now.Date.ToString(); + int HEquipDotCheckRuleInterID = list[0].HEquipDotCheckRuleInterID; + int HEquipMaintainRuleInterID = list[0].HEquipMaintainRuleInterID; + int HSourceID = list[0].HSourceID; + if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber)) { @@ -308,28 +339,33 @@ //涓昏〃 oCN.RunProc("Update Gy_EquipFileBillMain set " + " HEquipFileNumber='" + HEquipFileNumber + "'" + - " HEquipFileNo='" + HEquipFileNo + "'" + - " HName='" + HName + "'" + - " HModel='" + HModel + "'" + - " HModel2='" + HModel2 + "'" + - " HMaterID=" + HMaterID + - " HUnitID=" + HUnitID + - " HOutComDate='" + HOutComDate + "'" + - " HOutComNo='" + HOutComNo + "'" + - " HDeptID=" + HDeptID + - " HUseEmpID=" + HUseEmpID + - " HRepairEmpID=" + HRepairEmpID + - " HAddress='" + HAddress + "'" + - " HSetupDate='" + HSetupDate + "'" + - " HStartupDate='" + HStartupDate + "'" + - " HStatus='" + HStatus + "'" + - " HEquipFileTypeID=" + HEquipFileTypeID + + ",HEquipFileNo='" + HEquipFileNo + "'" + + ",HName='" + HName + "'" + + ",HModel='" + HModel + "'" + + ",HModel2='" + HModel2 + "'" + + ",HMaterID=" + HMaterID + + ",HUnitID=" + HUnitID + + ",HOutComDate='" + HOutComDate + "'" + + ",HOutComNo='" + HOutComNo + "'" + + ",HDeptID=" + HDeptID + + ",HUseEmpID=" + HUseEmpID + + ",HRepairEmpID=" + HRepairEmpID + + ",HAddress='" + HAddress + "'" + + ",HSetupDate='" + HSetupDate + "'" + + ",HStartupDate='" + HStartupDate + "'" + + ",HStatus='" + HStatus + "'" + + ",HEquipFileTypeID=" + HEquipFileTypeID + ",HProNum='" + HProNum + "'" + ",HBarCode='" + HBarCode + "'" + ",HWorkArea='" + HWorkArea + "'" + - ",HLogo=" + HLogo + - ",HSellSupID=" + HSellSupID + + ",HLogo='" + HLogo + "'" + + ",HSellSupID=" + HSellSupID + ",HMakeSupID= " + HMakeSupID + + ",HUpDater= '" + HUpDater + "'" + + ",HUpDateDate= '" + HUpDateDate + "'" + + ",HEquipDotCheckRuleInterID='" + HEquipDotCheckRuleInterID + "'" + + ",HEquipMaintainRuleInterID='" + HEquipMaintainRuleInterID + "'" + + ",HSourceID='" + HSourceID + "'" + " Where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo); //淇敼瀛愰」鐩唬鐮� //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo); @@ -352,5 +388,113 @@ } } #endregion + + #region[璁惧灞ュ巻(鐐瑰嚮涓昏〃甯﹀嚭浠庤〃)] + [Route("Gy_EquipFileMain/Sb_EquipFileBillResumeDate")] + [HttpGet] + public object Sb_EquipFileBillResumeDate(string HInterID) + { + + DataTable ds, ds1; + long HInterID1 = long.Parse(HInterID); + List<object> list = new List<object>(); + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + //鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁 + string sql1 = string.Format($"exec h_p_Gy_EquipRecord {HInterID1}"); + ds = oCN.RunProcReturn(sql1, "h_p_Gy_EquipRecord").Tables[0]; + ds1 = oCN.RunProcReturn(sql1, "h_p_Gy_EquipRecord").Tables[1]; + + list.Add(ds);//鏃ュ父璁板綍 + list.Add(ds1);//缁翠慨璁板綍 + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; + objJsonResult.list = list; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.data = null; + } + return objJsonResult; + } + #endregion + + #region[鍣ㄥ叿灞ュ巻(鐐瑰嚮涓昏〃甯﹀嚭浠庤〃)] + [Route("Gy_EquipFileMain/Gy_MouldFileBillResumeDate")] + [HttpGet] + public object Gy_MouldFileBillResumeDate(string HInterID) + { + + DataTable ds, ds1, ds2, ds3; + + long HInterID1 = long.Parse(HInterID); + List<object> list = new List<object>(); + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + //鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁 + string sql1 = string.Format($"exec h_p_Gy_MouldRecord {HInterID1}"); + ds = oCN.RunProcReturn(sql1, "h_p_Gy_MouldRecord").Tables[0]; + ds1 = oCN.RunProcReturn(sql1, "h_p_Gy_MouldRecord").Tables[1]; + ds2 = oCN.RunProcReturn(sql1, "h_p_Gy_MouldRecord").Tables[2]; + ds3 = oCN.RunProcReturn(sql1, "h_p_Gy_MouldRecord").Tables[3]; + + list.Add(ds);//鍑哄叆搴撹褰� + list.Add(ds1);//鍣ㄥ叿鑰楃敤璁板綍 + list.Add(ds2);//鏃ュ父璁板綍 + list.Add(ds3);//缁翠慨璁板綍 + + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; + objJsonResult.list = list; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.data = null; + } + return objJsonResult; + } + #endregion + + #region[鏍规嵁鏉$爜杩斿洖璁惧淇℃伅] + [Route("Gy_EquipFileMain/Gy_MouldFileBillBarCodeInfo")] + [HttpGet] + public object Gy_MouldFileBillBarCodeInfo(string HBarCode) + { + DataTable ds; + List<object> list = new List<object>(); + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + //鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁 + string sql1 = string.Format($"exec h_p_Gy_EquipFileGetInfoByBarCode {HBarCode}"); + ds = oCN.RunProcReturn(sql1, "h_p_Gy_EquipFileGetInfoByBarCode").Tables[0]; + + list.Add(ds);//璁惧妗f + + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鑾峰彇璁惧淇℃伅鎴愬姛锛�"; + objJsonResult.list = list; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛佽妫�鏌ユ潯褰㈢爜锛�" + e.ToString(); + objJsonResult.data = null; + } + return objJsonResult; + } + #endregion } } -- Gitblit v1.9.1