| SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Controllers/基础资料/基础资料/Gy_PlanImplementation_ReportController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/WebAPI.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/WebAPI.csproj.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache | 补丁 | 查看 | 原始文档 | blame | 历史 |
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -14,3 +14,13 @@ C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb <<<<<<< HEAD ======= C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache D:\GitHub\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll D:\GitHub\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb >>>>>>> 7857ee010972be30ae38d3d73c1516dd87d58d79 WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_PlanImplementation_ReportController.cs
New file @@ -0,0 +1,124 @@ using System; using System.Collections.Generic; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Pub_Class; using System; using System.Collections; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; using System.IO; using System.Web.Http; using WebAPI.DLL; using WebAPI.Models; using WebAPI.Service; using Kingdee.BOS.WebApi.Client; using System.Linq; namespace WebAPI.Controllers.åºç¡èµæ.åºç¡èµæ { public class Gy_PlanImplementation_ReportController : ApiController { private json objJsonResult = new json(); public DataSet ds = new DataSet(); public SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); // GET: Gy_PlanImplementation_Report [Route("Gy_PlanImplementation_ReportController/PlanStatusReport")] [HttpGet] public object PlanStatusReport(string sWhere, string HBeginDate, string HEndDate) { List<object> columnNameList = new List<object>(); try { // éªè¯æ¥æ if (!DateTime.TryParse(HBeginDate, out DateTime beginDate) || !DateTime.TryParse(HEndDate, out DateTime endDate)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ¥ææ ¼å¼ä¸æ£ç¡®"; return objJsonResult; } if(sWhere!=null) ds = oCN.RunProcReturn($"select * from PlanImplementationStatus where æ¥æ<='{HEndDate}' and æ¥æ>='{HBeginDate}' and {sWhere}", "PlanImplementationStatus"); else ds = oCN.RunProcReturn($"select * from PlanImplementationStatus where æ¥æ<='{HEndDate}' and æ¥æ>='{HBeginDate}'", "PlanImplementationStatus"); // æ·»å åå 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)); } objJsonResult.code = "1"; objJsonResult.count = ds.Tables[0].Rows.Count; objJsonResult.Message = "Successï¼"; 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; } } [Route("Gy_PlanImplementation_ReportController/OperationBillReport")] [HttpGet] public object OperationBillReport(string HEquipmentNumber, string HBeginDate, string HEndDate) { List<object> columnNameList = new List<object>(); try { // éªè¯æ¥æ if (!DateTime.TryParse(HBeginDate, out DateTime beginDate) || !DateTime.TryParse(HEndDate, out DateTime endDate)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ¥ææ ¼å¼ä¸æ£ç¡®"; return objJsonResult; } ds = oCN.RunProcReturn($"exec h_p_OperationBill '{HBeginDate}','{HEndDate}',''{HEquipmentNumber}", "h_p_OperationBill"); // æ·»å åå 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)); } objJsonResult.code = "1"; objJsonResult.count = ds.Tables[0].Rows.Count; objJsonResult.Message = "Successï¼"; 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; } } } } WebAPI/WebAPI.csproj
@@ -643,6 +643,7 @@ <Compile Include="Controllers\åºç¡èµæ\åºç¡èµæ\Gy_PaymentConditionListBillController.cs" /> <Compile Include="Controllers\åºç¡èµæ\åºç¡èµæ\Gy_DisposeWayController.cs" /> <Compile Include="Controllers\åè¿datamapping\Gy_PNLInfoController.cs" /> <Compile Include="Controllers\åºç¡èµæ\åºç¡èµæ\Gy_PlanImplementation_ReportController.cs" /> <Compile Include="Controllers\åºç¡èµæ\åºç¡èµæ\Gy_PNLInfoTypeLevelController.cs" /> <Compile Include="Controllers\项ç®ç®¡ç\å·¥ç¨é¡¹ç®\PM_ProjectBill_WorkController.cs" /> <Compile Include="DLL\ClsSc_MESStopRestoreWorkBill.cs" /> @@ -1240,6 +1241,7 @@ <Folder Include="Views\Gy_Operator\" /> <Folder Include="Views\Gy_PackType\" /> <Folder Include="Views\Gy_PaymentConditionListBill\" /> <Folder Include="Views\Gy_PlanImplementation_Report\" /> <Folder Include="Views\Gy_PNLInfoTypeLevel\" /> <Folder Include="Views\Gy_RateType\" /> <Folder Include="Views\Gy_RecConditionBill\" /> WebAPI/WebAPI.csproj.user
@@ -5,7 +5,7 @@ <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig> <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\æºäºè¿æ\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile> sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cacheBinary files differ
