SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,15 +1,6 @@ <<<<<<< HEAD D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache ======= C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb C:\Users\86130\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache >>>>>>> 3a1239dbd6e9cce019acaae934f1675298ef8a06 WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
@@ -66,6 +66,62 @@ } } #region 收料通知单分页列表 [Route("Cg_POInStockBill/page")] [HttpGet] public object Cg_POInStockBillPage(string sWhere, string user, int page, int size) { DataSet ds; json res = new json(); try { List<object> columnNameList = new List<object>(); //判断权限 if (!DBUtility.ClsPub.Security_Log("Cg_POInStockBillQuery", 1, false, user)) { objJsonResult.code = CodeConstant.FAIL; objJsonResult.count = CountConstant.FAIL; objJsonResult.Message = "您没有该模块权限,请与管理员联系!"; objJsonResult.data = null; return objJsonResult; } sWhere = sWhere.Replace("'", "''"); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("exec h_p_IF_POInStockBillList " + page + "," + size + ",''", "h_p_IF_POInStockBillList"); } else { ds = oCN.RunProcReturn("exec h_p_IF_POInStockBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_IF_POInStockBillList"); } //添加列名 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));//获取到DataColumn列对象的列名 } res.code = CodeConstant.SUCCEED; res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString()); res.Message = "Sucess!"; res.list = columnNameList; res.data = ds.Tables[0]; return res; } catch (Exception e) { res.code = CodeConstant.FAIL; res.count = CountConstant.FAIL; res.Message = "Exception!" + e.ToString(); res.data = null; return res; } } #endregion /// <summary> /// 返回收料通知单列表 ///参数:string sql。 WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
@@ -25,6 +25,63 @@ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds; #region 应付单分页列表 [Route("Cg_PayableBill/page")] [HttpGet] public object Cg_PayableBillPage(string sWhere, string user, int page, int size) { DataSet ds; json res = new json(); try { List<object> columnNameList = new List<object>(); //判断权限 //if (!DBUtility.ClsPub.Security_Log("Kf_POStockInBillList", 1, false, user)) //{ // objJsonResult.code = CodeConstant.FAIL; // objJsonResult.count = CountConstant.FAIL; // objJsonResult.Message = "您没有该模块权限,请与管理员联系!"; // objJsonResult.data = null; // return objJsonResult; //} sWhere = sWhere.Replace("'", "''"); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("exec h_p_Cg_PayableBillList " + page + "," + size + ",''", "h_p_Cg_PayableBillList"); } else { ds = oCN.RunProcReturn("exec h_p_Cg_PayableBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_Cg_PayableBillList"); } //添加列名 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));//获取到DataColumn列对象的列名 } res.code = CodeConstant.SUCCEED; res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString()); res.Message = "Sucess!"; res.list = columnNameList; res.data = ds.Tables[0]; return res; } catch (Exception e) { res.code = CodeConstant.FAIL; res.count = CountConstant.FAIL; res.Message = "Exception!" + e.ToString(); res.data = null; return res; } } #endregion #region 应付单列表 查询 /// <summary> /// 返回应收单列表 WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
@@ -90,6 +90,64 @@ } } #region 采购入库单分页列表 [Route("Kf_POStockInBill/page")] [HttpGet] public object Kf_POStockInBillPage(string sWhere, string user, int page, int size) { DataSet ds; json res = new json(); try { List<object> columnNameList = new List<object>(); //判断权限 //if (!DBUtility.ClsPub.Security_Log("Kf_POStockInBillList", 1, false, user)) //{ // objJsonResult.code = CodeConstant.FAIL; // objJsonResult.count = CountConstant.FAIL; // objJsonResult.Message = "您没有该模块权限,请与管理员联系!"; // objJsonResult.data = null; // return objJsonResult; //} sWhere = sWhere.Replace("'", "''"); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("exec h_p_Kf_POStockInBillList_New " + page + "," + size + ",''", "h_p_Kf_POStockInBillList_New"); } else { ds = oCN.RunProcReturn("exec h_p_Kf_POStockInBillList_New " + page + "," + size + ",'" + sWhere + "'", "h_p_Kf_POStockInBillList_New"); } //添加列名 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));//获取到DataColumn列对象的列名 } res.code = CodeConstant.SUCCEED; res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString()); res.Message = "Sucess!"; res.list = columnNameList; res.data = ds.Tables[0]; return res; } catch (Exception e) { res.code = CodeConstant.FAIL; res.count = CountConstant.FAIL; res.Message = "Exception!" + e.ToString(); res.data = null; return res; } } #endregion #region 采购入库单 保存/编辑功能 [Route("Kf_POStockInBill/POStockInBillEdit")] [HttpPost] WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
@@ -25,6 +25,62 @@ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds; #region 付款单分页列表 [Route("YF_PayMentBill/page")] [HttpGet] public object YF_PayMentBillPage(string sWhere, string user, int page, int size) { DataSet ds; json res = new json(); try { List<object> columnNameList = new List<object>(); //判断权限 //if (!DBUtility.ClsPub.Security_Log("Kf_POStockInBillList", 1, false, user)) //{ // objJsonResult.code = CodeConstant.FAIL; // objJsonResult.count = CountConstant.FAIL; // objJsonResult.Message = "您没有该模块权限,请与管理员联系!"; // objJsonResult.data = null; // return objJsonResult; //} sWhere = sWhere.Replace("'", "''"); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("exec h_p_YF_PayMentBillList_New " + page + "," + size + ",''", "h_p_YF_PayMentBillList_New"); } else { ds = oCN.RunProcReturn("exec h_p_YF_PayMentBillList_New " + page + "," + size + ",'" + sWhere + "'", "h_p_YF_PayMentBillList_New"); } //添加列名 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));//获取到DataColumn列对象的列名 } res.code = CodeConstant.SUCCEED; res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString()); res.Message = "Sucess!"; res.list = columnNameList; res.data = ds.Tables[0]; return res; } catch (Exception e) { res.code = CodeConstant.FAIL; res.count = CountConstant.FAIL; res.Message = "Exception!" + e.ToString(); res.data = null; return res; } } #endregion #region 付款单列表 查询 /// <summary> /// 返回项目阶段列表 WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -45,28 +45,28 @@ <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>11/25/2024 10:23:11</publishTime> <publishTime>11/25/2024 14:59:34</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>11/25/2024 10:23:11</publishTime> <publishTime>11/25/2024 14:59:34</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>11/25/2024 10:23:09</publishTime> <publishTime>11/25/2024 14:59:32</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>11/25/2024 10:23:09</publishTime> <publishTime>11/25/2024 14:59:32</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>11/25/2024 10:23:05</publishTime> <publishTime>11/25/2024 14:59:27</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>11/25/2024 10:23:05</publishTime> <publishTime>11/25/2024 14:59:27</publishTime> </File> <File Include="bin/Grpc.Core.Api.dll"> <publishTime>03/22/2022 13:17:26</publishTime> @@ -111,10 +111,10 @@ <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> <publishTime>11/25/2024 10:23:06</publishTime> <publishTime>11/25/2024 14:59:28</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>11/25/2024 10:23:06</publishTime> <publishTime>11/25/2024 14:59:28</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>04/15/2024 12:55:45</publishTime> @@ -147,34 +147,34 @@ <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>11/25/2024 10:23:02</publishTime> <publishTime>11/25/2024 14:59:24</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>11/25/2024 10:23:02</publishTime> <publishTime>11/25/2024 14:59:24</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>11/25/2024 10:23:03</publishTime> <publishTime>11/25/2024 14:59:26</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>11/25/2024 10:23:03</publishTime> <publishTime>11/25/2024 14:59:26</publishTime> </File> <File Include="bin/RestSharp.dll"> <publishTime>08/31/2012 06:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>11/25/2024 10:23:03</publishTime> <publishTime>11/25/2024 14:59:26</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>11/25/2024 10:23:03</publishTime> <publishTime>11/25/2024 14:59:26</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/16/2015 01:57:08</publishTime> </File> <File Include="bin/SyntacticSugar.dll"> <publishTime>11/25/2024 10:18:53</publishTime> <publishTime>11/25/2024 14:22:06</publishTime> </File> <File Include="bin/SyntacticSugar.pdb"> <publishTime>11/25/2024 10:18:53</publishTime> <publishTime>11/25/2024 14:22:06</publishTime> </File> <File Include="bin/System.Buffers.dll"> <publishTime>07/19/2017 18:01:28</publishTime> @@ -285,19 +285,19 @@ <publishTime>05/09/2023 10:43:40</publishTime> </File> <File Include="bin/TopSdk.dll"> <publishTime>11/25/2024 10:18:59</publishTime> <publishTime>11/25/2024 14:22:12</publishTime> </File> <File Include="bin/TopSdk.pdb"> <publishTime>11/25/2024 10:18:59</publishTime> <publishTime>11/25/2024 14:22:12</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>11/25/2024 10:23:38</publishTime> <publishTime>11/25/2024 15:00:04</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>11/25/2024 10:23:38</publishTime> <publishTime>11/25/2024 15:00:04</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>08/16/2024 16:55:28</publishTime> sdk_dingding/TopSdk/bin/Debug/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdbBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cacheBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,15 +1,6 @@ <<<<<<< HEAD D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb ======= C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll C:\Users\86130\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb >>>>>>> 3a1239dbd6e9cce019acaae934f1675298ef8a06 sdk_dingding/TopSdk/obj/Debug/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdbBinary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cacheBinary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
File was deleted sdk_dingding/TopSdk/obj/Release/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.pdbBinary files differ