From aaa742141d18b5f6d73942c975de55a14446ef22 Mon Sep 17 00:00:00 2001 From: yxj <yxj@hz-kingdee.com> Date: 星期五, 02 二月 2024 08:49:23 +0800 Subject: [PATCH] 网页版工资结算单(个人)、工资结算单(集体)、工资结算单(其他)、定额申请单、异常工时申请单列表模块,列表返回数据、审核反审核、关闭反关闭、作废反作废、删除等调用方法修改 --- WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) diff --git a/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs b/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs index df2b71b..e78e6ca 100644 --- a/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs +++ b/WebAPI/Controllers/SCGL/Sc_ICMOChangeBillController.cs @@ -48,12 +48,12 @@ if (sWhere == null || sWhere.Equals("")) { - ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOChangeBillList_Query order by 鍗曟嵁鍙� ", "h_v_Sc_ICMOChangeBillList_Query"); + ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOChangeBillList_Query order by 鍗曟嵁鍙� desc", "h_v_Sc_ICMOChangeBillList_Query"); } else { string sql1 = "select * from h_v_Sc_ICMOChangeBillList_Query where 1 = 1 "; - string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� "; + string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc"; ds = oCN.RunProcReturn(sql, "h_v_Sc_ICMOChangeBillList_Query"); } @@ -487,9 +487,36 @@ return objJsonResult; } + //妫�鏌ユ簮鍗曟槸鍚﹀瓨鍦� + string sql = "select * from Sc_ICMOBillSub where HInterID = " + oBill.omodel.HMainSourceInterID + " and HEntryID =" + oBill.omodel.HMainSourceEntryID; + ds = oCN.RunProcReturn(sql, "Sc_ICMOBillSub"); + if(ds==null || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:婧愬崟鏁版嵁涓嶅瓨鍦紒"; + objJsonResult.data = null; + return objJsonResult; + } + else if (ds.Tables[0].Rows[0]["HBillStatus"].ToString() != "2") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:婧愬崟鏈浜庡鏍哥姸鎬�!"; + objJsonResult.data = null; + return objJsonResult; + } + + oCN.BeginTran(); + //鍙嶅啓婧愬崟鏁版嵁 + sql = "exec h_p_Sc_ICMOBill_ReWriteByICMOChangeBill " + oBill.omodel.HInterID; + oCN.RunProc(sql); + //瀹℃牳鎻愪氦 if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true) { + oCN.Commit(); + objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "瀹℃牳鎴愬姛"; @@ -498,6 +525,8 @@ } else { + oCN.RollBack(); + objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo; @@ -529,6 +558,8 @@ } catch (Exception e) { + oCN.RollBack(); + objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString(); -- Gitblit v1.9.1