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

zrg

2024-03-05 a56071d66299cc953cbdf54f209e5976b4cf9a8c

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

 WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs

@@ -384,8 +384,8 @@
                    foreach (DataRow row in ds.Tables[0].Rows)
                    {
                        TreeModel Three = new TreeModel();
                        Three.id = ds.Tables[0].Rows[0]["HInterID"].ToString();
                        Three.title = ds.Tables[0].Rows[0]["HName"].ToString();
                        Three.id = row["HInterID"].ToString();
                        Three.title = row["HName"].ToString();
                        treeModels.Add(Three);
                    }
                }

 WebAPI/Controllers/WebAPIController.cs

@@ -10330,6 +10330,37 @@
        }


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