From 01685f3ab68f64b51b83eee40af90f4030866691 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 03 六月 2025 18:18:21 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs | 86 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 85 insertions(+), 1 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs b/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs
index 60b8326..92c8687 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs
@@ -25,6 +25,85 @@
DAL.ClsGy_MouldType_Ctl oDept = new DAL.ClsGy_MouldType_Ctl();
DAL.ClsGy_MouldType_View oDeptHlp = new DAL.ClsGy_MouldType_View();
+ #region 鏍规嵁鐖秈d鍜岀瓑绾ц幏寰楁爲鐘跺浘閫掑綊
+ public class TreeModel
+ {
+ public string id { get; set; }
+ public string title { get; set; }
+ public List<TreeModel> children = new List<TreeModel>();
+ }
+
+
+ [Route("Gy_ModelType/Gy_ModelTypeTreeListByLevel")]
+ [HttpGet]
+ public object Gy_ModelTypeTreeListByLevel(string HOrgID)
+ {
+ try
+ {
+ string sql1 = string.Format("select hitemid,hnumber,hname,hparentid,hlevel,hhelpcode from Gy_MouldType where HUSEORGID = '" + HOrgID + "' order by hhelpcode");
+
+ ds = oCN.RunProcReturn(sql1, "Gy_ModelType");
+
+ 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
#region 妯℃不鍏峰垎绫诲垪琛ㄦ暟鎹�
/// <summary>
@@ -48,7 +127,12 @@
objJsonResult.data = null;
return objJsonResult;
}
- ds = oCN.RunProcReturn("select HItemID,HParentID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_MouldType where 1=1 " + sWhere+ " order by HNumber", "Gy_MouldType");
+ //ds = oCN.RunProcReturn("select HItemID,HParentID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_MouldType where 1=1 " + sWhere+ " order by HNumber", "Gy_MouldType");
+
+ string sql = "select * from h_v_Gy_MouldType where 1=1 " + sWhere + " order by 鍣ㄥ叿鍒嗙被浠ｇ爜,鍣ㄥ叿鍒嗙被鍚嶇О,鎵�灞炵埗绾у垎绫诲悕绉�,鍒涘缓浜�,瀹℃牳浜�,澶囨敞,缁勭粐,绂佺敤鏍囪";
+
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_MouldType");
+
foreach (DataColumn col in ds.Tables[0].Columns)
{
Type dataType = col.DataType;
--
Gitblit v1.9.1