From 074a92bfbecba6697e67f48514d8f545fbd4aca7 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 12 八月 2025 13:24:19 +0800
Subject: [PATCH] 出战汇报单添加开工和完工时间
---
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache | 0
WebAPI/Models/StationBill.cs | 4 ++--
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 42 +++++++++++++++++++++---------------------
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
WebAPI/WebAPI.csproj.user | 3 ---
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 4 ++--
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
9 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 5d23593..dcdd61b 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -154,8 +154,8 @@
int HMouldID = list[0].HMouldID;//妯″叿id
double HMachineWorkTimes = list[0].HMachineWorkTimes;//璁惧宸ユ椂
int HIsTimeFlag = list[0].HIsTimeFlag;//鏄惁璁℃椂
- DateTime HRelBeginTime = list[0].HRelBeginTime;//寮�宸ユ椂闂�
- DateTime HRelEndTime = list[0].HRelEndTime;//瀹屽伐鏃堕棿
+ string HRelBeginTime = list[0].HRelBeginTime;//寮�宸ユ椂闂�
+ string HRelEndTime = list[0].HRelEndTime;//瀹屽伐鏃堕棿
LogService.Write($"1.瀛楁璧嬪�硷紝鐢ㄦ椂" + sw.Elapsed );
//鍗曟嵁瀹屾暣鎬у垽鏂�
diff --git a/WebAPI/Models/StationBill.cs b/WebAPI/Models/StationBill.cs
index 05a4a8c..a256942 100644
--- a/WebAPI/Models/StationBill.cs
+++ b/WebAPI/Models/StationBill.cs
@@ -53,9 +53,9 @@
public long lngBillSubKey { get; set; }
public DateTime HStationOutTime { get; set; }
- public DateTime HRelBeginTime { get; set; }
+ public string HRelBeginTime { get; set; }
- public DateTime HRelEndTime { get; set; }
+ public string HRelEndTime { get; set; }
public long HPayProcID { get; set; }
public long HSourceID2 { get; set; }
public long HSourceID3 { get; set; }
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index a9889bb..062b12f 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
+++ b/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>08/12/2025 10:21:48</publishTime>
+ <publishTime>08/12/2025 11:35:26</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>08/12/2025 10:21:48</publishTime>
+ <publishTime>08/12/2025 11:35:26</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>08/12/2025 10:21:46</publishTime>
+ <publishTime>08/12/2025 11:35:24</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>08/12/2025 10:21:46</publishTime>
+ <publishTime>08/12/2025 11:35:24</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>08/12/2025 10:21:40</publishTime>
+ <publishTime>08/12/2025 11:35:18</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>08/12/2025 10:21:40</publishTime>
+ <publishTime>08/12/2025 11:35:18</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>08/12/2025 10:21:41</publishTime>
+ <publishTime>08/12/2025 11:35:19</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>08/12/2025 10:21:41</publishTime>
+ <publishTime>08/12/2025 11:35:19</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>08/12/2025 10:21:37</publishTime>
+ <publishTime>08/12/2025 11:35:14</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>08/12/2025 10:21:37</publishTime>
+ <publishTime>08/12/2025 11:35:14</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>08/12/2025 10:21:39</publishTime>
+ <publishTime>08/12/2025 11:35:16</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>08/12/2025 10:21:39</publishTime>
+ <publishTime>08/12/2025 11:35:16</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>08/12/2025 10:21:39</publishTime>
+ <publishTime>08/12/2025 11:35:17</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>08/12/2025 10:21:39</publishTime>
+ <publishTime>08/12/2025 11:35:17</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>08/12/2025 10:21:36</publishTime>
+ <publishTime>08/12/2025 10:55:14</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>08/12/2025 10:21:36</publishTime>
+ <publishTime>08/12/2025 10:55:14</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>08/12/2025 10:21:42</publishTime>
+ <publishTime>08/12/2025 11:35:19</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>08/12/2025 10:21:42</publishTime>
+ <publishTime>08/12/2025 11:35:19</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>08/12/2025 10:21:55</publishTime>
+ <publishTime>08/12/2025 11:35:35</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>08/12/2025 10:21:55</publishTime>
+ <publishTime>08/12/2025 11:35:35</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>08/16/2024 16:55:28</publishTime>
@@ -495,7 +495,7 @@
<publishTime>04/29/2024 08:30:03</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/12/2025 10:23:09</publishTime>
+ <publishTime>08/12/2025 11:35:42</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index f712ed4..f32cbba 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -3,12 +3,9 @@
<PropertyGroup>
<LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
-<<<<<<< HEAD
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
-=======
<LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
->>>>>>> 3fac13fb2f8d23d85178755826f0cb39f8d06093
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index 2a4c7c9..eab56ff 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
index 8e512bb..3a85a0b 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..d6e21aa
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index 2a4c7c9..eab56ff 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
index 8e512bb..3a85a0b 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1