From 9fa7ddf7e05c62b9cb4adab2fce2f2b5a29733fb Mon Sep 17 00:00:00 2001
From: Marvin <marvinhong@163.com>
Date: Sun, 1 May 2022 16:45:39 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=89=AF=E7=8E=87=201.1.?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E5=88=B6=E7=A8=8B=E5=90=8E=E7=9A=84?=
 =?UTF-8?q?=E7=BA=BF=E5=88=AB=E5=A2=9E=E5=8A=A0=E2=80=9C=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E2=80=9D=201.2.=E4=BF=AE=E6=94=B9=E7=BA=BF=E5=88=AB=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AMESCoreStudio.Web/Controllers/QRSController.cs              | 5 +++++
 AMESCoreStudio.Web/Controllers/REPController.cs              | 2 +-
 AMESCoreStudio.Web/Views/QRS/QRS010.cshtml                   | 4 ++--
 .../Controllers/BAS/LineInfoesController.cs                  | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/QRSController.cs b/AMESCoreStudio.Web/Controllers/QRSController.cs
index 2e12fdee..bc6e5f10 100644
--- a/AMESCoreStudio.Web/Controllers/QRSController.cs
+++ b/AMESCoreStudio.Web/Controllers/QRSController.cs
@@ -642,6 +642,7 @@ namespace AMESCoreStudio.Web.Controllers
             var result = await _basApi.GetLineInfoes();
 
             var LineItems = new List<SelectListItem>();
+
             for (int i = 0; i < result.Count; i++)
             {
                 LineItems.Add(new SelectListItem(result[i].LineDesc, result[i].LineID.ToString()));
@@ -656,15 +657,19 @@ namespace AMESCoreStudio.Web.Controllers
 
             var item = new List<SelectListItem>();
 
+            item.Add(new SelectListItem("全部", "0"));
+
             for (int i = 0; i < result.Count; i++)
             {
                 item.Add(new SelectListItem(result[i].LineDesc, result[i].LineID.ToString()));
             }
 
+            /*
             if (item.Count == 0)
             {
                 item.Add(new SelectListItem("全部", "*"));
             }
+            */
 
             //将数据Json化并传到前台视图
             return Json(new { data = item });
diff --git a/AMESCoreStudio.Web/Controllers/REPController.cs b/AMESCoreStudio.Web/Controllers/REPController.cs
index fe5c1884..bed2b238 100644
--- a/AMESCoreStudio.Web/Controllers/REPController.cs
+++ b/AMESCoreStudio.Web/Controllers/REPController.cs
@@ -99,7 +99,7 @@ namespace AMESCoreStudio.Web.Controllers
 
             if (item.Count == 0)
             {
-                item.Add(new SelectListItem("全部", "*"));
+                item.Add(new SelectListItem("全部", "0"));
             }
 
             //将数据Json化并传到前台视图
diff --git a/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml b/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml
index 0d0f2dae..66843600 100644
--- a/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml
+++ b/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml
@@ -171,7 +171,7 @@
         {
             $.ajax(
                 {
-                    url: '@Url.Action("GetUnitLineJson", "REP")',
+                    url: '@Url.Action("GetUnitLineJson", "QRS")',
                     dataType: 'json',
                     data: { "unit_no": $("#unit").val() },
                     type: 'post',
@@ -181,7 +181,7 @@
                         $.each(result.data, function (index, item) {
                             $("#line").append($("<option>").text(item.text).val(item.value))
                         });
-                        $("#line option:eq(1)").attr("selected", 'selected'); //默认选择第一个选项
+                        $("#line option:eq(0)").attr("selected", 'selected'); //默认选择第一个选项
                         layui.form.render("select");//重新渲染 固定写法
                     },
                     error: function (result) {
diff --git a/AMESCoreStudio.WebApi/Controllers/BAS/LineInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/BAS/LineInfoesController.cs
index a6a3fd80..9428eeb8 100644
--- a/AMESCoreStudio.WebApi/Controllers/BAS/LineInfoesController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/BAS/LineInfoesController.cs
@@ -102,7 +102,7 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
                 //q = q.Where(p => p.LineID.Equals(id));
                 q = q.Where(p => p.UnitNo.Equals(id));
             }
-            q.OrderBy(p => p.LineID);
+            q = q.OrderBy(p => p.LineDesc);
 
             var lineInfo = await q.ToListAsync();