From e923301596f8dd498d060c161139ebf1cc6aab3e Mon Sep 17 00:00:00 2001 From: jl Date: Mon, 9 Jun 2025 14:59:19 +0800 Subject: [PATCH] --- Epost.BLL/AddressstorageBLL.cs | 7 +- Epost.BLL/CommandBLL.cs | 23 +- Epost.BLL/OrderControlBLL.cs | 4 +- Epost.BLL/Work_ScanThread.cs | 251 +++++++++--------- .../Controllers/ServerController.cs | 4 +- Epost.TestToolsWeb/Epost.DPS.csproj.user | 4 +- .../PublishProfiles/Toolsweb.pubxml.user | 30 +-- 7 files changed, 161 insertions(+), 162 deletions(-) diff --git a/Epost.BLL/AddressstorageBLL.cs b/Epost.BLL/AddressstorageBLL.cs index 9cfeb62..f50fec7 100644 --- a/Epost.BLL/AddressstorageBLL.cs +++ b/Epost.BLL/AddressstorageBLL.cs @@ -150,9 +150,12 @@ namespace Epost.BLL { return dal.getLabelList(controlid, batchno); } - + public DataTable getLabelList(string controlid) + { + return dal.getLabelList(controlid); + } #endregion - + #region 获取所有地址 public DataTable getAddressList() { diff --git a/Epost.BLL/CommandBLL.cs b/Epost.BLL/CommandBLL.cs index ac1c838..2f75756 100644 --- a/Epost.BLL/CommandBLL.cs +++ b/Epost.BLL/CommandBLL.cs @@ -90,7 +90,7 @@ namespace Epost.BLL #endregion #region 设备检测 查询所有标签 - public ResultModel GetAllLabelList_M(string batchno) + public ResultModel GetAllLabelList_M() { ResultModel model = new ResultModel(); try @@ -102,7 +102,8 @@ namespace Epost.BLL { foreach (DataRow item in dt.Rows) { - DataTable lableDt = addrBLL.getLabelList(item["id"].ToString(), batchno); + // DataTable lableDt = addrBLL.getLabelList(item["id"].ToString(), batchno); + DataTable lableDt = addrBLL.getLabelList(item["id"].ToString()); if (lableDt != null && lableDt.Rows.Count > 0) { foreach (DataRow labelItem in lableDt.Rows) @@ -122,14 +123,20 @@ namespace Epost.BLL } else { - if (!string.IsNullOrEmpty(labelItem["shopid"].ToString())) + //if (!string.IsNullOrEmpty(labelItem["shopid"].ToString())) + //{ + // shopid = labelItem["shopid"].ToString(); + // if (shopid.Length > 4) + // { + // shopid = shopid.Substring(shopid.Length - 4, 4); + // } + //} + + if (shopid.Length > 4) { - shopid = labelItem["shopid"].ToString(); - if (shopid.Length > 4) - { - shopid = shopid.Substring(shopid.Length-4,4); - } + shopid = shopid.Substring(shopid.Length - 4, 4); } + LabelParamModel lablemodel = new LabelParamModel(); lablemodel.Address = labelItem["address"].ToString(); lablemodel.ControlIP = item["ControlIP"].ToString(); diff --git a/Epost.BLL/OrderControlBLL.cs b/Epost.BLL/OrderControlBLL.cs index 30ce07f..d028f93 100644 --- a/Epost.BLL/OrderControlBLL.cs +++ b/Epost.BLL/OrderControlBLL.cs @@ -119,10 +119,10 @@ namespace Epost.BLL #region 设备检测 - public ResultModel TestStart(string batchno) + public ResultModel TestStart() { - ResultModel result = comBLL.GetAllLabelList_M(batchno); + ResultModel result = comBLL.GetAllLabelList_M(); return result; } diff --git a/Epost.BLL/Work_ScanThread.cs b/Epost.BLL/Work_ScanThread.cs index 42b94b9..ef686f8 100644 --- a/Epost.BLL/Work_ScanThread.cs +++ b/Epost.BLL/Work_ScanThread.cs @@ -5,6 +5,7 @@ using Epost.Model; using System; using System.Collections.Generic; using System.Data; +using System.Data.Entity.Core.Metadata.Edm; using System.Linq; using System.Text; using System.Text.RegularExpressions; @@ -99,7 +100,7 @@ namespace Epost.BLL { case "QUERY_SPECIAL_STATUS": BindJobList(data); - break; + break; default: break; } @@ -128,53 +129,53 @@ namespace Epost.BLL ResultModel res = new ResultModel(); res.result = "0"; try - { - string sblock = data.Block; - string scanStr = data.Parameter.Trim(); - string sarea = data.Area; - string name = string.Empty; - string matchid = string.Empty; - #region 提示请扫描波次号 - List ulist = UserCacheDAL.GetUserCodeList().FindAll(m => m.Block == sblock && m.Area == sarea);// - bool isnum = ConvertHexHelper.IsNum(scanStr.Substring(0, 1));//判断扫描首字母是否是数字 + { + string sblock = data.Block; + string scanStr = data.Parameter.Trim(); + string sarea = data.Area; + string name = string.Empty; + string matchid = string.Empty; + #region 提示请扫描波次号 + List ulist = UserCacheDAL.GetUserCodeList().FindAll(m => m.Block == sblock && m.Area == sarea);// + bool isnum = ConvertHexHelper.IsNum(scanStr.Substring(0, 1));//判断扫描首字母是否是数字 - if (!ulist.Any()) + if (!ulist.Any()) + { + //手动加波次信息 + DataTable matdt = orderbll.GetMatchOrderList(); + if (matdt != null && matdt.Rows.Count > 0) { - //手动加波次信息 - DataTable matdt = orderbll.GetMatchOrderList(); - if (matdt != null && matdt.Rows.Count > 0) - { - UserCodeModel umodel = new UserCodeModel(); - umodel.Matchid = matdt.Rows[0]["matchid"].ToString(); - umodel.Block = sblock; - umodel.Area = sarea; - UserCacheDAL.UpdateUserCodeList(new List { umodel }, EUserCommend.Create); - } + UserCodeModel umodel = new UserCodeModel(); + umodel.Matchid = matdt.Rows[0]["matchid"].ToString(); + umodel.Block = sblock; + umodel.Area = sarea; + UserCacheDAL.UpdateUserCodeList(new List { umodel }, EUserCommend.Create); } - ulist = UserCacheDAL.GetUserCodeList().FindAll(m => m.Block == sblock && m.Area == sarea); - if (ulist.Any()) - { matchid = ulist.FirstOrDefault().Matchid; } + } + ulist = UserCacheDAL.GetUserCodeList().FindAll(m => m.Block == sblock && m.Area == sarea); + if (ulist.Any()) + { matchid = ulist.FirstOrDefault().Matchid; } - #endregion - if (data.Type == "5")//中分扫描枪 - { + #endregion + if (data.Type == "5")//中分扫描枪 + { - zhongfenBind(ulist, scanStr, data); - downCacheDAL.UpdateJobDownModelList(new List { data }, EdownCommend.Execute); - } - else if (data.Type == "6")//播种扫描枪 - { + zhongfenBind(ulist, scanStr, data); + downCacheDAL.UpdateJobDownModelList(new List { data }, EdownCommend.Execute); + } + else if (data.Type == "6")//播种扫描枪 + { - xifenBind(ulist, scanStr, data, matchid, isnum); + xifenBind(ulist, scanStr, data, matchid, isnum); - downCacheDAL.UpdateJobDownModelList(new List { data }, EdownCommend.Execute); - } + downCacheDAL.UpdateJobDownModelList(new List { data }, EdownCommend.Execute); + } - return res; + return res; + - } catch (Exception ex) { @@ -211,7 +212,7 @@ namespace Epost.BLL //} //else { - if (scanStr.Substring(0, 1) == "U") + if (scanStr.Substring(0, 1) == "Y") { #region 扫描工号 if (ulist.Any()) @@ -226,7 +227,7 @@ namespace Epost.BLL show.Block = data.Block; show.Area = data.Area; show.Type = 2; - show.Islock = true; + show.Islock = false; comBLL.ShowBoxMessage_M(show); #endregion } @@ -245,7 +246,7 @@ namespace Epost.BLL // location = data.Parameter;// sinfodt.Rows[0]["tolocation"].ToString(); } LogHelper.WriteLogInfo("中分" + data.Parameter + "===SKU" + scanStr); - List Arealist = addrBLL.GetAreaList(); + List Arealist = addrBLL.GetAreaList(data.Block); if (Arealist.Any()) { foreach (AddressstorageModel item in Arealist) @@ -268,11 +269,8 @@ namespace Epost.BLL // SumQuantity = SumQuantity % discount; // } //} - - - ShowMessageModel_M show = new ShowMessageModel_M(); - show.Title = skudt.Rows[0]["sku_goodsname"].ToString(); + show.Title = skudt.Rows[0]["goodsname"].ToString(); show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red); show.Block = item.block; show.Islock = true; @@ -329,97 +327,94 @@ namespace Epost.BLL //else //{ - if (scanStr.Substring(0, 1) == "Y") + + #region 扫描商品 + + List hangList = downCacheDAL.GetPlanJobDownList().FindAll(m => m.Parameter == "888888"); + + if (hangList.Any()) { - #region 扫描工号 - if (ulist.Any()) + + #region 挂起 + LogHelper.WriteLogInfo("挂起" + data.Parameter + "-------通道" + data.Block); + // LabelParamModel FORMATEModel = new LabelParamModel(); + // FORMATEModel.ControlIP = data.IP; + // comBLL.FORMATE_JOB_DATA(FORMATEModel); + DataTable qdt = queueBLL.getQueuesOrderbyState(data.Block, data.Area, "1"); + if (qdt != null && qdt.Rows.Count > 0) { - UserCodeModel umodel = ulist.FirstOrDefault(); - umodel.UserCode = scanStr; - #region 扫描工号 + scanStr = qdt.Rows[0]["sku"].ToString(); ShowMessageModel_M show = new ShowMessageModel_M(); - show.Title = "请扫描sku开始作业！"; - show.Contents = ""; - show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red); show.Block = data.Block; show.Area = data.Area; show.Type = 8; - show.Islock = true; - comBLL.ShowBoxMessage_M(show); - #endregion + comBLL.RemoveBoxMessage_M(show); + // data.Parameter = scanStr; + Hangup_SKU(scanStr, data.Block, data.Area, matchid); + //删除sku对应缓存 + List sdown = downCacheDAL.GetPlanJobDownList().FindAll(p => p.Parameter == scanStr && p.Parameter == qdt.Rows[0]["sku"].ToString() && p.Block == data.Block && p.Area == data.Area); + downCacheDAL.UpdateJobDownModelList(sdown, EdownCommend.Execute); } - downCacheDAL.UpdateJobDownModelList(new List { data }, EdownCommend.Execute); + downCacheDAL.UpdateJobDownModelList(hangList, EdownCommend.Execute); + #endregion + } else { + 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); - #region 扫描商品 - - List hangList = downCacheDAL.GetPlanJobDownList().FindAll(m => m.Parameter == "888888"); - - if (hangList.Any()) - { - - #region 挂起 - LogHelper.WriteLogInfo("挂起" + data.Parameter + "-------通道" + data.Block); - // LabelParamModel FORMATEModel = new LabelParamModel(); - // FORMATEModel.ControlIP = data.IP; - // comBLL.FORMATE_JOB_DATA(FORMATEModel); - - - DataTable qdt = queueBLL.getQueuesOrderbyState(data.Block, data.Area, "1"); - if (qdt != null && qdt.Rows.Count > 0) - { - scanStr = qdt.Rows[0]["sku"].ToString(); - ShowMessageModel_M show = new ShowMessageModel_M(); - show.Block = data.Block; - show.Area = data.Area; - show.Type = 8; - - comBLL.RemoveBoxMessage_M(show); - // data.Parameter = scanStr; - Hangup_SKU(scanStr, data.Block, data.Area,matchid); - //删除sku对应缓存 - List sdown = downCacheDAL.GetPlanJobDownList().FindAll(p => p.Parameter == scanStr && p.Parameter == qdt.Rows[0]["sku"].ToString()&&p.Block == data.Block&&p.Area ==data.Area); - downCacheDAL.UpdateJobDownModelList(sdown, EdownCommend.Execute); - } - downCacheDAL.UpdateJobDownModelList(hangList, EdownCommend.Execute); - - #endregion + if (scanlist.Count > 1 || (skudt != null && skudt.Rows.Count > 0)) + { //重复扫描 + //ShowMessageModel_M show = new ShowMessageModel_M(); + //show.Title = scanStr + "重复扫描/已拣配！"; + //show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red); + //show.Block = sblock; + //show.Area = sarea; + //show.Type = 8; + //comBLL.ShowBoxMessage_M(show); + downCacheDAL.UpdateJobDownModelList(new List { data }, EdownCommend.Execute); } - else if (isnum)//sku + else { - #region 扫描SKU - //根据扫描商品内码获取商品码 - data.ScanCode = data.Parameter; - DataTable sinfodt = skuBLL.GetSkuInfoList(data.Parameter); - string location = string.Empty; - if (sinfodt != null && sinfodt.Rows.Count > 0) + if (scanStr.Substring(0, 1) == "Y") { - scanStr = sinfodt.Rows[0]["sku"].ToString(); - location = data.Parameter;// sinfodt.Rows[0]["tolocation"].ToString(); - } - data.Parameter = scanStr; - 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)) - { //重复扫描 - //ShowMessageModel_M show = new ShowMessageModel_M(); - //show.Title = scanStr + "重复扫描/已拣配！"; - //show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red); - //show.Block = sblock; - //show.Area = sarea; - //show.Type = 8; - //comBLL.ShowBoxMessage_M(show); + #region 扫描工号 + if (ulist.Any()) + { + UserCodeModel umodel = ulist.FirstOrDefault(); + umodel.UserCode = scanStr; + #region 扫描工号 + ShowMessageModel_M show = new ShowMessageModel_M(); + show.Title = "请扫描sku开始作业！"; + show.Contents = ""; + show.Color = EnumHelper.EMToDescriptionString(LightColor.Color.Red); + show.Block = data.Block; + show.Area = data.Area; + show.Type = 8; + show.Islock = true; + comBLL.ShowBoxMessage_M(show); + #endregion + } downCacheDAL.UpdateJobDownModelList(new List { data }, EdownCommend.Execute); - + #endregion } - else - { + else if (isnum)//sku + { + #region 扫描SKU + //根据扫描商品内码获取商品码 + data.ScanCode = data.Parameter; + DataTable sinfodt = skuBLL.GetSkuInfoList(data.Parameter); + string location = string.Empty; + if (sinfodt != null && sinfodt.Rows.Count > 0) + { + scanStr = sinfodt.Rows[0]["sku"].ToString(); + location = data.Parameter;// sinfodt.Rows[0]["tolocation"].ToString(); + } + data.Parameter = scanStr; DataTable OrderDt = orderbll.GetOrderList_Car(matchid, scanStr, data.Area, data.Block); if (OrderDt != null && OrderDt.Rows.Count > 0) { @@ -438,8 +433,6 @@ namespace Epost.BLL qmodel.Location = location; qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Red); queueBLL.insertQueueOrders(qmodel); - - } else { @@ -466,7 +459,7 @@ namespace Epost.BLL qmodel.Matchid = umodel.Matchid; // qmodel.Location = location; qmodel.Shopid = echoDt.Rows[0]["GoodsName"].ToString(); - + qmodel.Lightcolor = EnumHelper.EMToDescriptionString(LightColor.Color.Blue); queueBLL.insertQueueOrders(qmodel); @@ -491,35 +484,31 @@ namespace Epost.BLL show.Islock = false; comBLL.ShowBoxMessage_M(show); downCacheDAL.UpdateJobDownModelList(new List { data }, EdownCommend.Execute); - } + } #endregion } - + #endregion } - - - #endregion - } - #endregion } + + #endregion } #endregion - #region SKU挂起/缺货 - public void Hangup_SKU(string sku, string block, string area,string matchid, ResultMessageModel data = null) + public void Hangup_SKU(string sku, string block, string area, string matchid, ResultMessageModel data = null) { List list = new List(); //查询当前通道sku是否有任务 - DataTable dt = orderbll.getOrderListBysku(block, sku,area, matchid); + DataTable dt = orderbll.getOrderListBysku(block, sku, area, matchid); //if (dt == null || dt.Rows.Count == 0) //{ // dt = orderbll.getOrderHisListBysku(block, sku, area, matchid); // //回显挂起 //} - + if (dt != null && dt.Rows.Count > 0) { // 将当前通道所有sku正在亮的设备熄灭 @@ -556,7 +545,7 @@ namespace Epost.BLL //删除缓存中sku记录 List jobList = JobCache.GetPlanJobList(); - List relist = jobList.FindAll(m => m.Sku == sku && m.Block == block&&m.Area==area); + List relist = jobList.FindAll(m => m.Sku == sku && m.Block == block && m.Area == area); JobModel model = new JobModel(); if (relist.Any()) { diff --git a/Epost.TestToolsWeb/Controllers/ServerController.cs b/Epost.TestToolsWeb/Controllers/ServerController.cs index 0e11b79..1834c6d 100644 --- a/Epost.TestToolsWeb/Controllers/ServerController.cs +++ b/Epost.TestToolsWeb/Controllers/ServerController.cs @@ -104,14 +104,14 @@ namespace Epost.DPS.Controllers #region 设备检测 [Route("TestStart")] [HttpPost] - public ResultModel TestStart(BatchModel model) + public ResultModel TestStart() { lock (lockinit) { ResultModel res = new ResultModel(); try { - ResultModel result = contrbll.TestStart(model.batchno); + ResultModel result = contrbll.TestStart(); return result; diff --git a/Epost.TestToolsWeb/Epost.DPS.csproj.user b/Epost.TestToolsWeb/Epost.DPS.csproj.user index 2eaafac..e42c801 100644 --- a/Epost.TestToolsWeb/Epost.DPS.csproj.user +++ b/Epost.TestToolsWeb/Epost.DPS.csproj.user @@ -1,4 +1,4 @@ - + true @@ -11,7 +11,7 @@ False 600 E:\WORK\代码管理\T系列\播种\Epost.TestToolsWeb\Properties\PublishProfiles\Toolsweb.pubxml - Debug|Any CPU + Release|Any CPU diff --git a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user index ef98cf8..9b63599 100644 --- a/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user +++ b/Epost.TestToolsWeb/Properties/PublishProfiles/Toolsweb.pubxml.user @@ -7,7 +7,7 @@ <_PublishTargetUrl>D:\驿传\Wuxidingshi_DAS - True|2025-01-16T07:37:40.8814043Z;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-09T03:40:40.2739751Z||;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||; @@ -33,19 +33,19 @@ 04/04/2018 15:45:12 - 01/16/2025 15:49:24 + 06/09/2025 11:53:17 - 01/16/2025 15:49:24 + 06/09/2025 11:53:17 02/24/2020 15:29:24 - 01/16/2025 15:37:17 + 06/09/2025 11:40:16 - 01/16/2025 15:37:17 + 06/09/2025 11:40:16 04/29/2020 16:50:14 @@ -63,31 +63,31 @@ 10/23/2017 13:15:20 - 01/16/2025 15:37:18 + 06/09/2025 11:53:06 - 01/16/2025 15:37:18 + 06/09/2025 11:53:06 08/26/2020 18:09:48 - 01/16/2025 15:37:17 + 06/09/2025 11:40:16 - 01/16/2025 15:37:17 + 06/09/2025 11:40:16 - 01/16/2025 15:37:21 + 06/09/2025 11:53:08 - 01/16/2025 15:37:21 + 06/09/2025 11:53:08 - 01/16/2025 15:37:16 + 06/08/2025 16:20:17 - 01/16/2025 15:37:16 + 06/08/2025 16:20:17 09/06/2018 11:57:11 @@ -5652,7 +5652,7 @@ 05/30/2022 16:58:47 - 01/16/2025 15:49:18 + 06/09/2025 11:53:10 04/04/2018 15:45:12 @@ -7572,7 +7572,7 @@ 07/04/2022 14:22:38 - 01/16/2025 15:37:22 + 06/08/2025 16:20:27 \ No newline at end of file