1.修改前判維修輸入

1.1.增加選擇維修代碼自動關聯責任單位 2.修改後判維修輸入 2.1.增加選擇維修代碼自動關聯責任單位 2.2.修改维修方式改为输入，回车带出维修方式描述 3.修改流程規則維護,可以編輯過站狀態 4.調整SYS模組
3 years ago · ac490be8ea
17 changed files with 212 additions and 10 deletions
--- a/AMESCoreStudio.Web/Controllers/REPController.cs
+++ b/AMESCoreStudio.Web/Controllers/REPController.cs
@ -106,6 +106,21 @@ namespace AMESCoreStudio.Web.Controllers
            return Json(new { data = item });
        }

+        [HttpPost]
+        public async Task<JsonResult> GetRepairResponsibleJson(string reason_no)
+        {
+            var result = await _basApi.GetRepairResponsibleUnitsByReasonNo(reason_no);
+
+            var item = new List<SelectListItem>();
+
+            for (int i = 0; i < result.Count; i++)
+            {
+                item.Add(new SelectListItem(result[i].RRDesc, result[i].RRID.ToString()));
+            }
+            //将数据Json化并传到前台视图
+            return Json(new { data = item });
+        }
+
        private async Task GetStationList()
        {
            var result = await _basApi.GetStationses();
--- a/AMESCoreStudio.Web/Controllers/SYSController.cs
+++ b/AMESCoreStudio.Web/Controllers/SYSController.cs
@ -192,10 +192,12 @@ namespace AMESCoreStudio.Web.Controllers
                IResultModel result;
                if (model.SystemID == 0)
                {
+                    model.CreateDateTime = System.DateTime.Now;
                    result = await _sysApi.PostSystemInfo(JsonConvert.SerializeObject(model));
                }
                else
                {
+                    model.UpdateDateTime = System.DateTime.Now;
                    result = await _sysApi.PutSystemInfo(model.SystemID, JsonConvert.SerializeObject(model));
                }

--- a/AMESCoreStudio.Web/HttpApis/IBAS.cs
+++ b/AMESCoreStudio.Web/HttpApis/IBAS.cs
@ -505,6 +505,13 @@ namespace AMESCoreStudio.Web
        [WebApiClient.Attributes.HttpGet("api/RepairResponsibleUnitses/{id}")]
        ITask<List<RepairResponsibleUnits>> GetRepairResponsibleUnits(int id);

+        /// <summary>
+        /// 根據維修原因代碼獲取指定責任單位資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/RepairResponsibleUnitses/Query/{no}")]
+        ITask<List<RepairResponsibleUnits>> GetRepairResponsibleUnitsByReasonNo(string no);
+
        /// <summary>
        /// 獲取責任單位資料
        /// </summary>
--- a/AMESCoreStudio.Web/Views/BAS/BAS011U.cshtml
+++ b/AMESCoreStudio.Web/Views/BAS/BAS011U.cshtml
@ -34,11 +34,11 @@
                <label asp-for="RuleStatus" class="control-label col-sm-3"></label>
                <div class="col-sm-9">
                    <div class="radio icheck-primary form-check-inline">
-                        <input type="radio" id="P" asp-for="RuleStatus" value="P" disabled />
+                        <input type="radio" id="P" asp-for="RuleStatus" value="P" />
                        <label for="P">&nbsp;PASS&nbsp;</label>
                    </div>
                    <div class="radio icheck-primary form-check-inline">
-                        <input type="radio" id="F" asp-for="RuleStatus" value="F" disabled />
+                        <input type="radio" id="F" asp-for="RuleStatus" value="F" />
                        <label for="F">&nbsp;FAIL&nbsp;</label>
                    </div>
                </div>
--- a/AMESCoreStudio.Web/Views/REP/REP001R.cshtml
+++ b/AMESCoreStudio.Web/Views/REP/REP001R.cshtml
@ -284,8 +284,9 @@
                <div class="layui-inline">
                    <label asp-for="ngRepair.RepairNo" class="layui-form-label"></label>
                    <div class="layui-input-inline">
-                        <select asp-for="ngRepair.RepairNo" asp-items="@ViewBag.RMAReasonList" class=""></select>
+                        <select id="repairno" lay-filter="repairno" lay-verify="required" asp-for="ngRepair.RepairNo" asp-items="@ViewBag.RMAReasonList" class=""></select>
                        <span asp-validation-for="ngRepair.RepairNo" class="layui-bg-red"></span>
+                        <input id="repairNo" type="hidden" name="repairNo" value="" />
                    </div>
                    <label asp-for="ngRepair.RepairTypeNo" class="layui-form-label"></label>
                    <div class="layui-input-inline">
@ -304,7 +305,7 @@
                <div class="layui-inline">
                    <label asp-for="ngRepair.RepairResponsibleID" class="layui-form-label"></label>
                    <div class="layui-input-inline">
-                        <select asp-for="ngRepair.RepairResponsibleID" asp-items="@ViewBag.RepairResponsibleUnitList" class=""></select>
+                        <select id="responsible" lay-filter="responsible" lay-verify="required" asp-for="ngRepair.RepairResponsibleID" asp-items="@ViewBag.RepairResponsibleUnitList" class=""></select>
                        <span asp-validation-for="ngRepair.RepairResponsibleID" class="layui-bg-red"></span>
                    </div>
                    <label asp-for="ngRepair.RmaNo" class="layui-form-label"></label>
@ -361,6 +362,16 @@
        await Html.RenderPartialAsync("_FileinputScriptsPartial"); }

 <script type="text/javascript">
