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

zzr99

2022-06-27 20f0478d39110034363d852d6d0594cea325617f

 WebAPI/Controllers/WebAPIController.cs

@@ -955,7 +955,7 @@
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn("Select HItemID,HNumber 班组代码,HName 班组 from h_v_IF_Group where HStopflag=0 " + sWhere + " Order by HItemID ", "h_v_IF_Group");
                ds = oCN.RunProcReturn("Select HItemID,班组代码 班组代码,班组名称 班组 from h_v_GroupList where 1=1 " + sWhere + " Order by HItemID ", "h_v_GroupList");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
@@ -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>
        /// 核算方式列表删除按钮