diff --git a/HHWMS.Web/Areas/Api/IWCSController.cs b/HHWMS.Web/Areas/Api/IWCSController.cs index 568517f..fc7aa49 100644 --- a/HHWMS.Web/Areas/Api/IWCSController.cs +++ b/HHWMS.Web/Areas/Api/IWCSController.cs @@ -33,6 +33,7 @@ namespace HHWMS.Web private readonly IMemoryCache _cache; private const int DEBOUNCE_INTERVAL_MS = 1000; // 防抖间隔1秒 private int ContainerWeight = 500; + private int SmallContainerWeight = 50; public IWCSController(IUnitWork unitWork, IMapper mapper, IMemoryCache cache) { @@ -85,40 +86,59 @@ namespace HHWMS.Web return ApiResultError($"处理请求时发生错误: {ex.Message}"); } } - + + /// - /// 请求入库(带防抖) + /// 满入处理 /// [HttpPost] - public Task RequestIn(WcsRequest request) + public IActionResult FullIn(WcsRequest request) { - if (request == null || string.IsNullOrEmpty(request.PalletNo)) + var task = _unitWork.FindSingle(x => x.TaskNo == request.TaskNo + && x.Status != TaskStatusEnum.完成); + + if (task == null) { - return Task.FromResult(ApiResultError("请求参数无效")); + return ApiResultError(msg: "未找到任务!"); + } + + //查找新仓位 + var locationVm = Wtm.CreateVM(); + + // 更新旧仓位 + var oldLoc = _unitWork.FindSingle(x => x.Code == task.ToLocation); + oldLoc.ContainerCode = "FullIn"; + oldLoc.UpdateBy = "FullIn"; + oldLoc.UpdateTime = DateTime.Now; + _unitWork.Update(oldLoc); + + return ApiResult(); + } + + + /// + /// 空出处理 + /// + [HttpPost] + public IActionResult EmptyOut(WcsRequest request) + { + var task = _unitWork.FindSingle(x => x.TaskNo == request.TaskNo + && x.Status != TaskStatusEnum.完成); + + if (task == null) + { + return ApiResultError(msg: "未找到任务!"); } - return WithDebounce($"RequestIn_{request.PalletNo}", async () => - { - await ProcessRequestIn(request); - return ApiResult(new { Message = "入库请求处理成功" }); - }); + return ApiResult(); } - - /// - /// 处理入库请求的具体业务逻辑 - /// - private async Task ProcessRequestIn(WcsRequest request) - { - // TODO: 实现具体的入库处理逻辑 - await Task.Delay(1000); // 模拟异步处理 - } - + /// /// 状态返回(带防抖) /// [Public] [HttpPost] - public Task TaskStatusResult(WcsRequest request) + public Task ReturnStatus(WcsRequest request) { if (request == null || string.IsNullOrEmpty(request.TaskNo)) { @@ -251,7 +271,7 @@ namespace HHWMS.Web { var material = _unitWork.FindSingle(x => x.MaterialCode == inventory.MaterialCode); - inventory.Qty = (request.Weight - ContainerWeight) / material.Qty; + inventory.Qty = (request.Weight - ContainerWeight - inventory.TaskQty * SmallContainerWeight) / (material.Qty ?? 5); } if (task.TaskType != TaskTypeEnum.移库) @@ -409,7 +429,37 @@ namespace HHWMS.Web } } + #region 暂时无用 + + + /// + /// 请求入库(带防抖) + /// + [HttpPost] + public Task RequestIn(WcsRequest request) + { + if (request == null || string.IsNullOrEmpty(request.PalletNo)) + { + return Task.FromResult(ApiResultError("请求参数无效")); + } + return WithDebounce($"RequestIn_{request.PalletNo}", async () => + { + await ProcessRequestIn(request); + return ApiResult(new { Message = "入库请求处理成功" }); + }); + } + + /// + /// 处理入库请求的具体业务逻辑 + /// + private async Task ProcessRequestIn(WcsRequest request) + { + // TODO: 实现具体的入库处理逻辑 + await Task.Delay(1000); // 模拟异步处理 + } + + /// /// 请求空闲库位(带防抖) /// @@ -474,5 +524,7 @@ namespace HHWMS.Web return ApiResult(new { LocationCode = location?.Code }); } + + #endregion } } \ No newline at end of file diff --git a/HHWMS.Web/Areas/Configs/Controllers/CustomerController.cs b/HHWMS.Web/Areas/Configs/Controllers/CustomerController.cs new file mode 100644 index 0000000..3792c84 --- /dev/null +++ b/HHWMS.Web/Areas/Configs/Controllers/CustomerController.cs @@ -0,0 +1,228 @@ +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using System; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Mvc; +using WalkingTec.Mvvm.Core.Extensions; +using HHWMS.Web.configs.ViewModels.CustomerVMs; + +namespace HHWMS.Web.Controllers +{ + [Area("configs")] + [ActionDescription("客户管理")] + public partial class CustomerController : BaseController + { + private readonly IUnitWork _unitWork; + + public CustomerController(IUnitWork unitWork) + { + _unitWork = unitWork; + } + + #region Search + [ActionDescription("Sys.Search")] + public ActionResult Index() + { + var vm = Wtm.CreateVM(); + return PartialView(vm); + } + + [ActionDescription("Sys.Search")] + [HttpPost] + public string Search(CustomerSearcher searcher) + { + var vm = Wtm.CreateVM(passInit: true); + if (ModelState.IsValid) + { + vm.Searcher = searcher; + return vm.GetJson(false); + } + else + { + return vm.GetError(); + } + } + + #endregion + + #region Create + [ActionDescription("Sys.Create")] + public ActionResult Create() + { + var vm = Wtm.CreateVM(); + return PartialView(vm); + } + + [HttpPost] + [ActionDescription("Sys.Create")] + public ActionResult Create(CustomerVM vm) + { + if (!ModelState.IsValid) + { + return PartialView(vm); + } + else + { + vm.DoAdd(); + if (!ModelState.IsValid) + { + vm.DoReInit(); + return PartialView(vm); + } + else + { + return FFResult().CloseDialog().RefreshGrid(); + } + } + } + #endregion + + #region Edit + [ActionDescription("Sys.Edit")] + public ActionResult Edit(string id) + { + var vm = Wtm.CreateVM(id); + return PartialView(vm); + } + + [ActionDescription("Sys.Edit")] + [HttpPost] + [ValidateFormItemOnly] + public ActionResult Edit(CustomerVM vm) + { + if (!ModelState.IsValid) + { + return PartialView(vm); + } + else + { + vm.DoEdit(); + if (!ModelState.IsValid) + { + vm.DoReInit(); + return PartialView(vm); + } + else + { + return FFResult().CloseDialog().RefreshGridRow(vm.Entity.ID); + } + } + } + #endregion + + #region Delete + [ActionDescription("Sys.Delete")] + public ActionResult Delete(string id) + { + var vm = Wtm.CreateVM(id); + return PartialView(vm); + } + + [ActionDescription("Sys.Delete")] + [HttpPost] + public ActionResult Delete(string id, IFormCollection nouse) + { + var vm = Wtm.CreateVM(id); + vm.DoDelete(); + if (!ModelState.IsValid) + { + return PartialView(vm); + } + else + { + return FFResult().CloseDialog().RefreshGrid(); + } + } + #endregion + + #region Details + [ActionDescription("Sys.Details")] + public ActionResult Details(string id) + { + var vm = Wtm.CreateVM(id); + return PartialView(vm); + } + #endregion + + #region BatchEdit + [HttpPost] + [ActionDescription("Sys.BatchEdit")] + public ActionResult BatchEdit(string[] IDs) + { + var vm = Wtm.CreateVM(Ids: IDs); + return PartialView(vm); + } + + [HttpPost] + [ActionDescription("Sys.BatchEdit")] + public ActionResult DoBatchEdit(CustomerBatchVM vm, IFormCollection nouse) + { + if (!ModelState.IsValid || !vm.DoBatchEdit()) + { + return PartialView("BatchEdit",vm); + } + else + { + return FFResult().CloseDialog().RefreshGrid().Alert(Localizer["Sys.BatchEditSuccess", vm.Ids.Length]); + } + } + #endregion + + #region BatchDelete + [HttpPost] + [ActionDescription("Sys.BatchDelete")] + public ActionResult BatchDelete(string[] IDs) + { + var vm = Wtm.CreateVM(Ids: IDs); + return PartialView(vm); + } + + [HttpPost] + [ActionDescription("Sys.BatchDelete")] + public ActionResult DoBatchDelete(CustomerBatchVM vm, IFormCollection nouse) + { + if (!ModelState.IsValid || !vm.DoBatchDelete()) + { + return PartialView("BatchDelete",vm); + } + else + { + return FFResult().CloseDialog().RefreshGrid().Alert(Localizer["Sys.BatchDeleteSuccess", vm.Ids.Length]); + } + } + #endregion + + #region Import + [ActionDescription("Sys.Import")] + public ActionResult Import() + { + var vm = Wtm.CreateVM(); + return PartialView(vm); + } + + [HttpPost] + [ActionDescription("Sys.Import")] + public ActionResult Import(CustomerImportVM vm, IFormCollection nouse) + { + if (vm.ErrorListVM.EntityList.Count > 0 || !vm.BatchSaveData()) + { + return PartialView(vm); + } + else + { + return FFResult().CloseDialog().RefreshGrid().Alert(Localizer["Sys.ImportSuccess", vm.EntityList.Count.ToString()]); + } + } + #endregion + + #region Export + [ActionDescription("Sys.Export")] + [HttpPost] + public IActionResult ExportExcel(CustomerListVM vm) + { + return vm.GetExportData(); + } + #endregion + + } +} diff --git a/HHWMS.Web/Areas/Configs/ViewModels/CustomerVMs/CustomerBatchVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/CustomerVMs/CustomerBatchVM.cs new file mode 100644 index 0000000..f8b958b --- /dev/null +++ b/HHWMS.Web/Areas/Configs/ViewModels/CustomerVMs/CustomerBatchVM.cs @@ -0,0 +1,35 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; +using HHWMS.Web.Models; + + +namespace HHWMS.Web.configs.ViewModels.CustomerVMs +{ + public partial class CustomerBatchVM : BaseBatchVM + { + public CustomerBatchVM() + { + ListVM = new CustomerListVM(); + LinkedVM = new Customer_BatchEdit(); + } + + } + + /// + /// Class to define batch edit fields + /// + public class Customer_BatchEdit : BaseVM + { + + protected override void InitVM() + { + } + + } + +} diff --git a/HHWMS.Web/Areas/Configs/ViewModels/CustomerVMs/CustomerImportVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/CustomerVMs/CustomerImportVM.cs new file mode 100644 index 0000000..81e7ca6 --- /dev/null +++ b/HHWMS.Web/Areas/Configs/ViewModels/CustomerVMs/CustomerImportVM.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; +using HHWMS.Web.Models; + + +namespace HHWMS.Web.configs.ViewModels.CustomerVMs +{ + public partial class CustomerTemplateVM : BaseTemplateVM + { + [Display(Name = "Location.ZoneCode")] + public ExcelPropety Code_Excel = ExcelPropety.CreateProperty(x => x.Code); + [Display(Name = "Location.ZoneName")] + public ExcelPropety Type_Excel = ExcelPropety.CreateProperty(x => x.Type); + [Display(Name = "Customer.ZoneName")] + public ExcelPropety Name_Excel = ExcelPropety.CreateProperty(x => x.Name); + + protected override void InitVM() + { + } + + } + + public class CustomerImportVM : BaseImportVM + { + + } + +} diff --git a/HHWMS.Web/Areas/Configs/ViewModels/CustomerVMs/CustomerListVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/CustomerVMs/CustomerListVM.cs new file mode 100644 index 0000000..09f5ea1 --- /dev/null +++ b/HHWMS.Web/Areas/Configs/ViewModels/CustomerVMs/CustomerListVM.cs @@ -0,0 +1,64 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; +using Microsoft.EntityFrameworkCore; +using System.ComponentModel.DataAnnotations; +using HHWMS.Web.Models; + + +namespace HHWMS.Web.configs.ViewModels.CustomerVMs +{ + public partial class CustomerListVM : BasePagedListVM + { + protected override List InitGridAction() + { + return new List + { + this.MakeStandardAction("Customer", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"configs", dialogWidth: 800), + this.MakeStandardAction("Customer", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "configs", dialogWidth: 800), + this.MakeStandardAction("Customer", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "configs", dialogWidth: 800), + this.MakeStandardAction("Customer", GridActionStandardTypesEnum.Details, Localizer["Sys.Details"], "configs", dialogWidth: 800), + this.MakeStandardAction("Customer", GridActionStandardTypesEnum.BatchEdit, Localizer["Sys.BatchEdit"], "configs", dialogWidth: 800), + this.MakeStandardAction("Customer", GridActionStandardTypesEnum.BatchDelete, Localizer["Sys.BatchDelete"], "configs", dialogWidth: 800), + this.MakeStandardAction("Customer", GridActionStandardTypesEnum.Import, Localizer["Sys.Import"], "configs", dialogWidth: 800), + this.MakeStandardAction("Customer", GridActionStandardTypesEnum.ExportExcel, Localizer["Sys.Export"], "configs"), + }; + } + + + protected override IEnumerable> InitGridHeader() + { + return new List>{ + this.MakeGridHeader(x => x.Code), + this.MakeGridHeader(x => x.Type), + this.MakeGridHeader(x => x.Name), + this.MakeGridHeaderAction(width: 200) + }; + } + + public override IOrderedQueryable GetSearchQuery() + { + var query = DC.Set() + .CheckContain(Searcher.Code, x=>x.Code) + .CheckContain(Searcher.Type, x=>x.Type) + .CheckContain(Searcher.Name, x=>x.Name) + .Select(x => new Customer_View + { + ID = x.ID, + Code = x.Code, + Type = x.Type, + Name = x.Name, + }) + .OrderBy(x => x.ID); + return query; + } + + } + + public class Customer_View : Customer{ + + } +} diff --git a/HHWMS.Web/Areas/Configs/ViewModels/CustomerVMs/CustomerSearcher.cs b/HHWMS.Web/Areas/Configs/ViewModels/CustomerVMs/CustomerSearcher.cs new file mode 100644 index 0000000..edb8598 --- /dev/null +++ b/HHWMS.Web/Areas/Configs/ViewModels/CustomerVMs/CustomerSearcher.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; +using HHWMS.Web.Models; + + +namespace HHWMS.Web.configs.ViewModels.CustomerVMs +{ + public partial class CustomerSearcher : BaseSearcher + { + [Display(Name = "Customer.Code")] + public String Code { get; set; } + [Display(Name = "Customer.Type")] + public String Type { get; set; } + [Display(Name = "Customer.Name")] + public String Name { get; set; } + + protected override void InitVM() + { + } + + } +} diff --git a/HHWMS.Web/Areas/Configs/ViewModels/CustomerVMs/CustomerVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/CustomerVMs/CustomerVM.cs new file mode 100644 index 0000000..f30d762 --- /dev/null +++ b/HHWMS.Web/Areas/Configs/ViewModels/CustomerVMs/CustomerVM.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using System.ComponentModel.DataAnnotations; +using WalkingTec.Mvvm.Core; +using WalkingTec.Mvvm.Core.Extensions; +using HHWMS.Web.Models; + + +namespace HHWMS.Web.configs.ViewModels.CustomerVMs +{ + public partial class CustomerVM : BaseCRUDVM + { + + public CustomerVM() + { + } + + protected override void InitVM() + { + } + + public override void DoAdd() + { + base.DoAdd(); + } + + public override void DoEdit(bool updateAllFields = false) + { + base.DoEdit(updateAllFields); + } + + public override void DoDelete() + { + base.DoDelete(); + } + } +} diff --git a/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs index 7e9470d..2f36afb 100644 --- a/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs +++ b/HHWMS.Web/Areas/Configs/ViewModels/LocationVMs/LocationVM.cs @@ -429,7 +429,6 @@ namespace HHWMS.Web string code = moveloc.Data.Code; var movelocation = _unitWork.FindSingle(x => x.Code == code); - // 生成outter移库任务 var outterTask = new TaskHeader() { @@ -466,18 +465,16 @@ namespace HHWMS.Web } // 下发任务到wcs + // 成品库下发WCS入库,目的仓位给固定WareCell var postData = new { TaskNo = task.TaskNo, PalletNo = task.ContainerCode, FromLocation = task.FromLocation, - ToLocation = task.ToLocation + ToLocation = (task.TaskType == TaskTypeEnum.入库 && task.ZoneId != 1027) ? "WareCell" : task.ToLocation }; - task.Status = TaskStatusEnum.已下发; - task.UpdateTime = DateTime.Now; - task.UpdateBy = "WMS"; - _unitWork.Add(task); - /*try + + try { var domain = task.ZoneId == 1027 ? "WCSXB" : "WCSCP"; var res = Wtm.CallAPI>(domain, "TaskAssign", HttpMethodEnum.POST, postData) @@ -500,7 +497,7 @@ namespace HHWMS.Web { task.ErrorMsg = ex.Message; return ResponseResult.Error("任务下发失败!"); - }*/ + } return ResponseResult.Success(); } diff --git a/HHWMS.Web/Areas/Configs/ViewModels/MaterialProcessVMs/MaterialProcessImportVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/MaterialProcessVMs/MaterialProcessImportVM.cs index f858c56..3f1deb7 100644 --- a/HHWMS.Web/Areas/Configs/ViewModels/MaterialProcessVMs/MaterialProcessImportVM.cs +++ b/HHWMS.Web/Areas/Configs/ViewModels/MaterialProcessVMs/MaterialProcessImportVM.cs @@ -20,6 +20,8 @@ namespace HHWMS.Web public ExcelPropety ProcessName_Excel = ExcelPropety.CreateProperty(x => x.ProcessName); [Display(Name = "MaterialProcess.ProcessCode")] public ExcelPropety ProcessCode_Excel = ExcelPropety.CreateProperty(x => x.ProcessCode); + [Display(Name = "MaterialProcess.Weight")] + public ExcelPropety Weight_Excel = ExcelPropety.CreateProperty(x => x.Weight); [Display(Name = "MaterialProcess.Description")] public ExcelPropety Description_Excel = ExcelPropety.CreateProperty(x => x.Description); [Display(Name = "MaterialProcess.IsActive")] diff --git a/HHWMS.Web/Areas/Configs/ViewModels/MaterialProcessVMs/MaterialProcessListVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/MaterialProcessVMs/MaterialProcessListVM.cs index a0de145..46a283c 100644 --- a/HHWMS.Web/Areas/Configs/ViewModels/MaterialProcessVMs/MaterialProcessListVM.cs +++ b/HHWMS.Web/Areas/Configs/ViewModels/MaterialProcessVMs/MaterialProcessListVM.cs @@ -36,6 +36,7 @@ namespace HHWMS.Web this.MakeGridHeader(x => x.ProcessOrder), this.MakeGridHeader(x => x.ProcessName), this.MakeGridHeader(x => x.ProcessCode), + this.MakeGridHeader(x => x.Weight), this.MakeGridHeader(x => x.Description), this.MakeGridHeader(x => x.IsActive), this.MakeGridHeaderAction(width: 200) @@ -49,7 +50,9 @@ namespace HHWMS.Web .CheckEqual(Searcher.ProcessOrder, x=>x.ProcessOrder) .CheckContain(Searcher.ProcessName, x=>x.ProcessName) .CheckContain(Searcher.ProcessCode, x=>x.ProcessCode) + .CheckEqual(Searcher.Weight, x=>x.Weight) .CheckContain(Searcher.Description, x=>x.Description) + .CheckEqual(Searcher.IsActive, x=>x.IsActive) .Select(x => new MaterialProcess_View { ID = x.ID, @@ -57,6 +60,7 @@ namespace HHWMS.Web ProcessOrder = x.ProcessOrder, ProcessName = x.ProcessName, ProcessCode = x.ProcessCode, + Weight = x.Weight, Description = x.Description, IsActive = x.IsActive, }) diff --git a/HHWMS.Web/Areas/Configs/ViewModels/MaterialProcessVMs/MaterialProcessSearcher.cs b/HHWMS.Web/Areas/Configs/ViewModels/MaterialProcessVMs/MaterialProcessSearcher.cs index dad62b8..fca3a85 100644 --- a/HHWMS.Web/Areas/Configs/ViewModels/MaterialProcessVMs/MaterialProcessSearcher.cs +++ b/HHWMS.Web/Areas/Configs/ViewModels/MaterialProcessVMs/MaterialProcessSearcher.cs @@ -20,8 +20,12 @@ namespace HHWMS.Web public String ProcessName { get; set; } [Display(Name = "MaterialProcess.ProcessCode")] public String ProcessCode { get; set; } + [Display(Name = "MaterialProcess.Weight")] + public Int32? Weight { get; set; } [Display(Name = "MaterialProcess.Description")] public String Description { get; set; } + [Display(Name = "MaterialProcess.IsActive")] + public Boolean? IsActive { get; set; } protected override void InitVM() { diff --git a/HHWMS.Web/Areas/Configs/Views/Container/Index.cshtml b/HHWMS.Web/Areas/Configs/Views/Container/Index.cshtml index 7b78f04..986262b 100644 --- a/HHWMS.Web/Areas/Configs/Views/Container/Index.cshtml +++ b/HHWMS.Web/Areas/Configs/Views/Container/Index.cshtml @@ -17,33 +17,7 @@