From ece36a265e3d56b6a903b3cbd6ce0a8ff7cb47a6 Mon Sep 17 00:00:00 2001 From: ch <37327@LLOOCCY> Date: 星期五, 16 四月 2021 10:30:31 +0800 Subject: [PATCH] 在控制里面新增了列表API显示方法(合并) --- WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs | 75 ++++ WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs | 75 ++++ WebAPI.v12.suo | 0 WebAPI/Controllers/WebAPIController.cs | 124 +++++++ WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 75 ++++ WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs | 75 ++++ WebAPI/ListModels.cs | 24 + WebAPI/Controllers/CGGL/Cg_POInStockBackBillController.cs | 75 ++++ WebAPI/Controllers/Sc_ProcessMangementController.cs | 134 +++++++ WebAPI/Properties/PublishProfiles/API.pubxml.user | 149 ++++---- WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs | 75 ++++ WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs | 75 ++++ WebAPI/WebAPI.csproj | 7 13 files changed, 889 insertions(+), 74 deletions(-) diff --git a/WebAPI.v12.suo b/WebAPI.v12.suo index 9e74e9c..6338a71 100644 --- a/WebAPI.v12.suo +++ b/WebAPI.v12.suo Binary files differ diff --git a/WebAPI/Controllers/CGGL/Cg_POInStockBackBillController.cs b/WebAPI/Controllers/CGGL/Cg_POInStockBackBillController.cs new file mode 100644 index 0000000..8973803 --- /dev/null +++ b/WebAPI/Controllers/CGGL/Cg_POInStockBackBillController.cs @@ -0,0 +1,75 @@ +锘縰sing Newtonsoft.Json.Linq; +using Pub_Class; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Web.Http; +using WebAPI.Models; + +namespace WebAPI.Controllers +{ + //閫�鏂欓�氱煡鍗旵ontroller + public class Cg_POInStockBackBillController : ApiController + { + public DBUtility.ClsPub.Enum_BillStatus BillStatus; + + private json objJsonResult = new json(); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + DataSet ds; + + + /// <summary> + /// 杩斿洖閫�鏂欓�氱煡鍗曞垪琛� + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Cg_POInStockBackBill/list")] + [HttpGet] + public object list(string sWhere) + { + try + { + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_IF_POInStockBackBillList " + sWhere, "h_v_IF_POInStockBackBillList"); + } + else + { + string sql1 = "select * from h_v_IF_POInStockBackBillList where 1 = 1 "; + string sql = sql1 + sWhere; + ds = oCN.RunProcReturn(sql, "h_v_IF_POInStockBackBillList"); + } + 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; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + + + // + } +} \ No newline at end of file diff --git a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs new file mode 100644 index 0000000..e48d969 --- /dev/null +++ b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs @@ -0,0 +1,75 @@ +锘縰sing Newtonsoft.Json.Linq; +using Pub_Class; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Web.Http; +using WebAPI.Models; + +namespace WebAPI.Controllers +{ + //鏀舵枡閫氱煡鍗旵ontroller + public class Cg_POInStockBillController : ApiController + { + public DBUtility.ClsPub.Enum_BillStatus BillStatus; + + private json objJsonResult = new json(); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + DataSet ds; + + + /// <summary> + /// 杩斿洖鏀舵枡閫氱煡鍗曞垪琛� + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Cg_POInStockBill/list")] + [HttpGet] + public object list(string sWhere) + { + try + { + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_IF_POInStockBillList " + sWhere, "h_v_IF_POInStockBillList"); + } + else + { + string sql1 = "select * from h_v_IF_POInStockBillList where 1 = 1 "; + string sql = sql1 + sWhere; + ds = oCN.RunProcReturn(sql, "h_v_IF_POInStockBillList"); + } + 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; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + + + // + } +} \ No newline at end of file diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs new file mode 100644 index 0000000..964cfac --- /dev/null +++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs @@ -0,0 +1,75 @@ +锘縰sing Newtonsoft.Json.Linq; +using Pub_Class; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Web.Http; +using WebAPI.Models; + +namespace WebAPI.Controllers +{ + //閲囪喘璁㈠崟Controller + public class Cg_POOrderBillController : ApiController + { + public DBUtility.ClsPub.Enum_BillStatus BillStatus; + + private json objJsonResult = new json(); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + DataSet ds; + + + /// <summary> + /// 杩斿洖閲囪喘璁㈠崟鍒楄〃 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Cg_POOrderBill/list")] + [HttpGet] + public object list(string sWhere) + { + try + { + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList " + sWhere, "h_v_IF_POOrderBillList"); + } + else + { + string sql1 = "select * from h_v_IF_POOrderBillList where 1 = 1 "; + string sql = sql1 + sWhere; + ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList"); + } + 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; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + + + // + } +} \ No newline at end of file diff --git a/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs b/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs new file mode 100644 index 0000000..a2e6028 --- /dev/null +++ b/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs @@ -0,0 +1,75 @@ +锘縰sing Newtonsoft.Json.Linq; +using Pub_Class; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Web.Http; +using WebAPI.Models; + +namespace WebAPI.Controllers +{ + //濮斿璁㈠崟Controller + public class WW_EntrustOrderBillController : ApiController + { + public DBUtility.ClsPub.Enum_BillStatus BillStatus; + + private json objJsonResult = new json(); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + DataSet ds; + + + /// <summary> + /// 杩斿洖濮斿璁㈠崟鍒楄〃 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("WW_EntrustOrderBill/list")] + [HttpGet] + public object list(string sWhere) + { + try + { + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_IF_EntrustOrderBillList " + sWhere, "h_v_IF_EntrustOrderBillList"); + } + else + { + string sql1 = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 "; + string sql = sql1 + sWhere; + ds = oCN.RunProcReturn(sql, "h_v_IF_EntrustOrderBillList"); + } + 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; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + + + // + } +} \ No newline at end of file diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs index daf2fce..9b16fff 100644 --- a/WebAPI/Controllers/Sc_ProcessMangementController.cs +++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs @@ -896,6 +896,140 @@ } + /// <summary> + /// 淇濆瓨涓嶈壇璇勫鍗曚俊鎭� + /// </summary> + /// <param name="msg"></param> + /// <returns></returns> + [Route("SaveBadReasonList")] + [HttpPost] + public object SaveBadReasonList([FromBody] JObject msg) + { + var _value = msg["msg"].ToString(); + 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 + { + DAL.ClsQC_NoPassProdCheckBill oBill = new DAL.ClsQC_NoPassProdCheckBill(); + List<Model.ClsQC_NoPassProdCheckBillMain> lsmain = new List<Model.ClsQC_NoPassProdCheckBillMain>(); + msg2 = msg2.Replace("\\", ""); + msg2 = msg2.Replace("\n", ""); //\n + lsmain = oListModels.getObjectByJson_NoPassProdCheckMain(msg2); + foreach (Model.ClsQC_NoPassProdCheckBillMain oItem in lsmain) + { + //oItem.HMaker = ""; + UserName=oItem.HMaker; + 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")); + //oItem.HCurID = 1; + //oItem.HExRate = 1; + oItem.HMainSourceInterID = oItem.HInterID; + oItem.HInterID = 0; + //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo); + if (DBUtility.ClsPub.isStrNull(oItem.HDate)=="") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈塪anju鏃ユ湡锛屾棤娉曚繚瀛橈紒"; + objJsonResult.data = 1; + return objJsonResult; + } + oBill.omodel = oItem; + } + //琛ㄤ綋鏁版嵁 + //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆� + msg3 = msg3.Substring(1, msg3.Length - 2); + msg3 = msg3.Replace("\\", ""); + msg3 = msg3.Replace("\n", ""); //\n + //msg2 = msg2.Replace("'", "鈥�"); + List<Model.ClsQC_NoPassProdCheckBillSub> ls = new List<Model.ClsQC_NoPassProdCheckBillSub>(); + ls = oListModels.getObjectByJson_NoPassProdCheckSub(msg3); + int i = 0; + foreach (Model.ClsQC_NoPassProdCheckBillSub oItemSub in ls) + { + i++; + if (oItemSub.HBadQty<=0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屼笉鑹瘎瀹℃暟閲忎笉澶т簬0鏃犳硶淇濆瓨锛�"; + objJsonResult.data = 1; + return objJsonResult; + } + if ((double)oItemSub.HBadQty >oBill.omodel.HPlanQty ) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾暟閲忎笉鑳藉ぇ浜庝笉鑹暟閲忥紒"; + objJsonResult.data = 1; + return objJsonResult; + } + if (DBUtility.ClsPub.isStrNull(oItemSub.HWasterReasonName)=="") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾湭濉啓涓嶈壇鍘熷洜锛�"; + objJsonResult.data = 1; + return objJsonResult; + } + + oItemSub.HEntryID = i; + oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now); + oItemSub.HRemark = ""; + oItemSub.HCloseMan = ""; + oItemSub.HCloseType = false; + oBill.DetailColl.Add(oItemSub); + + } + //淇濆瓨鍓嶅垽鏂�(鍗曟嵁鍙烽噸澶嶏紝绗斿綍椤圭洰) + //淇濆瓨 + //淇濆瓨瀹屾瘯鍚庡鐞� + bool bResult; + if (oBill.omodel.HInterID == 0) + { + // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); + bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); + } + else + { + bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo); + } + if (bResult) + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "淇濆瓨鎴愬姛锛�"; + //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�"); + objJsonResult.data = 1; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = 1; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString(); + objJsonResult.data = 1; + return objJsonResult; + } + } + + diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs index 28dd8da..84bae22 100644 --- a/WebAPI/Controllers/WebAPIController.cs +++ b/WebAPI/Controllers/WebAPIController.cs @@ -933,6 +933,130 @@ return objjson; ; } } + + /// <summary> + /// 鑾峰彇涓嶈壇鍘熷洜鍒楄〃 + /// </summary> + /// <returns></returns> + [Route("Web/GetBadReasonList_Json")] + [HttpGet] + public object GetBadReasonList_Json(string BadReason) + { + //sWhere = " Where HStopFlag=0 and HEndFlag=1"; + //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString(); + if (BadReason != "") + { + sWhere = sWhere + " and ( HNumber like '%" + BadReason + "%' or HName like '%" + BadReason + "%' ) "; + } + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + if (sWhere == null || sWhere.Equals("")) + + { + ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName from Gy_BadReason where HStopflag=0 Order by HItemID ", "Gy_BadReason"); + } + else + { + string sql1 = "Select HItemID,HNumber ,HName from Gy_BadReason where HStopflag=0 and HEndFlag=1 "; + string sql = sql1 + sWhere; + ds = oCN.RunProcReturn(sql, "Gy_BadReason"); + } + + //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo); + + + if (ds == null || ds.Tables[0].Rows.Count <= 0) + { + objjson.code = "0"; + objjson.count = 0; + objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo; + objjson.data = null; + return objjson; + } + else + { + objjson.code = "0"; + objjson.count = 1; + objjson.Message = "鑾峰彇鎴愬姛!"; + objjson.data = ds.Tables[0]; + return objjson; + } + } + catch (Exception ex) + { + + objjson.code = "0"; + objjson.count = 0; + objjson.Message = "鑾峰彇澶辫触" + ex.ToString(); + objjson.data = null; + return objjson; + } + } + + + /// <summary> + /// 鑾峰彇宸ュ簭璁″垝鍗曞垪琛� + /// </summary> + /// <returns></returns> + [Route("Web/GetPlanList_Json")] + [HttpGet] + public object GetPlanList_Json(string Billno) + { + //sWhere = " Where HStopFlag=0 and HEndFlag=1"; + //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString(); + if (Billno != "") + { + sWhere = sWhere + " and ( 鍗曟嵁鍙� like '%" + Billno + "%' ) "; + } + try + { + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + if (sWhere == null || sWhere.Equals("")) + + { + ds = oCN.RunProcReturn("select hmainid,hsubid,鍗曟嵁鍙�,HMaterID,鐗╂枡浠g爜,鐗╂枡鍚嶇О,HCenterID,宸ヤ綔涓績,瑙勬牸鍨嬪彿,璁″垝鏁伴噺 from h_v_Sc_ProcessPlanList", "h_v_Sc_ProcessPlanList"); + } + else + { + string sql1 = "select hmainid,hsubid,鍗曟嵁鍙�,HMaterID,鐗╂枡浠g爜,鐗╂枡鍚嶇О,HCenterID,宸ヤ綔涓績,瑙勬牸鍨嬪彿,璁″垝鏁伴噺 from h_v_Sc_ProcessPlanList where 1=1 "; + string sql = sql1 + sWhere; + ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessPlanList"); + } + + //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo); + + + if (ds == null || ds.Tables[0].Rows.Count <= 0) + { + objjson.code = "0"; + objjson.count = 0; + objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo; + objjson.data = null; + return objjson; + } + else + { + objjson.code = "0"; + objjson.count = 1; + objjson.Message = "鑾峰彇鎴愬姛!"; + objjson.data = ds.Tables[0]; + return objjson; + } + } + catch (Exception ex) + { + + objjson.code = "0"; + objjson.count = 0; + objjson.Message = "鑾峰彇澶辫触" + ex.ToString(); + objjson.data = null; + return objjson; + } + } + + + #endregion } diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs new file mode 100644 index 0000000..fda1b9d --- /dev/null +++ b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs @@ -0,0 +1,75 @@ +锘縰sing Newtonsoft.Json.Linq; +using Pub_Class; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Web.Http; +using WebAPI.Models; + +namespace WebAPI.Controllers +{ + //閿�鍞鍗旵ontroller + public class Xs_SeOrderBillController : ApiController + { + public DBUtility.ClsPub.Enum_BillStatus BillStatus; + + private json objJsonResult = new json(); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + DataSet ds; + + + /// <summary> + /// 杩斿洖閿�鍞鍗曞垪琛� + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Xs_SeOrderBill/list")] + [HttpGet] + public object list(string sWhere) + { + try + { + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList " + sWhere, "h_v_IF_SeOrderBillList"); + } + else + { + string sql1 = "select * from h_v_IF_SeOrderBillList where 1 = 1 "; + string sql = sql1 + sWhere; + ds = oCN.RunProcReturn(sql, "h_v_IF_SeOrderBillList"); + } + 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; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + + + // + } +} \ No newline at end of file diff --git a/WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs new file mode 100644 index 0000000..41086ed --- /dev/null +++ b/WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs @@ -0,0 +1,75 @@ +锘縰sing Newtonsoft.Json.Linq; +using Pub_Class; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Web.Http; +using WebAPI.Models; + +namespace WebAPI.Controllers +{ + //閫�璐ч�氱煡鍗旵ontroller + public class Xs_SeOutStockBackBillController : ApiController + { + public DBUtility.ClsPub.Enum_BillStatus BillStatus; + + private json objJsonResult = new json(); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + DataSet ds; + + + /// <summary> + /// 杩斿洖閫�璐ч�氱煡鍗曞垪琛� + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Xs_SeOutStockBackBill/list")] + [HttpGet] + public object list(string sWhere) + { + try + { + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_IF_SeOutStockBackBillList " + sWhere, "h_v_IF_SeOutStockBackBillList"); + } + else + { + string sql1 = "select * from h_v_IF_SeOutStockBackBillList where 1 = 1 "; + string sql = sql1 + sWhere; + ds = oCN.RunProcReturn(sql, "h_v_IF_SeOutStockBackBillList"); + } + 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; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + + + // + } +} \ No newline at end of file diff --git a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs new file mode 100644 index 0000000..4b71ae8 --- /dev/null +++ b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs @@ -0,0 +1,75 @@ +锘縰sing Newtonsoft.Json.Linq; +using Pub_Class; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Web.Http; +using WebAPI.Models; + +namespace WebAPI.Controllers +{ + //鍙戣揣閫氱煡鍗旵ontroller + public class Xs_SeOutStockBillController : ApiController + { + public DBUtility.ClsPub.Enum_BillStatus BillStatus; + + private json objJsonResult = new json(); + SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); + DataSet ds; + + + /// <summary> + /// 杩斿洖鍙戣揣閫氱煡鍗曞垪琛� + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Xs_SeOutStockBill/list")] + [HttpGet] + public object list(string sWhere) + { + try + { + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_IF_SeOutStockBillList " + sWhere, "h_v_IF_SeOutStockBillList"); + } + else + { + string sql1 = "select * from h_v_IF_SeOutStockBillList where 1 = 1 "; + string sql = sql1 + sWhere; + ds = oCN.RunProcReturn(sql, "h_v_IF_SeOutStockBillList"); + } + 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; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + + + + // + } +} \ No newline at end of file diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs index c1e63f1..7c1145e 100644 --- a/WebAPI/ListModels.cs +++ b/WebAPI/ListModels.cs @@ -200,5 +200,29 @@ return list; } + /// <summary> + /// 澶勭悊鏂板涓嶈壇璇勫涓昏〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsQC_NoPassProdCheckBillMain> getObjectByJson_NoPassProdCheckMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsQC_NoPassProdCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_NoPassProdCheckBillMain>>(jsonString); + return list; + } + + /// <summary> + /// 澶勭悊鏂板涓嶈壇璇勫瀛愯〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsQC_NoPassProdCheckBillSub> getObjectByJson_NoPassProdCheckSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsQC_NoPassProdCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_NoPassProdCheckBillSub>>(jsonString); + return list; + } + } } \ No newline at end of file diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml.user b/WebAPI/Properties/PublishProfiles/API.pubxml.user index 39de1b7..20c2fab 100644 --- a/WebAPI/Properties/PublishProfiles/API.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/API.pubxml.user @@ -7,37 +7,38 @@ <PropertyGroup> <TimeStampOfAssociatedLegacyPublishXmlFile /> <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl> + <History>True|2021-04-16T00:50:41.5499248Z;True|2021-04-16T08:32:59.1701708+08:00;True|2021-04-16T08:27:36.9176335+08:00;True|2021-04-15T15:56:26.8485667+08:00;True|2021-04-15T15:21:23.2875671+08:00;True|2021-04-15T14:41:16.9980034+08:00;True|2021-04-15T14:36:34.8570017+08:00;True|2021-04-13T16:15:00.7668503+08:00;</History> </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="bin/Antlr3.Runtime.dll"> - <publishTime>02/22/2013 08:43:40</publishTime> + <publishTime>04/13/2021 13:28:28</publishTime> </File> <File Include="bin/Antlr3.Runtime.pdb"> - <publishTime>02/22/2013 08:43:40</publishTime> + <publishTime>04/13/2021 13:28:28</publishTime> </File> <File Include="bin/BLL.dll"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="bin/DAL.dll"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="bin/Dapper.dll"> - <publishTime>07/22/2016 14:52:40</publishTime> + <publishTime>04/13/2021 13:30:11</publishTime> </File> <File Include="bin/DBUtility.dll"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.FormService.dll"> - <publishTime>09/20/2018 19:23:20</publishTime> + <publishTime>04/26/2020 09:57:16</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.ServicesStub.dll"> - <publishTime>09/20/2018 19:28:34</publishTime> + <publishTime>04/26/2020 09:57:16</publishTime> </File> <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll"> <publishTime>03/18/2015 17:02:50</publishTime> @@ -49,7 +50,7 @@ <publishTime>07/25/2012 11:48:56</publishTime> </File> <File Include="bin/Model.dll"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="bin/Newtonsoft.Json.dll"> <publishTime>08/03/2014 20:33:56</publishTime> @@ -58,13 +59,13 @@ <publishTime>01/04/2011 13:48:18</publishTime> </File> <File Include="bin/Pub_Class.dll"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="bin/Pub_Control.dll"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="bin/SQLHelper.dll"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/15/2015 17:57:08</publishTime> @@ -106,7 +107,7 @@ <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.Cors.dll"> - <publishTime>11/28/2018 12:58:44</publishTime> + <publishTime>04/13/2021 13:30:39</publishTime> </File> <File Include="bin/System.Web.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -130,16 +131,16 @@ <publishTime>11/28/2018 13:01:00</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="bin/System.Web.Mvc.dll"> - <publishTime>01/28/2015 04:02:18</publishTime> + <publishTime>04/13/2021 13:31:08</publishTime> </File> <File Include="bin/System.Web.Optimization.dll"> - <publishTime>02/11/2014 15:26:04</publishTime> + <publishTime>04/13/2021 13:31:24</publishTime> </File> <File Include="bin/System.Web.Razor.dll"> - <publishTime>01/28/2015 04:02:32</publishTime> + <publishTime>04/13/2021 13:31:12</publishTime> </File> <File Include="bin/System.Web.Services.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -163,10 +164,10 @@ <publishTime>11/24/2014 11:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>04/16/2021 10:24:20</publishTime> + <publishTime>04/15/2021 21:07:29</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>04/16/2021 10:24:20</publishTime> + <publishTime>04/15/2021 21:07:29</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>02/04/2021 21:35:21</publishTime> @@ -184,163 +185,163 @@ <publishTime>03/26/2019 14:23:20</publishTime> </File> <File Include="Content/bootstrap.css"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="Content/bootstrap.min.css"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="Content/Site.css"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="DLL/BLL.dll"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="DLL/DAL.dll"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="DLL/DBUtility.dll"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="DLL/Model.dll"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="DLL/Pub_Class.dll"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="DLL/Pub_Control.dll"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="DLL/SQLHelper.dll"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.eot"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.svg"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.ttf"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.woff"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="Global.asax"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="Index.html"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:33</publishTime> </File> <File Include="packages.config"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 13:27:57</publishTime> </File> <File Include="Views/Scripts/bootstrap.js"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/Scripts/bootstrap.min.js"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.js"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.js"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.map"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/Scripts/jquery.validate.js"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/Scripts/jquery.validate.min.js"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/Scripts/modernizr-2.6.2.js"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/Shared/Error.cshtml"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/Shared/_Layout.cshtml"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/web.config"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Views/_ViewStart.cshtml"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> - <publishTime>04/12/2021 11:33:15</publishTime> + <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web.config"> - <publishTime>04/16/2021 10:24:25</publishTime> + <publishTime>04/15/2021 21:08:50</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index 373275c..4cf5f75 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -325,6 +325,10 @@ <Compile Include="Controllers\BaseSet\Gy_SourceController.cs" /> <Compile Include="Controllers\BaseSet\Gy_SupplierController.cs" /> <Compile Include="Controllers\BaseSet\Gy_WarehouseController.cs" /> + <Compile Include="Controllers\CGGL\Cg_POOrderBillController.cs" /> + <Compile Include="Controllers\CGGL\WW_EntrustOrderBillController.cs" /> + <Compile Include="Controllers\CGGL\Cg_POInStockBillController.cs" /> + <Compile Include="Controllers\CGGL\Cg_POInStockBackBillController.cs" /> <Compile Include="Controllers\CJGL\Cj_NoPassProcController.cs" /> <Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" /> <Compile Include="Controllers\Sc_ProcessMangementController.cs" /> @@ -335,6 +339,9 @@ <Compile Include="Controllers\SCGL\Sc_ICMOReportBillController.cs" /> <Compile Include="Controllers\SCGL\Sc_PPBomBillController.cs" /> <Compile Include="Controllers\Sc_CheckToolsRepairWorkBillController.cs" /> + <Compile Include="Controllers\XSGL\Xs_SeOutStockBackBillController.cs" /> + <Compile Include="Controllers\XSGL\Xs_SeOutStockBillController.cs" /> + <Compile Include="Controllers\XSGL\Xs_SeOrderBillController.cs" /> <Compile Include="Dapper\SqlHelper.cs" /> <Compile Include="Dapper\SqlPools.cs" /> <Compile Include="DbUntil\DataFormatUntil.cs" /> -- Gitblit v1.9.1