工资管理调整

王 垚

2022-06-27 2ffc4b7794e47bd8cf9f7b9662b0f92322406bb7

工资管理调整

 WebAPI/Controllers/PublicPageMethodController.cs

@@ -34,7 +34,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无该组织的用户数据！";
                    objJsonResult.Message = "当前组织数据未维护！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -108,7 +108,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无该组织的用户数据！";
                objJsonResult.Message = "当前组织数据未维护！";
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -140,7 +140,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无该组织的用户数据！";
                    objJsonResult.Message = "当前组织数据未维护！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -214,7 +214,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无该组织的用户数据！";
                objJsonResult.Message = "当前组织数据未维护！";
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -245,7 +245,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无该组织的用户数据！";
                    objJsonResult.Message = "当前组织数据未维护！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -319,7 +319,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无该组织的用户数据！";
                objJsonResult.Message = "当前组织数据未维护！";
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -350,7 +350,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无该组织的用户数据！";
                    objJsonResult.Message = "当前组织数据未维护！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -424,7 +424,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无该组织的用户数据！";
                objJsonResult.Message = "当前组织数据未维护！";
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -455,7 +455,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无该组织的用户数据！";
                    objJsonResult.Message = "当前组织数据未维护！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -529,7 +529,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无该组织的用户数据！";
                objJsonResult.Message = "当前组织数据未维护！";
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -2228,7 +2228,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无该组织的用户数据！";
                    objJsonResult.Message = "当前组织数据未维护！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -2302,7 +2302,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无该组织的用户数据！";
                objJsonResult.Message = "当前组织数据未维护！";
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -2333,7 +2333,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无该组织的用户数据！";
                    objJsonResult.Message = "当前组织数据未维护！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -2438,7 +2438,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无该组织的用户数据！";
                    objJsonResult.Message = "当前组织数据未维护！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

 WebAPI/Controllers/WebAPIController.cs

@@ -128,7 +128,7 @@

                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "登录异常！"+e.Message;
                objjson.Message = "登录异常！" + e.Message;
                objjson.data = null;
                return objjson; ;
            }