+
+    layui.use(['form', 'layer'], function () {
+        form = layui.form;
+
+        form.on('select(repairno)', function (data) {
+            $("#repairNo").val(data.value);
+            getRepairResponsible($('#repairNo').val());
+        });
+    });
+
    $(document).ready(function () {
        var error = '@Html.ValidationMessage("error")';
        if ($(error).text() != '') {
@ -368,6 +379,31 @@
        }
    });

+    function getRepairResponsible(data)
+    {
+            $.ajax(
+                {
+                    url: "@Url.Action("GetRepairResponsibleJson", "REP")",
+                    dataType: 'json',
+                    data: { "reason_no": $("#repairNo").val()},
+                    type: 'post',
+                    success: function (result)
+                    {
+                        console.info(result.data);
+                        $("#responsible").empty();//清空下拉框的值
+                        $.each(result.data, function (index, item) {
+                            $("#responsible").append(new Option(item.text, item.value));// 下拉菜单里添加元素
+                        });
+
+                        layui.form.render("select");//重新渲染 固定写法
+                    },
+                    error: function (result)
+                    {
+                        alert(result);
+                    }
+                });
+        };
+
    function getRepairType(data)
        {
            $.ajax(
--- a/AMESCoreStudio.Web/Views/REP/REP002R.cshtml
+++ b/AMESCoreStudio.Web/Views/REP/REP002R.cshtml
@ -284,12 +284,14 @@
                <div class="layui-inline">
                    <label asp-for="ngRepair.RepairNo" class="layui-form-label"></label>
                    <div class="layui-input-inline">
-                        <select asp-for="ngRepair.RepairNo" asp-items="@ViewBag.RMAReasonList" class=""></select>
+                        <select id="repairno" lay-filter="repairno" lay-verify="required" asp-for="ngRepair.RepairNo" asp-items="@ViewBag.RMAReasonList" class=""></select>
                        <span asp-validation-for="ngRepair.RepairNo" class="layui-bg-red"></span>
+                        <input id="repairNo" type="hidden" name="repairNo" value="" />
                    </div>
                    <label asp-for="ngRepair.RepairTypeNo" class="layui-form-label"></label>
                    <div class="layui-input-inline">
-                        <select asp-for="ngRepair.RepairTypeNo" asp-items="@ViewBag.RepairTypeList" class=""></select>
+                        <input id="txtRepairTypeNo" asp-for="ngRepair.RepairTypeNo" class="layui-input" autocomplete="off" />
+                        <input id="txtRepairTypeDesc" class="layui-input" autocomplete="off" readonly />
                        <span asp-validation-for="ngRepair.RepairTypeNo" class="layui-bg-red"></span>
                    </div>
                    <label asp-for="ngRepair.NgTypeNo" class="layui-form-label"></label>
@ -303,7 +305,7 @@
                <div class="layui-inline">
                    <label asp-for="ngRepair.RepairResponsibleID" class="layui-form-label"></label>
                    <div class="layui-input-inline">
-                        <select asp-for="ngRepair.RepairResponsibleID" asp-items="@ViewBag.RepairResponsibleUnitList" class=""></select>
+                        <select id="responsible" lay-filter="responsible" lay-verify="required" asp-for="ngRepair.RepairResponsibleID" asp-items="@ViewBag.RepairResponsibleUnitList" class=""></select>
                        <span asp-validation-for="ngRepair.RepairResponsibleID" class="layui-bg-red"></span>
                    </div>
                    <label asp-for="ngRepair.RmaNo" class="layui-form-label"></label>
@ -346,7 +348,7 @@
            <div style="text-align:center">
                <div class="layui-inline">
                    <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
-                    <input type="submit" value="確認" class="btn btn-primary offset-sm-3" />
+                    <button id="btnOK" type="button" class="layui-btn" lay-submit lay-filter="*">確認</button>
                </div>
            </div>
        </form>
@ -359,6 +361,16 @@
        await Html.RenderPartialAsync("_FileinputScriptsPartial"); }

 <script type="text/javascript">
+
+    layui.use(['form', 'layer'], function () {
+        form = layui.form;
+
+        form.on('select(repairno)', function (data) {
+            $("#repairNo").val(data.value);
+            getRepairResponsible($('#repairNo').val());
+        });
+    });
+
    $(document).ready(function () {
        var error = '@Html.ValidationMessage("error")';
        if ($(error).text() != '') {
@ -366,12 +378,72 @@
        }
    });

+    function getRepairResponsible(data)
+    {
+            $.ajax(
+                {
+                    url: "@Url.Action("GetRepairResponsibleJson", "REP")",
+                    dataType: 'json',
+                    data: { "reason_no": $("#repairNo").val()},
+                    type: 'post',
+                    success: function (result)
+                    {
+                        console.info(result.data);
+                        $("#responsible").empty();//清空下拉框的值
+                        $.each(result.data, function (index, item) {
+                            $("#responsible").append(new Option(item.text, item.value));// 下拉菜单里添加元素
+                        });
+
+                        layui.form.render("select");//重新渲染 固定写法
+                    },
+                    error: function (result)
+                    {
+                        alert(result);
+                    }
+                });
+        };
+
+    function getRepairType(data)
+        {
+            $.ajax(
+                {
+                    url: "@Url.Action("GetRepairTypeJson", "REP")",
+                    dataType: 'json',
+                    data: { "repair_type_no": data},
+                    type: 'post',
+                    success: function (result)
+                    {
+                        console.info(result.data);
+                        $.each(result.data, function (index, item) {
+                            $("#txtRepairTypeDesc").val(item.text);
+                        });
+                    },
+                    error: function (result)
+                    {
+                        alert(result);
+                    }
+                });
+        };
+
    $("#saveimage1").click(function (event) {
        alert('save1');


    });

+    $("#btnOK").click(function (event) {
+        $("#form").submit();
+    });
+
+    $('#txtRepairTypeNo').on('keypress', function (event) {
+
+        if (event.keyCode == 13) {
+            //alert($('#txtRepairTypeNo').val());
+            getRepairType($('#txtRepairTypeNo').val());
+        }
+
+    });
+
    var tableCols = [[
        {
            field: 'repairID',
--- a/AMESCoreStudio.WebApi/Controllers/BAS/RepairResponsibleUnitsesController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/BAS/RepairResponsibleUnitsesController.cs
@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using AMESCoreStudio.WebApi;
 using AMESCoreStudio.WebApi.Models.BAS;
+using AMESCoreStudio.WebApi.Models.AMES;
 using AMESCoreStudio.CommonTools.Result;

 namespace AMESCoreStudio.WebApi.Controllers.BAS
@ -67,6 +68,31 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
            return repairResponsibleUnits;
        }

+        /// <summary>
+        /// 用維修原因获取維修責任單位资料
+        /// </summary>
+        /// <param name="no">維修原因代碼</param>
+        /// <returns></returns>
+        // GET: api/RepairResponsibleUnitses/5
+        [HttpGet("Query/{no}")]
+        public async Task<ActionResult<IEnumerable<RepairResponsibleUnits>>> GetRepairResponsibleUnitsByReasonNo(string no)
+        {
+            IQueryable<RMAReason> q1 = _context.RMAReasons;
+            q1 = q1.Where(p => p.RMAReasonNo.Equals(no));
+            var rmaReason = await q1.ToListAsync();
+
+            IQueryable<RepairResponsibleUnits> q = _context.RepairResponsibleUnitses;
+            q = q.Where(p => p.RRID.Equals(rmaReason[0].ResponseDept));
+            var repairResponsibleUnits = await q.ToListAsync();
+
+            if (repairResponsibleUnits == null)
+            {
+                return NotFound();
+            }
+
+            return repairResponsibleUnits;
+        }
+
        /// <summary>
        /// 更新維修責任單位资料
        /// </summary>
--- a/AMESCoreStudio.WebApi/Models/SYS/DeptInfo.cs
+++ b/AMESCoreStudio.WebApi/Models/SYS/DeptInfo.cs
@ -79,24 +79,28 @@ namespace AMESCoreStudio.WebApi.Models.SYS
        /// 建立人員
        /// </summary>
        [Column("CREATE_USERID")]
+        [DataMember]
        public int CreateUserId { get; set; }

        /// <summary>
        /// 建立時間
        /// </summary>
        [Column("CREATE_DATETIME")]
+        [DataMember]
        public DateTime CreateDateTime { get; set; }

        /// <summary>
        /// 修改人員
        /// </summary>
        [Column("UPDATE_USERID")]
+        [DataMember]
        public int UpdateUserId { get; set; }

        /// <summary>
        /// 修改時間
        /// </summary>
        [Column("UPDATE_DATETIME")]
+        [DataMember]
        public DateTime UpdateDateTime { get; set; }
    }
 }
--- a/AMESCoreStudio.WebApi/Models/SYS/IDKey.cs
+++ b/AMESCoreStudio.WebApi/Models/SYS/IDKey.cs
@ -4,6 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Runtime.Serialization;

 namespace AMESCoreStudio.WebApi.Models.SYS
 {
@ -18,6 +19,7 @@ namespace AMESCoreStudio.WebApi.Models.SYS
        /// </summary>
        [Key]
        [Column("ID_NAME")]
+        [DataMember]
        [Required]
        public string IDName { get; set; }

@ -25,6 +27,7 @@ namespace AMESCoreStudio.WebApi.Models.SYS
        /// 當前值
        /// </summary>
        [Column("CURRENT_NUM")]
+        [DataMember]
        [Required]
        public int CurrentNum { get; set; }

@ -32,6 +35,7 @@ namespace AMESCoreStudio.WebApi.Models.SYS
        /// 初始值
        /// </summary>
        [Column("START_NUM")]
+        [DataMember]
        [Required]
        public int StartNum { get; set; }

@ -39,6 +43,7 @@ namespace AMESCoreStudio.WebApi.Models.SYS
        /// 最大值
        /// </summary>
        [Column("LIMIT_NUM")]
+        [DataMember]
        [Required]
        public int LimitNum { get; set; }

@ -46,6 +51,7 @@ namespace AMESCoreStudio.WebApi.Models.SYS
        /// 增量
        /// </summary>
        [Column("DELTA_NUM")]
+        [DataMember]
        [Required]
        public int DeltaNum { get; set; }

@ -53,12 +59,14 @@ namespace AMESCoreStudio.WebApi.Models.SYS
        /// 建立時間
        /// </summary>
        [Column("CREATE_DATETIME")]
+        [DataMember]
        public DateTime CreateDateTime { get; set; }

        /// <summary>
        /// 更新時間
        /// </summary>
        [Column("UPDATE_DATETIME")]
+        [DataMember]
        public DateTime UpdateDateTime { get; set; }
    }
 }
