From 51c8ecb7a3e5c8d681c7498c7a2e5ee1f108b90d Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 26 四月 2024 13:41:57 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs | 200 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 199 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
index 27036ac..6346119 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
@@ -1,4 +1,5 @@
锘縰sing DBUtility;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -397,7 +398,7 @@
public object Sb_EquipFileBillResumeDate(string HInterID)
{
- DataTable ds, ds1;
+ DataTable ds, ds1,ds2;
long HInterID1 = long.Parse(HInterID);
List<object> list = new List<object>();
try
@@ -407,9 +408,11 @@
string sql1 = string.Format($"exec h_p_Gy_EquipRecord {HInterID1}");
ds = oCN.RunProcReturn(sql1, "h_p_Gy_EquipRecord").Tables[0];
ds1 = oCN.RunProcReturn(sql1, "h_p_Gy_EquipRecord").Tables[1];
+ ds2 = oCN.RunProcReturn(sql1, "h_p_Gy_EquipRecord").Tables[2];
list.Add(ds);//鏃ュ父璁板綍
list.Add(ds1);//缁翠慨璁板綍
+ list.Add(ds2);//閰嶄欢鏇存崲娓呭崟
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
@@ -729,5 +732,200 @@
}
#endregion
+
+ #region 璁惧杩愯鐘舵�佹姤琛�
+
+ [Route("SB_EquipRunningStatus/Report")]
+ [HttpGet]
+ public object Report(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //if (!DBUtility.ClsPub.Security_Log("Gy_EquipFileList", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Sb_EquipRunningStatusReport " + sWhere + " order by 鎵�灞炴棩鏈� desc", "h_v_Sb_EquipRunningStatusReport");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sb_EquipRunningStatusReport where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鎵�灞炴棩鏈� desc";
+ 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));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+
+ //if (ds.Tables[0].Rows.Count != 0 && ds != null)
+ //{
+
+ //}
+ //else
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳暟鎹�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧杩愯鐘舵�佹姤琛� 鏍戠姸鍥� 閮ㄩ棬鍒嗙被鏌ヨ
+ public class TreeModel_Report
+ {
+ public string id { get; set; }
+ public string title { get; set; }
+ public string type { get; set; }
+ public List<TreeModel_Report> children = new List<TreeModel_Report>();
+ }
+ [Route("SB_EquipRunningStatus/ReportTreeGetList")]
+ [HttpGet]
+ public object ReportTreeGetList(string sWhere, string user)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select HItemID,HNumber,HName from Gy_Department", "Gy_Department");
+
+ List<TreeModel_Report> treeModels = new List<TreeModel_Report>();
+ TreeModel_Report first = new TreeModel_Report();
+
+ DataSet Ds;
+ string HCampanyName = "";
+ Ds = oCN.RunProcReturn("select HValue from Xt_SystemParameter where HCaption = '瀹㈡埛鍚嶇О'", "Xt_SystemParameter");
+ if (Ds.Tables[0].Rows.Count != 0 && Ds != null)
+ {
+ HCampanyName = Ds.Tables[0].Rows[0]["HValue"].ToString();
+ }
+
+ first.id = "0";
+ first.title = HCampanyName;
+ treeModels.Add(first);
+
+ foreach (DataRow row in ds.Tables[0].Rows)
+ {
+ var strLen = row["hitemid"].ToString().Split('.');
+ if (strLen.Length == 1)
+ {
+ TreeModel_Report tree = new TreeModel_Report();
+ tree.id = row["HItemID"].ToString();
+ tree.title = row["HName"].ToString();
+ tree.type = "Department";
+ treeModels[0].children.Add(tree);
+ }
+ }
+ getWorkCenter_Level2(ds.Tables[0], treeModels[0].children);
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = Newtonsoft.Json.JsonConvert.SerializeObject(treeModels);
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ /// <summary>
+ /// 绗簩绾у伐浣滀腑蹇�
+ /// </summary>
+ public void getWorkCenter_Level2(DataTable dt, List<TreeModel_Report> tree)
+ {
+ for (int i = 0;i < dt.Rows.Count;i++)
+ {
+ var HDeptID = dt.Rows[i]["HItemID"].ToString();
+ ds = oCN.RunProcReturn("select distinct HItemID,HNumber,HName from Gy_WorkCenter where HDeptID = " + HDeptID, "Gy_WorkCenter");
+ if (ds.Tables[0].Rows.Count != 0 && ds != null)
+ {
+ for (int j = 0; j < ds.Tables[0].Rows.Count; j++)
+ {
+ TreeModel_Report tbjson = new TreeModel_Report();
+ tbjson.id = ds.Tables[0].Rows[j]["HItemID"].ToString();
+ tbjson.title = ds.Tables[0].Rows[j]["HName"].ToString();
+ tbjson.type = "WorkCenter";
+ tree[i].children.Add(tbjson);
+ }
+ }
+ //digui_Report(ds.Tables[0], tree[i].children, 2);
+ }
+
+ }
+
+ /// <summary>
+ /// 閫掑綊鍑芥暟
+ /// </summary>
+ public void digui_Report(DataTable dt, List<TreeModel_Report> tree, int num)
+ {
+ for (int m = 0; m < tree.Count; m++)
+ {
+ tree[m].children = new List<TreeModel_Report>();
+ for (int i = 0; i < dt.Rows.Count; i++)//绗竴娆″惊鐜紝寰楀埌鎵�鏈夋牴鑺傜偣鐨勫瓙闆�
+ {
+ var HWorkCenterNumber = dt.Rows[i]["HNumber"].ToString();
+ DataSet Ds;
+ Ds = oCN.RunProcReturn("select distinct HItemID,HNumber,HName from Gy_WorkCenter where HNumber like '" + HWorkCenterNumber + "%'", "Gy_WorkCenter");
+
+ if (Ds.Tables[0].Rows.Count != 0 && Ds != null)
+ {
+ for (int j = 0;j < Ds.Tables[0].Rows.Count;j++)
+ {
+ var strLen = Ds.Tables[0].Rows[j]["HNumber"].ToString().Split('.');
+ if (strLen.Length == num && Ds.Tables[0].Rows[j]["HNumber"].ToString().Contains(tree[m].id + "."))
+ {
+ TreeModel_Report tbjson = new TreeModel_Report();
+ tbjson.id = Ds.Tables[0].Rows[j]["HItemID"].ToString();
+ tbjson.title = Ds.Tables[0].Rows[j]["HName"].ToString();
+ tbjson.type = "WorkCenter";
+ tree[m].children.Add(tbjson);
+ }
+ }
+ }
+ }
+ var strLens = tree[m].id.Split('.');
+ for (int i = 0; i < tree[m].children.Count; i++)
+ {
+ digui_Report(dt, tree[m].children, strLens.Length + 2);//鍐嶆鐢ㄥ瓙闆嗗幓寰幆锛屾嬁鍑哄瓙闆嗙殑瀛愰泦
+ }
+ }
+
+ }
+ #endregion
+
}
}
--
Gitblit v1.9.1