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

yangle

2022-07-25 061a166a87fd30ae6a4e61785e3c36a1c313f8a6

 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;
            }
@@ -770,7 +770,7 @@
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName,HModel from h_v_Gy_Mould Order by HNumber", "h_v_Gy_Mould");
                    ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName,HModel,HDesignLife,HUseLife,HLeaveLife from h_v_Gy_Mould Order by HNumber", "h_v_Gy_Mould");
                }
                else
                {
@@ -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;
                }
@@ -3528,5 +3528,104 @@

        #endregion


        #region 用户穿梭框查询列表
        [Route("PublicPageMethod/PeopleTransFerList")]
        [HttpGet]
        public object PeopleTransFerList()
        {
            try
            {

                ds = oCN.RunProcReturn("Select czybm value,czymc title from h_v_Gy_UserList Order by czybm ", "h_v_Gy_UserList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无用户数据！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region 获取核算方式列表
        /// <summary>
        /// 获取核算方式列表
        /// </summary>
        /// <returns></returns>
        [Route("PublicPageMethod/GetClassTimePrjList_Json")]
        [HttpGet]
        public object GetClassTimePrjList_Json(string Gy_ClassTimePrj)
        {
            string sWhere = "";
            //sWhere = " Where HStopFlag=0  and HEndFlag=1";
            //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
            if (Gy_ClassTimePrj != "")
            {
                sWhere = sWhere + " and ( HNumber like '%" + Gy_ClassTimePrj + "%' or HName like '%" + Gy_ClassTimePrj + "%' ) ";
            }
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName  from Gy_ClassTimePrj where HStopflag=0 Order by HItemID ", "Gy_ClassTimePrj");
                }
                else
                {
                    string sql1 = "Select HItemID,HNumber ,HName  from Gy_ClassTimePrj where HStopflag=0  ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrj");
                }

                //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);


                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取成功";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception ex)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "获取失败" + ex.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }
}