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

WYB

2021-03-31 16c3bb84eacc3326afad9a44e6dcb1ad1ca4967f

 WebAPI/Controllers/WebAPIController.cs

@@ -329,6 +329,33 @@
        }


        //删除表记录
        [Route("Web/Delete_Table")]
        [HttpGet]
        public object Delete_Table(string sqlStr)
        {
            try
            {
                //SQLHelper oCn;
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                oCN.RunProc(sqlStr);
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败！异常";
                objJsonResult.data = null;
                return objJsonResult;
            }

        }

        #region 基础资料
        /// <summary>
        /// 获取仓库列表
@@ -677,6 +704,111 @@
                return objjson;
            }
        }

        /// <summary>
        /// 获取物料列表
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetMaterialList_Json")]
        [HttpGet]
        public object GetMaterialList_Json(string Material)
        {
            sWhere = " Where HStopFlag=0  and HEndFlag=1";
            //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
            if (Material != "")
            {
                sWhere = sWhere + " and ( HNumber like '%" + Material + "%' or HName like '%" + Material + "%' ) ";
            }
            try
            {
                ds = webserver.GetMaterialList(sWhere, ref DBUtility.ClsPub.sErrInfo);
                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 = "0";
                    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;
            }
        }

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

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


                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 = "0";
                    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;
            }
        }

        /// <summary>
        /// 获取客户列表
        /// </summary>
@@ -721,6 +853,37 @@
                return objjson;
            }
        }

        /// <summary>
        /// 获取当前数据库名
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetDataBases")]
        [HttpGet]
        public object GetDataBases()
        {
            try
            {
                ClsCN oCn = new ClsCN();
                DataSet oDs = new DataSet();
                //==========
                oDs = oCn.RunProcReturn("Select Name From Master..SysDataBases Where DbId=(Select Dbid From Master..SysProcesses Where Spid = @@spid)", "SysDataBases");
                objjson.code = "1";
                objjson.count = 1;
                objjson.Message = "获取成功！";
                objjson.data = oDs.Tables[0];
                return objjson; ;
            }
            catch (Exception e)
            {

                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败！异常" + e.ToString();
                objjson.data = null;
                return objjson; ;
            }
        }
        #endregion
    }