@@ -209,7 +209,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "删除失败！"; 
                    objJsonResult.Message = "删除失败！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -729,7 +729,7 @@
        /// <returns></returns>
        [Route("Web/GetStockPlaceList_Json_NEW")]
        [HttpGet]
        public object GetStockPlaceList_Json_NEW(string StockPlace, Int64 HWhID,Int64 HOrgID)
        public object GetStockPlaceList_Json_NEW(string StockPlace, Int64 HWhID, Int64 HOrgID)
        {
            WebS.WebService1 oWeb = new WebS.WebService1();
            sWhere = " Where HStopFlag=0  and HEndFlag=1 and HUSEORGID = " + HOrgID + "";
@@ -1637,7 +1637,7 @@
        /// <returns></returns>
        [Route("DeltetGy_BadReason")]
        [HttpGet]
        public object DeltetGy_BadReason(string HItemID,string user)
        public object DeltetGy_BadReason(string HItemID, string user)
        {
            DataSet ds;
            //string ModRightNameCheck = "Sc_ProcessReport_check";
@@ -2099,7 +2099,7 @@

        [Route("Web/GetClassTimePrjGroupBillList_Json")]
        [HttpGet]
        public object GetClassTimePrjGroupBillList_Json(string sWhere,string user)
        public object GetClassTimePrjGroupBillList_Json(string sWhere, string user)
        {
            if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj", 1, false, user))
            {
@@ -2153,6 +2153,58 @@
                return objjson;
            }
        }
        /// <summary>
        /// æ ¸ç®—方式组编辑
        /// </summary>
        /// <param name="sWhere"></param>
        /// <param name="user"></param>
        /// <returns></returns>
        [Route("Web/GetClassTimePrjGroupBillEdit_Json")]
        [HttpGet]
        public object GetClassTimePrjGroupBillEdit_Json(string sWhere)
        {
            //if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj", 1, false, user))
            //{
            //    objJsonResult.code = "0";
            //    objJsonResult.count = 0;
            //    objJsonResult.Message = "没有查看权限";
            //    objJsonResult.data = null;
            //    return objJsonResult;
            //}
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = "select a.HNumber,a.HName,a.HDeptID,b.HName as ä»“库名称 from  Gy_ClassTimePrjGroup a left join Gy_Department b on a.HDeptID = b.HItemID where a.hitemid = " + sWhere;
                ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
                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 = "1";
                    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;
            }
        }


        #region åˆ é™¤æ ¸ç®—方式组
        /// <summary>
        /// æ ¸ç®—方式列表删除按钮
@@ -2201,9 +2253,9 @@
        /// <returns></returns>
        [Route("Web/SaveGetClassTimePrjGroupList")]
        [HttpGet]
        public object SaveGetClassTimePrjGroupList(string HNumber,string HName,string HDeptID,string refSav,string user,string HItem)
        public object SaveGetClassTimePrjGroupList(string HNumber, string HName, string HDeptID, string refSav, string user, string HItem)
        {
           

            try
            {
                int HItemID = int.Parse(HItem);
@@ -2216,18 +2268,18 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql="";
                if (refSav== "Add")
                string sql = "";
                if (refSav == "Add")
                {
                  sql = "Insert Into Gy_ClassTimePrjGroup   " +
                "(HNumber,HName,HStopflag,HRemark,HShortNumber,HParentID,HLevel" +
                ",HEndFlag,HHelpCode,HDeptID,HGroupID,HUseFlag" +
                ") " +
                " values('" + HNumber + "','" + HName + "','','',0,0,0,0,''," + HDeptID + ",0,'未使用'" + ") ";
                    sql = "Insert Into Gy_ClassTimePrjGroup   " +
                  "(HNumber,HName,HStopflag,HRemark,HShortNumber,HParentID,HLevel" +
                  ",HEndFlag,HHelpCode,HDeptID,HGroupID,HUseFlag" +
                  ") " +
                  " values('" + HNumber + "','" + HName + "','','',0,0,0,0,''," + HDeptID + ",0,'未使用'" + ") ";
                }
                else
                {
                    sql = "UpDate Gy_ClassTimePrjGroup set HNumber='" + HNumber + "',HName='" + HName + "',HDeptID=" + HDeptID+ " where HItemID="+ HItemID;
                    sql = "UpDate Gy_ClassTimePrjGroup set HNumber='" + HNumber + "',HName='" + HName + "',HDeptID=" + HDeptID + " where HItemID=" + HItemID;
                }
                oCN.RunProc(sql);
                objJsonResult.code = "1";
@@ -2713,7 +2765,7 @@
        [HttpGet]
        public object GetMaintainItemtemByMouldProjectID(int MouldProjectID)
        {
            

            if (MouldProjectID <= 0)
            {
                objjson.code = "0";
@@ -2825,7 +2877,7 @@
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = string.Format(@"select * from h_v_Sc_MouldDotCheckRuleBillList ");
                ds = oCN.RunProcReturn(sql+sWhere, "h_v_Sc_MouldDotCheckRuleBillList");
                ds = oCN.RunProcReturn(sql + sWhere, "h_v_Sc_MouldDotCheckRuleBillList");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
@@ -2853,7 +2905,7 @@
            }
        }

         /// <summary>
        /// <summary>
        /// æ ¹æ®è®¾å¤‡æ˜¾ç¤ºè®¾å¤‡ä¿å…»è§„程项目
        /// </summary>
        /// <returns></returns>
@@ -2931,7 +2983,7 @@
                                                from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID 
                                                left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
                                                left join Gy_Employee e on e.HItemID=t.HManagerID
                                                where a.HInterID=" + EquipProjectID );
                                                where a.HInterID=" + EquipProjectID);
                string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a  
                                                left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID 
                                                left join h_v_IF_Material m on b.HMaterID=m.HItemID
@@ -3063,8 +3115,8 @@
                return objjson;
            }
        }
        
        


        /// <summary>
        /// èŽ·å–维修项目列表
        /// </summary>
@@ -3289,7 +3341,7 @@
            WebS.WebService1 oWebs = new WebS.WebService1();
            try
            {
                ds = oWebs.GetKf_PonderationBillMain_TempList_New (HBillType, sHMaker, HOrgID);
                ds = oWebs.GetKf_PonderationBillMain_TempList_New(HBillType, sHMaker, HOrgID);
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";

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

@@ -17,7 +17,6 @@
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;


        /// <summary>
        /// è¿”回列表
        ///参数：string sql。
@@ -25,7 +24,7 @@
        /// </summary>
        [Route("Gy_ClassTimePrjSub/list")]
        [HttpGet]
        public object list(string sWhere,string user)
        public object list(string sWhere, string user)
        {
            try
            {
@@ -45,7 +44,7 @@
                else
                {
                    string sql1 = "select * from h_v_Gy_ClassTimePrjSubList where 1=1 ";
                    string sql = sql1 + sWhere+ " order by HInterID desc";
                    string sql = sql1 + sWhere + " order by HInterID desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_ClassTimePrjSubList");
                }

@@ -219,7 +218,7 @@
        /// <returns></returns>
        [Route("DeltetGy_ClassTimePrjSub")]
        [HttpGet]
        public object DeltetGy_ClassTimePrjSub(string HItemID,string user)
        public object DeltetGy_ClassTimePrjSub(string HItemID, string user)
        {
            DataSet ds;
            DataSet ds1;
@@ -268,18 +267,34 @@
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_ClassTimePrjSub/ModifyByID")]
        [HttpPost]
        [Route("Gy_ClassTimePrjSub/Calc")]
        [HttpGet]
        public object Calc(string HEntryID, string HYear, string HPeriod)
        {
            try
            {
                oCN.RunProcReturn("exec h_p_Pay_GetAvgMoney " + HYear.ToString() + "," + HPeriod.ToString() + "," + HEntryID.ToString(), "pjgz");

                objJsonResult.code = "0";
                if (string.IsNullOrEmpty(HEntryID) || HEntryID == "0")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "请选择核算方式组！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (HYear == "" || HPeriod == "" || !IsDate($"{HYear}-{HPeriod}-1"))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "请输入有限的年月份！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql = $"exec h_p_Pay_GetAvgMoneyTest {HYear},{HPeriod},{HEntryID}";
                ds = oCN.RunProcReturn(sql, "Pay_GetAvgMoneyTest");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "保存成功！";
                objJsonResult.data = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
@@ -292,5 +307,18 @@
                return objJsonResult;
            }
        }

        public bool IsDate(string strDate)
        {
            try
            {
                DateTime.Parse(strDate);
                return true;
            }
            catch
            {
                return false;
            }
        }
    }
}

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

@@ -408,7 +408,7 @@
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.Message = "执行异常，联系管理员！报错：" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }