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
2025-06-19 16:50:57 +08:00
parent 67ec46d1da
commit 0d861d7161
7 changed files with 63 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Epost.BLL/CommandBLL.cs
View File

@ -137,20 +137,13 @@ namespace Epost.BLL
else { else {
lablemodel.Quantity = shopid; lablemodel.Quantity = shopid;
lablemodel.Mode = "10"; lablemodel.Mode = "10";
}
}
lablemodel.Address = labelItem["address"].ToString(); lablemodel.Address = labelItem["address"].ToString();
lablemodel.ControlIP = item["ControlIP"].ToString(); lablemodel.ControlIP = item["ControlIP"].ToString();
lablemodel.Command = "DISPLAY_JOB"; lablemodel.Command = "DISPLAY_JOB";
lablemodel.Type = "N"; lablemodel.Type = "N";
lablemodel.Uid = labelItem["address"].ToString();
lablemodel.Uid = labelItem["address"].ToString();
list.Add(lablemodel); list.Add(lablemodel);
} }
@ -207,6 +200,12 @@ namespace Epost.BLL
} }
#endregion #endregion
#region 格式化标签
public bool FORMAT_DEVICE(LabelParamModel model)
{
return dal.FORMAT_DEVICE(model);
}
#endregion
#region 连接控制器 #region 连接控制器
public bool CONNECT(LabelParamModel model) public bool CONNECT(LabelParamModel model)
{ {

7
Epost.BLL/OrderBLL.cs
View File

@ -932,8 +932,11 @@ namespace Epost.BLL
{ {
return dal.UpOrderStateBybat(id); return dal.UpOrderStateBybat(id);
} }
public bool UpdateStateBymatchid(string matchid)
{
return dal.UpdateStateBymatchid(matchid);
}
public bool IsFinishWorkByCar(int endcount, string matchid, string block="") public bool IsFinishWorkByCar(int endcount, string matchid, string block="")
{ {

5
Epost.BLL/Work_JobDownThread.cs
View File

@ -328,6 +328,11 @@ namespace Epost.BLL
{ {
LogHelper.WriteLogInfo(model.Sku + "Sku播种完成" + model.Matchid); LogHelper.WriteLogInfo(model.Sku + "Sku播种完成" + model.Matchid);
orderbll.UpdateStateByCar(model.Matchid, model.Sku); orderbll.UpdateStateByCar(model.Matchid, model.Sku);
bool matchbo= orderbll.IsSkuFinishWork("", model.Matchid);
if (matchbo) {
LogHelper.WriteLogInfo("波次播种完成" + model.Matchid);
orderbll.UpdateStateBymatchid(model.Matchid);
}
} }
#endregion #endregion

12
Epost.DAL/CommandDAL.cs
View File

@ -91,6 +91,18 @@ namespace Epost.DAL
} }
#endregion #endregion
#region 格式化任务数据
public bool FORMAT_DEVICE(LabelParamModel model)
{
model.Address = "9999";
model.Command = "FORMAT_DEVICE";
model.Parameter = "";
model.Timeout = "0.5";
return Send(model);
}
#endregion
#region 导入地址信息 #region 导入地址信息
public bool INPUT_ADDRESS_DATA() public bool INPUT_ADDRESS_DATA()
{ {

7
Epost.DAL/OrdersDAL.cs
View File

@ -695,13 +695,14 @@ namespace Epost.DAL
#region 修改门店拣货状态 #region 修改门店拣货状态
public bool UpdateStateByOrderID(string orderid) public bool UpdateStateBymatchid(string matchid)
{ {
try try
{ {
string upsql = string.Format("update orders set oprationstate=3,truequantity=quantity, state=3 where orderid='{0}'", string upsql = string.Format("update orders set state=3 where matchid='{0}'",
orderid); matchid);
long x = db.UpdateSql(upsql); long x = db.UpdateSql(upsql);
LogHelper.WriteLogInfo(x+"修改波次拣选完成"+upsql);
if (x > 0) if (x > 0)
return true; return true;
return false; return false;

13
Epost.TestToolsWeb/Controllers/WebAPIController.cs
View File

@ -79,7 +79,18 @@ namespace Epost.TestToolsWeb.Controllers
JobCache.UpdateJobDownModelList(new List<ResultMessageModel>() { data }, EdownCommend.Create); JobCache.UpdateJobDownModelList(new List<ResultMessageModel>() { data }, EdownCommend.Create);
} }
if (data.Command == "JOB_Fail")
{
LabelParamModel lbmodel = new LabelParamModel();
lbmodel.Address = data.Address;
lbmodel.Uid = data.Address;
lbmodel.Type = data.Type;
combll.FORMAT_DEVICE(lbmodel);
LogHelper.WriteLogInfo("设备报错："+JsonHelper.SerializeObject(data), Log_Type.ERROR);
}
} }
catch (Exception ex) catch (Exception ex)

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

@ -7,7 +7,7 @@
<PropertyGroup> <PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile /> <TimeStampOfAssociatedLegacyPublishXmlFile />
<_PublishTargetUrl>D:\驿传\Wuxidingshi_DAS</_PublishTargetUrl> <_PublishTargetUrl>D:\驿传\Wuxidingshi_DAS</_PublishTargetUrl>
<History>True|2025-06-15T03:14:12.6170562Z||;True|2025-06-15T10:42:25.1172247+08:00||;True|2025-06-14T13:26:43.2442778+08:00||;True|2025-06-10T13:21:34.1684919+08:00||;True|2025-06-09T11:40:40.2739751+08:00||;True|2025-06-08T16:20:45.8519262+08:00||;True|2025-01-16T15:37:40.8814043+08:00||;True|2024-12-19T15:11:44.2536385+08:00||;True|2024-12-10T19:10:26.6514077+08:00||;True|2024-12-10T18:30:34.7211512+08:00||;True|2024-12-09T14:06:46.4112259+08:00||;True|2024-12-03T14:23:26.2134334+08:00||;True|2024-11-27T18:53:48.7373661+08:00||;True|2024-11-27T14:27:33.0840789+08:00||;True|2024-11-27T14:08:15.6442660+08:00||;True|2024-11-27T12:10:03.9412549+08:00||;True|2024-11-27T11:45:31.3775097+08:00||;True|2024-11-27T11:32:00.8297320+08:00||;True|2024-11-23T20:50:04.5476409+08:00||;False|2024-11-04T17:48:25.2781696+08:00||;True|2024-11-01T16:04:56.3535724+08:00||;True|2024-09-01T10:13:37.1598955+08:00||;True|2024-08-31T17:27:57.5375469+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|2025-06-19T08:33:25.6789576Z||;True|2025-06-19T16:31:35.8668377+08:00||;True|2025-06-17T17:16:38.1010406+08:00||;True|2025-06-15T11:14:12.6170562+08:00||;True|2025-06-15T10:42:25.1172247+08:00||;True|2025-06-14T13:26:43.2442778+08:00||;True|2025-06-10T13:21:34.1684919+08:00||;True|2025-06-09T11:40:40.2739751+08:00||;True|2025-06-08T16:20:45.8519262+08:00||;True|2025-01-16T15:37:40.8814043+08:00||;True|2024-12-19T15:11:44.2536385+08:00||;True|2024-12-10T19:10:26.6514077+08:00||;True|2024-12-10T18:30:34.7211512+08:00||;True|2024-12-09T14:06:46.4112259+08:00||;True|2024-12-03T14:23:26.2134334+08:00||;True|2024-11-27T18:53:48.7373661+08:00||;True|2024-11-27T14:27:33.0840789+08:00||;True|2024-11-27T14:08:15.6442660+08:00||;True|2024-11-27T12:10:03.9412549+08:00||;True|2024-11-27T11:45:31.3775097+08:00||;True|2024-11-27T11:32:00.8297320+08:00||;True|2024-11-23T20:50:04.5476409+08:00||;False|2024-11-04T17:48:25.2781696+08:00||;True|2024-11-01T16:04:56.3535724+08:00||;True|2024-09-01T10:13:37.1598955+08:00||;True|2024-08-31T17:27:57.5375469+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>06/15/2025 11:14:09</publishTime> <publishTime>06/19/2025 16:31:32</publishTime>
</File> </File>
<File Include="bin/App_global.asax.dll"> <File Include="bin/App_global.asax.dll">
<publishTime>06/15/2025 11:14:09</publishTime> <publishTime>06/19/2025 16:31:32</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>06/15/2025 10:42:00</publishTime> <publishTime>06/17/2025 17:16:09</publishTime>
</File> </File>
<File Include="bin/Common.pdb"> <File Include="bin/Common.pdb">
<publishTime>06/15/2025 10:42:00</publishTime> <publishTime>06/17/2025 17:16:09</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>06/15/2025 11:13:45</publishTime> <publishTime>06/19/2025 16:31:12</publishTime>
</File> </File>
<File Include="bin/Epost.BLL.pdb"> <File Include="bin/Epost.BLL.pdb">
<publishTime>06/15/2025 11:13:45</publishTime> <publishTime>06/19/2025 16:31:12</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>06/15/2025 10:42:00</publishTime> <publishTime>06/19/2025 16:31:11</publishTime>
</File> </File>
<File Include="bin/Epost.DAL.pdb"> <File Include="bin/Epost.DAL.pdb">
<publishTime>06/15/2025 10:42:00</publishTime> <publishTime>06/19/2025 16:31:11</publishTime>
</File> </File>
<File Include="bin/Epost.DPS.dll"> <File Include="bin/Epost.DPS.dll">
<publishTime>06/15/2025 11:13:53</publishTime> <publishTime>06/19/2025 16:31:16</publishTime>
</File> </File>
<File Include="bin/Epost.DPS.pdb"> <File Include="bin/Epost.DPS.pdb">
<publishTime>06/15/2025 11:13:53</publishTime> <publishTime>06/19/2025 16:31:16</publishTime>
</File> </File>
<File Include="bin/Epost.Model.dll"> <File Include="bin/Epost.Model.dll">
<publishTime>06/08/2025 16:20:17</publishTime> <publishTime>06/17/2025 17:16:08</publishTime>
</File> </File>
<File Include="bin/Epost.Model.pdb"> <File Include="bin/Epost.Model.pdb">
<publishTime>06/08/2025 16:20:17</publishTime> <publishTime>06/17/2025 17:16:08</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>06/15/2025 11:13:55</publishTime> <publishTime>06/19/2025 16:31:18</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,7 +7572,7 @@
<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>06/08/2025 16:20:27</publishTime> <publishTime>06/17/2025 17:16:18</publishTime>
</File> </File>
</ItemGroup> </ItemGroup>
</Project> </Project>