1.修改良率

1.1.修改选制程后的线别增加“全部”
1.2.修改线别排序

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 });

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化并传到前台视图

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) {

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();