From a3c29b5bf84e6caadb31eb5d060d5eca011424b9 Mon Sep 17 00:00:00 2001 From: jl Date: Mon, 15 Jan 2024 17:37:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B0=8F=E6=A0=BC=E5=8F=A3?= =?UTF-8?q?=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Epost.BLL/OrderBLL.cs | 8 +++ Epost.BLL/OrderControlBLL.cs | 67 +++++++++++++++--------- Epost.BLL/OrdersQueueBLL.cs | 9 ++++ Epost.DAL/OrdersDAL.cs | 22 ++++++++ Epost.DAL/OrdersQueueDAL.cs | 9 ++++ Epost.TestToolsWeb/Epost.DPS.csproj.user | 26 +-------- 6 files changed, 92 insertions(+), 49 deletions(-) diff --git a/Epost.BLL/OrderBLL.cs b/Epost.BLL/OrderBLL.cs index 62f79ae..ccac2e0 100644 --- a/Epost.BLL/OrderBLL.cs +++ b/Epost.BLL/OrderBLL.cs @@ -947,5 +947,13 @@ namespace Epost.BLL return dal.GetOrderList_echo(matchid, sku, sarea, sblock); } #endregion + + #region 修改小格口号 + public bool UpdateSkuLoc(string sku, string smallloc) + { + return dal.UpdateSkuLoc(sku,smallloc); + } + #endregion + } } diff --git a/Epost.BLL/OrderControlBLL.cs b/Epost.BLL/OrderControlBLL.cs index e4afc17..f7f6db0 100644 --- a/Epost.BLL/OrderControlBLL.cs +++ b/Epost.BLL/OrderControlBLL.cs @@ -851,23 +851,40 @@ namespace Epost.BLL } else if (isnum)//sku { - #region 扫描SKU - //根据扫描商品内码获取商品码 - data.ScanCode = data.Parameter; - DataTable skudt = queueBLL.GetOrderQueue(data.Block, data.Area, "3"); - List scanlist = downCacheDAL.GetPlanJobDownList().FindAll(m => m.Address == data.Address && m.Parameter == scanStr && m.Parameter != "888888" && m.Block == data.Block && m.Area == data.Area); - - if (scanlist.Count > 1 || (skudt != null && skudt.Rows.Count > 0)) - { - downCacheDAL.UpdateJobDownModelList(new List { data }, EdownCommend.Execute); + if (data.Parameter.Length <= 2) + { + #region 扫描小格口号 + DataTable quedt = queueBLL.getQueueList(); + if (quedt != null && quedt.Rows.Count > 0) + { + LogHelper.WriteLogInfo(quedt.Rows[0]["sku"].ToString()+"绑定小格口" + data.Parameter); + //更新订单记录 + orderbll.UpdateSkuLoc(quedt.Rows[0]["sku"].ToString(),data.Parameter); + } + else { + LogHelper.WriteLogInfo("没有可绑定物料" + data.Parameter); + } + #endregion } - else - { - DataTable OrderDt = orderbll.GetOrderList_Car(matchid, scanStr, data.Area, data.Block); - if (OrderDt != null && OrderDt.Rows.Count > 0) - { - OrdersQueueModel qmodel = new OrdersQueueModel(); + else { + #region 扫描SKU + //根据扫描商品内码获取商品码 + data.ScanCode = data.Parameter; + DataTable skudt = queueBLL.GetOrderQueue(data.Block, data.Area, "3"); + List scanlist = downCacheDAL.GetPlanJobDownList().FindAll(m => m.Address == data.Address && m.Parameter == scanStr && m.Parameter != "888888" && m.Block == data.Block && m.Area == data.Area); + + if (scanlist.Count > 1 || (skudt != null && skudt.Rows.Count > 0)) + { + downCacheDAL.UpdateJobDownModelList(new List { data }, EdownCommend.Execute); + + } + else + { + DataTable OrderDt = orderbll.GetOrderList_Car(matchid, scanStr, data.Area, data.Block); + if (OrderDt != null && OrderDt.Rows.Count > 0) + { + OrdersQueueModel qmodel = new OrdersQueueModel(); qmodel.Sku = scanStr; qmodel.Taskblock = data.Block; qmodel.Taskarea = data.Area; @@ -876,21 +893,23 @@ namespace Epost.BLL qmodel.Location = scanStr; qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Red); queueBLL.insertQueueOrders(qmodel); - - } - else - { - logBLL.SaveShowMesError("扫描：" + scanStr + "无任务！", "扫描：" + scanStr + "无任务！"); - downCacheDAL.UpdateJobDownModelList(new List { data }, EdownCommend.Execute); - + + } + else + { + logBLL.SaveShowMesError("扫描：" + scanStr + "无任务！", "扫描：" + scanStr + "无任务！"); + downCacheDAL.UpdateJobDownModelList(new List { data }, EdownCommend.Execute); + + + } } + + #endregion } - #endregion - } #endregion } diff --git a/Epost.BLL/OrdersQueueBLL.cs b/Epost.BLL/OrdersQueueBLL.cs index 262f7d8..ebac9f4 100644 --- a/Epost.BLL/OrdersQueueBLL.cs +++ b/Epost.BLL/OrdersQueueBLL.cs @@ -246,5 +246,14 @@ namespace Epost.BLL } #endregion + + #region 获取最新一条记录 + public DataTable getQueueList() + { + + return dal.getQueueList(); + + } + #endregion } } diff --git a/Epost.DAL/OrdersDAL.cs b/Epost.DAL/OrdersDAL.cs index ba2281c..71f23ae 100644 --- a/Epost.DAL/OrdersDAL.cs +++ b/Epost.DAL/OrdersDAL.cs @@ -2471,6 +2471,28 @@ namespace Epost.DAL } #endregion + #region 修改小格口号 + public bool UpdateSkuLoc(string sku,string smallloc) + { + try + { + string sql = string.Format(" update orders set partcode = '{0}' where sku='{1}'", + smallloc, + sku); + + long x = db.UpdateSql(sql); + LogHelper.WriteLogInfo(x+"修改小格口信息"+sql); + if (x > 0) + return true; + return false; + } + catch (Exception ex) + { + LogHelper.WriteLogInfo("修改小格口号出错1" + ex.Message); + return false; + } + } + #endregion } } diff --git a/Epost.DAL/OrdersQueueDAL.cs b/Epost.DAL/OrdersQueueDAL.cs index 024a4b8..61c4469 100644 --- a/Epost.DAL/OrdersQueueDAL.cs +++ b/Epost.DAL/OrdersQueueDAL.cs @@ -408,5 +408,14 @@ namespace Epost.DAL } #endregion + + #region 获取最新一条记录 + public DataTable getQueueList() + { + string sql = string.Format("select top 1 * from OrdersQueue where state=3 order by id desc"); + return db.GetsqlForDT(sql); + + } + #endregion } } diff --git a/Epost.TestToolsWeb/Epost.DPS.csproj.user b/Epost.TestToolsWeb/Epost.DPS.csproj.user index 044be83..7067f1e 100644 --- a/Epost.TestToolsWeb/Epost.DPS.csproj.user +++ b/Epost.TestToolsWeb/Epost.DPS.csproj.user @@ -21,29 +21,5 @@ ApiControllerEmptyScaffolder root/Controller - - - - - - - CurrentPage - True - False - False - False - - - - - - - - - True - False - - - - + \ No newline at end of file