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-26 13:09:49 +08:00
parent ccbca85c55
commit b4fd2d4e05
7 changed files with 99 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Epost.BLL/CommandBLL.cs
View File

@ -62,7 +62,7 @@ namespace Epost.BLL
model.Command = "UNLOCK";
model.Timeout = "0.5";
list.Add(model);
LED_OFF_CLEAR(item["ControlIP"].ToString());
}
if (list.Any())
{
@ -511,6 +511,7 @@ namespace Epost.BLL
model.ControlIP = item["ControlIP"].ToString();
FORMATE_JOB_DATA(model);
LED_OFF_CLEAR(item["ControlIP"].ToString());
}
}

6
Epost.BLL/OrderBLL.cs
View File

@ -401,7 +401,7 @@ namespace Epost.BLL
{
foreach (JobModel jobmo in downlist.ToArray())
{
dal.UpdateWorkState_Car(jobmo.Matchid, jobmo.Quantity, jobmo.Sku, jobmo.ID, checkquaantity, model.UserCode);
dal.UpdateWorkState_Car(jobmo.OrderID, jobmo.Quantity, jobmo.Sku, jobmo.ID, checkquaantity, model.UserCode);
}
}
@ -409,7 +409,7 @@ namespace Epost.BLL
else
{
dal.UpdateWorkState_Car(model.Matchid, truequantity, model.Sku, model.ID, checkquaantity, model.UserCode);
dal.UpdateWorkState_Car(model.OrderID, truequantity, model.Sku, model.ID, checkquaantity, model.UserCode);
}
@ -811,7 +811,7 @@ namespace Epost.BLL
if (!isecho)
{
//修改数据为已读
dal.UpOrder_Car(item["Matchid"].ToString(), item["sku"].ToString(), item["id"].ToString());
dal.UpOrder_Car(item["orderid"].ToString(), item["sku"].ToString(), item["id"].ToString());
}
#endregion
}

4
Epost.BLL/OrderControlBLL.cs
View File

@ -590,8 +590,8 @@ namespace Epost.BLL
lamodel.Title = item.genericname;
lamodel.Content = "" + item.Sku.Substring(item.Sku.Length - 4, 4) + "\t" + item.Spec + "\r" + item.GoodsName + "\r批号 " + item.batchno + "\t" + item.manufactname.Substring(0, 4) + "";
var aryloc = item.Tolocation.Split('-');
lamodel.Loc = "" + aryloc[1].ToString() + "-" + aryloc[2].ToString() + "";
lamodel.W_quantity = aryloc[3].ToString();
lamodel.Loc = "" + aryloc[0].ToString() + "-" + aryloc[1].ToString() + "";
lamodel.W_quantity = aryloc[2].ToString();
lamodel.Quantity = quantity.ToString();
lamodel.Unit = "盒";
lamodel.PicChoose = "";

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>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />

2
Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml
View File

@ -11,7 +11,7 @@
<SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<ExcludeApp_Data>false</ExcludeApp_Data>
<publishUrl>D:\驿传\SanYing_DAS-T后台</publishUrl>
<publishUrl>D:\驿传\抚远</publishUrl>
<DeleteExistingFiles>true</DeleteExistingFiles>
<PrecompileBeforePublish>true</PrecompileBeforePublish>
<EnableUpdateable>true</EnableUpdateable>

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

