DAL/ClsWL_YayBillMain.cs
@@ -231,6 +231,7 @@ // è·åå½åæ¥ææ¶é´ï¼ç¨äºç©ºæ¥æå段çé»è®¤å¼ // è·åå½åæ¥ææ¶é´ string currentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); string safeDateTime = "2000-01-01"; // è¾ å©æ¹æ³ï¼å®å ¨è½¬æ¢ä¸ºå符串ï¼å¤çnullå空å符串 @@ -303,21 +304,21 @@ SafeDateTime(omodel.HDateForRequestedPick?.ToString(), "'" + currentDateTime + "'") + "," + SafeDateTime(omodel.HDataForRequestedArrived?.ToString(), "'" + currentDateTime + "'") + "," + SafeInt(omodel.HCarryStatus?.ToString(), 1) + "," + // HCarryStatus SafeDateTime(omodel.HDate_CarrierSure?.ToString(), "'" + currentDateTime + "'") + "," + SafeDateTime(omodel.HDate_CarrierSure?.ToString(), "'" + safeDateTime + "'") + "," + SafeDateTime(omodel.HDate_AllocationDriver?.ToString(), "'" + currentDateTime + "'") + "," + SafeInt(omodel.HCarID?.ToString(), 0) + "," + // HCarID SafeInt(omodel.HDriverID?.ToString(), 0) + "," + // HDriverID "'" + SafeString(omodel.HSurer_Arrive) + "'," + SafeDateTime(omodel.HDate_Arrive?.ToString(), "'" + currentDateTime + "'") + "," + SafeDateTime(omodel.HDate_Arrive?.ToString(), "'" + safeDateTime + "'") + "," + "'" + SafeString(omodel.HSurer_Pick) + "'," + SafeDateTime(omodel.HDate_Pick?.ToString(), "'" + currentDateTime + "'") + "," + SafeDateTime(omodel.HDate_Pick?.ToString(), "'" + safeDateTime + "'") + "," + "'" + SafeString(omodel.HSurer_Trans) + "'," + SafeDateTime(omodel.HDate_Trans?.ToString(), "'" + currentDateTime + "'") + "," + SafeDateTime(omodel.HDate_Trans?.ToString(), "'" + safeDateTime + "'") + "," + "'" + SafeString(omodel.HSurer_Receive) + "'," + "'" + omodel.HExRate + "'," + SafeDateTime(omodel.HDate_Receive?.ToString(), "'" + currentDateTime + "'") + "," + SafeDateTime(omodel.HDate_Receive?.ToString(), "'" + safeDateTime + "'") + "," + "'" + SafeString(omodel.HSurer_Accounting) + "'," + SafeDateTime(omodel.HDate_Accounting?.ToString(), "'" + currentDateTime + "'") + ")"; SafeDateTime(omodel.HDate_Accounting?.ToString(), "'" + safeDateTime + "'") + ")"; oCn.RunProc(sql); //主表 DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cacheBinary files differ
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.CacheBinary files differ
Model/obj/Release/Model.csproj.AssemblyReference.cacheBinary files differ
Model/obj/x86/Release/Model.csproj.AssemblyReference.cacheBinary files differ
NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cacheBinary files differ
SyntacticSugar/bin/Debug/SyntacticSugar.dllBinary files differ
SyntacticSugar/bin/Debug/SyntacticSugar.pdbBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cacheBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,26 +1,5 @@ <<<<<<< 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.AssemblyReference.cache 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\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll D:\å·¥ä½ä»£ç \æºäºè¿æ\MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb D:\å·¥ä½ä»£ç \æºäºè¿æ\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache D:\å·¥ä½ä»£ç \æºäºè¿æ\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll D:\å·¥ä½ä»£ç \æºäºè¿æ\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb D:\å·¥ä½ä»£ç \æºäºè¿æ\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache 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 D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache SyntacticSugar/obj/Debug/SyntacticSugar.dllBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.pdbBinary files differ
SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cacheBinary files differ
SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
File was deleted SyntacticSugar/obj/Release/SyntacticSugar.dllBinary files differ
SyntacticSugar/obj/Release/SyntacticSugar.pdbBinary files differ
WebAPI/Controllers/³É±¾¹ÜÀí/CB_ActualItemMoneyCostController.cs
New file @@ -0,0 +1,78 @@ 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.Web; using System.Web.Http; using WebAPI.Models; using WebAPI.Controllers.SCGL.æ¥è®¡å管ç; using System.IO; using System.Linq; using System.Text; namespace WebAPI.Controllers.ææ¬ç®¡ç { public class CB_ActualItemMoneyCostController : ApiController { public DBUtility.ClsPub.Enum_BillStatus BillStatus; //public DAL.ClsCB_ItemMoneyBillMain BillOld = new DAL.ClsCB_ItemMoneyBillMain(); //public DAL.ClsCB_ItemMoneyBillMain BillNew0 = new DAL.ClsCB_ItemMoneyBillMain(); private json objJsonResult = new json(); SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds; #region [Route("CB_ActualItemMoneyCostController/CB_ActualItemMoneyCostList")] [HttpGet] public object CB_ActualItemMoneyCostList(string sWhere) { try { ds = oCN.RunProcReturn(sWhere, "WindowPrint"); List<object> columnNameList = new List<object>(); //客æ·å¶å® string sErr = ""; //if (oSystemParameter.ShowBill(ref sErr)) //{ // if (oSystemParameter.omodel.WMS_CampanyName == "ä¹ä¸") // { // if (ds.Tables[0].Columns.Count > 8) // { // LogService.CustomWriteLog("åæ®å·:" + ds.Tables[0].Rows[0][7].ToString(), "CS" + DateTime.Now.ToString("yyyyMMdd")); // } // } //} //æ·»å åå 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å对象çåå } objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "[0000-1-037]Sucessï¼"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "[0000-1-038]Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion } } WebAPI/Controllers/ÎïÁ÷¹ÜÀí/³öÔ˵¥/WLYayBillController.cs
@@ -446,7 +446,7 @@ objJsonResult.data = null; return objJsonResult; } if (ds.Tables[0].Rows[0]["HDate_AllocationDriver"] == null || ds.Tables[0].Rows[0]["HDate_AllocationDriver"].ToString() == ""|| ds.Tables[0].Rows[0]["HDate_CarrierSure"].ToString() == "") if (ds.Tables[0].Rows[0]["HDate_AllocationDriver"] == null || ds.Tables[0].Rows[0]["HDate_AllocationDriver"].ToString() == ""|| ds.Tables[0].Rows[0]["HDate_CarrierSure"].ToString() == "" || ds.Tables[0].Rows[0]["HDriverID"].ToString() == "0") { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -495,7 +495,7 @@ objJsonResult.data = null; return objJsonResult; } if (ds.Tables[0].Rows[0]["HSurer_Pick"] == null || ds.Tables[0].Rows[0]["HSurer_Pick"].ToString() == "") if (ds.Tables[0].Rows[0]["HSurer_Pick"] == null || ds.Tables[0].Rows[0]["HSurer_Pick"].ToString() == "" ) { objJsonResult.code = "0"; objJsonResult.count = 0; @@ -577,7 +577,7 @@ } DataSet ds; var dss = oCN.RunProcReturn("select * from WL_YayBillMain where HInterID=" + HInterID, "WL_YayBillMain"); if (dss.Tables[0].Rows[0]["HDate_CarrierSure"] == null || dss.Tables[0].Rows[0]["HDate_CarrierSure"].ToString() == "" || dss.Tables[0].Rows[0]["HChecker"].ToString() == "") if (dss.Tables[0].Rows[0]["HDate_CarrierSure"] == null || dss.Tables[0].Rows[0]["HDate_CarrierSure"].ToString() == "" || dss.Tables[0].Rows[0]["HChecker"].ToString() == "" || dss.Tables[0].Rows[0]["HDate_CarrierSure"] == "2000-01-01 00:00:00.000") { objJsonResult.code = "0"; objJsonResult.count = 0; WebAPI/Properties/PublishProfiles/WTTFolder.pubxml.user
@@ -5,7 +5,7 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <_PublishTargetUrl>D:\ç½ç«åå¸\API</_PublishTargetUrl> <History>True|2026-02-28T05:36:36.7808689Z;True|2026-02-28T13:07:59.4097968+08:00;True|2026-02-28T11:22:16.2244092+08:00;False|2026-02-28T11:21:50.3452184+08:00;True|2026-02-27T15:15:26.7008273+08:00;False|2026-02-27T15:15:03.5165987+08:00;True|2026-02-24T13:26:35.7198126+08:00;True|2026-02-24T13:17:50.6475487+08:00;False|2026-02-24T13:17:16.4754994+08:00;True|2026-02-09T09:03:02.9552827+08:00;False|2026-02-09T09:02:19.7888361+08:00;True|2026-01-23T16:43:00.5233443+08:00;True|2026-01-23T15:52:34.0578166+08:00;True|2026-01-23T15:18:26.9929522+08:00;True|2026-01-23T14:54:41.7989523+08:00;True|2026-01-23T14:20:36.5052445+08:00;False|2026-01-23T13:57:17.0723425+08:00;True|2026-01-23T08:08:55.5799949+08:00;False|2026-01-23T08:08:18.0965301+08:00;True|2026-01-21T13:46:11.7257946+08:00;True|2026-01-20T09:22:33.7255529+08:00;False|2026-01-20T08:33:10.2890987+08:00;True|2026-01-19T13:53:48.2079321+08:00;False|2026-01-19T13:53:24.9464993+08:00;True|2026-01-16T15:23:46.2649561+08:00;True|2026-01-16T09:00:43.1528772+08:00;</History> <History>True|2026-03-04T02:10:33.7184690Z;False|2026-03-04T10:10:13.6608297+08:00;True|2026-02-28T14:44:48.8921146+08:00;True|2026-02-28T13:49:09.3417790+08:00;True|2026-02-28T13:36:36.7808689+08:00;True|2026-02-28T13:07:59.4097968+08:00;True|2026-02-28T11:22:16.2244092+08:00;False|2026-02-28T11:21:50.3452184+08:00;True|2026-02-27T15:15:26.7008273+08:00;False|2026-02-27T15:15:03.5165987+08:00;True|2026-02-24T13:26:35.7198126+08:00;True|2026-02-24T13:17:50.6475487+08:00;False|2026-02-24T13:17:16.4754994+08:00;True|2026-02-09T09:03:02.9552827+08:00;False|2026-02-09T09:02:19.7888361+08:00;True|2026-01-23T16:43:00.5233443+08:00;True|2026-01-23T15:52:34.0578166+08:00;True|2026-01-23T15:18:26.9929522+08:00;True|2026-01-23T14:54:41.7989523+08:00;True|2026-01-23T14:20:36.5052445+08:00;False|2026-01-23T13:57:17.0723425+08:00;True|2026-01-23T08:08:55.5799949+08:00;False|2026-01-23T08:08:18.0965301+08:00;True|2026-01-21T13:46:11.7257946+08:00;True|2026-01-20T09:22:33.7255529+08:00;False|2026-01-20T08:33:10.2890987+08:00;True|2026-01-19T13:53:48.2079321+08:00;False|2026-01-19T13:53:24.9464993+08:00;True|2026-01-16T15:23:46.2649561+08:00;True|2026-01-16T09:00:43.1528772+08:00;</History> </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> @@ -45,28 +45,28 @@ <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>02/28/2026 13:36:25</publishTime> <publishTime>03/04/2026 10:10:27</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>02/28/2026 13:36:25</publishTime> <publishTime>03/04/2026 10:10:27</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>02/28/2026 13:36:20</publishTime> <publishTime>03/04/2026 10:10:25</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>02/28/2026 13:36:20</publishTime> <publishTime>03/04/2026 10:10:25</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>02/28/2026 13:36:15</publishTime> <publishTime>03/04/2026 10:10:22</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>02/28/2026 13:36:15</publishTime> <publishTime>03/04/2026 10:10:22</publishTime> </File> <File Include="bin/Fleck.dll"> <publishTime>04/22/2021 11:48:12</publishTime> @@ -138,10 +138,10 @@ <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> <publishTime>02/28/2026 13:36:18</publishTime> <publishTime>03/04/2026 10:10:24</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>02/28/2026 13:36:18</publishTime> <publishTime>03/04/2026 10:10:24</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>08/18/2025 16:11:18</publishTime> @@ -177,34 +177,34 @@ <publishTime>11/13/2012 20:19:34</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>02/28/2026 13:36:11</publishTime> <publishTime>03/04/2026 10:10:21</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>02/28/2026 13:36:11</publishTime> <publishTime>03/04/2026 10:10:21</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>02/28/2026 13:36:13</publishTime> <publishTime>03/04/2026 10:10:21</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>02/28/2026 13:36:13</publishTime> <publishTime>03/04/2026 10:10:21</publishTime> </File> <File Include="bin/RestSharp.dll"> <publishTime>08/31/2012 06:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>02/28/2026 13:36:13</publishTime> <publishTime>03/04/2026 10:10:22</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>02/28/2026 13:36:13</publishTime> <publishTime>03/04/2026 10:10:22</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/16/2015 01:57:08</publishTime> </File> <File Include="bin/SyntacticSugar.dll"> <publishTime>02/28/2026 13:33:08</publishTime> <publishTime>03/04/2026 10:08:49</publishTime> </File> <File Include="bin/SyntacticSugar.pdb"> <publishTime>02/28/2026 13:33:08</publishTime> <publishTime>03/04/2026 10:08:49</publishTime> </File> <File Include="bin/System.Buffers.dll"> <publishTime>07/19/2017 18:01:28</publishTime> @@ -281,6 +281,9 @@ <File Include="bin/System.Web.Http.dll"> <publishTime>11/28/2018 21:01:00</publishTime> </File> <File Include="bin/System.Web.Http.Owin.dll"> <publishTime>01/28/2015 12:03:16</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> <publishTime>08/18/2025 16:11:18</publishTime> </File> @@ -315,19 +318,19 @@ <publishTime>05/09/2023 10:43:40</publishTime> </File> <File Include="bin/TopSdk.dll"> <publishTime>02/28/2026 13:33:11</publishTime> <publishTime>03/04/2026 10:08:51</publishTime> </File> <File Include="bin/TopSdk.pdb"> <publishTime>02/28/2026 13:33:11</publishTime> <publishTime>03/04/2026 10:08:51</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>02/28/2026 13:36:34</publishTime> <publishTime>03/04/2026 10:10:32</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>02/28/2026 13:36:34</publishTime> <publishTime>03/04/2026 10:10:32</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> @@ -432,7 +435,7 @@ <publishTime>08/18/2025 16:11:18</publishTime> </File> <File Include="packages.config"> <publishTime>02/06/2026 14:36:49</publishTime> <publishTime>03/04/2026 09:23:23</publishTime> </File> <File Include="Properties/PublishProfiles/JFAPI.pubxml.user"> <publishTime>12/08/2025 10:29:30</publishTime> WebAPI/WebAPI.csproj
@@ -712,6 +712,7 @@ <Compile Include="Controllers\åºç¡èµæ\åºç¡èµæ\Gy_CostItemFixRateController.cs" /> <Compile Include="Controllers\åºç¡èµæ\åºç¡èµæ\Gy_CostItemAverageTypeController.cs" /> <Compile Include="Controllers\ææ¬ç®¡ç\CB_ItemMoneyBillController.cs" /> <Compile Include="Controllers\ææ¬ç®¡ç\CB_ActualItemMoneyCostController.cs" /> <Compile Include="Controllers\ææ¬ç®¡ç\CB_WipProcessTableController.cs" /> <Compile Include="Controllers\ææ¬ç®¡ç\ææ¬è´¹ç¨è°æ´å\CB_ChangeMoneyBillController.cs" /> <Compile Include="Controllers\æ£éªç³è¯·å\QC_RequestCheckBillController.cs" /> WebAPI/WebAPI.csproj.user
@@ -2,7 +2,8 @@ <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> <Use64BitIISExpress /> <IISExpressSSLPort /> @@ -12,7 +13,7 @@ <UseGlobalApplicationHostFile /> <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile8.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile4.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\WebAPI\Properties\PublishProfiles\WTTFolder.pubxml</NameOfLastUsedPublishProfile> <ProjectView>ShowAllFiles</ProjectView> </PropertyGroup> <ProjectExtensions> 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,20 +1,5 @@ <<<<<<< 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.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 ======= D:\å·¥ä½ä»£ç \æºäºè¿æ\MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll D:\å·¥ä½ä»£ç \æºäºè¿æ\MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb D:\å·¥ä½ä»£ç \æºäºè¿æ\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache D:\å·¥ä½ä»£ç \æºäºè¿æ\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache D:\å·¥ä½ä»£ç \æºäºè¿æ\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll D:\å·¥ä½ä»£ç \æºäºè¿æ\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll C:\Users\19858\Desktop\æºäºè¿æ\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb >>>>>>> b2e18e3fc0735edf1fc378936c81e5971bc52f61 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.CoreCompileInputs.cache
File was deleted 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
