hanlihui520/T-DAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
帅凯 贾
2023-07-14 14:05:22 +08:00
parent 3648692781
commit 53c4b66485
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Epost.BLL/OrderControlBLL.cs
View File

@ -682,12 +682,13 @@ namespace Epost.BLL
var d = false;
if (scanStr == "Finish")
{
dal.UpBkAddresss(data.Block, data.Area);
DataTable Mdt = dal.GetOrderMatchidInfo(data.Block, data.Area);
if (Mdt != null && Mdt.Rows.Count > 0)
{
LogHelper.WriteLogInfo("----开始强制结束----运单号：" + Mdt.Rows[0]["matchid"].ToString() + "");
dal.UpOrdersMatchid(data.Block, data.Area, Mdt.Rows[0]["matchid"].ToString());
dal.UpBkAddresss(data.Block, data.Area);
dal.UpOrdersqueue(data.Block, data.Area, Mdt.Rows[0]["matchid"].ToString());
LabelParamModel model = new LabelParamModel();
model.Address = "9999";

2
Epost.TestToolsWeb/Epost.DPS.csproj.user
View File

@ -11,7 +11,7 @@
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
<NameOfLastUsedPublishProfile>D:\驿传\Epost\T_DAS_PTL\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />

24
Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user
View File

@ -7,7 +7,7 @@
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
<_PublishTargetUrl>D:\驿传\SanYing_DAS-T后台</_PublishTargetUrl>
<History>True|2023-04-27T12:14:15.0331014Z;True|2023-04-21T16:37:45.9559800+08:00;True|2023-04-20T19:12:32.4520337+08:00;True|2023-04-20T18:51:17.9201241+08:00;True|2023-04-20T16:36:34.8353434+08:00;True|2023-04-19T11:42:01.7398184+08:00;True|2023-04-19T11:37:42.0024926+08:00;True|2023-04-18T15:36:56.8763198+08:00;True|2023-04-18T14:56:45.8672402+08:00;True|2023-04-17T10:51:00.4138485+08:00;True|2023-04-16T18:42:38.2510554+08:00;False|2023-04-16T18:42:10.5319125+08:00;True|2023-04-16T18:32:05.9038034+08:00;True|2023-04-16T17:11:22.6510841+08:00;True|2022-07-15T16:41:13.9750291+08:00;True|2022-07-14T14:02:20.7983427+08:00;True|2022-07-13T17:40:22.7531000+08:00;True|2022-07-13T17:34:22.9908701+08:00;True|2022-07-13T17:30:06.3588502+08:00;True|2022-07-11T10:32:06.9053981+08:00;True|2021-04-26T10:07:37.4889549+08:00;True|2021-04-09T10:32:51.9130162+08:00;True|2021-04-09T10:31:50.4974012+08:00;</History>
<History>True|2023-07-03T05:53:41.0701316Z;True|2023-04-27T20:14:15.0331014+08:00;True|2023-04-21T16:37:45.9559800+08:00;True|2023-04-20T19:12:32.4520337+08:00;True|2023-04-20T18:51:17.9201241+08:00;True|2023-04-20T16:36:34.8353434+08:00;True|2023-04-19T11:42:01.7398184+08:00;True|2023-04-19T11:37:42.0024926+08:00;True|2023-04-18T15:36:56.8763198+08:00;True|2023-04-18T14:56:45.8672402+08:00;True|2023-04-17T10:51:00.4138485+08:00;True|2023-04-16T18:42:38.2510554+08:00;False|2023-04-16T18:42:10.5319125+08:00;True|2023-04-16T18:32:05.9038034+08:00;True|2023-04-16T17:11:22.6510841+08:00;True|2022-07-15T16:41:13.9750291+08:00;True|2022-07-14T14:02:20.7983427+08:00;True|2022-07-13T17:40:22.7531000+08:00;True|2022-07-13T17:34:22.9908701+08:00;True|2022-07-13T17:30:06.3588502+08:00;True|2022-07-11T10:32:06.9053981+08:00;True|2021-04-26T10:07:37.4889549+08:00;True|2021-04-09T10:32:51.9130162+08:00;True|2021-04-09T10:31:50.4974012+08:00;</History>
<LastFailureDetails />
</PropertyGroup>
<ItemGroup>
@ -33,19 +33,19 @@
<publishTime>04/16/2023 15:06:26</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>04/27/2023 20:13:39</publishTime>
<publishTime>07/03/2023 13:53:15</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>04/27/2023 20:13:39</publishTime>
<publishTime>07/03/2023 13:53:15</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>02/24/2020 15:29:24</publishTime>
</File>
<File Include="bin/Common.dll">
<publishTime>04/27/2023 20:13:07</publishTime>
<publishTime>07/03/2023 13:52:54</publishTime>
</File>
<File Include="bin/Common.pdb">
<publishTime>04/27/2023 20:13:07</publishTime>
<publishTime>07/03/2023 13:52:54</publishTime>
</File>
<File Include="bin/ComposerSDK.dll">
<publishTime>04/16/2023 15:06:26</publishTime>
@ -63,25 +63,25 @@
<publishTime>10/23/2017 13:15:20</publishTime>
</File>
<File Include="bin/Epost.BLL.dll">
<publishTime>04/27/2023 20:13:09</publishTime>
<publishTime>07/03/2023 13:52:56</publishTime>
</File>
<File Include="bin/Epost.BLL.pdb">
<publishTime>04/27/2023 20:13:09</publishTime>
<publishTime>07/03/2023 13:52:56</publishTime>
</File>
<File Include="bin/Epost.BLL.XmlSerializers.dll">
<publishTime>08/26/2020 18:09:48</publishTime>
</File>
<File Include="bin/Epost.DAL.dll">
<publishTime>04/27/2023 20:13:08</publishTime>
<publishTime>07/03/2023 13:52:55</publishTime>
</File>
<File Include="bin/Epost.DAL.pdb">
<publishTime>04/27/2023 20:13:08</publishTime>
<publishTime>07/03/2023 13:52:55</publishTime>
</File>
<File Include="bin/Epost.DPS.dll">
<publishTime>04/27/2023 20:13:16</publishTime>
<publishTime>07/03/2023 13:53:00</publishTime>
</File>
<File Include="bin/Epost.DPS.pdb">
<publishTime>04/27/2023 20:13:16</publishTime>
<publishTime>07/03/2023 13:53:00</publishTime>
</File>
<File Include="bin/Epost.Model.dll">
<publishTime>04/16/2023 17:10:57</publishTime>
@ -5652,7 +5652,7 @@
<publishTime>04/16/2023 15:06:27</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>04/27/2023 20:13:23</publishTime>
<publishTime>07/03/2023 13:53:05</publishTime>
</File>
<File Include="Scripts/ai.0.22.9-build00167.js">
<publishTime>04/04/2018 15:45:12</publishTime>