diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs index 1cbc443..1b69b4e 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs @@ -7,6 +7,7 @@ using HHWMS.Web.Models; using System.Collections.Generic; using System; using System.Linq; +using Microsoft.EntityFrameworkCore; namespace HHWMS.Web.Controllers { @@ -132,11 +133,19 @@ namespace HHWMS.Web.Controllers [ActionDescription("Sys.Create")] public ActionResult CreateDetails(ReceiptDetailVM vm) { - var header = _unitwork.FindSingle(x => x.ID == vm.Entity.ReceiptHeaderId); + var header = _unitwork.Find(x => x.ID == vm.Entity.ReceiptHeaderId) + .Include(x => x.ReceiptDetails) + .FirstOrDefault(); + if(header.FirstStatus != ReceiptStatusEnum.新建) { return FFResult().Alert("主单据不是新建状态,不能新建明细!"); } + + if (header.ReceiptDetails.Any(x => x.Status != ReceiptStatusEnum.新建)) + { + return FFResult().Alert("主单据存在已入库的明细,不能新建明细!"); + } var plList = vm.Entity.MaterialCode.Split("\n"); var slList = vm.Entity.Lot.Split("\n"); var detailList = new List(); @@ -168,7 +177,7 @@ namespace HHWMS.Web.Controllers } } var uniqueGroup = detailList.GroupBy(x => x.UniqueCode); - + if (uniqueGroup.Any(x => x.Count() > 1)) { var codeList = uniqueGroup.Where(x => x.Count() > 1) diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs index c42b008..5c4fb8a 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs @@ -140,76 +140,99 @@ namespace HHWMS.Web.Controllers var receiptHeaderList = _unitWork.Find(x => data.Select(x => x.ReceiptCode).ToList().Contains(x.Code)) .Include(x => x.ReceiptDetails).ToList(); - // 查找明细,修改对应状态,并且 绑定物料周转箱 - foreach (Binding item in data) + using (var tran = Wtm.DC.Database.BeginTransaction()) { - // 更新入库单明细状态 - var header = receiptHeaderList.First(x => x.Code.Equals(item.ReceiptCode)); - var receipt = header.ReceiptDetails.First(x => - x.UniqueCode.Equals(item.UniqueCode) - && x.Status < ReceiptStatusEnum.收完); - //var receipt = _unitWork.FindSingle(x => x.UniqueCode == item.UniqueCode); - if (receipt != null) + try { - receipt.CompletedQty = receipt.Qty; - receipt.Status = ReceiptStatusEnum.收完; - if (!header.ReceiptDetails.Any(x => x.Status < ReceiptStatusEnum.收完)) + // 查找明细,修改对应状态,并且 绑定物料周转箱 + foreach (Binding item in data) { - header.FirstStatus = ReceiptStatusEnum.收完; - _unitWork.Update(header); + // 更新入库单明细状态 + var header = receiptHeaderList.First(x => x.Code.Equals(item.ReceiptCode)); + var receipt = header.ReceiptDetails.FirstOrDefault(x => + x.UniqueCode.Equals(item.UniqueCode) + && x.Status < ReceiptStatusEnum.收完); + //var receipt = _unitWork.FindSingle(x => x.UniqueCode == item.UniqueCode); + if (receipt != null) + { + receipt.CompletedQty = receipt.Qty; + receipt.Status = ReceiptStatusEnum.收完; + if (!header.ReceiptDetails.Any(x => x.Status < ReceiptStatusEnum.收完)) + { + header.FirstStatus = ReceiptStatusEnum.收完; + _unitWork.Update(header); + } + } + else + { + throw new Exception($"入库单{item.ReceiptCode}不存在{item.UniqueCode}的明细!"); + } + + _unitWork.Update(receipt); + // 新建库存 + var inventory = new Inventory + { + ZoneCode = ZoneCodeEnum.盘料库, + UniqueCode = item.UniqueCode, + Flag = item.Size, + MaterialCode = receipt.MaterialCode, + MaterialType = receipt.MaterialType, + MaterialName = receipt.MaterialName, + MaterialSpec = receipt.MaterialSpec, + Batch = receipt.Batch, + MaterialUnit = receipt.MaterialUnit, + SupplierCode = receipt.SupplierCode, + Qty = receipt.Qty, + Lot = item.Index.ToString(), + ContainerCode = item.BoxCode, + Status = "0", + TaskStatus = InventoryTaskStatus.任务中 + }; + _unitWork.Add(inventory); } + + var boxcode = data.First().BoxCode; + //创建入库任务 + var invList = _unitWork.Find(x => x.ContainerCode.Equals(boxcode)) + .ToList(); + if (invList.Count == 0) + { + return JsonMore(null, 500, $"站台{boxcode}没有绑定数据,请正确操作!"); + } + + var task = new TaskHeader + { + TaskNo = _unitWork.GetSerialNumber("pin", 4), + TaskType = TaskTypeEnum.盘料入库, + Status = TaskStatusEnum.待下发, + ZoneCode = ZoneCodeEnum.盘料库, + FromLocation = boxcode, + TaskDetails = new List(), + }; + foreach (var item in invList) + { + var detail = new TaskDetail + { + UniqueCode = item.UniqueCode, + FromLocation = item.Lot, + Status = TaskStatusEnum.新建, + CreateTime = DateTime.Now + }; + task.TaskDetails.Add(detail); + } + + _unitWork.Add(task); + + tran.Commit(); } - _unitWork.Update(receipt); - // 新建库存 - var inventory = new Inventory + catch (Exception ex) { - ZoneCode = ZoneCodeEnum.盘料库, - UniqueCode = item.UniqueCode, - Flag = item.Size, - MaterialCode = receipt.MaterialCode, - MaterialType = receipt.MaterialType, - MaterialName = receipt.MaterialName, - MaterialSpec = receipt.MaterialSpec, - Batch = receipt.Batch, - MaterialUnit = receipt.MaterialUnit, - SupplierCode = receipt.SupplierCode, - Qty = receipt.Qty, - Lot = item.Index.ToString(), - ContainerCode = item.BoxCode, - Status = "0", - TaskStatus = InventoryTaskStatus.任务中 - }; - _unitWork.Add(inventory); + tran.Rollback(); + return JsonMore(null, 500, ex.Message); + } + } - var boxcode = data.First().BoxCode; - //创建入库任务 - var invList = _unitWork.Find(x => x.ContainerCode.Equals(boxcode)) - .ToList(); - if (invList.Count == 0) - { - return JsonMore(null, 500, $"站台{boxcode}没有绑定数据,请正确操作!"); - } - var task = new TaskHeader - { - TaskNo = _unitWork.GetSerialNumber("pin", 4), - TaskType = TaskTypeEnum.盘料入库, - Status = TaskStatusEnum.待下发, - ZoneCode = ZoneCodeEnum.盘料库, - FromLocation = boxcode, - TaskDetails = new List(), - }; - foreach (var item in invList) - { - var detail = new TaskDetail - { - UniqueCode = item.UniqueCode, - FromLocation = item.Lot, - Status = TaskStatusEnum.新建, - CreateTime = DateTime.Now - }; - task.TaskDetails.Add(detail); - } - _unitWork.Add(task); + return JsonMore(null); } diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs index 9801184..ded9a2c 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptSLInController.cs @@ -131,7 +131,8 @@ public class ReceiptSLInController : BaseController [HttpPost] public ActionResult ScanUniqueCode(string uniqueCode) { - var receiptDetail = _unitWork.FindSingle(x => x.UniqueCode.Equals(uniqueCode)); + var receiptDetail = _unitWork.FindSingle(x => x.UniqueCode.Equals(uniqueCode) + && x.Status == ReceiptStatusEnum.新建); if (receiptDetail != null) { if (receiptDetail.Status == ReceiptStatusEnum.收完) @@ -142,7 +143,7 @@ public class ReceiptSLInController : BaseController } return JsonMore(null, 500, $"{uniqueCode}不存在!"); } - + /// /// 绑定 /// @@ -163,12 +164,16 @@ public class ReceiptSLInController : BaseController { // 更新入库单明细状态 var header = receiptHeaderList.Find(x => x.ID.ToString().Equals(item.ReceiptCode)); - var receipt = header.ReceiptDetails.First(x => x.UniqueCode.Equals(item.UniqueCode)); + var receipt = header.ReceiptDetails.FirstOrDefault(x => x.UniqueCode.Equals(item.UniqueCode)); if (receipt != null) { if (receipt.Status == ReceiptStatusEnum.收完) continue; receipt.CompletedQty += item.BindQty; } + else + { + throw new Exception($"入库单{item.ReceiptCode}不存在{item.UniqueCode}的明细!"); + } if (receipt.CompletedQty == receipt.Qty) { receipt.Status = ReceiptStatusEnum.收完; diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptShelfInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptShelfInController.cs index 7b29973..4e8d4a8 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptShelfInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptShelfInController.cs @@ -39,7 +39,8 @@ public class ReceiptShelfInController : BaseController [HttpPost] public ActionResult ScanUniqueCode(string uniqueCode) { - var receiptDetail = _unitWork.FindSingle(x => x.UniqueCode.Equals(uniqueCode)); + var receiptDetail = _unitWork.FindSingle(x => x.UniqueCode.Equals(uniqueCode) + && x.Status == ReceiptStatusEnum.新建); if (receiptDetail != null) { if (receiptDetail.Status == ReceiptStatusEnum.收完) @@ -50,7 +51,7 @@ public class ReceiptShelfInController : BaseController } return JsonMore(null, 500, $"{uniqueCode}不存在!"); } - + /// /// 绑定 /// @@ -75,7 +76,7 @@ public class ReceiptShelfInController : BaseController { // 更新入库单明细状态 var header = receiptHeaderList.Find(x => x.ID.ToString().Equals(item.ReceiptCode)); - var receipt = header.ReceiptDetails.First(x => x.UniqueCode.Equals(item.UniqueCode)); + var receipt = header.ReceiptDetails.FirstOrDefault(x => x.UniqueCode.Equals(item.UniqueCode)); if (receipt != null) { receipt.Status = ReceiptStatusEnum.收完; @@ -85,6 +86,10 @@ public class ReceiptShelfInController : BaseController } receipt.UpdateTime = DateTime.Now; } + else + { + throw new Exception($"入库单{item.ReceiptCode}不存在{item.UniqueCode}的明细!"); + } // 新建库存 invList.Add(new Inventory @@ -142,5 +147,5 @@ public class ReceiptShelfInController : BaseController } return JsonMore(null); } - + } diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs index 8fccf2a..724b654 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs @@ -39,7 +39,7 @@ namespace HHWMS.Web { InitVM(); return new List>{ - //this.MakeGridHeader(x => x.SourceCode), + this.MakeGridHeader(x => x.ID).SetHide(), this.MakeGridHeader(x => x.Code).SetFormat((a,b) => { string rv = UIService.MakeScriptButton(ButtonTypesEnum.Link,a.Code,$"details('{a.ID}')");