From 4c1b91ae0cd1dc4084328d8d29635b79ba1bebf0 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 14 十一月 2024 22:29:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs b/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
index 07a6398..544ec93 100644
--- a/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_NoPassProcController.cs
@@ -155,5 +155,48 @@
}
}
#endregion
+
+ #region 杞﹂棿绠＄悊 鐑鐞嗘俯搴︽洸绾垮浘
+ [Route("Cj_NoPassProc/GetHProcHBillNoId")]
+ [HttpGet]
+ public object GetHProcHBillNoId(string linterid, string num)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ if (num=="1")
+ {
+ ds = oCN.RunProcReturn("select b.HEquipFileNumber 璁惧缂栫爜,b.HName 璁惧鍚嶇О from Sc_ICMOBillStatus_Tmp a left join Gy_EquipFileBillMain b on a.HSourceID=b.HSourceID where HSourceInterID='" + linterid + "' and HProcID='85'", "Gy_EquipFileBillMain");
+ }
+ else if (num=="2")
+ {
+ ds = oCN.RunProcReturn("SELECT ef.HEquipFileNumber AS 璁惧缂栫爜,ef.HName AS 璁惧鍚嶇О FROM Gy_EquipFileBillMain ef JOIN Sc_ICMOBillStatus_Tmp tmp ON ef.HSourceID = tmp.HSourceID where HSourceInterID='" + linterid + "' and HProcID='186')", "Gy_EquipFileBillMain");
+ }
+
+ //娣诲姞鍒楀悕
+ 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 = "";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1