diff --git a/HHWMS.Web/Areas/Configs/Controllers/PrintConfigController.cs b/HHWMS.Web/Areas/Configs/Controllers/PrintConfigController.cs new file mode 100644 index 0000000..90069e6 --- /dev/null +++ b/HHWMS.Web/Areas/Configs/Controllers/PrintConfigController.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; + +namespace HHWMS.Web.Controllers +{ + [Area("configs")] + [ActionDescription("打印模板配置")] + public partial class PrintConfigController : BaseController + { + private readonly IUnitWork _unitWork; + + public PrintConfigController(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(PrintConfigSearcher 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(PrintConfigVM 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(PrintConfigVM 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(PrintConfigBatchVM 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(PrintConfigBatchVM 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(PrintConfigImportVM 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(PrintConfigListVM vm) + { + return vm.GetExportData(); + } + #endregion + + } +} diff --git a/HHWMS.Web/Areas/Configs/ViewModels/PrintConfigVMs/PrintConfigBatchVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/PrintConfigVMs/PrintConfigBatchVM.cs new file mode 100644 index 0000000..894aff7 --- /dev/null +++ b/HHWMS.Web/Areas/Configs/ViewModels/PrintConfigVMs/PrintConfigBatchVM.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 +{ + public partial class PrintConfigBatchVM : BaseBatchVM + { + public PrintConfigBatchVM() + { + ListVM = new PrintConfigListVM(); + LinkedVM = new PrintConfig_BatchEdit(); + } + + } + + /// + /// Class to define batch edit fields + /// + public class PrintConfig_BatchEdit : BaseVM + { + + protected override void InitVM() + { + } + + } + +} diff --git a/HHWMS.Web/Areas/Configs/ViewModels/PrintConfigVMs/PrintConfigImportVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/PrintConfigVMs/PrintConfigImportVM.cs new file mode 100644 index 0000000..8374913 --- /dev/null +++ b/HHWMS.Web/Areas/Configs/ViewModels/PrintConfigVMs/PrintConfigImportVM.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 +{ + public partial class PrintConfigTemplateVM : BaseTemplateVM + { + [Display(Name = "PrintConfig.Name")] + public ExcelPropety Name_Excel = ExcelPropety.CreateProperty(x => x.Name); + [Display(Name = "PrintConfig.Template")] + public ExcelPropety Template_Excel = ExcelPropety.CreateProperty(x => x.Template); + [Display(Name = "PrintConfig.TestData")] + public ExcelPropety TestData_Excel = ExcelPropety.CreateProperty(x => x.TestData); + + protected override void InitVM() + { + } + + } + + public class PrintConfigImportVM : BaseImportVM + { + + } + +} diff --git a/HHWMS.Web/Areas/Configs/ViewModels/PrintConfigVMs/PrintConfigListVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/PrintConfigVMs/PrintConfigListVM.cs new file mode 100644 index 0000000..0041482 --- /dev/null +++ b/HHWMS.Web/Areas/Configs/ViewModels/PrintConfigVMs/PrintConfigListVM.cs @@ -0,0 +1,62 @@ +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 +{ + public partial class PrintConfigListVM : BasePagedListVM + { + protected override List InitGridAction() + { + return new List + { + this.MakeStandardAction("PrintConfig", GridActionStandardTypesEnum.Create, Localizer["Sys.Create"],"configs", dialogWidth: 800), + this.MakeStandardAction("PrintConfig", GridActionStandardTypesEnum.Edit, Localizer["Sys.Edit"], "configs", dialogWidth: 800), + this.MakeStandardAction("PrintConfig", GridActionStandardTypesEnum.Delete, Localizer["Sys.Delete"], "configs", dialogWidth: 800), + this.MakeStandardAction("PrintConfig", GridActionStandardTypesEnum.Details, Localizer["Sys.Details"], "configs", dialogWidth: 800), + this.MakeStandardAction("PrintConfig", GridActionStandardTypesEnum.BatchEdit, Localizer["Sys.BatchEdit"], "configs", dialogWidth: 800), + this.MakeStandardAction("PrintConfig", GridActionStandardTypesEnum.BatchDelete, Localizer["Sys.BatchDelete"], "configs", dialogWidth: 800), + this.MakeStandardAction("PrintConfig", GridActionStandardTypesEnum.Import, Localizer["Sys.Import"], "configs", dialogWidth: 800), + this.MakeStandardAction("PrintConfig", GridActionStandardTypesEnum.ExportExcel, Localizer["Sys.Export"], "configs"), + }; + } + + + protected override IEnumerable> InitGridHeader() + { + return new List>{ + this.MakeGridHeader(x => x.Name), + this.MakeGridHeader(x => x.Template), + this.MakeGridHeader(x => x.TestData), + this.MakeGridHeaderAction(width: 200) + }; + } + + public override IOrderedQueryable GetSearchQuery() + { + var query = DC.Set() + .CheckContain(Searcher.Name, x=>x.Name) + .Select(x => new PrintConfig_View + { + ID = x.ID, + Name = x.Name, + Template = x.Template, + TestData = x.TestData, + }) + .OrderBy(x => x.ID); + return query; + } + + } + + public class PrintConfig_View : PrintConfig{ + + } +} diff --git a/HHWMS.Web/Areas/Configs/ViewModels/PrintConfigVMs/PrintConfigSearcher.cs b/HHWMS.Web/Areas/Configs/ViewModels/PrintConfigVMs/PrintConfigSearcher.cs new file mode 100644 index 0000000..32b7261 --- /dev/null +++ b/HHWMS.Web/Areas/Configs/ViewModels/PrintConfigVMs/PrintConfigSearcher.cs @@ -0,0 +1,23 @@ +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 +{ + public partial class PrintConfigSearcher : BaseSearcher + { + [Display(Name = "PrintConfig.Name")] + public String Name { get; set; } + + protected override void InitVM() + { + } + + } +} diff --git a/HHWMS.Web/Areas/Configs/ViewModels/PrintConfigVMs/PrintConfigVM.cs b/HHWMS.Web/Areas/Configs/ViewModels/PrintConfigVMs/PrintConfigVM.cs new file mode 100644 index 0000000..d8379de --- /dev/null +++ b/HHWMS.Web/Areas/Configs/ViewModels/PrintConfigVMs/PrintConfigVM.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 +{ + public partial class PrintConfigVM : BaseCRUDVM + { + + public PrintConfigVM() + { + } + + 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/Views/PrintConfig/BatchDelete.cshtml b/HHWMS.Web/Areas/Configs/Views/PrintConfig/BatchDelete.cshtml new file mode 100644 index 0000000..e04f94c --- /dev/null +++ b/HHWMS.Web/Areas/Configs/Views/PrintConfig/BatchDelete.cshtml @@ -0,0 +1,12 @@ +@model HHWMS.Web.PrintConfigBatchVM +@inject IStringLocalizer Localizer; + + + @Localizer["Sys.BatchDeleteConfirm"] + + + + + + + diff --git a/HHWMS.Web/Areas/Configs/Views/PrintConfig/BatchEdit.cshtml b/HHWMS.Web/Areas/Configs/Views/PrintConfig/BatchEdit.cshtml new file mode 100644 index 0000000..8705e1e --- /dev/null +++ b/HHWMS.Web/Areas/Configs/Views/PrintConfig/BatchEdit.cshtml @@ -0,0 +1,14 @@ +@model HHWMS.Web.PrintConfigBatchVM +@inject IStringLocalizer Localizer; + + +
@Localizer["Sys.BatchEditConfirm"]
+ + + + + + + + +
diff --git a/HHWMS.Web/Areas/Configs/Views/PrintConfig/Create.cshtml b/HHWMS.Web/Areas/Configs/Views/PrintConfig/Create.cshtml new file mode 100644 index 0000000..4311e30 --- /dev/null +++ b/HHWMS.Web/Areas/Configs/Views/PrintConfig/Create.cshtml @@ -0,0 +1,14 @@ +@model HHWMS.Web.PrintConfigVM +@inject IStringLocalizer Localizer; + + + + + + + + + + + + diff --git a/HHWMS.Web/Areas/Configs/Views/PrintConfig/Delete.cshtml b/HHWMS.Web/Areas/Configs/Views/PrintConfig/Delete.cshtml new file mode 100644 index 0000000..aebbc9e --- /dev/null +++ b/HHWMS.Web/Areas/Configs/Views/PrintConfig/Delete.cshtml @@ -0,0 +1,16 @@ +@model HHWMS.Web.PrintConfigVM +@inject IStringLocalizer Localizer; + + + @Localizer["Sys.DeleteConfirm"] + + + + + + + + + + + diff --git a/HHWMS.Web/Areas/Configs/Views/PrintConfig/Details.cshtml b/HHWMS.Web/Areas/Configs/Views/PrintConfig/Details.cshtml new file mode 100644 index 0000000..c555319 --- /dev/null +++ b/HHWMS.Web/Areas/Configs/Views/PrintConfig/Details.cshtml @@ -0,0 +1,13 @@ +@model HHWMS.Web.PrintConfigVM +@inject IStringLocalizer Localizer; + + + + + + + + + + + diff --git a/HHWMS.Web/Areas/Configs/Views/PrintConfig/Edit.cshtml b/HHWMS.Web/Areas/Configs/Views/PrintConfig/Edit.cshtml new file mode 100644 index 0000000..3e52b71 --- /dev/null +++ b/HHWMS.Web/Areas/Configs/Views/PrintConfig/Edit.cshtml @@ -0,0 +1,15 @@ +@model HHWMS.Web.PrintConfigVM +@inject IStringLocalizer Localizer; + + + + + + + + + + + + + diff --git a/HHWMS.Web/Areas/Configs/Views/PrintConfig/Import.cshtml b/HHWMS.Web/Areas/Configs/Views/PrintConfig/Import.cshtml new file mode 100644 index 0000000..97d4dbe --- /dev/null +++ b/HHWMS.Web/Areas/Configs/Views/PrintConfig/Import.cshtml @@ -0,0 +1,14 @@ +@model HHWMS.Web.PrintConfigImportVM +@inject IStringLocalizer Localizer; + + + + + + + + + + + + diff --git a/HHWMS.Web/Areas/Configs/Views/PrintConfig/Index.cshtml b/HHWMS.Web/Areas/Configs/Views/PrintConfig/Index.cshtml new file mode 100644 index 0000000..a203a0b --- /dev/null +++ b/HHWMS.Web/Areas/Configs/Views/PrintConfig/Index.cshtml @@ -0,0 +1,9 @@ +@model HHWMS.Web.PrintConfigListVM +@inject IStringLocalizer Localizer; + + + + + + + diff --git a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs index 1cbc443..f719caa 100644 --- a/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs +++ b/HHWMS.Web/Areas/Receipt/Controllers/ReceiptDetailController.cs @@ -118,114 +118,6 @@ namespace HHWMS.Web.Controllers } } - [ActionDescription("Sys.Create")] - public ActionResult CreateDetails(int id) - { - var vm = Wtm.CreateVM(passInit: true); - vm.Entity.ReceiptHeaderId = id; - vm.Entity.ReceiptHeader = new ReceiptHeader(); - //vm.Entity.ReceiptHeader.Code = vm.DC.Set().Find(id).Code; - return PartialView(vm); - } - - [HttpPost] - [ActionDescription("Sys.Create")] - public ActionResult CreateDetails(ReceiptDetailVM vm) - { - var header = _unitwork.FindSingle(x => x.ID == vm.Entity.ReceiptHeaderId); - if(header.FirstStatus != ReceiptStatusEnum.新建) - { - return FFResult().Alert("主单据不是新建状态,不能新建明细!"); - } - var plList = vm.Entity.MaterialCode.Split("\n"); - var slList = vm.Entity.Lot.Split("\n"); - var detailList = new List(); - foreach(var item in plList) - { - if (!string.IsNullOrEmpty(item)) - { - detailList.Add(new ReceiptDetail - { - UniqueCode = item, - Status = 0, - ZoneCode = ZoneCodeEnum.盘料库, - ReceiptHeaderId = vm.Entity.ReceiptHeaderId - }); - } - } - - foreach (var item in slList) - { - if (!string.IsNullOrEmpty(item)) - { - detailList.Add(new ReceiptDetail - { - UniqueCode = item, - ZoneCode = ZoneCodeEnum.散料库, - Status = 0, - ReceiptHeaderId = vm.Entity.ReceiptHeaderId - }); - } - } - var uniqueGroup = detailList.GroupBy(x => x.UniqueCode); - - if (uniqueGroup.Any(x => x.Count() > 1)) - { - var codeList = uniqueGroup.Where(x => x.Count() > 1) - .Select(x => x.Key) - .ToList(); - return FFResult().Alert($"新增明细中,存在重复的唯一码!{String.Join(", ", codeList.ToArray())}"); - } - - // 判断唯一码是否已在库内 - var reDetailList = _unitwork.Find(x => x.Status == ReceiptStatusEnum.新建) - .Select(x => new { x.UniqueCode, x.ReceiptHeader.Code }) - .ToList(); - var reDel = reDetailList.Select(x => x.UniqueCode) - .Intersect(detailList.Select(x => x.UniqueCode)); - if (reDel.Count() > 0) - { - var tt= reDetailList.Where(x => reDel.Contains(x.UniqueCode)) - .ToList(); - var returnStr = ""; - foreach (var item in tt) - { - returnStr += $"单号:{item.Code};唯一码:{item.UniqueCode};"; - } - return FFResult().Alert($"新增明细中,存在已添加的唯一码!{returnStr}"); - } - - // 判断唯一码是否已在库内 - var invList = _unitwork.Find(x => 1 == 1) - .Select(x => x.UniqueCode) - .ToList(); - if(invList.Intersect(detailList.Select(x => x.UniqueCode)).Count() > 0) - { - return FFResult().Alert("新增明细中,存在已在库内的唯一码!"); - } - // 补充物料明细 - foreach (var item in detailList) - { - var materialqr = _unitwork.FindSingle(x => x.UniqueCode.Equals(item.UniqueCode)); - if(materialqr == null) - { - return FFResult().Alert("新增明细中,存在不是WMS生成的唯一码!"); - } - var material = _unitwork.FindSingle(x => x.QRCode.Equals(materialqr.QRCode)); - item.MaterialCode = material.MaterialCode; - item.MaterialName = material.MaterialName; - item.MaterialSpec = material.MaterialSpec; - item.MaterialType = material.MaterialType; - item.MaterialUnit = material.MaterialUnit; - item.Batch = material.Batch; - item.Qty = material.Qty; - item.SupplierCode = material.SupplierCode; - item.CreateBy = Wtm.LoginUserInfo.ITCode; - item.CreateTime = DateTime.Now; - } - _unitwork.BatchAdd(detailList.ToArray()); - return FFResult().CloseDialog().RefreshGrid(index: 1); - } #endregion #region Edit diff --git a/HHWMS.Web/DataContext.cs b/HHWMS.Web/DataContext.cs index af4365c..a5376a2 100644 --- a/HHWMS.Web/DataContext.cs +++ b/HHWMS.Web/DataContext.cs @@ -53,7 +53,7 @@ namespace HHWMS.Web public DbSet ShipmentDetailHistories { get; set; } public DbSet ReportDesigns { get; set; } public DbSet Materials { get; set; } - public DbSet MaterialQrs { get; set; } + public DbSet PrintConfigs { get; set; } public override async Task DataInit(object allModules, bool IsSpa) { var state = await base.DataInit(allModules, IsSpa); diff --git a/HHWMS.Web/HHWMS.Web.csproj b/HHWMS.Web/HHWMS.Web.csproj index c5ae534..7f0d27b 100644 --- a/HHWMS.Web/HHWMS.Web.csproj +++ b/HHWMS.Web/HHWMS.Web.csproj @@ -18,9 +18,13 @@ + + + + @@ -47,9 +51,9 @@ - - - + + + diff --git a/HHWMS.Web/Models/Configs/MaterialQr.cs b/HHWMS.Web/Models/Configs/MaterialQr.cs deleted file mode 100644 index cbc9960..0000000 --- a/HHWMS.Web/Models/Configs/MaterialQr.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; -using WalkingTec.Mvvm.Core; - -namespace HHWMS.Web.Models -{ - /// - /// 物料二维码 唯一码对照表 - /// - [Table("Materialqr")] - public class MaterialQr : BasePoco - { - [Key] - [DatabaseGenerated(DatabaseGeneratedOption.Identity)] - public new int ID { get; set; } - - [Display(Name = "Inventory.QRCode", Description = "二维码")] - [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] - public string QRCode { get; set; } - - [Display(Name = "Inventory.UniqueCode", Description = "唯一码")] - [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] - public string UniqueCode { get; set; } - } -} diff --git a/HHWMS.Web/Models/Configs/PrintConfig.cs b/HHWMS.Web/Models/Configs/PrintConfig.cs new file mode 100644 index 0000000..377236d --- /dev/null +++ b/HHWMS.Web/Models/Configs/PrintConfig.cs @@ -0,0 +1,30 @@ +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using WalkingTec.Mvvm.Core; + +namespace HHWMS.Web.Models +{ + /// + /// 打印模板配置 + /// + [Table("PrintConfig")] + public class PrintConfig : BasePoco + { + [Key] + [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + public new int ID { get; set; } + + [Display(Name = "PrintConfig.Name", Description = "名称")] + [Required(ErrorMessage = "Validate.{0}required")] + [StringLength(50, ErrorMessage = "Validate.{0}stringmax{1}")] + public string Name { get; set; } + + [Display(Name = "PrintConfig.Template", Description = "模板")] + [Required(ErrorMessage = "Validate.{0}required")] + public string Template { get; set; } + + [Display(Name = "PrintConfig.TestData", Description = "测试数据")] + [Required(ErrorMessage = "Validate.{0}required")] + public string TestData { get; set; } + } +} diff --git a/HHWMS.Web/Resources/Program.zh.resx b/HHWMS.Web/Resources/Program.zh.resx index aeb4486..446eaf2 100644 --- a/HHWMS.Web/Resources/Program.zh.resx +++ b/HHWMS.Web/Resources/Program.zh.resx @@ -1382,8 +1382,17 @@ 回传 - Ship.ShipmentCode + 出库单号 + + 名称 + + + 模板 + + + 测试数据 + diff --git a/HHWMS.Web/WebService/WmsMesService.cs b/HHWMS.Web/WebService/WmsMesService.cs index 257192f..07a0701 100644 --- a/HHWMS.Web/WebService/WmsMesService.cs +++ b/HHWMS.Web/WebService/WmsMesService.cs @@ -65,50 +65,7 @@ namespace WebService try { _wtm.DoLog("", ActionLogTypesEnum.Normal, "mes", request: outOrder); - var data = JsonConvert.DeserializeObject(outOrder); - // 生成出库单和明细 - var shipment = new ShipmentHeader - { - Code = _unitwork.GetSerialNumber("MO",4), - BillType = "out", - FirstStatus = ShipStatusEnum.新建, - ShipmentDetails = new List(), - CreateTime = DateTime.Now - }; - foreach(var item in data.OUTWMS.OUTITEM) - { - var materialqr = _unitwork.FindSingle(x => x.UniqueCode.Equals(item.SN)); - if (materialqr != null) - { - var material = _unitwork.FindSingle(x => x.QRCode.Equals(materialqr.QRCode)); - - var detail = new ShipmentDetail - { - UniqueCode = item.SN, - MaterialCode = material?.MaterialCode, - MaterialName = material?.MaterialName, - MaterialSpec = material?.MaterialSpec, - MaterialType = material?.MaterialType, - MaterialUnit = material?.MaterialUnit, - Batch = material?.Batch, - DividedQty = 0, - Qty = material?.Qty, - CompanyCode = item?.FACTORY, - ManufactureDate = Convert.ToDateTime(item.MESDATE), - Status = ShipStatusEnum.新建, - CreateTime = DateTime.Now - }; - shipment.ShipmentDetails.Add(detail); - } - else - { - return new Result { Status = "N", Message = $"物料不存在库内!" }; - } - } - if(shipment.ShipmentDetails.Count > 0) - { - _unitwork.Add(shipment); - } + return new Result(); } catch (Exception ex) diff --git a/HHWMS.Web/appsettings.json b/HHWMS.Web/appsettings.json index c41526f..a933946 100644 --- a/HHWMS.Web/appsettings.json +++ b/HHWMS.Web/appsettings.json @@ -22,17 +22,17 @@ }, "Connections": [ - { - "Key": "default", - "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 - //} + // "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",