1.修正线别资料维护，选择“全部”转圈的问题

2.修改班别资料维护，修改“删除”改为“启用/停用”
3.修改时段资料维护，修改“删除”改为“启用/停用”
4.修改流程站别资料维护，修正第二次选“全部”资料错误
5.修改流程规则维护，修正第二次选“全部”资料错误
6.修改邮件群组类别维护，修正删除javascript弹窗错误
7.修改出货序号编码规则维护，修正无法删除

AMESCoreStudio.Web/Controllers/BASController.cs

@@ -1315,7 +1315,8 @@ namespace AMESCoreStudio.Web.Controllers
                 if (result.Success)
                 {
                     var _msg = model.RuleStationID == 0 ? "添加成功！" : "修改成功！";
-                    return RedirectToAction("Refresh", "Home", new { msg = _msg });
+                    //return RedirectToAction("Refresh", "Home", new { msg = _msg });
+                    return RedirectToAction("BAS010", "BAS", new { msg = _msg });
                 }
                 else
                 {
@@ -1354,6 +1355,7 @@ namespace AMESCoreStudio.Web.Controllers
         [HttpGet]
         public async Task<IActionResult> GetRuleStationsByFlowAsync(int flowId, int page = 0, int limit = 10)
         {
+            /*
             var flow_id = "";
             HttpContext.Request.Cookies.TryGetValue("FlowID4BAS010", out flow_id);
             if (flow_id != null)
@@ -1374,6 +1376,7 @@ namespace AMESCoreStudio.Web.Controllers
                     HttpContext.Response.Cookies.Append("FlowID4BAS010", flowId.ToString());
                 }
             }
+            */
 
             var result_total = await _basApi.GetRuleStationsByFlow(flowId, 0, limit);
 
@@ -1536,6 +1539,7 @@ namespace AMESCoreStudio.Web.Controllers
         [HttpGet]
         public async Task<IActionResult> GetRulesesByFlowAsync(int flowId, int page = 0, int limit = 10)
         {
+            /*
             var flow_id = "";
             HttpContext.Request.Cookies.TryGetValue("FlowID4BAS011", out flow_id);
             if (flow_id != null)
@@ -1556,6 +1560,7 @@ namespace AMESCoreStudio.Web.Controllers
                     HttpContext.Response.Cookies.Append("FlowID4BAS011", flowId.ToString());
                 }
             }
+            */
 
             var result_total = await _basApi.GetRulesesByFlow(flowId, 0, limit);
             var result = await _basApi.GetRulesesByFlow(flowId, page, limit);

AMESCoreStudio.Web/Views/BAS/BAS003.cshtml

@@ -161,8 +161,14 @@
                         field: 'unit',                        
                         title: '製程單位',
                         templet: function (d) {
+                            if (d.unit != null) {
                                 return d.unit["unitName"];
                             }
+                            else
+                            {
+                                return '';
+                            }
+                        }
                     },
                     {
                         field: 'lineDesc',

AMESCoreStudio.Web/Views/BAS/BAS005.cshtml

@@ -291,12 +291,10 @@
                     },
                     {
                         field: 'beginTime',
-
                         title: '上班時間'
                     },
                     {
                         field: 'endTime',
-
                         title: '下班時間'
                     },
                     {
@@ -304,12 +302,16 @@
                         width: 100,
                         title: '休息時間(分)'
                     },
+                    {
+                        field: 'statusNo',
+                        title: '狀態'
+                    },
                     {
                         field: 'sartDate',
                         width: 100,
                         title: '起用時間',
                         templet: function (d) {
-                            return layui.util.toDateString(d.bulletinTime, "yyyy-MM-dd");
+                            return layui.util.toDateString(d.sartDate, "yyyy-MM-dd");
                         }
                     },
                     {
@@ -317,7 +319,7 @@
                         width: 100,
                         title: '停用時間',
                         templet: function (d) {
-                            return layui.util.toDateString(d.bulletinTime, "yyyy-MM-dd");
+                            return layui.util.toDateString(d.stopDate, "yyyy-MM-dd");
                         }
                     },
                     {
@@ -333,7 +335,7 @@
                         templet: function (item) {
                             var btns = '';
                             btns = btns + '<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>';
-                            btns = btns + '<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>';
+                            btns = btns + '<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"> 啟用 / 停用 </a>';
                             
                             return btns;
                         }

AMESCoreStudio.Web/Views/BAS/BAS006.cshtml

@@ -75,7 +75,7 @@
                         templet: function (item) {
                             var btns = '';
                             btns = btns + '<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>';
-                            btns = btns + '<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">刪除</a>';
+                            btns = btns + '<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"> 啟用 / 停用 </a>';
 
                             return btns;
                         }

AMESCoreStudio.Web/Views/BAS/BAS010.cshtml

@@ -76,7 +76,7 @@
                     {
                         console.info(result.data);
                         $("#flow").empty();//清空下拉框的值
-                        $("#flow").prepend("<option value='0'>全部</option>");
+                        $("#flow").prepend("<option value='-1'>全部</option>");
                         $.each(result.data, function (index, item) {
                             $("#flow").append($("<option>").text(item.text).val(item.value))
                         });

AMESCoreStudio.Web/Views/BAS/BAS015.cshtml

@@ -59,7 +59,6 @@
 
         //通过行tool删除，lay-event="del"
         function del(obj) {
-            alert(obj);
             if (obj.data.groupID) {
                 hg.confirm("系統：" + obj.data.groupDesc + "，确定要删除吗？", function () {
                     $.ajax({

AMESCoreStudio.Web/Views/BAS/BAS019.cshtml

@@ -73,9 +73,9 @@
         }
         //通过行tool删除，lay-event="del"
         function del(obj) {
-            //alert(obj);
+            //alert(obj.data.serialRuleID);
-            if (obj.data.materialOutfitID) {
+            if (obj.data.serialRuleID) {
-                hg.confirm("系統：" + obj.data.itemNo + "，確定要删除嗎？", function () {
+                hg.confirm("系統：" + obj.data.itemNo + " 出貨序號編碼規則，確定要删除嗎？", function () {
                     $.ajax({
                         url: '/BAS/BAS019D',
                         data: { id: obj.data.serialRuleID},

AMESCoreStudio.WebApi/Controllers/BAS/ClassInfoesController.cs

@@ -207,9 +207,15 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
             _context.Entry(classInfoNew).State = EntityState.Modified;
 
             if (classInfo.StatusNo == "A")
+            {
                 classInfoNew.StatusNo = "S";
+                classInfoNew.StopDate = DateTime.Now;
+            }
             else
+            {
                 classInfoNew.StatusNo = "A";
+                classInfoNew.SartDate = DateTime.Now;
+            }
 
             try
             {