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

yusijie

2025-02-12 d19fcd70a3b11339eb0c50b5c734eeca855a9a95

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

@@ -55,7 +55,20 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //判断是否有查看全部班组的权限
                if (!DBUtility.ClsPub.Security_Log("Gy_Group_AllQuery", 3, false, HMaker))
                {
                    //如果没有这个权限
                    //根据用户对应班组的关系，过滤条件中增加只显示对应的班组
                    DataSet dsHitemID = oCn.RunProcReturn("exec h_p_Gy_GetSQLGroupByUser '" + HMaker + "'", "h_p_Gy_GetSQLGroupByUser");
                    string sqlGroupID = DBUtility.ClsPub.isStrNull(dsHitemID.Tables[0].Rows[0]["HBack"]);
                    if (sqlGroupID == "" || sqlGroupID == null)//如果没有绑定班组则让他看不到所有
                    {
                        sqlGroupID = "and 1 = 2";
                    }
                    sqlGroupID = sqlGroupID.Replace("HitemID", "HGroupID");//替换sql语句中的HitemID
                    sWhere = sWhere + sqlGroupID;
                }
                //返回列表信息
                ds = oCn.RunProcReturn("select * from h_v_Pay_SingleBalBillList where 1=1 " + sWhere + " order by hmainid desc", "h_v_Pay_SingleBalBillList");
                List<object> columnNameList = new List<object>();
@@ -418,6 +431,65 @@
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "审核或反审核工资结算单(个人)失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region å·¥èµ„结算单(个人) æ‰¹é‡å®¡æ ¸
        /// <summary>
        /// å®¡æ ¸/反审核工资结算单(个人)
        /// </summary>
        /// <param name="HInterID">单据ID</param>
        /// <param name="Type">审核(1),反审核(2)</param>
        /// <param name="HMaker">审核人</param>
        /// <returns></returns>
        [Route("Pay_SingleBalBillController/CheckAll")]
        [HttpGet]
        public object CheckAll(string ids, int Type, string HMaker)
        {
            try
            {
                //处理字符串
                if (!string.IsNullOrEmpty(ids))
                {
                    long[] idArray = Array.ConvertAll(ids.Split(','), long.Parse);
                    // å¤„理idArray...
                    oCn.BeginTran();
                    for (int i = 0; i < idArray.Length; i++)
                    {
                        objJsonResult = (json)GetPay_SingleBalBill_Check_Json(idArray[i], Type, HMaker);//审核执行
                        if (objJsonResult.count == 0)
                        {
                            oCn.RollBack();
                            objJsonResult.Message += "第" + (i + 1) + "行出现问题无法继续完成";
                            return objJsonResult;
                        }
                    }
                    oCn.Commit();
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "请选择正确行";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                
                objJsonResult.code = CodeConstant.SUCCEED;
                objJsonResult.count = CountConstant.SUCCEED;
                objJsonResult.Message = "执行成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCn.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "审核或反审核工资结算单(个人)失败！" + e.ToString();
@@ -882,7 +954,63 @@
        }
        #endregion

        #region å·¥èµ„结算单批量审核二版
        /// <summary>
        /// å·¥èµ„结算单批量审核二版
        /// </summary>
        /// <returns></returns>
        [Route("Pay_SingleBalBillController/CheckAllByTimeAndGroup")]
        [HttpGet]
        public object CheckAllByTimeAndGroup(string sWhere, string HMaker)
        {
            try
            {
                //判断权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 3, false, HMaker))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "您没有该模块权限,请与管理员联系！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = oCn.RunProcReturn($"exec h_p_Pay_SingleBalBill_CheckAllByTimeAndGroup " + sWhere + "", "h_p_Pay_SingleBalBill_CheckAllByTimeAndGroup");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "存储过程判断失败！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核失败！" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "成功！";
                objJsonResult.data = ds.Tables[0].Rows[0]["HRemark"];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "查询列表信息失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion