Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yusijie

2023-06-29 efa57c53b1b4c94e188a52f5a35d0a4ca8a82cb5

 WebAPI/Controllers/¹¤×ʹÜÀí/Pay_SingleBalBillController.cs

@@ -382,6 +382,37 @@
                return objJsonResult;
            }
        }

        /// <summary>
        /// ç”Ÿæˆå·¥èµ„结算
        /// </summary>
        /// <param name="HBeginDate">开始日期</param>
        /// <param name="HEndDate">结束日期</param>
        /// <param name="HDeptID">部门ID</param>
        /// <returns></returns>
        [Route("Pay_SingleBalBill/GenerateSalary")]
        [HttpGet]
        public object GenerateSalary(string HBeginDate, string HEndDate,int HDeptID)
        {
            try
            {
                string sql = $"exec h_p_Gy_GenerateSalary '{HBeginDate}','{HEndDate}','{HDeptID}' ";
                oCN.RunProc(sql); 
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "生成成功";
                objJsonResult.data = 1;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "执行异常，联系管理员！报错：" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        //
    }
}