From edcd7574e709748c5d3ccc0bd54930414ddcfc9a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 30 五月 2025 21:00:08 +0800
Subject: [PATCH] 合并冲突
---
WebAPI/Controllers/CJGL/Sc_WorkBeginDotCheckBillController.cs | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 113 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Sc_WorkBeginDotCheckBillController.cs b/WebAPI/Controllers/CJGL/Sc_WorkBeginDotCheckBillController.cs
index 880b697..06edf98 100644
--- a/WebAPI/Controllers/CJGL/Sc_WorkBeginDotCheckBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_WorkBeginDotCheckBillController.cs
@@ -2469,5 +2469,118 @@
#endregion
#endregion
+ #region 鍚姩鐐规 鏈堟煡璇� 鎶ヨ〃
+ [Route("Sc_WorkBeginDotCheckBill/get锘縎c_WorkBeginDotCheckReport")]
+ [HttpGet]
+ public object getSc_WorkBeginDotCheckReport(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string sDate = dic["sDate"].ToString();
+ string HSourceID = dic["HSourceID"].ToString();
+
+ ds = oCN.RunProcReturn("exec h_p_Sc_WorkBeginDotCheckReport '" + sDate + "','" + HSourceID + "'", "h_p_Sc_WorkBeginDotCheckReport");
+ if (ds.Tables.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds == null || ds.Tables[0].Rows.Count < 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撴湀娌℃湁鏁版嵁浜х敓锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //娣诲姞鍒楀悕
+ 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;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 闃查敊楠岃瘉 鏈堟煡璇� 鎶ヨ〃
+ [Route("Sc_WorkBeginDotCheckBill/getQc_PreventErrMouldCheckReport")]
+ [HttpGet]
+ public object getQc_PreventErrMouldCheckReports(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string sDate = dic["sDate"].ToString();
+ string HSourceID = dic["HSourceID"].ToString();
+
+ ds = oCN.RunProcReturn("exec h_p_Qc_PreventErrMouldCheckReport '" + sDate + "','" + HSourceID + "'", "h_p_Qc_PreventErrMouldCheckReport");
+ if (ds.Tables.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds == null || ds.Tables[0].Rows.Count < 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撴湀娌℃湁鏁版嵁浜х敓锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //娣诲姞鍒楀悕
+ 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;
+ }
+ 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