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-26 20:31:02 +08:00
parent de122526a2
commit 3042ef9370
5 changed files with 107 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Epost.BLL/OrdersQueueBLL.cs
View File

@ -83,7 +83,11 @@ namespace Epost.BLL
return dal.DeleteQueue(matchid); return dal.DeleteQueue(matchid);
} }
public bool DeleteQueuebyUser(string strwhere)
{
return dal.DeleteQueuebyUser(strwhere);
}
public bool DeleteOrderQueue(string matchid, string CancelTime) public bool DeleteOrderQueue(string matchid, string CancelTime)
{ {
return dal.DeleteOrderQueue(matchid, CancelTime); return dal.DeleteOrderQueue(matchid, CancelTime);
@ -146,6 +150,14 @@ namespace Epost.BLL
return dal.GetOrderQueue(block,area, state,sku); return dal.GetOrderQueue(block,area, state,sku);
}
#endregion
#region 获取sku是否正在作业
public DataTable GetOrderQueueByuser(string state, string usercode)
{
return dal.GetOrderQueueByuser( state, usercode);
} }
#endregion #endregion
#region 获取正在绑定箱号信息 #region 获取正在绑定箱号信息

51
Epost.BLL/Work_JobDownThread.cs
View File

@ -3,11 +3,13 @@ using Epost.DAL.Cache;
using Epost.DAL.Enum; using Epost.DAL.Enum;
using Epost.Model; using Epost.Model;
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Linq; using System.Linq;
using System.Runtime.Remoting.Metadata.W3cXsd2001; using System.Runtime.Remoting.Metadata.W3cXsd2001;
using System.Text; using System.Text;
using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using static Epost.DAL.Enum.LightColor; using static Epost.DAL.Enum.LightColor;
@ -181,6 +183,41 @@ namespace Epost.BLL
else if (data.Uid == "09" + "-" + data.Address)//完成灯拍下 else if (data.Uid == "09" + "-" + data.Address)//完成灯拍下
{ {
LogHelper.WriteLogInfo(data.Address+"end拍下"); LogHelper.WriteLogInfo(data.Address+"end拍下");
List<JobModel> offList = jobList.FindAll(m => m.Block == block && m.Area == area && m.Address == data.Address && m.ControlIP == data.IP && m.State == 3 );
if (offList.Any())
{
JobModel model = offList.FirstOrDefault();
#region 修改任务队列状态
OrdersQueueModel qumodel = new OrdersQueueModel();
qumodel.State = 3;
qumodel.Taskblock = block;
qumodel.Taskarea = area;
qumodel.Sku = model.Sku;
qumodel.Matchid = model.Matchid;
qumodel.UserCode = model.UserCode;
queueBLL.UpdateQueueTaskArea_Car(qumodel);
#endregion
bool bo = orderbll.IsSkuFinishWork("", model.Matchid);
if (bo)
{
LogHelper.WriteLogInfo("波次拣选完成");
List<UserCodeModel> ulist = UserCacheDAL.GetUserCodeList();
UserCacheDAL.UpdateUserCodeList(ulist, EUserCommend.Execute);//删除波次信息
}
Thread.Sleep(30);
#region 清除当前区已做完的sku
JobCache.UpdateJobModelList(offList, EcommendType.Execute);
#endregion
}
} }
else if (data.Result == "4")//■按键拍下 else if (data.Result == "4")//■按键拍下
{ {
@ -263,21 +300,7 @@ namespace Epost.BLL
comBLL.DISPLAY_JOB(lamodel); comBLL.DISPLAY_JOB(lamodel);
#endregion #endregion
#region 修改任务队列状态
OrdersQueueModel qumodel = new OrdersQueueModel();
qumodel.State = 3;
qumodel.Taskblock = block;
qumodel.Taskarea = area;
qumodel.Sku = model.Sku;
qumodel.Matchid = model.Matchid;
qumodel.UserCode = model.UserCode;
queueBLL.UpdateQueueTaskArea_Car(qumodel);
#endregion
Thread.Sleep(30);
#region 清除当前区已做完的sku
JobCache.UpdateJobModelList(offList, EcommendType.Execute);
#endregion
} }

22
Epost.BLL/Work_ScanThread.cs
View File

