1.修改线别资料维护

1.1.取消部门资料
1.2.增加制程不可空白

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<SelectListItem>();
+            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<IActionResult> BAS003C()
         {
             await GetDeptList();
-            await GetFactoryUnitList();
+            await GetFactoryUnitList2();
             return View();
         }
 

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);
         });
     </script>
     @*<script type="text/javascript">

AMESCoreStudio.Web/Views/BAS/BAS003C.cshtml

@@ -28,12 +28,13 @@
                 <span asp-validation-for="UnitNo" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
 
-            <div class="form-group form-inline my-sm-1">
-                <label asp-for="DeptID" class="control-label col-sm-3"></label>
-                <select asp-for="DeptID" asp-items="@ViewBag.DeptList" class="custom-select col-sm-9"></select>
-                <span asp-validation-for="DeptID" class="text-danger offset-sm-3 my-sm-1"></span>
-            </div>
-
+            <!--
+    <div class="form-group form-inline my-sm-1">
+        <label asp-for="DeptID" class="control-label col-sm-3"></label>
+        <select asp-for="DeptID" asp-items="@ViewBag.DeptList" class="custom-select col-sm-9"></select>
+        <span asp-validation-for="DeptID" class="text-danger offset-sm-3 my-sm-1"></span>
+    </div>
+    -->
 
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="LineDesc" class="control-label col-sm-3"></label>

AMESCoreStudio.Web/Views/BAS/BAS003U.cshtml

@@ -29,11 +29,13 @@
                 <span asp-validation-for="UnitNo" class="text-danger offset-sm-3 my-sm-1"></span>
             </div>
 
-            <div class="form-group form-inline my-sm-1">
-                <label asp-for="DeptID" class="control-label col-sm-3"></label>
-                <select asp-for="DeptID" asp-items="@ViewBag.DeptList" class="custom-select col-sm-9"></select>
-                <span asp-validation-for="DeptID" class="text-danger offset-sm-3 my-sm-1"></span>
-            </div>
+            <!--
+        <div class="form-group form-inline my-sm-1">
+            <label asp-for="DeptID" class="control-label col-sm-3"></label>
+            <select asp-for="DeptID" asp-items="@ViewBag.DeptList" class="custom-select col-sm-9"></select>
+            <span asp-validation-for="DeptID" class="text-danger offset-sm-3 my-sm-1"></span>
+        </div>
+           -->
 
             <div class="form-group form-inline my-sm-1">
                 <label asp-for="LineDesc" class="control-label col-sm-3"></label>
@@ -51,21 +53,21 @@
             </div>
 
         </form>
+        </div>
     </div>
-</div>
 
-@section Scripts {
-    @{
-        await Html.RenderPartialAsync("_ValidationScriptsPartial");
-        await Html.RenderPartialAsync("_FileinputScriptsPartial");
-    }
+    @section Scripts {
+        @{
+            await Html.RenderPartialAsync("_ValidationScriptsPartial");
+            await Html.RenderPartialAsync("_FileinputScriptsPartial");
+        }
 
-<script type="text/javascript">
-        $(document).ready(function () {
-            var error = '@Html.ValidationMessage("error")';
-            if ($(error).text() != '') {
-                parent.hg.msg(error);
-            }
-        });
-</script>
-}
+    <script type="text/javascript">
+            $(document).ready(function () {
+                var error = '@Html.ValidationMessage("error")';
+                if ($(error).text() != '') {
+                    parent.hg.msg(error);
+                }
+            });
+    </script>
+    }

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)

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; }
 
         /// <summary>