From 7b31d00b64218b6f11e2fa92386e3d15ee332d3e Mon Sep 17 00:00:00 2001 From: yxj <1qaz@123> Date: 星期一, 16 五月 2022 15:51:49 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs | 273 +++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 185 insertions(+), 88 deletions(-) diff --git a/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs index 1b48c2b..e394350 100644 --- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs +++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs @@ -25,16 +25,45 @@ /// <returns></returns> [Route("Sb_EquipMaintainBill/GetEquipMaintainBillList")] [HttpGet] - public object GetEquipMaintainBillList(string sWhere) + public object GetEquipMaintainBillList(string sWhere,string user) { try { - ds = Sb_EquipMaintainBillList_s(sWhere); + if (!DBUtility.ClsPub.Security_Log("Sb_EquipMaintainBillList", 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_Sc_EquipMaintain " + sWhere + " order by hmainid desc", "h_v_Sc_EquipMaintain"); + } + else + { + string sql1 = "select * from h_v_Sc_EquipMaintain where 1 = 1"; + string sql = sql1 + sWhere + " order by hmainid desc"; + ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipMaintain"); + } + + //if (ds.Tables[0].Rows.Count != 0 || ds != null) + //{ objJsonResult.code = "1"; objJsonResult.count = 1; - objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�"; + 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 ex) { @@ -70,12 +99,21 @@ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string msg3 = sArray[1].ToString(); - + string msg4 = sArray[2].ToString(); + string msg5 = sArray[3].ToString(); string UserName = ""; ListModels oListModels = new ListModels(); try { + if (!DBUtility.ClsPub.Security_Log("Sb_EquipMaintainBill_Edit", 1, false, msg5)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } DAL.ClsSb_EquipMaintainBill oBill = new DAL.ClsSb_EquipMaintainBill(); List<Model.ClsSb_EquipMaintainBillMain> lsmain = new List<Model.ClsSb_EquipMaintainBillMain>(); msg2 = msg2.Replace("\\", ""); @@ -114,28 +152,54 @@ } oBill.omodel = oItem; } - //琛ㄤ綋鏁版嵁 + //淇濆吇椤硅〃浣撴暟鎹� //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆� msg3 = msg3.Substring(1, msg3.Length - 2); msg3 = msg3.Replace("\\", ""); msg3 = msg3.Replace("\n", ""); //\n //msg2 = msg2.Replace("'", "鈥�"); - List<Model.ClsSb_EquipMaintainBillSub> ls = new List<Model.ClsSb_EquipMaintainBillSub>(); - ls = oListModels.getObjectByJson_Sb_EquipMaintainBillSub(msg3); + List<Model.ClsSc_EquipMaintainBillSub_Item> ls = new List<Model.ClsSc_EquipMaintainBillSub_Item>(); + ls = oListModels.getObjectByJson_Sc_EquipMaintainBillSub_Item(msg3); int i = 0; - foreach (Model.ClsSb_EquipMaintainBillSub oItemSub in ls) + foreach (Model.ClsSc_EquipMaintainBillSub_Item item in ls) { i++; + item.HEntryID = i; + //oItemSub.HCloseMan = ""; //琛屽叧闂� + item.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now); + item.HCloseType = false; //鍏抽棴绫诲瀷 + //oItemSub.HRemark = ""; //澶囨敞 + item.HSourceInterID = 0; // 婧愬崟涓诲唴鐮� + item.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮� + //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿 + //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷 + item.HRelationQty = 0; //鍏宠仈鏁伴噺 + oBill.DetailCol.Add(item); + + } + //閰嶄欢琛ㄤ綋鏁版嵁 + //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆� + msg4 = msg4.Substring(1, msg4.Length - 2); + msg4 = msg4.Replace("\\", ""); + msg4 = msg4.Replace("\n", ""); //\n + //msg2 = msg2.Replace("'", "鈥�"); + List<Model.ClsSb_EquipMaintainBillSub> ls1 = new List<Model.ClsSb_EquipMaintainBillSub>(); + ls1 = oListModels.getObjectByJson_Sb_EquipMaintainBillSub(msg4); + int j = 0; + foreach (Model.ClsSb_EquipMaintainBillSub oItemSub in ls1) + { + + j++; oItemSub.HEntryID = i; //oItemSub.HCloseMan = ""; //琛屽叧闂� oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now); oItemSub.HCloseType = false; //鍏抽棴绫诲瀷 - //oItemSub.HRemark = ""; //澶囨敞 + //oItemSub.HRemark = ""; //澶囨敞 oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮� oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮� - //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿 - //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷 + //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿 + //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷 oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺 //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦 //HMaterID = "";//閰嶄欢浠g爜 @@ -194,17 +258,17 @@ /// <returns></returns> [Route("Sb_EquipMaintainBill/DeltetEquipMaintainBillList")] [HttpGet] - public object DeltetEquipMaintainBillList(string HInterID) + public object DeltetEquipMaintainBillList(string HInterID,string user) { //缂栬緫鏉冮檺 - //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName)) - //{ - // objJsonResult.code = "0"; - // objJsonResult.count = 0; - // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒"; - // objJsonResult.data = null; - // return objJsonResult; - //} + if (!DBUtility.ClsPub.Security_Log("Sb_EquipMaintainBill_Delete", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } Int64 lngBillKey = 0; @@ -280,46 +344,93 @@ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet }; } #endregion - #region[璁惧淇濆吇璁″垝琛ㄧ紪杈戞椂鑾峰彇琛ㄩ鏁版嵁] + #region[璁惧淇濆吇璁″垝琛ㄧ紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁锛堜繚鍏诲瓙琛ㄣ�侀厤浠跺瓙琛級] [Route("Sb_EquipMaintainBill/Sb_EquipMaintainBillListProjectDetai")] [HttpGet] - public object Sb_EquipMaintainBillListProjectDetai(string sqlWhere) + public object Sb_EquipMaintainBillListProjectDetai(string HInterID) { - DataSet ds; + DataSet ds, ds1; + List<object> list = new List<object>(); + string Swhere = ""; try { - SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); - if (sqlWhere == null || sqlWhere.Equals("")) + if (HInterID != "" || HInterID != null) { - ds = oCN.RunProcReturn("select 瀹為檯鐢ㄩ噺 HQty,HMaterID, HUnitID ,琛ㄤ綋澶囨敞 HRemark,HManagerID from h_v_Sb_EquipMaintainBillList", "h_v_Sb_EquipMaintainBillList_Edit"); - objJsonResult.code = "0"; - objJsonResult.count = 1; - objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; - objJsonResult.data = ds.Tables[0]; + Swhere = " and hmainid='" + HInterID + "'"; } else { - string sql1 = "select 瀹為檯鐢ㄩ噺 HQty,HMaterID, HUnitID ,琛ㄤ綋澶囨敞 HRemark,HManagerID from h_v_Sb_EquipMaintainBillList where 1 = 1 "; - string sql = sql1 + sqlWhere; - ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMaintainBillList"); - objJsonResult.code = "0"; - objJsonResult.count = 1; - objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; - objJsonResult.data = ds.Tables[0]; + Swhere = HInterID; } + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + //鑾峰彇淇濆吇椤圭洰缂栬緫鏁版嵁 + string sql = "select HMaintainItemID, 淇濆吇椤圭洰浠g爜 HMaintainItemNumber,淇濆吇椤圭洰鍚嶇О HMaintainItem,淇濆吇閮ㄤ綅 HMaintainPart,鍏蜂綋瑕佹眰 HClaim,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName,琛ㄤ綋澶囨敞 HRemark from h_v_Sb_EquipMaintainBillSub_Item where 1 = 1 " + Swhere + ""; + ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMaintainBillSub_Item"); + //鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁 + string sql1 = "select HMaterID, 閰嶄欢浠g爜 HMaterNumber,閰嶄欢鍚嶇О HMaterName,鍗曚綅ID HUnitID,鍗曚綅浠g爜 HUnitNumber,鍗曚綅鍚嶇О HUnitName,瀹為檯鐢ㄩ噺 HQty,鏍囧噯鐢ㄩ噺 HQtyMust,琛ㄤ綋澶囨敞 HRemark,璐熻矗浜篒D HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName from h_v_Sb_EquipMaintainBillList where 1 = 1 " + Swhere + ""; + ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipMaintainBillList"); + list.Add(ds.Tables[0]); + list.Add(ds1.Tables[0]); + 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.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); objJsonResult.data = null; } return objJsonResult; } #endregion + #region[璁惧淇濆吇璁板綍琛ㄧ紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁鏂�(淇濆吇椤瑰垪琛ㄣ�侀厤浠堕」鍒楄〃)] + [Route("Sb_EquipMaintainBill/Sb_EquipMaintainBillListProjectDetaiNew")] + [HttpGet] + public object Sb_EquipMaintainBillListProjectDetaiNew(string HInterID) + { + DataSet ds, ds1; + List<object> list = new List<object>(); + string Swhere = ""; + try + { + if (HInterID != "" || HInterID != null) + { + Swhere = " and hmainid='" + HInterID + "'"; + } + else + { + Swhere = HInterID; + } + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + //鑾峰彇淇濆吇椤圭洰缂栬緫鏁版嵁 + string sql = "select 淇濆吇椤圭洰ID HMaintainItemID, 淇濆吇椤圭洰浠g爜 HMaintainItemNumber,淇濆吇椤圭洰鍚嶇О HMaintainItem,淇濆吇閮ㄤ綅 HMaintainPart,鍏蜂綋瑕佹眰 HClaim,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName,琛ㄤ綋澶囨敞 HRemark from h_v_Sb_EquipMaintainBillSub_Item where 1 = 1 " + Swhere + ""; + ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMaintainBillSub_Item"); + //鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁 + string sql1 = "select HMaterID, 閰嶄欢浠g爜 HMaterNumber,閰嶄欢鍚嶇О HMaterName,鍗曚綅ID HUnitID,鍗曚綅浠g爜 HUnitNumber,鍗曚綅鍚嶇О HUnitName,瀹為檯鐢ㄩ噺 HQty,鏍囧噯鐢ㄩ噺 HQtyMust,琛ㄤ綋澶囨敞 HRemark,璐熻矗浜篒D HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName from h_v_Sb_EquipMaintainBillList where 1 = 1 " + Swhere + ""; + ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipMaintainBillList"); + + list.Add(ds.Tables[0]); + list.Add(ds1.Tables[0]); + 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 @@ -345,7 +456,7 @@ return objJsonResult; } //寰楀埌淇℃伅 - ds = oCN.RunProcReturn("select top 1 * from Gy_EquipMent where HNumber= '" + HBarCode + "'", "Gy_EquipMent"); + ds = oCN.RunProcReturn("select top 1 * from Gy_EquipFileBillMain where HEquipFileNumber= '" + HBarCode + "'", "Gy_EquipFileBillMain"); //鍐欏叆淇℃伅 if (ds == null || ds.Tables[0].Rows.Count == 0) { @@ -382,49 +493,39 @@ string msg1 = _value.ToString(); string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); + string msg3 = sArray[1].ToString(); string UserName = ""; ListModels oListModels = new ListModels(); try { - DLL.ClsSb_EquipMaintainBill oBill = new DLL.ClsSb_EquipMaintainBill(); - List<Models.ClsSb_EquipMaintainBillMain > lsmain = new List<Models.ClsSb_EquipMaintainBillMain>(); + DAL.ClsSb_EquipMaintainBill oBill = new DAL.ClsSb_EquipMaintainBill(); + List<Model.ClsSb_EquipMaintainBillMain> lsmain = new List<Model.ClsSb_EquipMaintainBillMain>(); msg2 = msg2.Replace("\\", ""); msg2 = msg2.Replace("\n", ""); //\n - lsmain = oListModels.getObjectByJson_Sb_EquipMaintainBillMainPDA(msg2); - foreach (Models.ClsSb_EquipMaintainBillMain oItem in lsmain) + lsmain = oListModels.getObjectByJson_Sb_EquipMaintainBillMain(msg2); + foreach (Model.ClsSb_EquipMaintainBillMain oItem in lsmain) { - //鍗曟嵁鍙锋槸鍚﹂噸澶� - if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID)) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒"; - objJsonResult.data = 1; - return objJsonResult; - } - //oItem.HMaker = ""; UserName = oItem.HMaker; //鍒跺崟浜� oItem.HBillType = "3901"; oItem.HBillSubType = "3901"; - //oItem.HBillNo = ""; //鍗曟嵁鍙� - //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡 - //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙� - oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year); - oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd")); - //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent) - //oItem.HPeriod = 0; - //oItem.HCheckBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨鏃ユ湡 - //oItem.HCheckResult = ""; //楠屾敹缁撹--(姝e父锛屽紓甯�) - //oItem.HEmpID = 0; //楠屾敹浜�(Gy_Employee) - //oItem.HManagerID = 0; //璐熻矗浜�(Gy_Employee) - //oItem.HDeptID = 0; //楠屾敹閮ㄩ棬(Gy_Department) - //oItem.HExplanation = ""; //鎽樿(鏁呴殰鎻忚堪) - //oItem.HRemark = ""; //澶囨敞 - //oItem.HMainSourceInterID = oItem.HInterID; + //oItem.HInterID =0; + //oItem.HBillNo = ""; + oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡 + oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year); + //oItem.HMakeDate = ""; + //oItem.HYear = ""; + //oItem.HPeriod = ""; + //oItem.HRemark = ""; + //oItem.HCycleUnit = ""; + //oItem.HCheckCycle = ""; + //oItem.HBeginDate = ""; + //oItem.HEndDate = ""; + //oItem.HInnerBillNo = ""; + //oItem.HExplanation = ""; //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo); if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "") @@ -437,34 +538,30 @@ } oBill.omodel = oItem; } - //瀛愯〃浣撴暟鎹� - - List<Models.ClsSb_EquipMaintainBillSub> ls = new List<Models.ClsSb_EquipMaintainBillSub>(); - ls = oListModels.getObjectByJson_Sb_EquipMaintainBillSubPDA(msg2); + //淇濆吇椤硅〃浣撴暟鎹� + //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆� + msg3 = msg3.Substring(1, msg3.Length - 2); + msg3 = msg3.Replace("\\", ""); + msg3 = msg3.Replace("\n", ""); //\n + //msg2 = msg2.Replace("'", "鈥�"); + List<Model.ClsSc_EquipMaintainBillSub_Item> ls = new List<Model.ClsSc_EquipMaintainBillSub_Item>(); + ls = oListModels.getObjectByJson_Sc_EquipMaintainBillSub_Item(msg3); int i = 0; - foreach (Models.ClsSb_EquipMaintainBillSub oItemSub in ls) + foreach (Model.ClsSc_EquipMaintainBillSub_Item item in ls) { i++; - oItemSub.HEntryID = i; - - //oItemSub.HRepairCheckID = 0; //楠屾敹椤圭洰ID - //oItemSub.HRepairCheckContent = ""; //楠屾敹鍐呭 - //oItemSub.HManagerID = 0; //璐熻矗浜篒D + item.HEntryID = i; //oItemSub.HCloseMan = ""; //琛屽叧闂� - oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now); - oItemSub.HCloseType = false; //鍏抽棴绫诲瀷 + item.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now); + item.HCloseType = false; //鍏抽棴绫诲瀷 //oItemSub.HRemark = ""; //澶囨敞 - oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮� - oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮� + item.HSourceInterID = 0; // 婧愬崟涓诲唴鐮� + item.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮� //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿 //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷 - //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺 - //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦 - //oItemSub.HRepairID = 0; //缁翠慨椤圭洰 - //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰 - //oItemSub.HMoney = 0; //缁翠慨璐圭敤 - oBill.DetailColl.Add(oItemSub); + item.HRelationQty = 0; //鍏宠仈鏁伴噺 + oBill.DetailCol.Add(item); } //淇濆瓨 -- Gitblit v1.9.1