--- a/AMESCoreStudio.WebApi/Models/SYS/ModuleInfo.cs
+++ b/AMESCoreStudio.WebApi/Models/SYS/ModuleInfo.cs
@ -85,24 +85,28 @@ namespace AMESCoreStudio.WebApi.Models.SYS
        /// 建立人員
        /// </summary>
        [Column("CREATE_USERID")]
+        [DataMember]
        public int CreateUserId { get; set; }

        /// <summary>
        /// 建立時間
        /// </summary>
        [Column("CREATE_DATETIME")]
+        [DataMember]
        public DateTime CreateDateTime { get; set; }

        /// <summary>
        /// 修改人員
        /// </summary>
        [Column("UPDATE_USERID")]
+        [DataMember]
        public int UpdateUserId { get; set; }

        /// <summary>
        /// 修改時間
        /// </summary>
        [Column("UPDATE_DATETIME")]
+        [DataMember]
        public DateTime UpdateDateTime { get; set; }
    }
 }
--- a/AMESCoreStudio.WebApi/Models/SYS/ProgramInfo.cs
+++ b/AMESCoreStudio.WebApi/Models/SYS/ProgramInfo.cs
@ -94,24 +94,28 @@ namespace AMESCoreStudio.WebApi.Models.SYS
        /// 建立人員
        /// </summary>
        [Column("CREATE_USERID")]
