From 92a93a399f8c8481a9cc2f2e46b89ee0b45a98ec Mon Sep 17 00:00:00 2001 From: chenhaozhe <cgz@hz-kingdee.com> Date: 星期二, 06 五月 2025 13:14:43 +0800 Subject: [PATCH] 2025/5/6 提交 --- WebAPI/Controllers/SBGL/Sb_EquipPatrolCheckBillController.cs | 161 +++++++++++++++++++++++++++-------------------------- 1 files changed, 81 insertions(+), 80 deletions(-) diff --git a/WebAPI/Controllers/SBGL/Sb_EquipPatrolCheckBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipPatrolCheckBillController.cs index 04456ae..d4f04b4 100644 --- a/WebAPI/Controllers/SBGL/Sb_EquipPatrolCheckBillController.cs +++ b/WebAPI/Controllers/SBGL/Sb_EquipPatrolCheckBillController.cs @@ -17,8 +17,8 @@ public DataSet ds = new DataSet(); public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛� SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); - public DAL.ClsSb_EquipDotCheckBill BillNew = new DAL.ClsSb_EquipDotCheckBill(); //瀵瑰簲鍗曟嵁绫� - public DAL.ClsSb_EquipDotCheckBill BillOld = new DAL.ClsSb_EquipDotCheckBill(); //瀵瑰簲鍗曟嵁绫� + public DAL.ClsSb_EquipPatrolCheckBill BillNew = new DAL.ClsSb_EquipPatrolCheckBill(); //瀵瑰簲鍗曟嵁绫� + public DAL.ClsSb_EquipPatrolCheckBill BillOld = new DAL.ClsSb_EquipPatrolCheckBill(); //瀵瑰簲鍗曟嵁绫� Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); //鑾峰彇绯荤粺鍙傛暟 string fileip = System.Configuration.ConfigurationManager.AppSettings["FileIP"]; @@ -109,16 +109,17 @@ } } - #region 璁惧鐐规璁板綍鍒嗛〉鏌ヨ - [Route("Sb_EquipDotCheckBill/GetEquipDotCheckBillListPage")] + #region 璁惧宸℃璁板綍鍒嗛〉鏌ヨ + [Route("Sb_EquipPatrolCheckBill/GetEquipPatrolCheckBillListPage")] [HttpGet] - public object GetEquipDotCheckBillListPage(string sWhere, string user, int page, int size) + public object GetEquipPatrolCheckBillListPage(string sWhere, string user, int page, int size) { try { List<object> columnNameList = new List<object>(); //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipDotCheckBillList", 1, false, user)) + + if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipPatrolCheckBillList", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -129,11 +130,11 @@ sWhere = sWhere.Replace("'", "''"); if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("exec h_p_Sb_EquipDotCheckBillListPage " + page + "," + size + ",''", "h_p_Sb_EquipDotCheckBillListPage"); + ds = oCN.RunProcReturn("exec h_p_Sb_EquipPatrolCheckBillListPage " + page + "," + size + ",''", "h_p_Sb_EquipPatrolCheckBillListPage"); } else { - ds = oCN.RunProcReturn("exec h_p_Sb_EquipDotCheckBillListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_Sb_EquipDotCheckBillListPage"); + ds = oCN.RunProcReturn("exec h_p_Sb_EquipPatrolCheckBillListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_Sb_EquipPatrolCheckBillListPage"); } //娣诲姞鍒楀悕 @@ -165,21 +166,21 @@ #region sql璇彞 - public static DataSet Sb_EquipDotCheckBillList_s(string sWhere) + public static DataSet Sb_EquipPatrolCheckBillList_s(string sWhere) { - return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipDotCheckBillList ", "h_v_Sb_EquipDotCheckBillList"); + return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipPatrolCheckBillList ", "h_v_Sb_EquipPatrolCheckBillList"); } #endregion - #region 璁惧鐐规璁板綍琛� 淇濆瓨/缂栬緫 + #region 璁惧宸℃璁板綍琛� 淇濆瓨/缂栬緫 /// <summary> - /// 鐐规璁板綍琛� 淇濆瓨 + /// 宸℃璁板綍琛� 淇濆瓨 /// </summary> /// <param name="msg"></param> /// <returns></returns> - [Route("Sb_EquipDotCheckBill/SaveEquipDotCheckBillList")] + [Route("Sb_EquipPatrolCheckBill/SaveEquipPatrolCheckBillList")] [HttpPost] - public object SaveEquipDotCheckBillList([FromBody] JObject msg) + public object SaveEquipPatrolCheckBillList([FromBody] JObject msg) { var _value = msg["msg"].ToString(); string msg1 = _value.ToString(); @@ -193,7 +194,7 @@ ListModels oListModels = new ListModels(); try { - if (!DBUtility.ClsPub.Security_Log("Sb_EquipDotCheckBill_Edit", 1, false, msg4)) + if (!DBUtility.ClsPub.Security_Log("Sb_EquipPatrolCheckBill_Edit", 1, false, msg4)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -202,12 +203,12 @@ return objJsonResult; } - DAL.ClsSb_EquipDotCheckBill oBill = new DAL.ClsSb_EquipDotCheckBill(); - List<Model.ClsSb_EquipDotCheckBillMain> lsmain = new List<Model.ClsSb_EquipDotCheckBillMain>(); + DAL.ClsSb_EquipPatrolCheckBill oBill = new DAL.ClsSb_EquipPatrolCheckBill(); + List<Model.ClsSb_EquipPatrolCheckBillMain> lsmain = new List<Model.ClsSb_EquipPatrolCheckBillMain>(); msg2 = msg2.Replace("\\", ""); msg2 = msg2.Replace("\n", ""); //\n - lsmain = oListModels.getObjectByJson_Sb_EquipDotCheckBillMain(msg2); - foreach (Model.ClsSb_EquipDotCheckBillMain oItem in lsmain) + lsmain = oListModels.getObjectByJson_Sb_EquipPatrolCheckBillMain(msg2); + foreach (Model.ClsSb_EquipPatrolCheckBillMain oItem in lsmain) { //oItem.HMaker = ""; UserName = oItem.HMaker; //鍒跺崟浜� @@ -247,10 +248,10 @@ msg3 = msg3.Replace("\\", ""); msg3 = msg3.Replace("\n", ""); //\n //msg2 = msg2.Replace("'", "鈥�"); - List<Model.ClsSb_EquipDotCheckBillSub> ls = new List<Model.ClsSb_EquipDotCheckBillSub>(); - ls = oListModels.getObjectByJson_Sb_EquipDotCheckBillSub(msg3); + List<Model.ClsSb_EquipPatrolCheckBillSub> ls = new List<Model.ClsSb_EquipPatrolCheckBillSub>(); + ls = oListModels.getObjectByJson_Sb_EquipPatrolCheckBillSub(msg3); int i = 0; - foreach (Model.ClsSb_EquipDotCheckBillSub oItemSub in ls) + foreach (Model.ClsSb_EquipPatrolCheckBillSub oItemSub in ls) { i++; @@ -314,17 +315,17 @@ } #endregion - #region [璁惧鐐规璁板綍琛ㄥ垹闄ゅ姛鑳絔 + #region [璁惧宸℃璁板綍琛ㄥ垹闄ゅ姛鑳絔 /// <summary> /// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳� /// </summary> /// <returns></returns> - [Route("Sb_EquipDotCheckBill/DeltetEquipDotCheckBillList")] + [Route("Sb_EquipPatrolCheckBill/DeltetEquipPatrolCheckBillList")] [HttpGet] - public object DeltetEquipDotCheckBillList(string HInterID,string user) + public object DeltetEquipPatrolCheckBillList(string HInterID,string user) { //缂栬緫鏉冮檺 - if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipDotCheckBill_Delete", 1, false, user)) + if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipPatrolCheckBill_Delete", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -344,7 +345,7 @@ objJsonResult.data = null; return objJsonResult; } - DAL.ClsSb_EquipDotCheckBill oBill = new DAL.ClsSb_EquipDotCheckBill(); + DAL.ClsSb_EquipPatrolCheckBill oBill = new DAL.ClsSb_EquipPatrolCheckBill(); if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) { if (oBill.omodel.HBillStatus > 1) @@ -365,7 +366,7 @@ } //鍒犻櫎鍓嶆帶鍒� - DataSet BeforeDs = oCN.RunProcReturn("Exec h_p_Sb_EquipDotCheckBill_BeforeDelCtrl " + HInterID.ToString() + ",'" + user + "'", "h_p_Sb_EquipDotCheckBill_BeforeDelCtrl"); + DataSet BeforeDs = oCN.RunProcReturn("Exec h_p_Sb_EquipPatrolCheckBill_BeforeDelCtrl " + HInterID.ToString() + ",'" + user + "'", "h_p_Sb_EquipPatrolCheckBill_BeforeDelCtrl"); if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; @@ -386,7 +387,7 @@ } } - bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Sb_EquipDotCheckBill_AfterDelCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo); + bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Sb_EquipPatrolCheckBill_AfterDelCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo); if (IsDete) { objJsonResult.code = "0"; @@ -415,25 +416,25 @@ } #endregion - #region[璁惧鐐规璁板綍琛ㄧ紪杈戞椂鑾峰彇琛ㄥご鏁版嵁] - [Route("Sb_EquipDotCheckBill/Sb_EquipDotCheckBillListCheckDetai")] + #region[璁惧宸℃璁板綍琛ㄧ紪杈戞椂鑾峰彇琛ㄥご鏁版嵁] + [Route("Sb_EquipPatrolCheckBill/Sb_EquipPatrolCheckBillListCheckDetai")] [HttpGet] - public ApiResult<DataSet> Sb_EquipDotCheckBillListCheckDetai(string HID) + public ApiResult<DataSet> Sb_EquipPatrolCheckBillListCheckDetai(string HID) { if (string.IsNullOrEmpty(HID)) return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" }; SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); - var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sb_EquipDotCheckBill_Edit2 where hmainid= " + HID + " ", "h_v_Sb_EquipDotCheckBill_Edit2"); + var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sb_EquipPatrolCheckBill_Edit2 where hmainid= " + HID + " ", "h_v_Sb_EquipPatrolCheckBill_Edit2"); if (dataSet == null || dataSet.Tables[0].Rows.Count == 0) - return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ偣妫�璁板綍琛�" }; + return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄥ贰妫�璁板綍琛�" }; return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet }; } #endregion - #region[璁惧鐐规璁板綍琛ㄧ紪杈戞椂鑾峰彇琛ㄩ鏁版嵁] - [Route("Sb_EquipDotCheckBill/Sb_EquipDotCheckBillListProjectDetai")] + #region[璁惧宸℃璁板綍琛ㄧ紪杈戞椂鑾峰彇琛ㄩ鏁版嵁] + [Route("Sb_EquipPatrolCheckBill/Sb_EquipPatrolCheckBillListProjectDetai")] [HttpGet] - public object Sb_EquipDotCheckBillListProjectDetai(string sqlWhere) + public object Sb_EquipPatrolCheckBillListProjectDetai(string sqlWhere) { DataSet ds; try @@ -441,7 +442,7 @@ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (sqlWhere == null || sqlWhere.Equals("")) { - ds = oCN.RunProcReturn("select * from h_v_Sb_EquipDotCheckBill_Edit", "h_v_Sb_EquipDotCheckBill_Edit"); + ds = oCN.RunProcReturn("select * from h_v_Sb_EquipPatrolCheckBill_Edit", "h_v_Sb_EquipPatrolCheckBill_Edit"); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; @@ -449,9 +450,9 @@ } else { - string sql1 = "select * from h_v_Sb_EquipDotCheckBill_Edit where 1 = 1 "; + string sql1 = "select * from h_v_Sb_EquipPatrolCheckBill_Edit where 1 = 1 "; string sql = sql1 + sqlWhere; - ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckBill_Edit"); + ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipPatrolCheckBill_Edit"); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�"; @@ -474,7 +475,7 @@ #region 鏍规嵁璁惧鏉$爜鏌ユ壘璁惧妗f淇℃伅PDA - [Route("Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown")] + [Route("Sb_PDA_EquipPatrolCheckBill/txtHBarCode_KeyDown")] [HttpGet] public object txtHBarCode_KeyDown(string HBarCode) { @@ -517,7 +518,7 @@ #endregion #region 鏍规嵁璁惧鏉$爜鏌ユ壘璁惧妗f淇℃伅PDA 鏌ヨ鏉$爜妗f鍒楄〃 - [Route("Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_List")] + [Route("Sb_PDA_EquipPatrolCheckBill/txtHBarCode_KeyDown_List")] [HttpGet] public object txtHBarCode_KeyDown_List(string HBarCode) { @@ -559,11 +560,11 @@ } #endregion - #region 璁惧鐐规璁板綍鎻愪氦PDA + #region 璁惧宸℃璁板綍鎻愪氦PDA - [Route("Sb_PDA_EquipDotCheckBill/SaveGetEquipDotCheckBillList")] + [Route("Sb_PDA_EquipPatrolCheckBill/SaveGetEquipPatrolCheckBillList")] [HttpPost] - public object SaveGetEquipDotCheckBillList([FromBody] JObject msg) + public object SaveGetEquipPatrolCheckBillList([FromBody] JObject msg) { var _value = msg["msg"].ToString(); string msg1 = _value.ToString(); @@ -576,12 +577,12 @@ ListModels oListModels = new ListModels(); try { - DLL.ClsSb_EquipDotCheckBill oBill = new DLL.ClsSb_EquipDotCheckBill(); - List<Models.ClsSb_EquipDotCheckBillMain> lsmain = new List<Models.ClsSb_EquipDotCheckBillMain>(); + DLL.ClsSb_EquipPatrolCheckBill oBill = new DLL.ClsSb_EquipPatrolCheckBill(); + List<Models.ClsSb_EquipPatrolCheckBillMain> lsmain = new List<Models.ClsSb_EquipPatrolCheckBillMain>(); msg2 = msg2.Replace("\\", ""); msg2 = msg2.Replace("\n", ""); //\n - lsmain = oListModels.getObjectByJson_Sb_EquipDotCheckBillMainPDA(msg2); - foreach (Models.ClsSb_EquipDotCheckBillMain oItem in lsmain) + lsmain = oListModels.getObjectByJson_Sb_EquipPatrolCheckBillMainPDA(msg2); + foreach (Models.ClsSb_EquipPatrolCheckBillMain oItem in lsmain) { //鍗曟嵁鍙锋槸鍚﹂噸澶� if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID)) @@ -629,10 +630,10 @@ msg3 = msg3.Substring(1, msg3.Length - 2); msg3 = msg3.Replace("\\", ""); msg3 = msg3.Replace("\n", ""); //\n - List<Models.ClsSb_EquipDotCheckBillSub> ls = new List<Models.ClsSb_EquipDotCheckBillSub>(); - ls = oListModels.getObjectByJson_Sb_EquipDotCheckBillSubPDA(msg3); + List<Models.ClsSb_EquipPatrolCheckBillSub> ls = new List<Models.ClsSb_EquipPatrolCheckBillSub>(); + ls = oListModels.getObjectByJson_Sb_EquipPatrolCheckBillSubPDA(msg3); int i = 0; - foreach (Models.ClsSb_EquipDotCheckBillSub oItemSub in ls) + foreach (Models.ClsSb_EquipPatrolCheckBillSub oItemSub in ls) { i++; @@ -698,15 +699,15 @@ } #endregion - #region 璁惧鐐规璁板綍鍗曞鏍�/鍙嶅鏍稿姛鑳� - [Route("Sb_EquipDotCheckBill/CheckSb_EquipDotCheckBill")] + #region 璁惧宸℃璁板綍鍗曞鏍�/鍙嶅鏍稿姛鑳� + [Route("Sb_EquipPatrolCheckBill/CheckSb_EquipPatrolCheckBill")] [HttpGet] - public object CheckSb_EquipDotCheckBill(string HInterID, int Type, string user) + public object CheckSb_EquipPatrolCheckBill(string HInterID, int Type, string user) { try { //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄� - if (!DBUtility.ClsPub.Security_Log("Sb_EquipDotCheckBill_Check", 1, false, user)) + if (!DBUtility.ClsPub.Security_Log("Sb_EquipPatrolCheckBill_Check", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -731,8 +732,8 @@ if (Type == 1) { //瀹℃牳鍓嶆帶鍒�========================================= - string sql1 = "exec h_p_Sb_EquipDotCheckBill_BeforeCheckCtrl " + HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'"; - ds = oCN.RunProcReturn(sql1, "h_p_Sb_EquipDotCheckBill_BeforeCheckCtrl"); + string sql1 = "exec h_p_Sb_EquipPatrolCheckBill_BeforeCheckCtrl " + HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'"; + ds = oCN.RunProcReturn(sql1, "h_p_Sb_EquipPatrolCheckBill_BeforeCheckCtrl"); if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; @@ -754,7 +755,7 @@ } //================================================================================== - if (!BillOld.CheckBill(int.Parse(HInterID), BillOld.omodel.HBillNo, "h_p_Sb_EquipDotCheckBill_AfterCheckCtrl", user, ref ClsPub.sExeReturnInfo)) + if (!BillOld.CheckBill(int.Parse(HInterID), BillOld.omodel.HBillNo, "h_p_Sb_EquipPatrolCheckBill_AfterCheckCtrl", user, ref ClsPub.sExeReturnInfo)) { objJsonResult.code = "0"; objJsonResult.count = 1; @@ -766,8 +767,8 @@ else { //鍙嶅鏍稿墠鎺у埗========================================= - string sql1 = "exec h_p_Sb_EquipDotCheckBill_BeforeUnCheckCtrl " + HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'"; - ds = oCN.RunProcReturn(sql1, "h_p_Sb_EquipDotCheckBill_BeforeUnCheckCtrl"); + string sql1 = "exec h_p_Sb_EquipPatrolCheckBill_BeforeUnCheckCtrl " + HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'"; + ds = oCN.RunProcReturn(sql1, "h_p_Sb_EquipPatrolCheckBill_BeforeUnCheckCtrl"); if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; @@ -787,7 +788,7 @@ } //=========================================================== - if (!BillOld.AbandonCheck(int.Parse(HInterID), BillOld.omodel.HBillNo, "h_p_Sb_EquipDotCheckBill_AfterUnCheckCtrl", user, ref ClsPub.sExeReturnInfo)) + if (!BillOld.AbandonCheck(int.Parse(HInterID), BillOld.omodel.HBillNo, "h_p_Sb_EquipPatrolCheckBill_AfterUnCheckCtrl", user, ref ClsPub.sExeReturnInfo)) { objJsonResult.code = "0"; objJsonResult.count = 1; @@ -817,15 +818,15 @@ } #endregion - #region 璁惧鐐规璁板綍鍗曞叧闂�/鍙嶅叧闂姛鑳� - [Route("Sb_EquipDotCheckBill/CloseSb_EquipDotCheckBill")] + #region 璁惧宸℃璁板綍鍗曞叧闂�/鍙嶅叧闂姛鑳� + [Route("Sb_EquipPatrolCheckBill/CloseSb_EquipPatrolCheckBill")] [HttpGet] - public object CloseSb_EquipDotCheckBill(string HInterID, int Type, string user) + public object CloseSb_EquipPatrolCheckBill(string HInterID, int Type, string user) { try { //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄� - if (!DBUtility.ClsPub.Security_Log("Sb_EquipDotCheckBill_Close", 1, false, user)) + if (!DBUtility.ClsPub.Security_Log("Sb_EquipPatrolCheckBill_Close", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -852,8 +853,8 @@ { string sql = ""; //鍏抽棴鍓嶆帶鍒�===============================================Begin=================================================================== - sql = "exec h_p_Sb_EquipDotCheckBill_BeforeCloseCtrl " + HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'"; - ds = oCN.RunProcReturn(sql, "h_p_Sb_EquipDotCheckBill_BeforeCloseCtrl"); + sql = "exec h_p_Sb_EquipPatrolCheckBill_BeforeCloseCtrl " + HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'"; + ds = oCN.RunProcReturn(sql, "h_p_Sb_EquipPatrolCheckBill_BeforeCloseCtrl"); if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; @@ -874,7 +875,7 @@ //鍏抽棴鍓嶆帶鍒�===============================================End=================================================================== //鍏抽棴鎻愪氦 - if (BillOld.CloseBill(Convert.ToInt32(HInterID), BillOld.omodel.HBillNo, "h_p_Sb_EquipDotCheckBill_AfterCloseCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true) + if (BillOld.CloseBill(Convert.ToInt32(HInterID), BillOld.omodel.HBillNo, "h_p_Sb_EquipPatrolCheckBill_AfterCloseCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true) { objJsonResult.code = "1"; objJsonResult.count = 1; @@ -895,8 +896,8 @@ { string sql = ""; //鍙嶅叧闂墠鎺у埗===============================================Begin=================================================================== - sql = "exec h_p_Sb_EquipDotCheckBill_BeforeUnCloseCtrl " + HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'"; - ds = oCN.RunProcReturn(sql, "h_p_Sb_EquipDotCheckBill_BeforeUnCloseCtrl"); + sql = "exec h_p_Sb_EquipPatrolCheckBill_BeforeUnCloseCtrl " + HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'"; + ds = oCN.RunProcReturn(sql, "h_p_Sb_EquipPatrolCheckBill_BeforeUnCloseCtrl"); if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; @@ -917,7 +918,7 @@ //鍙嶅叧闂墠鎺у埗===============================================End=================================================================== //鍙嶅叧闂彁浜� - if (BillOld.CancelClose(Convert.ToInt32(HInterID), BillOld.omodel.HBillNo, "h_p_Sb_EquipDotCheckBill_AfterUnCloseCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true) + if (BillOld.CancelClose(Convert.ToInt32(HInterID), BillOld.omodel.HBillNo, "h_p_Sb_EquipPatrolCheckBill_AfterUnCloseCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true) { objJsonResult.code = "1"; objJsonResult.count = 1; @@ -955,9 +956,9 @@ } #endregion - #region 璁惧鐐规閫炬湡棰勮鎶ヨ〃 + #region 璁惧宸℃閫炬湡棰勮鎶ヨ〃 - [Route("Sb_EquipDotCheckWarning/Report")] + [Route("Sb_EquipPatrolCheckWarning/Report")] [HttpGet] public object Report(string HYear,string HMonth,string HEquipTypeID, string user) { @@ -983,8 +984,8 @@ } else { - string sql = "exec h_p_Sb_EquipDotCheckWarningReport " + HYear + "," + HMonth + "," + HEquipTypeID; - ds = oCN.RunProcReturn(sql, "h_p_Sb_EquipDotCheckWarningReport"); + string sql = "exec h_p_Sb_EquipPatrolCheckWarningReport " + HYear + "," + HMonth + "," + HEquipTypeID; + ds = oCN.RunProcReturn(sql, "h_p_Sb_EquipPatrolCheckWarningReport"); } //娣诲姞鍒楀悕 @@ -1013,8 +1014,8 @@ } #endregion - #region 璁惧鐐规璁板綍鎷嶇収涓婁紶 - [Route("Sb_EquipDotCheckBill/UploadFile")] + #region 璁惧宸℃璁板綍鎷嶇収涓婁紶 + [Route("Sb_EquipPatrolCheckBill/UploadFile")] [HttpPost] public object UploadFile() { @@ -1135,7 +1136,7 @@ /// </summary> /// <param name="sWhere"></param> /// <returns></returns> - [Route("Sb_EquipDotCheckBill/Filelist")] + [Route("Sb_EquipPatrolCheckBill/Filelist")] [HttpGet] public object Filelist(string HBillNo) { @@ -1166,7 +1167,7 @@ /// </summary> /// <param name="sWhere"></param> /// <returns></returns> - [Route("Sb_EquipDotCheckBill/DeleteFilelist")] + [Route("Sb_EquipPatrolCheckBill/DeleteFilelist")] [HttpGet] public object DeleteFilelist(string HItemID, string HSourceBillNo, string HFileName) { -- Gitblit v1.9.1