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

wtt

1 天以前 e6c9dc1eb94da184e00ff28ac6a558b788d05a6e

 WebAPI/Controllers/WebAPIController.cs

@@ -1424,6 +1424,48 @@
            }
        }

        /// <summary>
        /// 获取生产资源列表下拉框
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetSouceList_Select")]
        [HttpGet]
        public object GetSouceList_Select(string HMaterID,Int64 HOrgID)
        {
            sWhere = " and HStopFlag=0 and HUSEORGID =" + HOrgID + "";            
            try
            {
                string sql = "EXEC h_p_Gy_SouceList_PC " + HMaterID + ",'" + sWhere + "'";
                ds = oCN.RunProcReturn(sql, "h_p_Gy_SouceList_PC");

                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;
            }
        }


        /// <summary>
        /// 获取职员列表