+        [DataMember]
        public int CreateUserId { get; set; }

        /// <summary>
        /// 建立時間
        /// </summary>
        [Column("CREATE_DATETIME")]
+        [DataMember]
        public DateTime CreateDateTime { get; set; }

        /// <summary>
        /// 修改人員
        /// </summary>
        [Column("UPDATE_USERID")]
+        [DataMember]
        public int UpdateUserId { get; set; }

        /// <summary>
        /// 修改時間
        /// </summary>
        [Column("UPDATE_DATETIME")]
+        [DataMember]
        public DateTime UpdateDateTime { get; set; }
    }
 }
--- a/AMESCoreStudio.WebApi/Models/SYS/RoleInfo.cs
+++ b/AMESCoreStudio.WebApi/Models/SYS/RoleInfo.cs
@ -58,24 +58,28 @@ namespace AMESCoreStudio.WebApi.Models.SYS
        /// 建立人員
        /// </summary>
        [Column("CREATE_USERID")]
+        [DataMember]
        public int CreateUserId { get; set; }

        /// <summary>
        /// 建立時間
        /// </summary>
        [Column("CREATE_DATETIME")]
+        [DataMember]
        public DateTime CreateDateTime { get; set; }

        /// <summary>
        /// 修改人員
        /// </summary>
        [Column("UPDATE_USERID")]
