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

Browse Source
This commit is contained in:
jl
2024-01-17 15:56:28 +08:00
parent 9d5221ba0d
commit ae55e77ef8
4 changed files with 66 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Epost.BLL/OrderControlBLL.cs
View File

@ -750,9 +750,7 @@ namespace Epost.BLL
} }
} }
ShowMessageModel_M showmodel = new ShowMessageModel_M(); ShowMessageModel_M showmodel = new ShowMessageModel_M();
showmodel.Area = narea;
showmodel.Block = nblock;
showmodel.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red); showmodel.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red);
showmodel.Islock = true; showmodel.Islock = true;
showmodel.Title = "下发货位异常信息"; showmodel.Title = "下发货位异常信息";

23
Epost.TestToolsWeb.Tests/Controllers/UnitTest1.cs
View File

@ -9,6 +9,7 @@ using Epost.Common;
using System.Web.Helpers; using System.Web.Helpers;
using System.Data; using System.Data;
using System.Configuration; using System.Configuration;
using System.Text.RegularExpressions;
namespace Epost.TestToolsWeb.Tests.Controllers namespace Epost.TestToolsWeb.Tests.Controllers
{ {
@ -19,20 +20,16 @@ namespace Epost.TestToolsWeb.Tests.Controllers
[TestMethod] [TestMethod]
public void d() public void d()
{ {
string showmes = "211100|394892345|938275908324|93875|934725"; string showmes = "211100|总|938275908324|93875|934725";
if (showmes.Length > 30) if (!Regex.IsMatch(showmes, @"[\u4e00-\u9fa5]"))
{ {
string newstr = showmes.Substring(30, showmes.Length-30);
if (newstr.Length > 30)
{
showmes = showmes.Substring(0, 30) + "\r" + newstr.Substring(0, 30) + "\r" + newstr.Substring(30, newstr.Length-30);
}
else
{
showmes = showmes.Substring(0, 30) + "\r" + newstr;
}
} }
} else {
LogHelper.WriteLogInfo("dasf");
}
}
} }
} }

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

