From f250f1a4de54025fff06315712a1d54d18c3238c Mon Sep 17 00:00:00 2001
From: Marvin <marvinhong@163.com>
Date: Thu, 1 Dec 2022 18:49:06 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=BA=BF=E5=88=AB=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E7=BB=B4=E6=8A=A4=201.1.=E5=8F=96=E6=B6=88=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E8=B5=84=E6=96=99=201.2.=E5=A2=9E=E5=8A=A0=E5=88=B6?=
 =?UTF-8?q?=E7=A8=8B=E4=B8=8D=E5=8F=AF=E7=A9=BA=E7=99=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/BASController.cs              | 16 ++++++-
 AMESCoreStudio.Web/Views/BAS/BAS003.cshtml    | 18 +-------
 AMESCoreStudio.Web/Views/BAS/BAS003C.cshtml   | 13 +++---
 AMESCoreStudio.Web/Views/BAS/BAS003U.cshtml   | 42 ++++++++++---------
 .../Controllers/BAS/LineInfoesController.cs   |  1 -
 AMESCoreStudio.WebApi/Models/BAS/LineInfo.cs  |  1 +
 6 files changed, 47 insertions(+), 44 deletions(-)

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<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();
         }
 
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);
         });
     </script>
     @*<script type="text/javascript">
diff --git a/AMESCoreStudio.Web/Views/BAS/BAS003C.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS003C.cshtml
index f6a4d792..54436747 100644
--- a/AMESCoreStudio.Web/Views/BAS/BAS003C.cshtml
+++ b/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>
diff --git a/AMESCoreStudio.Web/Views/BAS/BAS003U.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS003U.cshtml
index c0166470..fc7332a1 100644
--- a/AMESCoreStudio.Web/Views/BAS/BAS003U.cshtml
+++ b/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>
+    }
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; }
 
         /// <summary>