+        [DataMember]
        public int UpdateUserId { get; set; }

        /// <summary>
        /// 修改時間
        /// </summary>
        [Column("UPDATE_DATETIME")]
+        [DataMember]
        public DateTime UpdateDateTime { get; set; }

        
--- a/AMESCoreStudio.WebApi/Models/SYS/RoleModule.cs
+++ b/AMESCoreStudio.WebApi/Models/SYS/RoleModule.cs
@ -52,24 +52,28 @@ namespace AMESCoreStudio.WebApi.Models.SYS
        /// 启用人員
        /// </summary>
        [Column("ENABLE_USERID")]
+        [DataMember]
        public int EnableUserId { get; set; }

        /// <summary>
        /// 启用時間
        /// </summary>
        [Column("ENABLE_DATETIME")]
+        [DataMember]
        public DateTime EnableDateTime { get; set; }

        /// <summary>
        /// 停用人員
        /// </summary>
        [Column("DISABLE_USERID")]
+        [DataMember]
        public int DisableUserId { get; set; }

        /// <summary>
        /// 停用時間
        /// </summary>
        [Column("DISABLE_DATETIME")]
+        [DataMember]
        public DateTime DisableDateTime { get; set; }

        /// <summary>
--- a/AMESCoreStudio.WebApi/Models/SYS/RoleProgram.cs
+++ b/AMESCoreStudio.WebApi/Models/SYS/RoleProgram.cs
@ -52,24 +52,28 @@ namespace AMESCoreStudio.WebApi.Models.SYS
        /// 启用人員
        /// </summary>
        [Column("ENABLE_USERID")]
