diff --git a/AMESCoreStudio.Web/Controllers/BASController.cs b/AMESCoreStudio.Web/Controllers/BASController.cs index a914ec39..75714b7c 100644 --- a/AMESCoreStudio.Web/Controllers/BASController.cs +++ b/AMESCoreStudio.Web/Controllers/BASController.cs @@ -54,6 +54,20 @@ namespace AMESCoreStudio.Web.Controllers } ViewBag.FactoryUnit = UnitItems; } + + private async Task GetFactoryUnitList2() + { + var result = await _basApi.GetFactoryUnits(); + + var UnitItems = new List(); + UnitItems.Add(new SelectListItem("全部", "")); + for (int i = 0; i < result.Count; i++) + { + UnitItems.Add(new SelectListItem(result[i].UnitName, result[i].UnitNo.ToString())); + } + ViewBag.FactoryUnit = UnitItems; + } + private async Task GetLineInfoList() { var result = await _basApi.GetLineInfoes(); @@ -496,7 +510,7 @@ namespace AMESCoreStudio.Web.Controllers public async Task BAS003C() { await GetDeptList(); - await GetFactoryUnitList(); + await GetFactoryUnitList2(); return View(); } diff --git a/AMESCoreStudio.Web/Views/BAS/BAS003.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS003.cshtml index debb3b48..ac6b4190 100644 --- a/AMESCoreStudio.Web/Views/BAS/BAS003.cshtml +++ b/AMESCoreStudio.Web/Views/BAS/BAS003.cshtml @@ -142,24 +142,10 @@ title: '#', sort: true }, - { - field: 'deptID', - width: 100, - title: '部門代碼', - templet: function (d) { - return d.dept["deptNo"]; - } - }, - { - field: 'dept', - title: '部門名稱', - templet: function (d) { - return d.dept["deptName"]; - } - }, { field: 'unit', title: '製程單位', + width: 200, templet: function (d) { if (d.unit != null) { return d.unit["unitName"]; @@ -214,7 +200,7 @@ }) $('#btnAdd').click(function () { - hg.open('新增線別', '/BAS/BAS003C', 480, 480); + hg.open('新增線別', '/BAS/BAS003C', 600, 360); }); @* -} + + } diff --git a/AMESCoreStudio.WebApi/Controllers/BAS/LineInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/BAS/LineInfoesController.cs index 9428eeb8..22ffd3c1 100644 --- a/AMESCoreStudio.WebApi/Controllers/BAS/LineInfoesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BAS/LineInfoesController.cs @@ -73,7 +73,6 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS //foreach (var data in LineInfo) //{ // data.Dept = _context.DeptInfoes.Where(p1 => p1.DeptID.Equals(data.DeptID)).FirstOrDefault(); - //} if (lineInfo == null) diff --git a/AMESCoreStudio.WebApi/Models/BAS/LineInfo.cs b/AMESCoreStudio.WebApi/Models/BAS/LineInfo.cs index a30d8ccb..6255651d 100644 --- a/AMESCoreStudio.WebApi/Models/BAS/LineInfo.cs +++ b/AMESCoreStudio.WebApi/Models/BAS/LineInfo.cs @@ -53,6 +53,7 @@ namespace AMESCoreStudio.WebApi.Models.BAS [Column("UNIT_NO")] [DataMember] [Display(Name = "生產單位")] + [Required(ErrorMessage = "{0},不能空白")] public string UnitNo { get; set; } ///