diff --git a/Epost.BLL/OrdersQueueBLL.cs b/Epost.BLL/OrdersQueueBLL.cs index 4bdb627..8f37241 100644 --- a/Epost.BLL/OrdersQueueBLL.cs +++ b/Epost.BLL/OrdersQueueBLL.cs @@ -83,7 +83,11 @@ namespace Epost.BLL return dal.DeleteQueue(matchid); } + public bool DeleteQueuebyUser(string strwhere) + { + return dal.DeleteQueuebyUser(strwhere); + } public bool DeleteOrderQueue(string matchid, string CancelTime) { return dal.DeleteOrderQueue(matchid, CancelTime); @@ -146,6 +150,14 @@ namespace Epost.BLL return dal.GetOrderQueue(block,area, state,sku); + } + #endregion + #region 获取sku是否正在作业 + public DataTable GetOrderQueueByuser(string state, string usercode) + { + + return dal.GetOrderQueueByuser( state, usercode); + } #endregion #region 获取正在绑定箱号信息 diff --git a/Epost.BLL/Work_JobDownThread.cs b/Epost.BLL/Work_JobDownThread.cs index 05ba090..34ccdc2 100644 --- a/Epost.BLL/Work_JobDownThread.cs +++ b/Epost.BLL/Work_JobDownThread.cs @@ -3,11 +3,13 @@ using Epost.DAL.Cache; using Epost.DAL.Enum; using Epost.Model; using System; +using System.Collections; using System.Collections.Generic; using System.Data; using System.Linq; using System.Runtime.Remoting.Metadata.W3cXsd2001; using System.Text; +using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; using static Epost.DAL.Enum.LightColor; @@ -181,6 +183,41 @@ namespace Epost.BLL else if (data.Uid == "09" + "-" + data.Address)//完成灯拍下 { LogHelper.WriteLogInfo(data.Address+"end拍下"); + + List 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 ulist = UserCacheDAL.GetUserCodeList(); + UserCacheDAL.UpdateUserCodeList(ulist, EUserCommend.Execute);//删除波次信息 + } + Thread.Sleep(30); + #region 清除当前区已做完的sku + JobCache.UpdateJobModelList(offList, EcommendType.Execute); + #endregion + + + + } + + + } else if (data.Result == "4")//■按键拍下 { @@ -263,21 +300,7 @@ namespace Epost.BLL comBLL.DISPLAY_JOB(lamodel); #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 + } diff --git a/Epost.BLL/Work_ScanThread.cs b/Epost.BLL/Work_ScanThread.cs index 1386456..f2f0a1e 100644 --- a/Epost.BLL/Work_ScanThread.cs +++ b/Epost.BLL/Work_ScanThread.cs @@ -343,16 +343,28 @@ namespace Epost.BLL umodel.UserCode = scanStr; //根据工号查询对应灯色 UserBLL userbll = new UserBLL(); - DataTable userdt= userbll.getUserColor(scanStr); + DataTable userdt= userbll.getUserColor(scanStr); if (userdt != null && userdt.Rows.Count > 0) { - bool bo= queueBLL.UpdateQueueByUser(scanStr, userdt.Rows[0]["lightcolor"].ToString()); - if (!bo) + DataTable skudt = queueBLL.GetOrderQueueByuser("1", scanStr); + if (skudt != null && skudt.Rows.Count > 0) { //无待启动的商品 - LogHelper.WriteLogInfo("无待启动的商品，请先扫描商品"+scanStr,LogHelper.Log_Type.ERROR); - logBLL.SaveShowMesError("无待启动的商品，请先扫描商品", "无待启动的商品，请先扫描商品"); + LogHelper.WriteLogInfo(scanStr + "工号任务未完成", LogHelper.Log_Type.ERROR); + 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 { //无此工号 diff --git a/Epost.DAL/OrdersQueueDAL.cs b/Epost.DAL/OrdersQueueDAL.cs index 80ccbbe..689adaf 100644 --- a/Epost.DAL/OrdersQueueDAL.cs +++ b/Epost.DAL/OrdersQueueDAL.cs @@ -106,7 +106,16 @@ namespace Epost.DAL return true; 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) { string sql = string.Format("delete from OrdersQueue where matchid='{0}' and Addtime='{1}'", @@ -222,6 +231,18 @@ namespace Epost.DAL } #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 获取当前区的作业状态 public bool UpdateQueueOrderState(OrdersQueueModel model) { diff --git a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user index 713a9f4..5abbe67 100644 --- a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user +++ b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user @@ -7,7 +7,7 @@ <_PublishTargetUrl>D:\驿传\GuangzhouHuiFeng_DAS - 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||; + 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||; @@ -33,19 +33,19 @@ 04/04/2018 15:45:12 - 06/26/2025 14:43:50 + 06/26/2025 17:42:57 - 06/26/2025 14:43:50 + 06/26/2025 17:42:57 02/24/2020 15:29:24 - 06/26/2025 14:25:19 + 06/26/2025 16:52:33 - 06/26/2025 14:25:19 + 06/26/2025 16:52:33 04/29/2020 16:50:14 @@ -63,31 +63,31 @@ 10/23/2017 13:15:20 - 06/26/2025 14:43:36 + 06/26/2025 17:42:44 - 06/26/2025 14:43:36 + 06/26/2025 17:42:44 08/26/2020 18:09:48 - 06/26/2025 14:25:21 + 06/26/2025 17:34:59 - 06/26/2025 14:25:21 + 06/26/2025 17:34:59 - 06/26/2025 14:43:41 + 06/26/2025 17:42:48 - 06/26/2025 14:43:41 + 06/26/2025 17:42:48 - 06/26/2025 14:25:18 + 06/26/2025 16:52:33 - 06/26/2025 14:25:18 + 06/26/2025 16:52:33 09/06/2018 11:57:11 @@ -105,13 +105,13 @@ 04/29/2020 16:50:14 - 06/26/2025 14:19:55 + 06/26/2025 16:33:42 - 06/26/2025 14:19:55 + 06/26/2025 16:33:43 - 06/26/2025 14:19:55 + 06/26/2025 16:33:42 08/10/2018 18:51:54 @@ -5661,7 +5661,7 @@ 05/30/2022 16:58:47 - 06/26/2025 14:43:42 + 06/26/2025 17:42:49 04/04/2018 15:45:12 @@ -7581,7 +7581,7 @@ 07/04/2022 14:22:38 - 06/26/2025 14:25:27 + 06/26/2025 16:52:38 \ No newline at end of file