@ -7,7 +7,7 @@
<PropertyGroup> <PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile /> <TimeStampOfAssociatedLegacyPublishXmlFile />
<_PublishTargetUrl>D:\驿传\抚远</_PublishTargetUrl> <_PublishTargetUrl>D:\驿传\抚远</_PublishTargetUrl>
<History>True|2024-01-12T08:47:12.8225374Z;True|2024-01-09T16:40:45.8685271+08:00;True|2024-01-09T16:17:52.3267113+08:00;True|2024-01-05T16:08:42.8957009+08:00;True|2023-12-15T11:52:56.4144409+08:00;True|2023-09-14T15:16:49.3254427+08:00;True|2023-09-14T15:15:13.5226711+08:00;True|2023-09-14T13:29:32.8021478+08:00;True|2023-09-13T10:41:55.1565224+08:00;True|2023-09-11T11:07:13.1727541+08:00;True|2023-09-04T13:33:29.7459963+08:00;True|2023-09-01T16:56:41.0563400+08:00;False|2023-09-01T16:55:48.4344805+08:00;True|2023-09-01T13:48:48.7619456+08:00;False|2023-09-01T13:47:55.1222255+08:00;True|2023-08-31T12:12:45.4579572+08:00;False|2023-08-31T12:03:58.6171819+08:00;False|2023-08-31T12:03:32.2416438+08:00;True|2023-08-29T14:40:55.7436382+08:00;True|2023-08-29T13:53:07.9540335+08:00;True|2023-08-28T18:11:01.9231397+08:00;True|2023-08-28T14:56:19.8843265+08:00;True|2023-08-23T11:17:33.7204155+08:00;True|2023-08-11T10:59:03.8399200+08:00;True|2023-08-10T10:43:16.0729140+08:00;True|2023-08-08T15:22:08.0127989+08:00;True|2023-08-08T13:59:07.6838749+08:00;True|2023-08-08T13:57:15.7160673+08:00;True|2023-08-03T15:39:49.2488696+08:00;True|2023-08-03T13:13:24.0839734+08:00;True|2023-08-02T14:19:21.5188473+08:00;True|2023-08-02T10:44:46.7436910+08:00;True|2023-08-01T10:42:26.5280618+08:00;True|2023-07-28T15:54:24.3172356+08:00;True|2023-07-25T17:25:54.2443213+08:00;True|2023-07-25T17:24:33.4620388+08:00;True|2023-07-19T16:26:31.8476193+08:00;True|2023-07-19T16:04:27.8753884+08:00;True|2023-07-19T15:38:50.9706808+08:00;True|2023-07-03T13:53:41.0701316+08:00;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> <History>True|2024-01-17T07:53:54.1218618Z;True|2024-01-16T15:04:44.6789639+08:00;True|2024-01-12T16:47:12.8225374+08:00;True|2024-01-09T16:40:45.8685271+08:00;True|2024-01-09T16:17:52.3267113+08:00;True|2024-01-05T16:08:42.8957009+08:00;True|2023-12-15T11:52:56.4144409+08:00;True|2023-09-14T15:16:49.3254427+08:00;True|2023-09-14T15:15:13.5226711+08:00;True|2023-09-14T13:29:32.8021478+08:00;True|2023-09-13T10:41:55.1565224+08:00;True|2023-09-11T11:07:13.1727541+08:00;True|2023-09-04T13:33:29.7459963+08:00;True|2023-09-01T16:56:41.0563400+08:00;False|2023-09-01T16:55:48.4344805+08:00;True|2023-09-01T13:48:48.7619456+08:00;False|2023-09-01T13:47:55.1222255+08:00;True|2023-08-31T12:12:45.4579572+08:00;False|2023-08-31T12:03:58.6171819+08:00;False|2023-08-31T12:03:32.2416438+08:00;True|2023-08-29T14:40:55.7436382+08:00;True|2023-08-29T13:53:07.9540335+08:00;True|2023-08-28T18:11:01.9231397+08:00;True|2023-08-28T14:56:19.8843265+08:00;True|2023-08-23T11:17:33.7204155+08:00;True|2023-08-11T10:59:03.8399200+08:00;True|2023-08-10T10:43:16.0729140+08:00;True|2023-08-08T15:22:08.0127989+08:00;True|2023-08-08T13:59:07.6838749+08:00;True|2023-08-08T13:57:15.7160673+08:00;True|2023-08-03T15:39:49.2488696+08:00;True|2023-08-03T13:13:24.0839734+08:00;True|2023-08-02T14:19:21.5188473+08:00;True|2023-08-02T10:44:46.7436910+08:00;True|2023-08-01T10:42:26.5280618+08:00;True|2023-07-28T15:54:24.3172356+08:00;True|2023-07-25T17:25:54.2443213+08:00;True|2023-07-25T17:24:33.4620388+08:00;True|2023-07-19T16:26:31.8476193+08:00;True|2023-07-19T16:04:27.8753884+08:00;True|2023-07-19T15:38:50.9706808+08:00;True|2023-07-03T13:53:41.0701316+08:00;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 /> <LastFailureDetails />
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -33,19 +33,19 @@
<publishTime>04/04/2018 15:45:12</publishTime> <publishTime>04/04/2018 15:45:12</publishTime>
</File> </File>
<File Include="bin/App_global.asax.compiled"> <File Include="bin/App_global.asax.compiled">
<publishTime>01/12/2024 16:47:09</publishTime> <publishTime>01/17/2024 15:53:51</publishTime>
</File> </File>
<File Include="bin/App_global.asax.dll"> <File Include="bin/App_global.asax.dll">
<publishTime>01/12/2024 16:47:09</publishTime> <publishTime>01/17/2024 15:53:50</publishTime>
</File> </File>
<File Include="bin/BouncyCastle.Crypto.dll"> <File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>02/24/2020 15:29:24</publishTime> <publishTime>02/24/2020 15:29:24</publishTime>
</File> </File>
<File Include="bin/Common.dll"> <File Include="bin/Common.dll">
<publishTime>01/12/2024 16:46:58</publishTime> <publishTime>01/17/2024 15:53:40</publishTime>
</File> </File>
<File Include="bin/Common.pdb"> <File Include="bin/Common.pdb">
<publishTime>01/12/2024 16:46:58</publishTime> <publishTime>01/17/2024 15:53:40</publishTime>
</File> </File>
<File Include="bin/ComposerSDK.dll"> <File Include="bin/ComposerSDK.dll">
<publishTime>04/29/2020 16:50:14</publishTime> <publishTime>04/29/2020 16:50:14</publishTime>
@ -63,31 +63,31 @@
<publishTime>10/23/2017 13:15:20</publishTime> <publishTime>10/23/2017 13:15:20</publishTime>
</File> </File>
<File Include="bin/Epost.BLL.dll"> <File Include="bin/Epost.BLL.dll">
<publishTime>01/12/2024 16:46:59</publishTime> <publishTime>01/17/2024 15:53:41</publishTime>
</File> </File>
<File Include="bin/Epost.BLL.pdb"> <File Include="bin/Epost.BLL.pdb">
<publishTime>01/12/2024 16:46:59</publishTime> <publishTime>01/17/2024 15:53:41</publishTime>
</File> </File>
<File Include="bin/Epost.BLL.XmlSerializers.dll"> <File Include="bin/Epost.BLL.XmlSerializers.dll">
<publishTime>08/26/2020 18:09:48</publishTime> <publishTime>08/26/2020 18:09:48</publishTime>
</File> </File>
<File Include="bin/Epost.DAL.dll"> <File Include="bin/Epost.DAL.dll">
<publishTime>01/12/2024 16:46:58</publishTime> <publishTime>01/17/2024 15:53:40</publishTime>
</File> </File>
<File Include="bin/Epost.DAL.pdb"> <File Include="bin/Epost.DAL.pdb">
<publishTime>01/12/2024 16:46:58</publishTime> <publishTime>01/17/2024 15:53:40</publishTime>
</File> </File>
<File Include="bin/Epost.DPS.dll"> <File Include="bin/Epost.DPS.dll">
<publishTime>01/12/2024 16:47:01</publishTime> <publishTime>01/17/2024 15:53:44</publishTime>
</File> </File>
<File Include="bin/Epost.DPS.pdb"> <File Include="bin/Epost.DPS.pdb">
<publishTime>01/12/2024 16:47:01</publishTime> <publishTime>01/17/2024 15:53:44</publishTime>
</File> </File>
<File Include="bin/Epost.Model.dll"> <File Include="bin/Epost.Model.dll">
<publishTime>01/12/2024 16:46:58</publishTime> <publishTime>01/16/2024 15:04:30</publishTime>
</File> </File>
<File Include="bin/Epost.Model.pdb"> <File Include="bin/Epost.Model.pdb">
<publishTime>01/12/2024 16:46:58</publishTime> <publishTime>01/16/2024 15:04:30</publishTime>
</File> </File>
<File Include="bin/Epost.TestToolsWeb.dll"> <File Include="bin/Epost.TestToolsWeb.dll">
<publishTime>09/06/2018 11:57:11</publishTime> <publishTime>09/06/2018 11:57:11</publishTime>
@ -5652,7 +5652,7 @@
<publishTime>05/30/2022 16:58:47</publishTime> <publishTime>05/30/2022 16:58:47</publishTime>
</File> </File>
<File Include="PrecompiledApp.config"> <File Include="PrecompiledApp.config">
<publishTime>01/12/2024 16:47:04</publishTime> <publishTime>01/17/2024 15:53:46</publishTime>
</File> </File>
<File Include="Scripts/ai.0.22.9-build00167.js"> <File Include="Scripts/ai.0.22.9-build00167.js">
<publishTime>04/04/2018 15:45:12</publishTime> <publishTime>04/04/2018 15:45:12</publishTime>
@ -7572,10 +7572,10 @@
<publishTime>07/04/2022 14:22:38</publishTime> <publishTime>07/04/2022 14:22:38</publishTime>
</File> </File>
<File Include="Web.config"> <File Include="Web.config">
<publishTime>01/05/2024 16:08:32</publishTime> <publishTime>01/16/2024 15:04:35</publishTime>
</File> </File>
<File Include="WebService/WebService.asmx"> <File Include="WebService/WebService.asmx">
<publishTime>01/04/2024 15:31:05</publishTime> <publishTime>01/15/2024 17:37:54</publishTime>
</File> </File>
</ItemGroup> </ItemGroup>
</Project> </Project>

