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

zrg

2024-01-30 93eee231d1d82f19013fbb51e8015ff9b84333d6

 WebAPI/Controllers/WebAPIController.cs

@@ -7974,6 +7974,31 @@
        }

        /// <summary>
        /// 用户关联班组获取信息
        /// </summary>
        /// <returns></returns>
        [Route("GetGy_UserGroupDetail")]
        [HttpGet]
        public ApiResult<DataSet> GetGy_UserGroupDetail(string HID)
        {
            var model = LuBaoSevice.GetGy_UserGroupBillDetail(HID);
            return model;
        }

        /// <summary>
        /// 用户关联供应商获取信息
        /// </summary>
        /// <returns></returns>
        [Route("GetGy_UserSupplierDetail")]
        [HttpGet]
        public ApiResult<DataSet> GetGy_UserSupplierDetail(string HID)
        {
            var model = LuBaoSevice.GetGy_UserSupplierBillDetail(HID);
            return model;
        }


        /// <summary>
        /// 报废原因
        /// </summary>
        /// <returns></returns>
@@ -9071,11 +9096,11 @@
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("Select HItemID,HNumber 代码,HName 名称 ,HQCCheckClassID 检验项目类别 from Gy_QCCheckItem where HStopflag=0 Order by HItemID  ", "Gy_QCCheckItem");
                    ds = oCN.RunProcReturn("Select HItemID,HNumber 代码,HName 名称 ,HQCCheckClassID 检验项目类别,HDefaultResult 默认结论 from Gy_QCCheckItem where HStopflag=0 Order by HItemID  ", "Gy_QCCheckItem");
                }
                else
                {
                    string sql = "Select HItemID,HNumber 代码,HName 名称 ,HQCCheckClassID 检验项目类别 from Gy_QCCheckItem where HStopflag=0 " + sWhere + "Order by HItemID ";
                    string sql = "Select HItemID,HNumber 代码,HName 名称 ,HQCCheckClassID 检验项目类别,HDefaultResult 默认结论 from Gy_QCCheckItem where HStopflag=0 " + sWhere + "Order by HItemID ";
                    ds = oCN.RunProcReturn(sql, "Gy_QCCheckItem");
                }
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
@@ -9991,6 +10016,39 @@
        }



        /// <summary>
        /// 获取选单号的源单类型
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetHSourceBillType")]
        [HttpGet]
        public object GetHSourceBillType(string HName)
        {
            try
            {
                ClsCN oCn = new ClsCN();
                DataSet oDs = new DataSet();
                //==========
                oDs = oCn.RunProcReturn("select * from  Xt_BillSourceSet where HName='"+HName+"'", "Xt_BillSourceSet");
                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; ;
            }
        }


        #region [从数据库加载菜单]
        public class MenuLoad
        {