From 2cae99cb3423339eb4cf8cf25560540ab7719da2 Mon Sep 17 00:00:00 2001 From: zgf Date: Tue, 21 Nov 2023 23:37:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E6=96=99=E5=87=BA=E5=BA=931=E5=AF=B9?= =?UTF-8?q?=E5=A4=9A=E5=B7=A5=E4=BD=8D=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HHWMS.Web/Areas/Api/IWCSController.cs | 7 + .../Configs/Controllers/LocationController.cs | 6 +- .../Areas/Configs/Views/Print/Index.cshtml | 17 +- .../InventoryVMs/InventoryListVM.cs | 4 +- .../Controllers/ReceiptHeaderController.cs | 1 + .../Controllers/ReceiptSLInController.cs | 10 +- .../Receipt/Views/ReceiptHeader/Create.cshtml | 4 +- .../System/Controllers/jobs/SendWcsJob.cs | 4 +- .../System/Controllers/jobs/SendWmsJob.cs | 285 ++++++++++++++++-- .../TaskDetailVMs/TaskDetailListVM2.cs | 3 +- HHWMS.Web/Resources/Program.zh.resx | 10 +- HHWMS.Web/appsettings.json | 16 +- 12 files changed, 308 insertions(+), 59 deletions(-) diff --git a/HHWMS.Web/Areas/Api/IWCSController.cs b/HHWMS.Web/Areas/Api/IWCSController.cs index d2ab769..a758020 100644 --- a/HHWMS.Web/Areas/Api/IWCSController.cs +++ b/HHWMS.Web/Areas/Api/IWCSController.cs @@ -159,6 +159,7 @@ namespace HHWMS.Web _unitwork.Update(taskfromlocatioin); var invCount = _unitwork.GetCount(x => x.ContainerCode == tasktolocatioin.ContainerCode); + tasktolocatioin.Width = invCount; if (invCount == tasktolocatioin.Length) { tasktolocatioin.Status = LocationStatus.满货; @@ -292,6 +293,12 @@ namespace HHWMS.Web var lll = response.TaskId.Split("-")[1]; var taskde = task.TaskDetails.First(x => x.FromLocation == lll); taskde.Status = TaskStatusEnum.完成; + + //更新托盘物料数量 + var container = _unitwork.Find(n => n.Code == task.ContainerCode).FirstOrDefault(); + container.Width -= 1; + _unitwork.Update(container); + //更新物料在料塔上的位置 var tolocation = _unitwork.Find(n => n.Code == task.ToLocation).FirstOrDefault(); var inv = _unitwork.Find(n => n.UniqueCode == taskde.UniqueCode diff --git a/HHWMS.Web/Areas/Configs/Controllers/LocationController.cs b/HHWMS.Web/Areas/Configs/Controllers/LocationController.cs index bc9863b..9b0b862 100644 --- a/HHWMS.Web/Areas/Configs/Controllers/LocationController.cs +++ b/HHWMS.Web/Areas/Configs/Controllers/LocationController.cs @@ -281,7 +281,11 @@ namespace HHWMS.Web.Controllers } } #endregion 新增库位 - + [ActionDescription("Sys.Print")] + public ActionResult Print() + { + return Ok(); + } } } diff --git a/HHWMS.Web/Areas/Configs/Views/Print/Index.cshtml b/HHWMS.Web/Areas/Configs/Views/Print/Index.cshtml index 1d3cae2..7ddf5b7 100644 --- a/HHWMS.Web/Areas/Configs/Views/Print/Index.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Print/Index.cshtml @@ -8,7 +8,7 @@ + placeholder="请输入数量"> @@ -34,6 +34,7 @@ gendCode: '', qrcode: '', num: 1, + clear: false, template: { "panels": [ { @@ -86,7 +87,10 @@ duration: "10000", }); } - _this.printData = []; + if (_this.clear) { + _this.gendCode = ""; + _this.printData = []; + } }, error: function (json) { _this.$message({ @@ -149,20 +153,21 @@ }); }, }); - _this.unm = 1; + _this.num = 1; }, print() { var _this = this; - _this.gendCode = ""; + // _this.gendCode = ""; hiprint.init(); var hiprintTemplate = new hiprint.PrintTemplate({ template: this.template }) hiprintTemplate.print(this.printData); // _this.printData = []; - //清空 + _this.clear = true; + //清空 _this.qrcode = ''; - _this.unm = 1; + _this.num = 1; } } }); diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs index ac38418..fafedd3 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs @@ -56,7 +56,7 @@ namespace HHWMS.Web return data?.Text ?? a.ZoneCode; }), this.MakeGridHeader(x => x.UniqueCode).SetWidth(230), - this.MakeGridHeader(x => x.ContainerCode), + this.MakeGridHeader(x => x.ContainerCode).SetHide(), this.MakeGridHeader(x => x.LocationCode), this.MakeGridHeader(x => x.MaterialCode), this.MakeGridHeader(x => x.MaterialType), @@ -69,7 +69,7 @@ namespace HHWMS.Web //this.MakeGridHeader(x => x.ExpirationDate), //this.MakeGridHeader(x => x.CompanyCode), //this.MakeGridHeader(x => x.SupplierCode), - this.MakeGridHeader(x => x.TaskQty), + this.MakeGridHeader(x => x.TaskQty).SetHide(), this.MakeGridHeader(x => x.Qty), //this.MakeGridHeader(x => x.SourceCode), //this.MakeGridHeader(x => x.ReceiptCode), diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs index eec427d..66467a7 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptHeaderController.cs @@ -66,6 +66,7 @@ namespace HHWMS.Web.Controllers } else { + vm.Entity.FirstStatus = ReceiptStatusEnum.新建; vm.DoAdd(); if (!ModelState.IsValid) { diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs index c976269..e7b1f5c 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs @@ -45,13 +45,19 @@ public class ReceiptSLInController : BaseController && x.Status != LocationStatus.任务锁 && x.Status != LocationStatus.满货 && x.Status != LocationStatus.空仓位 - && x.Row == stations.First().Row).FirstOrDefault(); + && x.Row == stations.First().Row) + .OrderBy(x => x.Layer) + .ThenByDescending(x => x.Line) + .FirstOrDefault(); if (box == null && stations.Count == 2) box = _unitWork.Find(x => (x.ZoneCode == ZoneCodeEnum.散料库) && x.Status != LocationStatus.任务锁 && x.Status != LocationStatus.满货 && x.Status != LocationStatus.空仓位 - && x.Row == stations.Last().Row).FirstOrDefault(); + && x.Row == stations.Last().Row) + .OrderBy(x => x.Layer) + .ThenByDescending(x => x.Line) + .FirstOrDefault(); if (box == null) return JsonMore(null, 500, "库内没有可用散料箱!"); diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Create.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Create.cshtml index 2eef810..68d344d 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Create.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Create.cshtml @@ -10,8 +10,8 @@ -*@ - + + *@ diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs b/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs index 75839dc..1df58c7 100644 --- a/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs +++ b/HHWMS.Web/Areas/System/Controllers/jobs/SendWcsJob.cs @@ -264,7 +264,7 @@ namespace HHWMS.Web } else { - task.ErrorMsg = "库内没有符合条件的盘料箱"; + task.ErrorMsg = "库内没有符合条件的盘料箱或站台被占用"; _unitwork.Update(task); } } @@ -438,7 +438,7 @@ namespace HHWMS.Web break; case TaskTypeEnum.盘料出库: - foreach (var item in task.TaskDetails) + foreach (var item in task.TaskDetails.Where(x => x.Status == TaskStatusEnum.待下发)) { taskInfoList.Add(new TaskInfo { diff --git a/HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs b/HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs index 1c3803c..a7d5283 100644 --- a/HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs +++ b/HHWMS.Web/Areas/System/Controllers/jobs/SendWmsJob.cs @@ -88,8 +88,15 @@ namespace HHWMS.Web } //出库库存通过托盘号分组 - var lockInvs = _unitwork.Find(x => x.TaskStatus == InventoryTaskStatus.任务中).ToList(); + var lockInvs = _unitwork.Find(x => x.TaskStatus == InventoryTaskStatus.任务中 + && !"L01,L02".Contains(x.ContainerCode)) + .ToList(); shiInventorys.AddRange(lockInvs); + //已生成任务的库存不再生成任务 + var taskUniques = _unitwork.Find(x => x.Status > TaskStatusEnum.新建) + .Select(x => x.UniqueCode).ToList(); + var taskInvs = _unitwork.Find(x => taskUniques.Contains(x.UniqueCode)).ToList(); + shiInventorys.Except(lockInvs); shiInventorys.DistinctBy(x => x.UniqueCode); var inventoryList = shiInventorys.GroupBy(x => x.ContainerCode) .ToList(); @@ -166,26 +173,41 @@ namespace HHWMS.Web row = 1; } // 查找工位 G1 - var gLoc = _unitwork.Find(x => string.IsNullOrEmpty(x.ContainerCode) + var gLoc = _unitwork.Find(x => x.ContainerCode == item.Key && x.Row == location.Row && x.Type.Equals(LocationTypeEnum.堆垛机工位)).FirstOrDefault(); - // 新建盘料盒出库任务 if (gLoc != null) { - var pTask = new TaskHeader + //盘料箱已在堆垛机工位,直接生成盘料出库任务 + } + else + { + // 盘料箱在库内,工位为空,先生成料盘箱出库任务 + + gLoc = _unitwork.Find(x => string.IsNullOrEmpty(x.ContainerCode) + && x.Row == location.Row + && x.Type.Equals(LocationTypeEnum.堆垛机工位)).FirstOrDefault(); + if (gLoc != null) { - ZoneCode = ZoneCodeEnum.盘料库, - TaskNo = _unitwork.GetSerialNumber("Out"), - TaskType = TaskTypeEnum.盘料盒出库, - ContainerCode = item.Key, - FromLocation = location.ContainerCode, - ToLocation = gLoc.Code, - Status = TaskStatusEnum.待下发, - Priority = 0, - CreateTime = DateTime.Now, - CreateBy = "wmsjob" - }; - //_unitwork.Add(pTask); + var pTask = new TaskHeader + { + ZoneCode = ZoneCodeEnum.盘料库, + TaskNo = _unitwork.GetSerialNumber("Out"), + TaskType = TaskTypeEnum.盘料盒出库, + ContainerCode = item.Key, + FromLocation = location.ContainerCode, + ToLocation = gLoc.Code, + Status = TaskStatusEnum.待下发, + Priority = 0, + CreateTime = DateTime.Now, + CreateBy = "wmsjob" + }; + _unitwork.Add(pTask); + } + } + + if (gLoc != null) + { //查找料塔工位 T var tLoc = _unitwork.Find(x => string.IsNullOrEmpty(x.ContainerCode) && x.Row == row @@ -210,23 +232,48 @@ namespace HHWMS.Web { if (tLoc.Height < tLoc.Length) { - var detail = new TaskDetail + // 库存不在已建任务明细中,新增任务明细 + if (!containerTask.TaskDetails.Any(x => x.UniqueCode.Equals(inventory.UniqueCode))) { - UniqueCode = inventory.UniqueCode, - Lot = $"{Convert.ToInt32(location.Length)}-{tLoc.Code}", - FromLocation = inventory.Lot, - ToLocation = (Convert.ToInt32(tLoc.Height) + 1).ToString(), - Status = TaskStatusEnum.新建, - ContainerCode = inventory.ContainerCode, - CreateTime = DateTime.Now - }; - tLoc.Height += 1; + containerTask.TaskDetails.Add(new TaskDetail + { + UniqueCode = inventory.UniqueCode, + Lot = $"{Convert.ToInt32(location.Length)}-{tLoc.Code}", + FromLocation = inventory.Lot, + ToLocation = (Convert.ToInt32(tLoc.Height) + 1).ToString(), + Status = TaskStatusEnum.待下发, + ContainerCode = inventory.ContainerCode, + CreateTime = DateTime.Now + }); + tLoc.Height += 1; + } + //存在 + else + { + foreach (var i in containerTask.TaskDetails.Where(x => x.Status == TaskStatusEnum.新建)) + { + i.Lot = $"{Convert.ToInt32(location.Length)}-{tLoc.Code}"; + i.ToLocation = (Convert.ToInt32(tLoc.Height) + 1).ToString(); + i.Status = TaskStatusEnum.待下发; + tLoc.Height += 1; + } + } containerTask.Status = TaskStatusEnum.待下发; - containerTask.TaskDetails.Add(detail); } else { - break; + // 库存不在已建任务明细中,新增任务明细 + if (!containerTask.TaskDetails.Any(x => x.UniqueCode.Equals(inventory.UniqueCode))) + { + containerTask.TaskDetails.Add(new TaskDetail + { + UniqueCode = inventory.UniqueCode, + FromLocation = inventory.Lot, + Status = TaskStatusEnum.新建, + ContainerCode = inventory.ContainerCode, + CreateTime = DateTime.Now + }); + } } } _unitwork.Update(tLoc); @@ -237,8 +284,7 @@ namespace HHWMS.Web continue; } } - else - if (tLoc != null) + else if (tLoc != null) { task.ZoneCode = ZoneCodeEnum.盘料库; task.TaskNo = _unitwork.GetSerialNumber("pout", 4); @@ -247,7 +293,7 @@ namespace HHWMS.Web task.ContainerCode = item.Key; task.Priority = 100; task.FromLocation = _unitwork - .FindSingle(x => x.ContiguousCode == pTask.ToLocation)?.Code; + .FindSingle(x => x.ContiguousCode == gLoc.Code)?.Code; task.ToLocation = tLoc.Code; task.CreateTime = DateTime.Now; task.CreateBy = "wmsjob"; @@ -273,7 +319,6 @@ namespace HHWMS.Web break; } } - _unitwork.Add(pTask); _unitwork.Add(task); //更新库位状态 var container = _unitwork.Find(x => x.ContainerCode == item.Key) @@ -323,5 +368,181 @@ namespace HHWMS.Web catch { } return Task.CompletedTask; } + + // 根据库存明细,生成盘料出库任务 + public void GenPlcTask(List invs, UnitWork _unitwork) + { + // 按盘料箱分组 + var inventoryList = invs.GroupBy(x => x.ContainerCode) + .ToList(); + foreach (var item in inventoryList) + { + var task = new TaskHeader(); + task.TaskDetails = new List(); + var inv = item.FirstOrDefault(); + var location = _unitwork.Find(x => x.ContainerCode == item.Key + && x.Status != LocationStatus.空仓位 + && x.Status != LocationStatus.空容器).FirstOrDefault(); + //查询仓位表是否符合 + if (location != null) + { + var row = 1; + if (inv.Flag == 8) + { + row = 3; + } + else if (inv.Flag == 24 || inv.Flag == 16 || inv.Flag == 10) + { + row = 1; + } + // 查找工位 G1 + var gLoc = _unitwork.Find(x => x.ContainerCode == item.Key + && x.Row == location.Row + && x.Type.Equals(LocationTypeEnum.堆垛机工位)) + .FirstOrDefault(); + + // gLoc != null 盘料箱已在堆垛机工位,直接生成盘料出库任务 + + if (gLoc == null) + { + // 盘料箱不在工位,先生成料盘箱出库任务 + + gLoc = _unitwork.Find(x => string.IsNullOrEmpty(x.ContainerCode) + && x.Row == location.Row + && x.Type.Equals(LocationTypeEnum.堆垛机工位)) + .FirstOrDefault(); + if (gLoc != null) + { + var pTask = new TaskHeader + { + ZoneCode = ZoneCodeEnum.盘料库, + TaskNo = _unitwork.GetSerialNumber("Out"), + TaskType = TaskTypeEnum.盘料盒出库, + ContainerCode = item.Key, + FromLocation = location.ContainerCode, + ToLocation = gLoc.Code, + Status = TaskStatusEnum.待下发, + Priority = 0, + CreateTime = DateTime.Now, + CreateBy = "wmsjob" + }; + _unitwork.Add(pTask); + } + else + { + // 找不到工位,直接跳出 + return; + } + } + // 新建盘料盒出库任务 + if (gLoc != null) + { + //查找料塔工位 T + var tLoc = _unitwork.Find(x => string.IsNullOrEmpty(x.ContainerCode) + && x.Row == row + && x.Type.Equals(LocationTypeEnum.料塔)) + .FirstOrDefault(); + + //查询料塔是否为空 + if (tLoc == null) + { + //判断是否存在此托盘的出库任务 + var containerTask = _unitwork.Find(x => x.Status < TaskStatusEnum.已下发 + && x.ContainerCode == item.Key + && x.TaskType == TaskTypeEnum.盘料出库) + .Include(x => x.TaskDetails) + .FirstOrDefault(); + if (containerTask != null) + { + tLoc = _unitwork.Find(x => x.Code == containerTask.ToLocation + && x.Type.Equals(LocationTypeEnum.料塔)) + .FirstOrDefault(); + foreach (var inventory in item) + { + if (tLoc.Height < tLoc.Length) + { + var detail = new TaskDetail + { + UniqueCode = inventory.UniqueCode, + Lot = $"{Convert.ToInt32(location.Length)}-{tLoc.Code}", + FromLocation = inventory.Lot, + ToLocation = (Convert.ToInt32(tLoc.Height) + 1).ToString(), + Status = TaskStatusEnum.新建, + ContainerCode = inventory.ContainerCode, + CreateTime = DateTime.Now + }; + tLoc.Height += 1; + containerTask.Status = TaskStatusEnum.待下发; + containerTask.TaskDetails.Add(detail); + } + else + { + break; + } + } + _unitwork.Update(tLoc); + _unitwork.Update(containerTask); + } + else + { + continue; + } + } + else if (tLoc != null) + { + task.ZoneCode = ZoneCodeEnum.盘料库; + task.TaskNo = _unitwork.GetSerialNumber("pout", 4); + task.TaskType = TaskTypeEnum.盘料出库; + task.Status = TaskStatusEnum.待下发; + task.ContainerCode = item.Key; + task.Priority = 100; + task.FromLocation = _unitwork + .FindSingle(x => x.ContiguousCode == gLoc.Code)?.Code; + task.ToLocation = tLoc.Code; + task.CreateTime = DateTime.Now; + task.CreateBy = "wmsjob"; + foreach (var inventory in item) + { + if (tLoc.Height < tLoc.Length) + { + var detail = new TaskDetail + { + UniqueCode = inventory.UniqueCode, + Lot = $"{Convert.ToInt32(location.Length)}-{tLoc.Code}", + FromLocation = inventory.Lot, + ToLocation = (Convert.ToInt32(tLoc.Height) + 1).ToString(), + Status = TaskStatusEnum.新建, + ContainerCode = inventory.ContainerCode, + CreateTime = DateTime.Now + }; + task.TaskDetails.Add(detail); + tLoc.Height += 1; + } + else + { + break; + } + } + _unitwork.Add(task); + //更新库位状态 + var container = _unitwork.Find(x => x.ContainerCode == item.Key) + .FirstOrDefault(); + if (container != null) + { + container.Status = LocationStatus.任务锁; + container.UpdateTime = DateTime.Now; + container.UpdateBy = "wmsjob"; + _unitwork.Update(container); + } + + tLoc.ContainerCode = tLoc.Code; + tLoc.UpdateBy = "wmsjob"; + tLoc.UpdateTime = DateTime.Now; + _unitwork.Update(tLoc); + } + } + } + } + } } } diff --git a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM2.cs b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM2.cs index dbc699d..b522e3b 100644 --- a/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM2.cs +++ b/HHWMS.Web/Areas/TaskManage/ViewModels/TaskDetailVMs/TaskDetailListVM2.cs @@ -40,8 +40,7 @@ namespace HHWMS.Web this.MakeGridHeader(x => x.InventoryId).SetHide(), this.MakeGridHeader(x => x.FromLocation), this.MakeGridHeader(x => x.ToLocation), - this.MakeGridHeader(x => x.Status), - this.MakeGridHeaderAction(width: 200) + this.MakeGridHeader(x => x.Status) }; } diff --git a/HHWMS.Web/Resources/Program.zh.resx b/HHWMS.Web/Resources/Program.zh.resx index df5b3c9..dbb4880 100644 --- a/HHWMS.Web/Resources/Program.zh.resx +++ b/HHWMS.Web/Resources/Program.zh.resx @@ -1018,10 +1018,10 @@ 错误信息 - 入库任务 + 盘料盒入库 - 出库任务 + 盘料盒出库 盘料入库 @@ -1029,6 +1029,12 @@ 盘料出库 + + 散料盒入库 + + + 散料盒出库 + 移库任务 diff --git a/HHWMS.Web/appsettings.json b/HHWMS.Web/appsettings.json index 170fe01..f9c90cb 100644 --- a/HHWMS.Web/appsettings.json +++ b/HHWMS.Web/appsettings.json @@ -27,21 +27,21 @@ // "Value": "Server=127.0.0.1;Port=3306;Database=8357wms;Uid=root;Password=abc123*;Character Set=utf8mb4;", // "DBType": "mysql" //} - { - "Key": "default", - "Value": "Data Source=.;Initial Catalog=8357wms;User=sa;Password=abc123*;Persist Security Info=True", - "DbContext": "DataContext", - "DBType": "sqlserver" //DataBase, you can choose mysql,sqlserver,pgsql,sqlite,oracle - } //{ // "Key": "default", - // "Value": "Data Source=10.18.106.4;Initial Catalog=8357wms;User=wms;Password=abc123*;Persist Security Info=True", + // "Value": "Data Source=.;Initial Catalog=8357wms;User=sa;Password=abc123*;Persist Security Info=True", // "DbContext": "DataContext", // "DBType": "sqlserver" //DataBase, you can choose mysql,sqlserver,pgsql,sqlite,oracle //} + { + "Key": "default", + "Value": "Data Source=10.18.106.4;Initial Catalog=8357wms;User=wms;Password=abc123*;Persist Security Info=True", + "DbContext": "DataContext", + "DBType": "sqlserver" //DataBase, you can choose mysql,sqlserver,pgsql,sqlite,oracle + } ], "CookiePre": "HHWMS", //cookie前缀 - "IsQuickDebug": true, //是否启用debug模式 + "IsQuickDebug": false, //是否启用debug模式 "EnableTenant": false, //是否启动多租户 "SyncDb": true, //是否自动同步数据库 "EncryptKey": "", //加密密钥