71
Epost.TestToolsWeb/WebService/WebService.asmx.cs
View File

@ -9,6 +9,7 @@ using System.Collections.Generic;
using System.Data; using System.Data;
using System.Linq; using System.Linq;
using System.Security.Policy; using System.Security.Policy;
using System.Text.RegularExpressions;
using System.Web; using System.Web;
using System.Web.Helpers; using System.Web.Helpers;
using System.Web.Razor.Tokenizer.Symbols; using System.Web.Razor.Tokenizer.Symbols;
@ -68,38 +69,44 @@ namespace Epost.DPS.WebService
if (dt == null || dt.Rows.Count <= 0) if (dt == null || dt.Rows.Count <= 0)
{ {
DataTable locdt = bll.GetlocationInfo(item["areaId"].ToString()); DataTable locdt = bll.GetlocationInfo(item["areaId"].ToString());
if (locdt != null && locdt.Rows.Count > 0)
{
locdt.Columns.Add("strinfo", typeof(string));
DataRow dataRow = dtResult.NewRow();
dataRow["transderMid"] = item["transderMid"].ToString();
dataRow["transderDid"] = item["transderDid"].ToString();
dataRow["drugCode"] = item["drugCode"].ToString();
dataRow["drugCommName"] = item["drugCommName"].ToString();
dataRow["drugName"] = item["drugName"].ToString();
dataRow["drugSpec"] = item["drugSpec"].ToString();
dataRow["Unit"] = item["Unit"].ToString();
dataRow["manufactName"] = item["manufactName"].ToString();
dataRow["batchNo"] = item["batchNo"].ToString();
dataRow["expire"] = item["expire"].ToString();
dataRow["areaId"] = item["areaId"].ToString();
dataRow["pickQty"] = item["pickQty"].ToString();
dataRow["stock"] = item["stock"].ToString();
dataRow["drugStoreName"] = item["drugStoreName"].ToString();
dataRow["labelColor"] = item["labelColor"].ToString();
dataRow["lookListen"] = item["lookListen"].ToString();
dataRow["labelIP"] = item["labelIP"].ToString();
dataRow["labelNo"] = item["labelNo"].ToString();
dataRow["strinfo"] = dataRow["strinfo"] + str;
dtResult.Rows.Add(dataRow);
} if (!Regex.IsMatch(item["areaId"].ToString(), @"[\u4e00-\u9fa5]"))
else
{ {
LogHelper.WriteLogInfo("" + item["areaId"].ToString() + "，该货位不存在"); if (locdt != null && locdt.Rows.Count > 0)
str = str + item["areaId"].ToString() + "|"; {
locdt.Columns.Add("strinfo", typeof(string));
DataRow dataRow = dtResult.NewRow();
dataRow["transderMid"] = item["transderMid"].ToString();
dataRow["transderDid"] = item["transderDid"].ToString();
dataRow["drugCode"] = item["drugCode"].ToString();
dataRow["drugCommName"] = item["drugCommName"].ToString();
dataRow["drugName"] = item["drugName"].ToString();
dataRow["drugSpec"] = item["drugSpec"].ToString();
dataRow["Unit"] = item["Unit"].ToString();
dataRow["manufactName"] = item["manufactName"].ToString();
dataRow["batchNo"] = item["batchNo"].ToString();
dataRow["expire"] = item["expire"].ToString();
dataRow["areaId"] = item["areaId"].ToString();
dataRow["pickQty"] = item["pickQty"].ToString();
dataRow["stock"] = item["stock"].ToString();
dataRow["drugStoreName"] = item["drugStoreName"].ToString();
dataRow["labelColor"] = item["labelColor"].ToString();
dataRow["lookListen"] = item["lookListen"].ToString();
dataRow["labelIP"] = item["labelIP"].ToString();
dataRow["labelNo"] = item["labelNo"].ToString();
dataRow["strinfo"] = dataRow["strinfo"] + str;
dtResult.Rows.Add(dataRow);
}
else
{
LogHelper.WriteLogInfo("" + item["areaId"].ToString() + "，该货位不存在");
str = str + item["areaId"].ToString() + "|";
}
} }
else { LogHelper.WriteLogInfo("" + item["areaId"].ToString() + "，货位包含中文"); }
} }
else else
{ {
@ -142,9 +149,7 @@ namespace Epost.DPS.WebService
diclist.Add("lookListen", "looklisten"); diclist.Add("lookListen", "looklisten");
diclist.Add("labelIP", "labelIP"); diclist.Add("labelIP", "labelIP");
diclist.Add("labelNo", "labelno"); diclist.Add("labelNo", "labelno");
diclist.Add("strinfo", "clientcode"); diclist.Add("strinfo", "clientcode");
bool b = bll.ImportOrderinfo(dtResult, diclist); bool b = bll.ImportOrderinfo(dtResult, diclist);
if (b) if (b)
{ {
@ -205,5 +210,7 @@ namespace Epost.DPS.WebService
} }
} }
} }
} }
} }