+        [DataMember]
        public int EnableUserId { get; set; }

        /// <summary>
        /// 启用時間
        /// </summary>
        [Column("ENABLE_DATETIME")]
+        [DataMember]
        public DateTime EnableDateTime { get; set; }

        /// <summary>
        /// 停用人員
        /// </summary>
        [Column("DISABLE_USERID")]
+        [DataMember]
        public int DisableUserId { get; set; }

        /// <summary>
        /// 停用時間
        /// </summary>
        [Column("DISABLE_DATETIME")]
+        [DataMember]
        public DateTime DisableDateTime { get; set; }

        /// <summary>
--- a/AMESCoreStudio.WebApi/Models/SYS/SystemInfo.cs
+++ b/AMESCoreStudio.WebApi/Models/SYS/SystemInfo.cs
@ -77,24 +77,28 @@ namespace AMESCoreStudio.WebApi.Models.SYS
        /// 建立人員
        /// </summary>
        [Column("CREATE_USERID")]
+        [DataMember]
        public int CreateUserId { get; set; }

        /// <summary>
        /// 建立時間
        /// </summary>
        [Column("CREATE_DATETIME")]
+        [DataMember]
        public DateTime CreateDateTime { get; set; }

        /// <summary>
        /// 修改人員
        /// </summary>
        [Column("UPDATE_USERID")]
+        [DataMember]
        public int UpdateUserId { get; set; }

        /// <summary>
        /// 修改時間
        /// </summary>
        [Column("UPDATE_DATETIME")]
+        [DataMember]
        public DateTime UpdateDateTime { get; set; }
    }
 }
--- a/AMESCoreStudio.WebApi/Models/SYS/UserInfo.cs
+++ b/AMESCoreStudio.WebApi/Models/SYS/UserInfo.cs
@ -101,24 +101,28 @@ namespace AMESCoreStudio.WebApi.Models.SYS
        /// 建立人員
        /// </summary>
        [Column("CREATE_USERID")]
+        [DataMember]
        public int CreateUserId { get; set; }

        /// <summary>
        /// 建立時間
        /// </summary>
        [Column("CREATE_DATETIME")]
+        [DataMember]
        public DateTime CreateDateTime { get; set; }

        /// <summary>
        /// 修改人員
        /// </summary>
        [Column("UPDATE_USERID")]
+        [DataMember]
        public int UpdateUserId { get; set; }

        /// <summary>
        /// 修改時間
        /// </summary>
        [Column("UPDATE_DATETIME")]
+        [DataMember]
        public DateTime UpdateDateTime { get; set; }
    }
 }
--- a/AMESCoreStudio.WebApi/Models/SYS/UserRole.cs
+++ b/AMESCoreStudio.WebApi/Models/SYS/UserRole.cs
@ -52,24 +52,28 @@ namespace AMESCoreStudio.WebApi.Models.SYS
        /// 启用人員
        /// </summary>
        [Column("ENABLE_USERID")]
+        [DataMember]
        public int EnableUserId { get; set; }

        /// <summary>
        /// 启用時間
        /// </summary>
        [Column("ENABLE_DATETIME")]
+        [DataMember]
        public DateTime EnableDateTime { get; set; }

        /// <summary>
        /// 停用人員
        /// </summary>
        [Column("DISABLE_USERID")]
+        [DataMember]
        public int DisableUserId { get; set; }

        /// <summary>
        /// 停用時間
        /// </summary>
        [Column("DISABLE_DATETIME")]
+        [DataMember]
        public DateTime DisableDateTime { get; set; }

        /// <summary>