@ -6,8 +6,8 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
<_PublishTargetUrl>D:\驿传\SanYing_DAS-T后台</_PublishTargetUrl>
<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>
<_PublishTargetUrl>D:\驿传\抚远</_PublishTargetUrl>
<History>True|2023-07-25T09:25:54.2443213Z;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 />
</PropertyGroup>
<ItemGroup>
@ -33,19 +33,19 @@
<publishTime>04/16/2023 15:06:26</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>07/03/2023 13:53:15</publishTime>
<publishTime>07/25/2023 17:23:54</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>07/03/2023 13:53:15</publishTime>
<publishTime>07/25/2023 17:23:54</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>02/24/2020 15:29:24</publishTime>
</File>
<File Include="bin/Common.dll">
<publishTime>07/03/2023 13:52:54</publishTime>
<publishTime>07/25/2023 17:23:35</publishTime>
</File>
<File Include="bin/Common.pdb">
<publishTime>07/03/2023 13:52:54</publishTime>
<publishTime>07/25/2023 17:23:35</publishTime>
</File>
<File Include="bin/ComposerSDK.dll">
<publishTime>04/16/2023 15:06:26</publishTime>
@ -63,31 +63,31 @@
<publishTime>10/23/2017 13:15:20</publishTime>
</File>
<File Include="bin/Epost.BLL.dll">
<publishTime>07/03/2023 13:52:56</publishTime>
<publishTime>07/25/2023 17:23:37</publishTime>
</File>
<File Include="bin/Epost.BLL.pdb">
<publishTime>07/03/2023 13:52:56</publishTime>
<publishTime>07/25/2023 17:23:37</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>07/03/2023 13:52:55</publishTime>
<publishTime>07/25/2023 17:23:36</publishTime>
</File>
<File Include="bin/Epost.DAL.pdb">
<publishTime>07/03/2023 13:52:55</publishTime>
<publishTime>07/25/2023 17:23:36</publishTime>
</File>
<File Include="bin/Epost.DPS.dll">
<publishTime>07/03/2023 13:53:00</publishTime>
<publishTime>07/25/2023 17:23:41</publishTime>
</File>
<File Include="bin/Epost.DPS.pdb">
<publishTime>07/03/2023 13:53:00</publishTime>
<publishTime>07/25/2023 17:23:41</publishTime>
</File>
<File Include="bin/Epost.Model.dll">
<publishTime>04/16/2023 17:10:57</publishTime>
<publishTime>07/19/2023 15:37:56</publishTime>
</File>
<File Include="bin/Epost.Model.pdb">
<publishTime>04/16/2023 17:10:57</publishTime>
<publishTime>07/19/2023 15:37:56</publishTime>
</File>
<File Include="bin/Epost.TestToolsWeb.dll">
<publishTime>09/06/2018 11:57:11</publishTime>
@ -5652,7 +5652,7 @@
<publishTime>04/16/2023 15:06:27</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>07/03/2023 13:53:05</publishTime>
<publishTime>07/25/2023 17:23:46</publishTime>
</File>
<File Include="Scripts/ai.0.22.9-build00167.js">
<publishTime>04/04/2018 15:45:12</publishTime>
@ -7572,7 +7572,10 @@
<publishTime>04/16/2023 15:06:27</publishTime>
</File>
<File Include="Web.config">
<publishTime>04/16/2023 17:11:05</publishTime>
<publishTime>07/19/2023 15:38:06</publishTime>
</File>
<File Include="WebService/WebService.asmx">
<publishTime>07/19/2023 15:30:16</publishTime>
</File>
</ItemGroup>
</Project>

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

@ -36,11 +36,12 @@ namespace Epost.DPS.WebService
var resultxml = string.Empty;
try
{
DataTable queuedt = queueBLL.getQueuesbyState();
if (queuedt == null || queuedt.Rows.Count <= 0)
{
//DataTable queuedt = queueBLL.getQueuesbyState();
//if (queuedt == null || queuedt.Rows.Count <= 0)
//{
if (!string.IsNullOrEmpty(messages))
{
string mms = string.Empty;
LogHelper.WriteLogInfo("======开始处理数据======");
DataSet set = XmlHelper.GetDataSetStrXml(messages);
if (set != null && set.Tables.Count > 0 && set.Tables[0].Rows.Count > 0)
@ -74,7 +75,27 @@ namespace Epost.DPS.WebService
dtResult.Rows.Add(dataRow);
}
else
{
mms += "主键重复 (" + item["transderMid"].ToString() + "-" + item["transderDid"].ToString() + ")，";
}
}
if (!string.IsNullOrEmpty(mms))
{
mms = mms.Substring(mms.Length - 1, 1);
msg.Status = "erro";
msg.Message = "数据异常：" + mms + "";
main.msg = msg;
resultxml = XmlHelper.ModelToXml(main);
LogHelper.WriteLogInfo("数据异常：" + mms + "");
}
else
{
Dictionary<string, string> diclist = new Dictionary<string, string>();
diclist.Add("transderMid", "orderid");
diclist.Add("transderDid", "transderDid");
@ -106,10 +127,11 @@ namespace Epost.DPS.WebService
else
{
msg.Status = "erro";
msg.Message = "数据异常：数据处理失败，请重试！";
msg.Message = "数据异常：数据接收失败，请重试！";
main.msg = msg;
resultxml = XmlHelper.XmlSerialize(main);
LogHelper.WriteLogInfo("数据异常：数据处理失败，请重试！");
LogHelper.WriteLogInfo("数据异常：数据接收失败，请重试！");
}
}
}
else
@ -130,15 +152,15 @@ namespace Epost.DPS.WebService
LogHelper.WriteLogInfo("数据异常：未在XML内获取到数据，请检查后再进行推送！");
}
return resultxml;
}
else
{
msg.Status = "erro";
msg.Message = "数据异常/当前存在拣药任务";
main.msg = msg;
LogHelper.WriteLogInfo("数据异常/当前存在拣药任务");
return resultxml = XmlHelper.ModelToXml(main);
}
//}
//else
//{
// msg.Status = "erro";
// msg.Message = "数据异常/当前存在拣药任务";
// main.msg = msg;
// LogHelper.WriteLogInfo("数据异常/当前存在拣药任务");
// return resultxml = XmlHelper.ModelToXml(main);
//}
}
catch (Exception ex)
{