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

yxj

2026-04-16 9967a08d57b74daefa44ead22f6c0ed72dfadea0

 WebAPI/Controllers/Éú²ú¹ÜÀí/É豸״̬·Ö²½/Sc_HEquipStateDistributionController.cs

@@ -23,6 +23,7 @@
        //获取系统参数
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();

        

        #region è®¾å¤‡åˆ†å¸ƒ è®¾å¤‡ç»‘定的生产资源上正在生产的工单 

@@ -175,5 +176,127 @@
            }
        }
        #endregion

        #region è®¾å¤‡è¿è¡Œåˆ‡ç‰‡ï¼ŒèŽ·å–部门-设备 æ ‘状图
        private class HEquipTreeList_DAQ_Node
        {
            public int id { get; set; }
            public string title { get; set; }
            public List<HEquipTreeList_DAQ_Node> children { get; set; }
        }


        [Route("DAQ_EquipRunningSlice/GetHEquipTreeList_DAQ")]
        [HttpGet]
        public object Sc_HEquipStateDistribution_Souce(string sWhere)
        {
            try
            {
                List<HEquipTreeList_DAQ_Node> treeArr = new List<HEquipTreeList_DAQ_Node>();
                // è®°å½•éƒ¨é—¨æ˜¯å¦å·²ç»åŠ å…¥treeArr(不可重复加入)
                HashSet<String> HDeptSet = new HashSet<String>();

                ds = oCN.RunProcReturn($@"select hmainid HEquipID, è®¾å¤‡åç§° HEquipName, HDeptID HDeptID, ä½¿ç”¨éƒ¨é—¨ HDeptName from h_v_Gy_EquipFileMainList
                {sWhere}    
                order by HEquipName asc", "h_v_Gy_EquipFileMainList");

                foreach(DataRow row in ds.Tables[0].Rows)
                {
                    int HDeptID = int.Parse(row["HDeptID"].ToString());
                    string HDeptName = row["HDeptName"] as string;
                    int HEquipID = int.Parse(row["HEquipID"].ToString());
                    string HEquipName = row["HEquipName"] as string;

                    if (!HDeptSet.Contains(row["HDeptID"].ToString()))
                    {
                        // æ²¡æœ‰éƒ¨é—¨å¯¹åº”的一级节点，则添加一级节点
                        treeArr.Add(new HEquipTreeList_DAQ_Node
                        {
                            id = int.Parse(row["HDeptID"].ToString()),
                            title = row["HDeptName"].ToString(),
                            children = new List<HEquipTreeList_DAQ_Node>() 
                        });

                        // éƒ¨é—¨ID添加到Set，确保唯一性
                        HDeptSet.Add(row["HDeptID"].ToString());
                    }

                    // éƒ¨é—¨å¯¹å°çš„一级节点已经设置好，设置二级节点
                    HEquipTreeList_DAQ_Node Node = treeArr.First(item => item.id == HDeptID);
                    Node.children.Add(new HEquipTreeList_DAQ_Node
                    {
                        id = HEquipID,
                        title = HEquipName,
                        children = new List<HEquipTreeList_DAQ_Node>()
                    });
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "查询成功";
                objJsonResult.data = JArray.FromObject(treeArr);
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.Message.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region è®¾å¤‡è¿è¡Œåˆ‡ç‰‡ è¿”回设备状态 å›¾è¡¨æ•°æ®
        [Route("DAQ_EquipRunningSlice/GetHEquipStatusReportList_DAQ")]
        [HttpGet]
        public object GetHEquipStatusReportList_DAQ(string HEquipID, string HDeptID, string HBeginDate, string HEndDate, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                string sql = "select * from h_v_Sb_EquipRunningStatusReport where 1 = 1";
                if(!string.IsNullOrWhiteSpace(HEquipID) && HEquipID != "0")
                {
                    sql += $" and HEquipID = {HEquipID}";
                }
                if(!string.IsNullOrWhiteSpace(HDeptID) && HDeptID != "0")
                {
                    sql += $" and HDeptID = {HDeptID}";
                }
                if(!string.IsNullOrWhiteSpace(HBeginDate) && !string.IsNullOrWhiteSpace(HEndDate))
                {
                    sql += $"and (所属日期 between CONVERT(DATETIME, '{HBeginDate} 00:00:00', 120) AND CONVERT(DATETIME, '{HEndDate} 23:59:59', 120))";
                }

                ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipRunningStatusReport");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception ex)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "查询数据异常，请与管理员联系！" + ex.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}