@ -343,16 +343,28 @@ namespace Epost.BLL
umodel.UserCode = scanStr; umodel.UserCode = scanStr;
//根据工号查询对应灯色 //根据工号查询对应灯色
UserBLL userbll = new UserBLL(); UserBLL userbll = new UserBLL();
DataTable userdt= userbll.getUserColor(scanStr); DataTable userdt= userbll.getUserColor(scanStr);
if (userdt != null && userdt.Rows.Count > 0) if (userdt != null && userdt.Rows.Count > 0)
{ {
bool bo= queueBLL.UpdateQueueByUser(scanStr, userdt.Rows[0]["lightcolor"].ToString()); DataTable skudt = queueBLL.GetOrderQueueByuser("1", scanStr);
if (!bo) if (skudt != null && skudt.Rows.Count > 0)
{ {
//无待启动的商品 //无待启动的商品
LogHelper.WriteLogInfo("无待启动的商品，请先扫描商品"+scanStr,LogHelper.Log_Type.ERROR); LogHelper.WriteLogInfo(scanStr + "工号任务未完成", LogHelper.Log_Type.ERROR);
logBLL.SaveShowMesError("无待启动的商品，请先扫描商品", "无待启动的商品，请先扫描商品"); logBLL.SaveShowMesError(scanStr+"工号任务未完成", scanStr + "工号任务未完成");
queueBLL.DeleteQueuebyUser(" and state = 2");
} }
else
{
bool bo = queueBLL.UpdateQueueByUser(scanStr, userdt.Rows[0]["lightcolor"].ToString());
if (!bo)
{
//无待启动的商品
LogHelper.WriteLogInfo("无待启动的商品，请先扫描商品" + scanStr, LogHelper.Log_Type.ERROR);
logBLL.SaveShowMesError("无待启动的商品，请先扫描商品", "无待启动的商品，请先扫描商品");
}
}
} }
else { else {
//无此工号 //无此工号

21
Epost.DAL/OrdersQueueDAL.cs
View File

@ -106,6 +106,15 @@ namespace Epost.DAL
return true; return true;
return false; return false;
} }
public bool DeleteQueuebyUser(string strwhere)
{
string sql = string.Format("delete from OrdersQueue where 1=1 "+ strwhere
);
long x = db.DeleteSql(sql);
if (x > 0)
return true;
return false;
}
public bool DeleteOrderQueue(string matchid,string CancelTime) public bool DeleteOrderQueue(string matchid,string CancelTime)
{ {
@ -222,6 +231,18 @@ namespace Epost.DAL
} }
#endregion #endregion
#region 获取sku是否正在作业
public DataTable GetOrderQueueByuser(string state, string usercode)
{
string sql = string.Format("select * from OrdersQueue where state ='{0}' and usercode = '{1}'",
state,
usercode);
LogHelper.WriteLogInfo("获取工号是否正在作业" + sql);
return db.GetsqlForDT(sql);
}
#endregion
#region 获取当前区的作业状态 #region 获取当前区的作业状态
public bool UpdateQueueOrderState(OrdersQueueModel model) public bool UpdateQueueOrderState(OrdersQueueModel model)
{ {

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

@ -7,7 +7,7 @@
<PropertyGroup> <PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile /> <TimeStampOfAssociatedLegacyPublishXmlFile />
<_PublishTargetUrl>D:\驿传\GuangzhouHuiFeng_DAS</_PublishTargetUrl> <_PublishTargetUrl>D:\驿传\GuangzhouHuiFeng_DAS</_PublishTargetUrl>
<History>True|2025-06-26T06:43:53.4124674Z||;True|2025-06-26T14:36:49.8290629+08:00||;True|2025-06-26T14:32:48.0261661+08:00||;True|2025-06-26T14:25:41.0829044+08:00||;True|2025-06-26T11:51:25.0046611+08:00||;True|2025-06-26T10:39:18.2677815+08:00||;True|2025-06-24T19:52:28.3640036+08:00||;True|2025-06-24T19:41:27.8431415+08:00||;True|2025-06-24T19:02:20.3384315+08:00||;True|2025-06-24T14:58:06.2128620+08:00||;False|2025-06-24T14:57:07.8710970+08:00||;True|2025-06-24T14:54:53.0047658+08:00||;True|2025-06-24T14:21:21.1147627+08:00||;False|2025-06-24T14:20:37.2040902+08:00||;True|2025-06-24T13:14:08.5696828+08:00||;True|2025-06-24T11:28:41.9414169+08:00||;False|2025-06-24T11:28:18.5427055+08:00||;True|2025-06-23T18:49:19.8150434+08:00||;False|2025-06-23T18:47:53.8200239+08:00||;True|2025-06-23T18:13:17.9954519+08:00||;True|2025-06-16T16:39:46.1896351+08:00||;True|2025-06-04T15:01:49.8008687+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-26T09:43:01.0379434Z||;True|2025-06-26T17:35:14.4249922+08:00||;True|2025-06-26T16:52:50.3133122+08:00||;True|2025-06-26T14:43:53.4124674+08:00||;True|2025-06-26T14:36:49.8290629+08:00||;True|2025-06-26T14:32:48.0261661+08:00||;True|2025-06-26T14:25:41.0829044+08:00||;True|2025-06-26T11:51:25.0046611+08:00||;True|2025-06-26T10:39:18.2677815+08:00||;True|2025-06-24T19:52:28.3640036+08:00||;True|2025-06-24T19:41:27.8431415+08:00||;True|2025-06-24T19:02:20.3384315+08:00||;True|2025-06-24T14:58:06.2128620+08:00||;False|2025-06-24T14:57:07.8710970+08:00||;True|2025-06-24T14:54:53.0047658+08:00||;True|2025-06-24T14:21:21.1147627+08:00||;False|2025-06-24T14:20:37.2040902+08:00||;True|2025-06-24T13:14:08.5696828+08:00||;True|2025-06-24T11:28:41.9414169+08:00||;False|2025-06-24T11:28:18.5427055+08:00||;True|2025-06-23T18:49:19.8150434+08:00||;False|2025-06-23T18:47:53.8200239+08:00||;True|2025-06-23T18:13:17.9954519+08:00||;True|2025-06-16T16:39:46.1896351+08:00||;True|2025-06-04T15:01:49.8008687+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/26/2025 14:43:50</publishTime> <publishTime>06/26/2025 17:42:57</publishTime>
</File> </File>
<File Include="bin/App_global.asax.dll"> <File Include="bin/App_global.asax.dll">
<publishTime>06/26/2025 14:43:50</publishTime> <publishTime>06/26/2025 17:42:57</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/26/2025 14:25:19</publishTime> <publishTime>06/26/2025 16:52:33</publishTime>
</File> </File>
<File Include="bin/Common.pdb"> <File Include="bin/Common.pdb">
<publishTime>06/26/2025 14:25:19</publishTime> <publishTime>06/26/2025 16:52:33</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/26/2025 14:43:36</publishTime> <publishTime>06/26/2025 17:42:44</publishTime>
</File> </File>
<File Include="bin/Epost.BLL.pdb"> <File Include="bin/Epost.BLL.pdb">
<publishTime>06/26/2025 14:43:36</publishTime> <publishTime>06/26/2025 17:42:44</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/26/2025 14:25:21</publishTime> <publishTime>06/26/2025 17:34:59</publishTime>
</File> </File>
<File Include="bin/Epost.DAL.pdb"> <File Include="bin/Epost.DAL.pdb">
<publishTime>06/26/2025 14:25:21</publishTime> <publishTime>06/26/2025 17:34:59</publishTime>
</File> </File>
<File Include="bin/Epost.DPS.dll"> <File Include="bin/Epost.DPS.dll">
<publishTime>06/26/2025 14:43:41</publishTime> <publishTime>06/26/2025 17:42:48</publishTime>
</File> </File>
<File Include="bin/Epost.DPS.pdb"> <File Include="bin/Epost.DPS.pdb">
<publishTime>06/26/2025 14:43:41</publishTime> <publishTime>06/26/2025 17:42:48</publishTime>
</File> </File>
<File Include="bin/Epost.Model.dll"> <File Include="bin/Epost.Model.dll">
<publishTime>06/26/2025 14:25:18</publishTime> <publishTime>06/26/2025 16:52:33</publishTime>
</File> </File>
<File Include="bin/Epost.Model.pdb"> <File Include="bin/Epost.Model.pdb">
<publishTime>06/26/2025 14:25:18</publishTime> <publishTime>06/26/2025 16:52:33</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>
@ -105,13 +105,13 @@
<publishTime>04/29/2020 16:50:14</publishTime> <publishTime>04/29/2020 16:50:14</publishTime>
</File> </File>
<File Include="bin/FastReport.Bars.dll"> <File Include="bin/FastReport.Bars.dll">
<publishTime>06/26/2025 14:19:55</publishTime> <publishTime>06/26/2025 16:33:42</publishTime>
</File> </File>
<File Include="bin/FastReport.dll"> <File Include="bin/FastReport.dll">
<publishTime>06/26/2025 14:19:55</publishTime> <publishTime>06/26/2025 16:33:43</publishTime>
</File> </File>
<File Include="bin/FastReport.Editor.dll"> <File Include="bin/FastReport.Editor.dll">
<publishTime>06/26/2025 14:19:55</publishTime> <publishTime>06/26/2025 16:33:42</publishTime>
</File> </File>
<File Include="bin/Google.Protobuf.dll"> <File Include="bin/Google.Protobuf.dll">
<publishTime>08/10/2018 18:51:54</publishTime> <publishTime>08/10/2018 18:51:54</publishTime>
@ -5661,7 +5661,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/26/2025 14:43:42</publishTime> <publishTime>06/26/2025 17:42:49</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>
@ -7581,7 +7581,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/26/2025 14:25:27</publishTime> <publishTime>06/26/2025 16:52:38</publishTime>
</File> </File>
</ItemGroup> </ItemGroup>
</Project> </Project>