From 3af26b3f5d9297a4d99b570631c8d049cc50f3a1 Mon Sep 17 00:00:00 2001 From: zgq <519541279@qq.com> Date: 星期四, 29 四月 2021 16:23:59 +0800 Subject: [PATCH] 工艺路线模块-合并 --- WebAPI/Controllers/Sc_ProcessMangementController.cs | 464 +++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 411 insertions(+), 53 deletions(-) diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs index 2a2139f..ccf0739 100644 --- a/WebAPI/Controllers/Sc_ProcessMangementController.cs +++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs @@ -128,6 +128,97 @@ } /// <summary> + /// 杩斿洖鐢熶骇姹囨姤鍗曚富琛ㄨ鎯呬俊鎭� + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Sc_ProcessMangement/MES_DetailSc_ProcessReportList_Json")] + [HttpGet] + public object MES_DetailSc_ProcessReportList_Json(int HInterID) + { + DataSet ds; + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + if (HInterID<=0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "HInterID灏忎簬0锛�" ; + objJsonResult.data = null; + return objJsonResult; + } + else + { + + string sql1 = @"select s1.HInterID,s1.HBillNo,s1.HDeptID,s2.HName,s1.HDate,s1.HPlanQty,s1.HICMOBillNo,s1.HRemark,s2.HNumber +,s1.HMaker,s1.HMakeDate,s1.HChecker,s1.HCheckDate,s1.HUpDater,s1.HUpDateDate,s1.HCloseMan,s1.HCloseDate +from Sc_ProcessReportMain s1 + inner join Gy_Department s2 on s1.HDeptID=s2.HItemID and s1.HInterID=" + HInterID; + + ds = oCN.RunProcReturn(sql1, "Sc_ProcessReportMain"); + + } + + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + return GetObjectJson(ds); + } + + /// <summary> + /// 杩斿洖鐢熶骇娲惧伐鍗曞叧鑱旇鎯呬俊鎭� + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Sc_ProcessMangement/MES_h_v_Sc_ProcessSendWorkList_Json")] + [HttpGet] + public object MES_h_v_Sc_ProcessSendWorkList_Json(int HInterID) + { + DataSet ds; + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + if (HInterID <= 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "HInterID灏忎簬0锛�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + + string sql1 =@"select [hmainid], [鏃ユ湡], [鍗曟嵁鍙穄, [HDeptID], [閮ㄩ棬浠g爜], [閮ㄩ棬], [HMaterID], [鐗╂枡浠g爜], [鐗╂枡鍚嶇О], [瑙勬牸鍨嬪彿], [HUnitID], [璁¢噺鍗曚綅浠g爜], [璁¢噺鍗曚綅], [HprocID], +[宸ュ簭浠g爜], [宸ュ簭], [HGroupID], [鐝粍浠g爜], [鐝粍鍚嶇О], [HSourceID], [璧勬簮浠g爜], [鐢熶骇璧勬簮], [HWorkerID], [鑱屽憳浠g爜], [鑱屽憳], [hsubid], [鏁伴噺], [璁″垝寮�宸ユ棩鏈焆, +[璁″垝瀹屽伐鏃ユ湡], [璁″垝宸ユ椂], [琛ㄤ綋澶囨敞], [HICMOInterID], [鐢熶骇浠诲姟鍗曞彿], [HSeOrderInterID], [閿�鍞鍗曞彿], [琛ㄥご澶囨敞], [鍒跺崟浜篯, [鍒跺崟鏃ユ湡], [瀹℃牳浜篯, [瀹℃牳鏃ユ湡], [淇敼浜篯, +[淇敼鏃ユ湡], [鍏抽棴浜篯, [鍏抽棴鏃ユ湡], [浣滃簾浜篯, [浣滃簾鏃ユ湡], [婧愬崟涓诲唴鐮乚, [婧愬崟瀛愬唴鐮乚, [婧愬崟鍗曞彿], [婧愬崟绫诲瀷], [琛屽叧闂汉], [HBillType], [HQtyDecimal], [HPriceDecimal] +from h_v_Sc_ProcessSendWorkList +where hmainid=(select HSourceID from Sc_ProcessReportSub where HInterID="+HInterID+")"; + + ds = oCN.RunProcReturn(sql1, "h_v_Sc_ProcessSendWorkList"); + + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + return GetObjectJson(ds); + } + + /// <summary> /// 杩斿洖鐢熶骇宸ュ簭璁″垝鍗曞垪琛� ///鍙傛暟锛歴tring sql銆� ///杩斿洖鍊硷細object銆� @@ -388,13 +479,13 @@ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("select top 500 * from WW_EntrustWorkOrderBillMain ", "WW_EntrustWorkOrderBillMain"); + ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustWorkOrderBillList ", "h_v_WW_EntrustWorkOrderBillList"); } else { - string sql1 = "select * from WW_EntrustWorkOrderBillMain where 1 = 1 "; + string sql1 = "select * from h_v_WW_EntrustWorkOrderBillList where 1 = 1 "; string sql = sql1 + sWhere; - ds = oCN.RunProcReturn(sql, "WW_EntrustWorkOrderBillMain"); + ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustWorkOrderBillList"); } } catch (Exception e) @@ -407,43 +498,6 @@ } return GetObjectJson(ds); } - - - /// <summary> - /// 杩斿洖濮斿宸ュ簭姹囨姤鍗曞垪琛� - /// </summary> - /// <param name="sWhere"></param> - /// <returns></returns> - [Route("Sc_ProcessMangement/MES_Sc_StationOutBillMain_Json")] - [HttpGet] - public object MES_Sc_StationOutBillMain_Json(string sWhere) - { - DataSet ds; - try - { - SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); - if (sWhere == null || sWhere.Equals("")) - { - ds = oCN.RunProcReturn("select top 500 * from Sc_StationOutBillMain ", "Sc_StationOutBillMain"); - } - else - { - string sql1 = "select * from Sc_StationOutBillMain where 1 = 1 "; - string sql = sql1 + sWhere; - ds = oCN.RunProcReturn(sql, "Sc_StationOutBillMain"); - } - } - catch (Exception e) - { - objJsonResult.code = "0"; - objJsonResult.count = 0; - objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); - objJsonResult.data = null; - return objJsonResult; - } - return GetObjectJson(ds); - } - /// <summary> /// 杩斿洖涓嶅悎鏍艰瘎瀹″垪琛� @@ -692,7 +746,7 @@ 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 { @@ -703,8 +757,8 @@ lsmain = oListModels.getObjectByJson_Reportlist(msg2); foreach (Model.ClsSc_ProcessReportMain oItem in lsmain) { - //oItem.HMaker = ""; - //UserName = oItem.HMaker; + UserName = oItem.HMaker; + oItem.HMaker = UserName; oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd")); oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year); oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); @@ -761,23 +815,19 @@ reportSub.HEntryID = i; reportSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now); reportSub.HRemark = ""; - reportSub.HCloseMan = ""; + reportSub.HCloseMan = ReportModel.omodel.HCloseMan; reportSub.HCloseType = false; reportSub.HEmpID =0; reportSub.HICMOBillNo =""; reportSub.HICMOInterID = (long)ItemView.HICMOInterID; - reportSub.HEntryID = i; - reportSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now); reportSub.HRemark = ""; - reportSub.HCloseMan = ""; - reportSub.HCloseType = false; reportSub.HSourceBillType = "3712"; reportSub.HQty = (double)ItemView.鏁伴噺; reportSub.HProcID = (long)ItemView.HprocID; reportSub.HProcNumber = ItemView.宸ュ簭浠g爜; reportSub.HOutPrice = 0; reportSub.HOutMoney = 0; - reportSub.HSourceID = (long)ItemView.HSourceID; + reportSub.HSourceID = (long)ItemView.hmainid; reportSub.HEmpNumber = ""; reportSub.HRelBeginDate = DateTime.Now; reportSub.HRelEndDate = DateTime.Now; @@ -787,8 +837,8 @@ reportSub.HSeOrderBillNo = ""; reportSub.HProcPlanInterID = 0; reportSub.HProcPlanBillNo = ""; - reportSub.HSourceInterID = 0; - reportSub.HSourceBillNo = ""; + reportSub.HSourceInterID = (long)ItemView.hmainid; + reportSub.HSourceBillNo = ItemView.鍗曟嵁鍙�; reportSub.HRelationQty = 0; reportSub.HRelationMoney = 0; reportSub.HMaterID = (long)ItemView.HMaterID; @@ -803,7 +853,7 @@ reportSub.HProcPlanEntryID = 0; reportSub.HProcPlanBillNo = ""; reportSub.HSourceEntryID = 0; - reportSub.HSourceBillType = ""; + reportSub.HSourceBillType = "3712"; reportSub.HRelationQty = 0; reportSub.HRelationMoney = 0; reportSub.HBadPrirce = 0; @@ -1067,8 +1117,316 @@ } + /// <summary> + /// 姹囨姤鍗曠紪杈戝叧闂姛鑳� + /// </summary> + /// <param name="HInterID"></param> + /// <param name="IsClose"></param> + /// <param name="CurUserName"></param> + /// <returns></returns> + [Route("CloseProcessReportList")] + [HttpGet] + public object CloseProcessReportList(int HInterID,int IsClose,string CurUserName) + { + DataSet ds; + string ModRightNameCheck = "Sc_ProcessReport_check"; + try + { + //瀹℃牳鏉冮檺 + if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�"; + objJsonResult.data = null; + return objJsonResult; + } + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + if (HInterID <= 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "HInterID灏忎簬0锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + ds = oCN.RunProcReturn("select * from Sc_ProcessReportMain where HInterID=" + HInterID, "Sc_ProcessReportMain"); + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩欎釜鍗曟嵁锛屾棤娉曞叧闂紒"; + objJsonResult.data = null; + return objJsonResult; ; + } + var HChecker = ds.Tables[0].Rows[0]["HChecker"].ToString(); + var HCloseMan = ds.Tables[0].Rows[0]["HCloseMan"].ToString(); + + if (IsClose == 0) + { + if (HCloseMan.Trim() != "" || HChecker.Trim() == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁鏈鏍搞�佸凡鍏抽棴銆佸凡浣滃簾鐘舵�佷笅涓嶅厑璁稿叧闂紒锛侊紒"; + objJsonResult.data = null; + return objJsonResult; + } + oCN.RunProc("update Sc_ProcessReportMain set HCloseMan='" + CurUserName + "' ,HCloseDate=GETDATE() where HInterID=" + HInterID); + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "* 鍗曟嵁鍏抽棴鎴愬姛锛�"; + objJsonResult.data = null; + return objJsonResult; ; + } + else if(IsClose==1) + { + if (HCloseMan.Trim() == "" || HChecker.Trim() == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁鏈鏍搞�佹湭鍏抽棴銆佸凡浣滃簾鐘舵�佷笅涓嶅厑璁告挙閿�鍏抽棴锛侊紒锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + oCN.RunProc("update Sc_ProcessReportMain set HCloseMan='' ,HCloseDate=null where HInterID=" + HInterID); + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "* 鍗曟嵁鍙嶅叧闂垚鍔燂紒"; + objJsonResult.data = null; + return objJsonResult; ; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁鏃犳硶鍏抽棴锛�"; + objJsonResult.data = null; + return objJsonResult; ; + } + + + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍏抽棴澶辫触鎴栧垯鍙嶅叧闂け璐ワ紒" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + /// <summary> + /// 姹囨姤鍗曠紪杈戝鏍稿弽瀹℃牳鍔熻兘 + /// </summary> + /// <param name="HInterID"></param> + /// <param name="IsAudit"></param> + /// <param name="CurUserName"></param> + /// <returns></returns> + [Route("AuditProcessReportList")] + [HttpGet] + public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName) + { + DataSet ds; + string ModRightNameCheck = "Sc_ProcessReport_check"; + var a = DBUtility.ClsPub.CurUserName; + try + { + //瀹℃牳鏉冮檺 + if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�"; + objJsonResult.data = null; + return objJsonResult; + } + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + if (HInterID <= 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "HInterID灏忎簬0锛�"; + objJsonResult.data = null; + return objJsonResult; + } + ds = oCN.RunProcReturn("select * from Sc_ProcessReportMain where HInterID=" + HInterID, "Sc_ProcessReportMain"); + if (ds == null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩欎釜鍗曟嵁锛屾棤娉曞鏍革紒"; + objJsonResult.data = null; + return objJsonResult; + } + var HChecker = ds.Tables[0].Rows[0]["HChecker"].ToString();//鍙栧鏍镐汉 + var HMaker=ds.Tables[0].Rows[0]["HMaker"].ToString();//鍙栧埗鍗曚汉 + var HCloseMan=ds.Tables[0].Rows[0]["HCloseMan"].ToString();//鍙栧叧闂汉 + if (IsAudit == 0) + { + if (HChecker.Trim() != "" || HChecker.Trim() == HMaker || HCloseMan != "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁宸插鏍搞�佸凡鍏抽棴銆佸凡浣滃簾鐘舵�佷笉鍏佽瀹℃牳锛侊紒锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + oCN.RunProc("update Sc_ProcessReportMain set HChecker='" + CurUserName + "' ,HCheckDate=GETDATE() where HInterID=" + HInterID); + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "* 鍗曟嵁瀹℃牳鎴愬姛锛�"; + objJsonResult.data = null; + return objJsonResult; + } + else if (IsAudit == 1) + { + if (HChecker.Trim() == "" || HChecker.Trim() == CurUserName || HCloseMan != "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁鏈鏍搞�佸凡鍏抽棴銆佸凡浣滃簾鐘舵�佷笅涓嶅厑璁稿弽瀹℃牳锛侊紒锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + oCN.RunProc("update Sc_ProcessReportMain set HChecker='' ,HCheckDate=null where HInterID=" + HInterID); + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "* 鍗曟嵁鍙嶅鏍告垚鍔燂紒"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁鏃犳硶瀹℃牳锛�"; + objJsonResult.data = null; + return objJsonResult; + } - + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + /// <summary> + /// 杩斿洖濮斿宸ュ簭娲惧伐鍗曞垪琛� + /// </summary> + /// <param name="sqlWhere"></param> + /// <returns></returns> + [Route("Sc_ProcessMangement/MES_WW_EntrustProcSendWorkBill_Json")] + [HttpGet] + public object MES_WW_EntrustProcSendWorkBill_Json(string sqlWhere) + { + DataSet ds; + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + if (sqlWhere == null || sqlWhere.Equals("")) + { + ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustProcSendWorkBillList ", "h_v_WW_EntrustProcSendWorkBillList"); + } + else + { + string sql1 = "select * from h_v_WW_EntrustProcSendWorkBillList where 1 = 1 "; + string sql = sql1 + sqlWhere; + ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustProcSendWorkBillList"); + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + return GetObjectJson(ds); + } + + /// <summary> + /// 杩斿洖濮斿宸ュ簭璁″垝姹囨姤鍗曞垪琛� + /// </summary> + /// <param name="sqlWhere"></param> + /// <returns></returns> + [Route("Sc_ProcessMangement/MES_WW_EntrustProcessReportBill_Json")] + [HttpGet] + public object MES_WW_EntrustProcessReportBill_Json(string sqlWhere) + { + DataSet ds; + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + if (sqlWhere == null || sqlWhere.Equals("")) + { + ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustProcessReportBillList ", "h_v_WW_EntrustProcessReportBillList"); + } + else + { + string sql1 = "select * from h_v_WW_EntrustProcessReportBillList where 1 = 1 "; + string sql = sql1 + sqlWhere; + ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustProcessReportBillList"); + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + return GetObjectJson(ds); + } + + /// <summary> + /// 杩斿洖濮斿宸ュ簭璁″垝杞嚭鍗曞垪琛� + /// </summary> + /// <param name="sqlWhere"></param> + /// <returns></returns> + [Route("Sc_ProcessMangement/MES_WW_EntrustProcessSendOutBillList_Json")] + [HttpGet] + public object MES_WW_EntrustProcessSendOutBillList_Json(string sqlWhere) + { + DataSet ds; + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + if (sqlWhere == null || sqlWhere.Equals("")) + { + ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustProcessSendOutBillList ", "h_v_WW_EntrustProcessSendOutBillList"); + } + else + { + string sql1 = "select * from h_v_WW_EntrustProcessSendOutBillList where 1 = 1 "; + string sql = sql1 + sqlWhere; + ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustProcessSendOutBillList"); + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + return GetObjectJson(ds); + } + + } } \ No newline at end of file -- Gitblit v1.9.1