From 70ebea62921bc9c98671926a2e1089d90d6549a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=85=E5=87=AF=20=E8=B4=BE?= <807404298@qq.com> Date: Wed, 19 Apr 2023 14:42:48 +0800 Subject: [PATCH] --- Epost.BLL/OrderControlBLL.cs | 87 +++++++++---------- Epost.DAL/OrdersDAL.cs | 1 + .../PublishProfiles/Toolsweb.pubxml.user | 20 ++--- 3 files changed, 52 insertions(+), 56 deletions(-) diff --git a/Epost.BLL/OrderControlBLL.cs b/Epost.BLL/OrderControlBLL.cs index 8ae8415..7c6e494 100644 --- a/Epost.BLL/OrderControlBLL.cs +++ b/Epost.BLL/OrderControlBLL.cs @@ -48,7 +48,7 @@ namespace Epost.BLL try { bool t = addrBLL.UpdateState(); - LogHelper.WriteLogInfo("初始化@@@@@@@@@@@@！----V20220705-1---"); + LogHelper.WriteLogInfo("初始化@@@@@@@@@@@@！----V20230418-1---"); JobCache.ClearJobList(); downCacheDAL.ClearJobDownList(); locCache.ClearScanList(); @@ -62,11 +62,6 @@ namespace Epost.BLL - LogHelper.WriteLogInfo("初始化@@@@@@@@@@@@！----V20200727-1---"); - - - - return resultModel; } catch (Exception ex) @@ -560,53 +555,53 @@ namespace Epost.BLL #region 点亮任务标签 foreach (JobModel item in nowJoblist.ToArray()) { - - - - List manyJoblist = nowJoblist.FindAll(m => m.Tolocation == item.Tolocation); - int quantity = item.Quantity; - - #region 判断同一订单、同一货位多条数据 合并显示 - if (manyJoblist.Count > 1)//同一个货位的数据合并显示 + if (item.State == 0) { - quantity = 0; - if (manyJoblist.FindAll(m => m.State == 0).Any()) + List manyJoblist = nowJoblist.FindAll(m => m.Tolocation == item.Tolocation); + int quantity = item.Quantity; + + #region 判断同一订单、同一货位多条数据 合并显示 + if (manyJoblist.Count > 1)//同一个货位的数据合并显示 { - foreach (JobModel mitem in manyJoblist) + quantity = 0; + if (manyJoblist.FindAll(m => m.State == 0).Any()) { - quantity += mitem.Quantity; - mitem.State = 1; - mitem.ManyState = 1; + foreach (JobModel mitem in manyJoblist) + { + quantity += mitem.Quantity; + mitem.State = 1; + mitem.ManyState = 1; + } } } + #endregion + + LabelParamModel lamodel = new LabelParamModel(); + string address = item.Address.ToString(); + lamodel.Address = address; + lamodel.ControlIP = item.ControlIP.ToString(); + lamodel.Command = "DISPLAY_JOB"; + lamodel.Uid = item.ID; + lamodel.Type = "N"; + lamodel.Quantity = quantity.ToString(); + lamodel.Uid = item.ID; + lamodel.Mode = queueDT.Rows[0]["lightcolor"].ToString() + "0"; + + list.Add(lamodel); + + item.State = 1; + item.ColorCode = queueDT.Rows[0]["lightcolor"].ToString(); + item.DisplayTime = DateTime.Now; } #endregion - - LabelParamModel lamodel = new LabelParamModel(); - string address = item.Address.ToString(); - lamodel.Address = address; - lamodel.ControlIP = item.ControlIP.ToString(); - lamodel.Command = "DISPLAY_JOB"; - lamodel.Uid = item.ID; - lamodel.Type = "N"; - lamodel.Quantity = quantity.ToString(); - lamodel.Uid = item.ID; - lamodel.Mode = queueDT.Rows[0]["lightcolor"].ToString() + "0"; - - list.Add(lamodel); - - item.State = 1; - item.ColorCode = queueDT.Rows[0]["lightcolor"].ToString(); - item.DisplayTime = DateTime.Now; - } - #endregion - #region 点亮通道灯 - //comBLL.DISPLAY_LIGHT_BLOCK(model.Taskblock, model.Taskarea, "1"); - #endregion - if (list != null && list.Count > 0) - { - LogHelper.WriteLogInfo("添加到点亮的list————————————————————：" + list.Count); - comBLL.DISPLAY_JOBALL(list); + #region 点亮通道灯 + //comBLL.DISPLAY_LIGHT_BLOCK(model.Taskblock, model.Taskarea, "1"); + #endregion + if (list != null && list.Count > 0) + { + LogHelper.WriteLogInfo("添加到点亮的list————————————————————：" + list.Count); + comBLL.DISPLAY_JOBALL(list); + } } } else diff --git a/Epost.DAL/OrdersDAL.cs b/Epost.DAL/OrdersDAL.cs index 774faae..d9ed2c2 100644 --- a/Epost.DAL/OrdersDAL.cs +++ b/Epost.DAL/OrdersDAL.cs @@ -656,6 +656,7 @@ namespace Epost.DAL usercode ); long x = db.UpdateSql(upsql); + LogHelper.WriteLogInfo("修改当前标签拣货状态:" + upsql + ",成功条数：" + x + ""); if (x > 0) return true; return false; diff --git a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user index 83e0f44..2a21f11 100644 --- a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user +++ b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user @@ -7,7 +7,7 @@ <_PublishTargetUrl>D:\驿传\SanYing_DAS-T后台 - True|2023-04-18T06:56:45.8672402Z;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; + True|2023-04-19T03:42:01.7398184Z;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; @@ -33,10 +33,10 @@ 04/16/2023 15:06:26 - 04/18/2023 14:56:32 + 04/19/2023 11:37:28 - 04/18/2023 14:56:32 + 04/19/2023 11:37:28 02/24/2020 15:29:24 @@ -63,25 +63,25 @@ 10/23/2017 13:15:20 - 04/18/2023 14:56:14 + 04/19/2023 11:37:11 - 04/18/2023 14:56:14 + 04/19/2023 11:37:11 08/26/2020 18:09:48 - 04/18/2023 14:56:13 + 04/19/2023 11:37:10 - 04/18/2023 14:56:13 + 04/19/2023 11:37:10 - 04/18/2023 14:56:20 + 04/19/2023 11:37:17 - 04/18/2023 14:56:20 + 04/19/2023 11:37:17 04/16/2023 17:10:57 @@ -5652,7 +5652,7 @@ 04/16/2023 15:06:27 - 04/18/2023 14:56:23 + 04/19/2023 11:37:21 04/04/2018 15:45:12