From 52fdbb3d0c065abc0bba434188c98affed024e76 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 30 八月 2024 15:16:40 +0800
Subject: [PATCH] 各工序趋势图后端查询
---
WebAPI/Controllers/基础资料/基础资料/Gy_MaterTypeBillController.cs | 90 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 85 insertions(+), 5 deletions(-)
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterTypeBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterTypeBillController.cs"
index 339ea43..eedb205 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterTypeBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_MaterTypeBillController.cs"
@@ -135,8 +135,6 @@
return objJsonResult;
}
}
-
-
//寰楀埌鐭唬鐮�
string sShortNumber;
sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
@@ -152,7 +150,16 @@
oItem.HShortNumber = sShortNumber;//鐭唬鐮�
oItem.HMakeEmp = msg2;
oItem.HEndFlag = true;//鏈骇鏍囧織
- oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇
+ DataSet ds2 = oCN.RunProcReturn("select HLevel from Gy_MaterType where HItemID =" + oItem.HParentID , "Gy_MaterType");//鎼滅储鐖剁被绛夌骇
+ //oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber); //绛夌骇
+ if (ds2.Tables[0].Rows.Count > 0)
+ {
+ oItem.HLevel = (int)ds2.Tables[0].Rows[0]["HLevel"] + 1;
+ }
+ else
+ {
+ oItem.HLevel = 1;
+ }
oBill.oModel = oItem;
}
//淇濆瓨
@@ -452,7 +459,7 @@
}
#endregion
- #region 鐗╂枡鍒嗙被 鏍戝舰鍥�
+ #region 鐗╂枡鍒嗙被 鏍戝舰鍥�(鏍规嵁浠ｇ爜灞曞紑鏍戠姸鍥�)
public class TreeModel
{
public string id { get; set; }
@@ -477,7 +484,7 @@
foreach (DataRow row in ds.Tables[0].Rows)
{
- var strLen = row["hitemid"].ToString().Split('.');
+ var strLen = row["hnumber"].ToString().Split('.');
if (strLen.Length == 1)
{
TreeModel tree = new TreeModel();
@@ -532,5 +539,78 @@
}
#endregion
+
+ #region 鏍规嵁鐖秈d鍜岀瓑绾ц幏寰楁爲鐘跺浘閫掑綊
+
+ [Route("Gy_MaterType/Gy_MaterTypeTreeListByLevel")]
+ [HttpGet]
+ public object Gy_MaterTypeTreeListByLevel()
+ {
+ try
+ {
+ string sql1 = string.Format("select hitemid,hnumber,hname,hparentid,hlevel from Gy_MaterType order by hnumber");
+
+ ds = oCN.RunProcReturn(sql1, "Gy_MaterType");
+
+ List<TreeModel> treeModels = new List<TreeModel>();
+ TreeModel first = new TreeModel();
+ first.id = "0";
+ first.title = "鐗╂枡鍒嗙被璁剧疆";
+ treeModels.Add(first);
+
+ foreach (DataRow row in ds.Tables[0].Rows)
+ {
+ var HLevel = (int)row["hlevel"];
+ if (HLevel == 1)
+ {
+ TreeModel tree = new TreeModel();
+ tree.id = row["hitemid"].ToString();
+ tree.title = row["hname"].ToString();
+ treeModels[0].children.Add(tree);
+ }
+ }
+ getTreeByLevel(ds.Tables[0], treeModels[0].children, 2);
+
+ 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;
+ }
+ }
+
+ public void getTreeByLevel(DataTable dt, List<TreeModel> tree, int num)
+ {
+ for (int m = 0; m < tree.Count; m++)
+ {
+ tree[m].children = new List<TreeModel>();
+ for (int i = 0; i < dt.Rows.Count; i++)//绗竴娆″惊鐜紝寰楀埌鎵�鏈夋牴鑺傜偣鐨勫瓙闆�
+ {
+ var HLevel = (int)dt.Rows[i]["hlevel"];
+ var HParentID = dt.Rows[i]["hparentid"].ToString();
+ if (HLevel == num && HParentID==tree[m].id)
+ {
+ TreeModel tbjson = new TreeModel();
+ tbjson.id = dt.Rows[i]["hitemid"].ToString();
+ tbjson.title = dt.Rows[i]["hname"].ToString();
+ tree[m].children.Add(tbjson);
+ }
+ }
+ for (int i = 0; i < tree[m].children.Count; i++)
+ {
+ getTreeByLevel(dt, tree[m].children, num+1);//鍐嶆鐢ㄥ瓙闆嗗幓寰幆锛屾嬁鍑哄瓙闆嗙殑瀛愰泦
+ }
+ }
+
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1