diff --git a/HHWMS.Web/Areas/Api/IWCSController.cs b/HHWMS.Web/Areas/Api/IWCSController.cs index b6b1b20..0513619 100644 --- a/HHWMS.Web/Areas/Api/IWCSController.cs +++ b/HHWMS.Web/Areas/Api/IWCSController.cs @@ -357,6 +357,35 @@ namespace HHWMS.Web break; } + if(task.TaskType == TaskTypeEnum.盘料盒入库 + || task.TaskType == TaskTypeEnum.散料盒入库) + { + var invList = _unitwork.Find(x => x.ContainerCode == task.ContainerCode) + .ToList(); + var listInvtran = new List(); + foreach (var inv in invList) + { + listInvtran.Add(new InventoryTransaction + { + BillType = "in", + ZoneCode = inv.ZoneCode, + Type = inv.UniqueCode, + MaterialCode = inv.MaterialCode, + MaterialName = inv.MaterialName, + MaterialSpec = inv.MaterialSpec, + MaterialUnit = inv.MaterialUnit, + MaterialType = inv.MaterialType, + Batch = inv.Batch, + Lot = inv.Lot, + CompanyCode = inv.CompanyCode, + LocationCode = inv.LocationCode, + SupplierCode = inv.SupplierCode, + Qty = inv.Qty, + CreateTime = DateTime.Now + }); + } + _unitwork.BatchAdd(listInvtran.ToArray()); + } _unitwork.Update(task); if (task.Status == TaskStatusEnum.完成) { diff --git a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs index fafedd3..5783ea6 100644 --- a/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs +++ b/HHWMS.Web/Areas/Inventory/ViewModels/InventoryVMs/InventoryListVM.cs @@ -64,7 +64,7 @@ namespace HHWMS.Web this.MakeGridHeader(x => x.MaterialSpec), this.MakeGridHeader(x => x.MaterialUnit), this.MakeGridHeader(x => x.Batch), - //this.MakeGridHeader(x => x.Lot), + this.MakeGridHeader(x => x.Lot), //this.MakeGridHeader(x => x.ManufactureDate), //this.MakeGridHeader(x => x.ExpirationDate), //this.MakeGridHeader(x => x.CompanyCode), diff --git a/HHWMS.Web/Areas/Inventory/Views/Inventory/Index.cshtml b/HHWMS.Web/Areas/Inventory/Views/Inventory/Index.cshtml index b9a8f4c..91867e1 100644 --- a/HHWMS.Web/Areas/Inventory/Views/Inventory/Index.cshtml +++ b/HHWMS.Web/Areas/Inventory/Views/Inventory/Index.cshtml @@ -5,8 +5,9 @@ -@* - + + + @* diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs index c645239..c17da6d 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptInController.cs @@ -217,6 +217,7 @@ namespace HHWMS.Web.Controllers public class Binding { + public int ID { get; set; } public string ReceiptCode { get; set; } public string UniqueCode { get; set; } public string BoxCode { get; set; } diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptShelfInController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptShelfInController.cs new file mode 100644 index 0000000..2ebdd72 --- /dev/null +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptShelfInController.cs @@ -0,0 +1,137 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection.Emit; +using HHWMS.Web.Models; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; +using NPOI.SS.Formula.Functions; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Mvc; + +namespace HHWMS.Web.Controllers; + +[Area("receipt")] +[ActionDescription("货架入库")] +public class ReceiptShelfInController : BaseController +{ + private readonly IUnitWork _unitWork; + + public ReceiptShelfInController(IUnitWork unitWork) + { + _unitWork = unitWork; + } + + #region Search + + [ActionDescription("Sys.Search")] + public ActionResult Index() + { + return PartialView("Index"); + } + #endregion + + /// + /// 扫描唯一码,并验证,返回入库单明细 + /// + /// + /// + [HttpPost] + public ActionResult ScanUniqueCode(string uniqueCode) + { + var receiptDetail = _unitWork.FindSingle(x => x.UniqueCode.Equals(uniqueCode)); + if (receiptDetail != null) + { + if (receiptDetail.Status == ReceiptStatusEnum.收完) + { + return JsonMore(null, 500, $"{uniqueCode}已全部收完,无需重新绑定!"); + } + return JsonMore(receiptDetail); + } + return JsonMore(null, 500, $"{uniqueCode}不存在!"); + } + + /// + /// 绑定 + /// + /// + /// + [HttpPost] + public ActionResult BindingData(List data) + { + var receiptHeaderList = _unitWork.Find(x => + data.Select(x => x.ReceiptCode).ToList().Contains(x.ID.ToString())) + .Include(x => x.ReceiptDetails).ToList(); + + var invList = new List(); + var listInvtran = new List(); + + // 查找明细,修改对应状态,并且 绑定物料周转箱 + foreach (Binding item in data.OrderBy(x => x.ReceiptCode)) + { + // 更新入库单明细状态 + var header = receiptHeaderList.Find(x => x.ID.ToString().Equals(item.ReceiptCode)); + var receipt = header.ReceiptDetails.First(x => x.UniqueCode.Equals(item.UniqueCode)); + if (receipt != null) + { + if (receipt.Status == ReceiptStatusEnum.收完) continue; + receipt.CompletedQty += item.BindQty; + } + if(receipt.CompletedQty == receipt.Qty) + { + receipt.Status = ReceiptStatusEnum.收完; + if (!header.ReceiptDetails.Any(x => x.Status < ReceiptStatusEnum.收完)) + { + header.FirstStatus = ReceiptStatusEnum.收完; + } + receipt.UpdateTime = DateTime.Now; + } + + // 新建库存 + invList.Add(new Inventory + { + ZoneCode = ZoneCodeEnum.货架库, + UniqueCode = item.UniqueCode, + MaterialCode = receipt.MaterialCode, + MaterialType = receipt.MaterialType, + MaterialName = receipt.MaterialName, + MaterialSpec = receipt.MaterialSpec, + Batch = receipt.Batch, + MaterialUnit = receipt.MaterialUnit, + SupplierCode = receipt.SupplierCode, + Qty = item.BindQty, + Status = "0", + TaskStatus = InventoryTaskStatus.无任务, + CreateBy = Wtm.LoginUserInfo.ITCode, + CreateTime = DateTime.Now + }); ; + + foreach (var inv in invList) + { + listInvtran.Add(new InventoryTransaction + { + BillType = "in", + ZoneCode = inv.ZoneCode, + Type = inv.UniqueCode, + MaterialCode = inv.MaterialCode, + MaterialName = inv.MaterialName, + MaterialSpec = inv.MaterialSpec, + MaterialUnit = inv.MaterialUnit, + MaterialType = inv.MaterialType, + Batch = inv.Batch, + Lot = inv.Lot, + CompanyCode = inv.CompanyCode, + LocationCode = inv.LocationCode, + SupplierCode = inv.SupplierCode, + Qty = inv.Qty, + CreateTime = DateTime.Now + }); + } + } + _unitWork.BatchAdd(invList.ToArray()); + _unitWork.BatchAdd(listInvtran.ToArray()); + _unitWork.BatchUpdate(receiptHeaderList.ToArray()); + return JsonMore(null); + } + +} diff --git a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs index 86476d0..8fccf2a 100644 --- a/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs +++ b/HHWMS.Web/Areas/Receipt/ViewModels/ReceiptHeaderVMs/ReceiptHeaderListVM.cs @@ -86,7 +86,7 @@ namespace HHWMS.Web AppointmentTime = x.AppointmentTime, Remark = x.Remark, }) - .OrderBy(x => x.ID); + .OrderByDescending(x => x.ID); return query; } } diff --git a/HHWMS.Web/Areas/Receipt/Views/ReceiptShelfIn/Index.cshtml b/HHWMS.Web/Areas/Receipt/Views/ReceiptShelfIn/Index.cshtml new file mode 100644 index 0000000..7d4a299 --- /dev/null +++ b/HHWMS.Web/Areas/Receipt/Views/ReceiptShelfIn/Index.cshtml @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + 入库 + 重置 + + + + + + diff --git a/HHWMS.Web/Areas/Shipment/Controllers/ShipOutController.cs b/HHWMS.Web/Areas/Shipment/Controllers/ShipOutController.cs index 04fee34..b40beda 100644 --- a/HHWMS.Web/Areas/Shipment/Controllers/ShipOutController.cs +++ b/HHWMS.Web/Areas/Shipment/Controllers/ShipOutController.cs @@ -88,6 +88,27 @@ public class ShipOutController : BaseController if (inv != null) { // 删除库存,扣账,记录库存交易 todo,根据站台查询是否还有未拣货的物料,如果没有就清空站台占用 + + var invTran = new InventoryTransaction + { + BillType = "out", + ZoneCode = inv.ZoneCode, + Type = inv.UniqueCode, + MaterialCode = inv.MaterialCode, + MaterialName = inv.MaterialName, + MaterialSpec = inv.MaterialSpec, + MaterialUnit = inv.MaterialUnit, + MaterialType = inv.MaterialType, + Batch = inv.Batch, + Lot = inv.Lot, + CompanyCode = inv.CompanyCode, + LocationCode = inv.LocationCode, + SupplierCode = inv.SupplierCode, + Qty = inv.Qty, + CreateTime = DateTime.Now + }; + _unitWork.Add(invTran); + _unitWork.Delete(inv); List list = _unitWork.Find(x => x.LocationCode == station).ToList(); if (list.Count() == 0) diff --git a/HHWMS.Web/Areas/Shipment/Controllers/ShipmentDetailController.cs b/HHWMS.Web/Areas/Shipment/Controllers/ShipmentDetailController.cs index 9b25a7d..4fd5c83 100644 --- a/HHWMS.Web/Areas/Shipment/Controllers/ShipmentDetailController.cs +++ b/HHWMS.Web/Areas/Shipment/Controllers/ShipmentDetailController.cs @@ -4,6 +4,8 @@ using WalkingTec.Mvvm.Core; using WalkingTec.Mvvm.Core.Extensions; using WalkingTec.Mvvm.Mvc; using HHWMS.Web; +using HHWMS.Web.Models; +using System.Linq; namespace HHWMS.Web.Controllers { diff --git a/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.cs b/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.cs index 7074cab..f55405e 100644 --- a/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.cs +++ b/HHWMS.Web/Areas/Shipment/Controllers/ShipmentHeaderController.cs @@ -9,6 +9,8 @@ using System.Reflection; using HHWMS.Web.Models; using Microsoft.EntityFrameworkCore; using System.Linq; +using NPOI.SS.Formula.Functions; +using System.Collections.Generic; namespace HHWMS.Web.Controllers { @@ -250,7 +252,7 @@ namespace HHWMS.Web.Controllers { var data = _unitwork.Find(x => x.ID == id) .Include(x => x.ShipmentDetails).ToList(); - var details = data.FirstOrDefault().ShipmentDetails.Where(x => x.Status < ShipStatusEnum.拣货完成); + var details = data.FirstOrDefault().ShipmentDetails.Where(x => x.Status < ShipStatusEnum.分配完成); foreach (var item in details) { var invQty = _unitwork.Find(x => x.UniqueCode.Equals(item.UniqueCode)) @@ -260,6 +262,99 @@ namespace HHWMS.Web.Controllers return JsonMore(details); } + [ActionDescription("ShipmentHeader.ShelfInv")] + public ActionResult ShelfInv(string id) + { + var vm = Wtm.CreateVM(id); + return PartialView(vm); + } + + /// + /// 货架库存 + /// + /// + /// + [ActionDescription("ShipmentHeader.ShelfInv")] + public ActionResult ShelfInvData(int id) + { + var data = _unitwork.Find(x => x.ID == id) + .Include(x => x.ShipmentDetails) + .FirstOrDefault(); + var details = data.ShipmentDetails.Where(x => x.Status < ShipStatusEnum.分配完成) + .Select(x => x.UniqueCode) + .ToList(); + + var invList = _unitwork.Find(x => x.ZoneCode.Equals(ZoneCodeEnum.货架库) + && x.TaskStatus.Equals(InventoryTaskStatus.无任务) + && details.Contains(x.UniqueCode)) + .ToList(); + //var details = data.ShipmentDetails.Where(x => invList.Contains(x.UniqueCode)); + return JsonMore(invList); + } + + [ActionDescription("ShipmentHeader.Pick")] + [HttpPost] + public ActionResult Pick(List data, int shipId) + { + var shipment = _unitwork.Find(x => x.ID.Equals(shipId)) + .Include(x => x.ShipmentDetails) + .FirstOrDefault(); + if(shipment == null) + { + return JsonMore(null, 500, "未找到该出库单!"); + } + foreach(var detail in shipment.ShipmentDetails + .Where(x => data.Select(x => x.UniqueCode).Contains(x.UniqueCode))) + { + detail.Status = ShipStatusEnum.拣货完成; + } + if (!shipment.ShipmentDetails.Any(x => x.Status < ShipStatusEnum.拣货完成)) + { + shipment.FirstStatus = ShipStatusEnum.拣货完成; + } + else + { + shipment.FirstStatus = ShipStatusEnum.拣货中; + } + shipment.UpdateBy = Wtm.LoginUserInfo.ITCode; + shipment.UpdateTime = DateTime.Now; + + var ids = data.Select(x => x.ID).ToList(); + var invList = _unitwork.Find(x => ids.Contains(x.ID)) + .ToList(); + + + // 加入交易表 + var listInvtran = new List(); + foreach (var inv in invList) + { + listInvtran.Add(new InventoryTransaction + { + BillType = "out", + ZoneCode = inv.ZoneCode, + BillCode = shipment.Code, + Type = inv.UniqueCode, + MaterialCode = inv.MaterialCode, + MaterialName = inv.MaterialName, + MaterialSpec = inv.MaterialSpec, + MaterialUnit = inv.MaterialUnit, + MaterialType = inv.MaterialType, + Batch = inv.Batch, + Lot = inv.Lot, + CompanyCode = inv.CompanyCode, + LocationCode = inv.LocationCode, + SupplierCode = inv.SupplierCode, + Qty = inv.Qty, + CreateTime = DateTime.Now + }); + } + _unitwork.BatchAdd(listInvtran.ToArray()); + + // 删除库存 + _unitwork.BatchDelete(x => data.Select(u => u.ID).Contains(x.ID)); + return JsonMore(null); + } + /// /// 获取库存数据 /// diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailListVM.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailListVM.cs index 7fec3da..08c1040 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailListVM.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailListVM.cs @@ -111,6 +111,7 @@ namespace HHWMS.Web var query = DC.Set() .CheckEqual(Searcher.ShipmentHeaderId, x => x.ShipmentHeaderId) .CheckContain(Searcher.ZoneCode, x => x.ZoneCode) + .CheckContain(Searcher.UniqueCode, x => x.UniqueCode) .CheckContain(Searcher.MaterialCode, x => x.MaterialCode) .CheckContain(Searcher.MaterialType, x => x.MaterialType) .CheckContain(Searcher.MaterialName, x => x.MaterialName) diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailSearcher.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailSearcher.cs index 16450a7..8be5ea3 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailSearcher.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentDetailVMs/ShipmentDetailSearcher.cs @@ -17,6 +17,9 @@ namespace HHWMS.Web [Display(Name = "Task.ZoneCode")] public String ZoneCode { get; set; } + [Display(Name = "Inventory.UniqueCode")] + public String UniqueCode { get; set; } + [Display(Name = "Inventory.MaterialCode")] public String MaterialCode { get; set; } diff --git a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderListVM.cs b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderListVM.cs index 4854d23..63ca739 100644 --- a/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderListVM.cs +++ b/HHWMS.Web/Areas/Shipment/ViewModels/ShipmentHeaderVMs/ShipmentHeaderListVM.cs @@ -9,7 +9,6 @@ namespace HHWMS.Web public partial class ShipmentHeaderListVM : BasePagedListVM { public List ShipTypes { get; set; } - protected override void InitVM() { var vm = Wtm.CreateVM(); @@ -22,6 +21,9 @@ namespace HHWMS.Web this.MakeAction("ShipmentHeader","StartOut",Localizer["ShipmentHeader.StartOut"],"",GridActionParameterTypesEnum.SingleId,"shipment"), this.MakeAction("ShipmentHeader","Analyse",Localizer["ShipmentHeader.Analyse"],Localizer["ShipmentHeader.Analyse"],GridActionParameterTypesEnum.SingleId,"shipment") .SetShowInRow().SetHideOnToolBar().SetButtonClass("layui-btn-Warm").SetSize(1200,800), + this.MakeAction("ShipmentHeader","ShelfInv",Localizer["ShipmentHeader.ShelfInv"],Localizer["ShipmentHeader.ShelfInv"],GridActionParameterTypesEnum.SingleId,"shipment") + .SetShowInRow().SetHideOnToolBar().SetButtonClass("layui-btn-Warm").SetSize(1200,800), + this.MakeStandardAction("ShipmentHeader", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"shipment", dialogWidth: 800), this.MakeStandardAction("ShipmentHeader", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "shipment", dialogWidth: 800), this.MakeStandardAction("ShipmentHeader", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "shipment", dialogWidth: 800), @@ -77,7 +79,7 @@ namespace HHWMS.Web LastStatus = x.LastStatus, Remark = x.Remark, }) - .OrderBy(x => x.ID); + .OrderByDescending(x => x.ID); return query; } } diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Index.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Index.cshtml index 04e834c..b037f2f 100644 --- a/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Index.cshtml +++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentDetail/Index.cshtml @@ -1,4 +1,4 @@ -@model HHWMS.Web.ShipmentDetailListVM +@model HHWMS.Web.ShipmentDetailListVM @inject IStringLocalizer Localizer; diff --git a/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/ShelfInv.cshtml b/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/ShelfInv.cshtml new file mode 100644 index 0000000..481fb75 --- /dev/null +++ b/HHWMS.Web/Areas/Shipment/Views/ShipmentHeader/ShelfInv.cshtml @@ -0,0 +1,142 @@ +@model HHWMS.Web.ShipmentHeaderVM + + + + + + + + + + + + 打印 + 全部拣货 + + + + + + + diff --git a/HHWMS.Web/Models/Enum/WMSEnum.cs b/HHWMS.Web/Models/Enum/WMSEnum.cs index 34e51e4..40676e0 100644 --- a/HHWMS.Web/Models/Enum/WMSEnum.cs +++ b/HHWMS.Web/Models/Enum/WMSEnum.cs @@ -289,6 +289,10 @@ namespace HHWMS.Web.Models /// public const string 散料库 = "C"; + /// + /// 货架库 = "P"; + /// + public const string 货架库 = "P"; } /// diff --git a/HHWMS.Web/Resources/Program.zh.resx b/HHWMS.Web/Resources/Program.zh.resx index dbb4880..44d8365 100644 --- a/HHWMS.Web/Resources/Program.zh.resx +++ b/HHWMS.Web/Resources/Program.zh.resx @@ -1225,7 +1225,7 @@ 批次 - 料号 + 格 生产日期