diff --git a/HHWMS.Web/Areas/Api/IWCSController.cs b/HHWMS.Web/Areas/Api/IWCSController.cs index ea3fd5a..366df1e 100644 --- a/HHWMS.Web/Areas/Api/IWCSController.cs +++ b/HHWMS.Web/Areas/Api/IWCSController.cs @@ -113,6 +113,7 @@ namespace HHWMS.Web _unitwork.Update(taskfromlocatioin); tasktolocatioin.Status = LocationStatus.有货; + tasktolocatioin.ContainerCode = task.ContainerCode; _unitwork.Update(tasktolocatioin); _unitwork.BatchUpdate(x => x.ContainerCode.Equals(task.ContainerCode), @@ -180,7 +181,7 @@ namespace HHWMS.Web .Include(x => x.TaskDetails).FirstOrDefault(); if (plrTask != null) { - var details = plrTask.TaskDetails.Where(x => x.ContainerCode.Equals(task.ContainerCode)); + var details = plrTask.TaskDetails.Where(x => !string.IsNullOrEmpty(x.ContainerCode) && x.ContainerCode.Equals(task.ContainerCode)); foreach (var detail in details) { detail.Status = TaskStatusEnum.待下发; @@ -193,7 +194,7 @@ namespace HHWMS.Web else if (task.Station == "2") { // 下发盘料入库 - var plrTask = _unitwork.Find(x => x.TaskType.Equals(TaskTypeEnum.盘料入库) + var plrTask = _unitwork.Find(x => x.TaskType.Equals(TaskTypeEnum.盘料入库) && !string.IsNullOrEmpty(x.ContainerCode) && x.ContainerCode.Contains(task.ContainerCode)) .Include(x => x.TaskDetails).FirstOrDefault(); if (plrTask != null) @@ -204,7 +205,7 @@ namespace HHWMS.Web && x.Type.Equals(LocationTypeEnum.机械臂工位))?.Code; plrTask.ToLocation = to; // 更新明细为待下发 - var details = plrTask.TaskDetails.Where(x => x.ContainerCode.Equals(task.ContainerCode)); + var details = plrTask.TaskDetails.Where(x =>!string.IsNullOrEmpty(x.ContainerCode) && x.ContainerCode.Contains(task.ContainerCode)); foreach(var item in details) { @@ -224,15 +225,15 @@ namespace HHWMS.Web && n.TaskStatus == InventoryTaskStatus.任务中).FirstOrDefault(); if (invIn != null) { - invIn.ContainerCode = task.ContainerCode; - invIn.LocationCode = task.ContainerCode; + invIn.ContainerCode = taskdetail.ContainerCode; + invIn.LocationCode = taskdetail.ContainerCode; invIn.Lot = taskdetail.ToLocation; _unitwork.Update(invIn); } task.TaskDetails.First(x => x.FromLocation == ll).Status = TaskStatusEnum.完成; var containerCode = task.TaskDetails.First(x => x.FromLocation == ll).ContainerCode; // 查询料塔 是否还有 此料盒 已下发,未完成的盘料入库任务 有不操作,没有 创建料盒入库任务 - if (!task.TaskDetails.Any(x => x.Status < TaskStatusEnum.完成 && x.ContainerCode.Equals(containerCode))) + if (!task.TaskDetails.Any(x => x.Status < TaskStatusEnum.完成 && !string.IsNullOrEmpty(x.ContainerCode) && x.ContainerCode.Equals(containerCode))) { var station = _unitwork.Find(x => x.Code == task.FromLocation).FirstOrDefault(); // 创建料盒入库任务 diff --git a/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs index de514ee..64c80ed 100644 --- a/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs +++ b/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs @@ -2,6 +2,8 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; using HHWMS.Web.Models; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.SqlServer.Query.Internal; using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Core.Extensions; @@ -39,7 +41,13 @@ namespace HHWMS.Web Inventorys.CopyContext(this); Inventorys.Searcher.LocationCode = Entity.Code; - _unitWork = new UnitWork(Wtm); + //var tt = DC.Set().Where(x => x.ID > 1).Include(x => x.TaskDetails); + //_unitWork = new UnitWork(Wtm); + //var task = _unitWork.Find(x => x.ID > 1) + // .Include(x => x.TaskDetails) + // .FirstOrDefault(); + //var details = task.TaskDetails; + var CurrentCulture = Wtm.CurrentCulture; var dictDatas = DC.Set().ToList(); RoadwayTypes = dictDatas.Where(x => x.DictType == "RoadwayType").Select(x => new ComboSelectListItem diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs index 25ab6a3..bbd0f70 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs @@ -135,22 +135,30 @@ namespace HHWMS.Web.Controllers var detailList = new List(); foreach(var item in plList) { - detailList.Add(new ReceiptDetail + if (!string.IsNullOrEmpty(item)) { - UniqueCode = item, - MaterialType = "PL", - ReceiptHeaderId = vm.Entity.ReceiptHeaderId - }); + detailList.Add(new ReceiptDetail + { + UniqueCode = item, + Status = 0, + MaterialType = "PL", + ReceiptHeaderId = vm.Entity.ReceiptHeaderId + }); + } } foreach (var item in slList) { - detailList.Add(new ReceiptDetail + if (!string.IsNullOrEmpty(item)) { - UniqueCode = item, - MaterialType = "SL", - ReceiptHeaderId = vm.Entity.ReceiptHeaderId - }); + detailList.Add(new ReceiptDetail + { + UniqueCode = item, + MaterialType = "SL", + Status = 0, + ReceiptHeaderId = vm.Entity.ReceiptHeaderId + }); + } } _unitwork.BatchAdd(detailList.ToArray()); return FFResult().CloseDialog().RefreshGrid(index: 1); diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs index fef85b8..6bf5f91 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs @@ -36,7 +36,8 @@ public class ReceiptSLInController : BaseController // 查询站台占用 var stations = _unitWork.Find(x => (x.Code == StationCode.散料库左抽屉 || x.Code == StationCode.散料库右抽屉) - && x.Status != LocationStatus.任务锁).ToList(); + && x.Status == LocationStatus.空仓位 + ).ToList(); if (stations.Count == 0) return JsonMore(null, 500, "无可用站台!"); // 查找没任务的仓位,分两边查,那边站台能用 查哪边 diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM2.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM2.cs index a7687f1..82d890c 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM2.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptDetailVMs/ReceiptDetailListVM2.cs @@ -14,7 +14,7 @@ namespace HHWMS.Web return new List { this.MakeAction("ReceiptDetail","Create2",Localizer["Sys.Create"],Localizer["Sys.Create"],GridActionParameterTypesEnum.NoId,"receipt").SetOnClickScript("CreateDetail"), - this.MakeAction("ReceiptDetail","CreateDetail",Localizer["Sys.CreateDetails"],Localizer["Sys.CreateDetails"],GridActionParameterTypesEnum.NoId,"receipt").SetOnClickScript("CreateDetails"), + this.MakeAction("ReceiptDetail","CreateDetails",Localizer["Sys.CreateDetails"],Localizer["Sys.CreateDetails"],GridActionParameterTypesEnum.NoId,"receipt").SetOnClickScript("CreateDetails"), this.MakeStandardAction("ReceiptDetail", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "receipt", dialogWidth: 800), this.MakeStandardAction("ReceiptDetail", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "receipt", dialogWidth: 800), diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Create.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Create.cshtml index d22a299..2eef810 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Create.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Create.cshtml @@ -9,9 +9,9 @@ @* - + +*@ - *@ diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Index.cshtml index 4fdc992..307b68c 100644 --- a/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Index.cshtml +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptHeader/Index.cshtml @@ -1,7 +1,7 @@ @model HHWMS.Web.ReceiptHeaderListVM @inject IStringLocalizer Localizer; - + @* *@ @@ -10,14 +10,14 @@ @* *@ - - + + diff --git a/HHWMS.Web/Resources/Program.zh.resx b/HHWMS.Web/Resources/Program.zh.resx index 58adbe6..98f1564 100644 --- a/HHWMS.Web/Resources/Program.zh.resx +++ b/HHWMS.Web/Resources/Program.zh.resx @@ -1009,7 +1009,7 @@ 执行 - 取消 + 取消任务 状态 @@ -1371,4 +1371,4 @@ 启动出库 - \ No newline at end of file + diff --git a/HHWMS.Web/appsettings.json b/HHWMS.Web/appsettings.json index 9337766..5211e35 100644 --- a/HHWMS.Web/appsettings.json +++ b/HHWMS.Web/appsettings.json @@ -29,9 +29,9 @@ } //{ // "Key": "default", - // "Value": "Data Source=./Vehicle_DB", + // "Value": "Data Source=.;Initial Catalog=8357wms;User=sa;Password=abc123*;Persist Security Info=True", // "DbContext": "DataContext", - // "DBType": "SQLite" //DataBase, you can choose mysql,sqlserver,pgsql,sqlite,oracle + // "DBType": "sqlserver" //DataBase, you can choose mysql,sqlserver,pgsql,sqlite,oracle //} ], "CookiePre": "HHWMS", //cookie前缀 @@ -39,7 +39,7 @@ "EnableTenant": false, //是否启动多租户 "SyncDb": true, //是否自动同步数据库 "EncryptKey": "", //加密密钥 - "PageMode": "Single", //页面显示模式,Single或者Tab + "PageMode": "Tab", //页面显示模式,Single或者Tab "TabMode": "Simple", //Tab页显示方式,Default或者Simple "IsFilePublic": true, "ErrorHandler": "/_Framework/Error", @@ -105,7 +105,7 @@ "Address": "https://api.github.com" }, "WCS": { - "Address": "http://10.18.97.193:1111/api/WcsWebApi/" + "Address": "http://10.18.97.205:1111/api/WcsWebApi/" } }, "AppSettings": {