協助Yiru上傳3個問題修正，1個新增

AMESCoreStudio.Web/Controllers/WHSController.cs

@@ -1207,7 +1207,7 @@ namespace AMESCoreStudio.Web.Controllers
 
 
 
-            var result = await _whsApi.GetExceptionWorktimeByQuery(factoryNo, unitNo, lineID, deptID, sdate, edate);
+            var result = await _whsApi.GetExceptionWorktimeByQueryWHS009(factoryNo, unitNo, lineID, deptID, sdate, edate);
 
 
             if (result.Count > 0)

AMESCoreStudio.Web/HttpApis/AMES/IWHS.cs

@@ -325,6 +325,9 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpGet("api/ExceptionWorktimes/Query/{factoryid}/{unitid}/{lineid}/{deptid}/{sdate}/{edate}")]
         ITask<List<ExceptionWorktime>> GetExceptionWorktimeByQuery(string factoryid, string unitid, string lineid, string deptid, string sdate, string edate);
 
+        [WebApiClient.Attributes.HttpGet("api/ExceptionWorktimes/ByQueryWHS009/{factoryid}/{unitid}/{lineid}/{deptid}/{sdate}/{edate}")]
+        ITask<List<ExceptionWorktimeDto>> GetExceptionWorktimeByQueryWHS009(string factoryid, string unitid, string lineid, string deptid, string sdate, string edate);
+
         #endregion
 
         #region WHS011 重工標準工時維護

AMESCoreStudio.Web/Views/WHS/WHS009.cshtml

@@ -158,47 +158,47 @@
                 templet: '<div>{{ layui.util.toDateString(d.exceptionDate, "yyyy/MM/dd") }}</div>'
             },
             {
-                field: 'lineID',
-                width: 50,
+                field: 'lineDesc',
+                width: 80,
                 title: '線別',
                 sort: true
             },
             {
                 field: 'wipNo',
                 title: '歸屬工單',
-                width: 200,
+                width: 120,
                 sort: true
             },
             {
                 field: 'modelNo',
                 title: '歸屬機種',
-                width: 100,
+                width: 120,
                 sort: true
             },
             {
                 field: 'time',
                 title: '異常工時(Min)',
-                width: 100,
+                width: 120,
                 sort: true
             },
             {
                 field: 'reasonNameCh',
-                title: '判定描述(中文)',
-                width: 100,
+                title: '判定描述(中文)'
             },
             {
-                field: 'decidUserID',
-                title: '判定負責人'
+                field: 'decideUserName',
+                title: '判定負責人',
+                width: 120,
             },
             {
-                field: 'dutyDeptID',
+                field: 'dutyDeptName',
                 title: '責任單位',
                 width: 100,
                 
             },
             {
                 field: 'right',
-                width: 80,
+                width: 150,
                 title: '操作',
                 align: 'center',
                 fixed: 'right',
@@ -215,7 +215,7 @@
         }
         //通过行tool删除，lay-event="del"
         function del(obj) {
-            if (obj.data.classID) {
+            if (obj.data.exceptionID) {
                 hg.confirm("異常工時：" + obj.data.exceptionID + "，確定要删除嗎？", function () {
                     $.ajax({
                         url: '/WHS/WHS009D',

AMESCoreStudio.Web/Views/WHS/WHS009C.cshtml

@@ -267,8 +267,8 @@
                 type: 'get',
                 success: function (result) {
                     if (result.data) {
-                        //console.info(result.data);//確認itemNO/modelNO
-                        $("#ModelNo").val(result.data.modelNO);
+                        //console.info(result.data);//確認itemNO
+                        $("#ModelNo").val(result.data.itemNO);
                     }
                     else {
                         alert("查無資料,請確認工單是否正確！");

AMESCoreStudio.WebApi/Controllers/AMES/ExceptionWorktimesController.cs

@@ -230,9 +230,117 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return result;
         }
 
+
         private bool ExceptionWorktimeExists(int id)
         {
             return _context.ExceptionWorktimes.Any(e => e.ExceptionID == id);
         }
+
+        //YIRU ADD  ------------------------------------------------------------------------------------------
+
+        /// <summary>
+        /// 異常工時查詢QuerybyWHS009
+        /// </summary>
+        /// <param name="factoryid"></param>
+        /// <param name="unitid"></param>
+        /// <param name="lineid"></param>
+        /// <param name="deptid"></param>
+        /// <param name="sdate"></param>
+        /// <param name="edate"></param>
+        /// <returns></returns>
+        [HttpGet("ByQueryWHS009/{factoryid}/{unitid}/{lineid}/{deptid}/{sdate}/{edate}")]
+        public async Task<ActionResult<IEnumerable<ExceptionWorktimeDto>>> GetExceptionWorktimeByQueryWHS009(string factoryid, string unitid, string lineid, string deptid, string sdate, string edate)
+        {
+
+            IQueryable<ExceptionWorktimeDto> q = from q1 in _context.ExceptionWorktimes
+                                                 join q2 in _context.UserInfoes on q1.DecidUserID equals q2.UserID
+                                                 join q3 in _context.DeptInfoes on q1.DutyDeptID equals q3.DeptID
+                                                 join q4 in _context.LineInfoes on q1.LineID equals q4.LineID
+                                                 select new ExceptionWorktimeDto
+                                                 {
+                                                     ExceptionID = q1.ExceptionID,
+                                                     FactoryNo = q1.FactoryNo,
+                                                     UnitNo = q1.UnitNo,
+                                                     LineID = q1.LineID,
+                                                     LineDesc = q4.LineDesc,
+                                                     ExceptionDate = q1.ExceptionDate,
+                                                     ClassNo = q1.ClassNo,
+                                                     ExceptionNo = q1.ExceptionNo,
+                                                     WipNo = q1.WipNo,
+                                                     ModelNo = q1.ModelNo,
+                                                     Time = q1.Time,
+                                                     DeptID = q1.DeptID,
+                                                     Memo = q1.Memo,
+                                                     StationID = q1.StationID,
+                                                     T2UserName = q1.T2UserName,
+                                                     StartTime = q1.StartTime,
+                                                     EndTime = q1.EndTime,
+                                                     DecideDept = q1.DecideDept,
+                                                     DecideUser = q1.DecideUser,
+                                                     DutyDept = q1.DutyDept,
+                                                     Measure = q1.Measure,
+                                                     PersonNum = q1.PersonNum,
+                                                     ReasonNameCh = q1.ReasonNameCh,
+                                                     PersonNo = q1.PersonNo,
+                                                     MeasureDate = q1.MeasureDate,
+                                                     MeasureMemo = q1.MeasureMemo,
+                                                     DecidDeptID = q1.DecidDeptID,
+                                                     DecidUserID = q1.DecidUserID,
+                                                     DecideUserName = q2.UserName,
+                                                     DutyDeptID = q1.DutyDeptID,
+                                                     DutyDeptName = q3.DeptName,
+                                                     DutyUserID = q1.DutyUserID,
+                                                     DutyUser = q1.DutyUser,
+                                                     CreateUserID = q1.CreateUserID,
+                                                     CreateDate = q1.CreateDate,
+                                                     UpdateUserID = q1.UpdateUserID,
+                                                     UpdateDate = q1.UpdateDate,
+
+                                                 };
+
+
+
+
+            if (factoryid != "*")
+                q = q.Where(p => p.FactoryNo.Equals(factoryid));
+            if (unitid != "*")
+                q = q.Where(p => p.UnitNo.Equals(unitid));
+            if (deptid != "*")
+                q = q.Where(p => p.DecidDeptID == int.Parse(deptid));
+            if (lineid != "*")
+                q = q.Where(p => p.LineID == int.Parse(lineid));
+
+            DateTime dateValue;
+            if (sdate != "*")
+            {
+
+                if (DateTime.TryParse(sdate, out dateValue))
+                {
+                    q = q.Where(p => p.ExceptionDate >= DateTime.Parse(sdate));
+                }
+            }
+            if (edate != "*")
+            {
+                if (DateTime.TryParse(edate, out dateValue))
+                {
+                    q = q.Where(p => p.ExceptionDate <= DateTime.Parse(edate));
+                }
+
+            }
+
+
+            var exceptionWorktime = await q.ToListAsync();
+
+            if (exceptionWorktime == null)
+            {
+                return NotFound();
+            }
+            return exceptionWorktime;
+
+
+        }
+
+        //YIRU End  ------------------------------------------------------------------------------------------
+
     }
 }

AMESCoreStudio.WebApi/DTO/AMES/ExceptionWorktimeDto.cs

@@ -0,0 +1,307 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Runtime.Serialization;
+
+namespace AMESCoreStudio.WebApi.Models.AMES
+{
+    /// <summary>
+    /// 異常工時資料
+    /// </summary>
+  
+
+    public partial class ExceptionWorktimeDto
+    {
+        //yiru add 2022-10-14
+        /// <summary>
+        /// 異常工時ID
+        /// </summary>
+        [Key]
+        [Column("EXCEPTION_ID")]
+        [Required(ErrorMessage = "{0},不能空白")]
+        [DataMember]
+        public int ExceptionID { get; set; }
+
+        /// <summary>
+        /// 廠別
+        /// </summary>
+        [Column("FACTORY_NO")]
+        [DataMember]
+        [Display(Name = "廠別")]
+        public string FactoryNo { get; set; }
+
+        /// <summary>
+        /// 制程代碼
+        /// </summary>
+        [Column("UNIT_NO")]
+        [DataMember]
+        [Display(Name = "制程代碼")]
+        public string UnitNo { get; set; }
+
+        /// <summary>
+        /// 線別
+        /// </summary>
+        [Column("LINE_ID")]
+        [DataMember]
+        [Display(Name = "線別")]
+        public int LineID { get; set; }
+
+        /// <summary>
+        /// 線別 desc
+        /// </summary>
+        [Column("LINE_DESC")]
+        [DataMember]
+        [Display(Name = "線別敘述")]
+        public string LineDesc { get; set; }
+
+        /// <summary>
+        /// 異常日期
+        /// </summary>
+        [Column("EXCEPTION_DATE")]
+        [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
+        [Display(Name = "異常日期")]
+        public DateTime ExceptionDate { get; set; }
+
+        /// <summary>
+        /// 異常班別
+        /// </summary>
+        [Column("CLASS_NO")]
+        [DataMember]
+        [Display(Name = "異常班別")]
+        public string ClassNo { get; set; }
+
+        /// <summary>
+        /// 異常代碼
+        /// </summary>
+        [Column("EXCEPTION_NO")]
+        [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
+        [Display(Name = "異常代碼")]
+        public string ExceptionNo { get; set; }
+
+        /// <summary>
+        /// 歸屬工單
+        /// </summary>
+        [Column("WIP_NO")]
+        [Display(Name = "歸屬工單")]
+        public string WipNo { get; set; }
+
+        /// <summary>
+        /// 機種
+        /// </summary>
+        [Column("MODEL_NO")]
+        [Display(Name = "歸屬機種")]
+        public string ModelNo { get; set; }
+
+
+        /// <summary>
+        /// 異常工時(Min)
+        /// </summary>
+        [Column("TIME")]
+        [DataMember]
+        [Display(Name = "異常工時(Min)")]
+        public decimal Time { get; set; }
+
+        /// <summary>
+        /// 歸屬部門
+        /// </summary>
+        [Column("DEPT_ID")]
+        [DataMember]
+        [Display(Name = "歸屬部門")]
+        public int DeptID { get; set; }
+
+        /// <summary>
+        /// 異常備註
+        /// </summary>
+        [Display(Name = "異常備註")]
+        [Column("MEMO")]
+        public string Memo { get; set; }
+
+        /// <summary>
+        /// 站別ID
+        /// </summary>
+        [Column("STATION_ID")]
+        [DataMember]
+        [Display(Name = "站別")]
+        public int StationID { get; set; }
+
+        /// <summary>
+        /// T2站點姓名
+        /// </summary>
+        [Column("T2_USER_NAME")]
+        [Display(Name = "T2站點姓名")]
+        public string T2UserName { get; set; }
+
+        /// <summary>
+        /// 起始時間
+        /// </summary>
+        [Column("START_TIME")]
+        [Display(Name = "起始時間")]
+        public DateTime StartTime { get; set; }
+
+        /// <summary>
+        /// 結束時間
+        /// </summary>
+        [Column("END_TIME")]
+        [Display(Name = "結束時間")]
+        public DateTime EndTime { get; set; }
+
+        /// <summary>
+        /// 判定單位
+        /// </summary>
+        [Column("DECIDE_DEPT")]
+        [Display(Name = "判定單位")]
+        public string DecideDept { get; set; }
+
+        /// <summary>
+        /// 判定負責人
+        /// </summary>
+        [Column("DECIDE_USER")]
+        [Display(Name = "判定負責人")]
+        public string DecideUser{ get; set; }
+
+       
+
+        /// <summary>
+        /// 責任單位(回覆)
+        /// </summary>
+        [Column("DUTY_DEPT")]
+        [Display(Name = "責任單位")]
+        public string DutyDept { get; set; }
+
+
+        /// <summary>
+        /// 回覆: 回覆對策
+        /// </summary>
+        [Column("MEASURE")]
+        [Display(Name = "回覆: 回覆對策")]
+        public string Measure { get; set; }
+
+        /// <summary>
+        /// 異常人數
+        /// </summary>
+        [Column("PERSON_NUM")]
+        [DataMember]
+        [Display(Name = "異常人數")]
+        public int PersonNum { get; set; }
+
+        /// <summary>
+        /// 回覆: 判定描述
+        /// </summary>
+        [Column("REASON_NAME_CH")]
+        [Display(Name = "回覆: 判定描述")]
+        public string ReasonNameCh { get; set; }
+
+        /// <summary>
+        ///回覆: 判定類別
+        /// </summary>
+        [Column("REASON_NO")]
+        [Display(Name = "判定類別")]
+        public string PersonNo { get; set; }
+
+        /// <summary>
+        /// 回覆: 回覆日期
+        /// </summary>
+        [Column("MEASURE_DATE")]
+        [Display(Name = "回覆: 回覆日期")]
+        public DateTime MeasureDate { get; set; }
+
+        /// <summary>
+        /// 回覆: 回覆備註
+        /// </summary>
+        [Column("MEASURE_MEMO")]
+        [Display(Name = "回覆: 回覆備註")]
+        public string MeasureMemo { get; set; }
+
+        /// <summary>
+        /// 判定單位ID
+        /// </summary>
+        [Column("DECIDE_DEPT_ID")]
+        [Display(Name = "判定單位ID")]
+        public int DecidDeptID { get; set; }
+
+
+
+        /// <summary>
+        /// 判定負責人ID
+        /// </summary>
+        [Column("DECIDE_USER_ID")]
+        [Display(Name = "判定負責人ID")]
+        public int DecidUserID { get; set; }
+
+
+        /// <summary>
+        /// 判定負責人姓名
+        /// </summary>
+        [Column("DECIDE_USER_NAME")]
+        [Display(Name = "判定負責人")]
+        public string DecideUserName { get; set; }
+
+        /// <summary>
+        /// 責任單位ID
+        /// </summary>
+        [Column("DUTY_DEPT_ID")]
+        [Display(Name = "責任單位ID")]
+        public int DutyDeptID { get; set; }
+
+
+        /// <summary>
+        /// 責任單位(回覆)
+        /// </summary>
+        [Column("DUTY_DEPT_NAME")]
+        [Display(Name = "責任單位")]
+        public string DutyDeptName { get; set; }
+
+        /// <summary>
+        /// 責任人ID
+        /// </summary>
+        [Column("DUTY_USER_ID")]
+        [Display(Name = "責任人ID")]
+        public int DutyUserID { get; set; }
+
+        /// <summary>
+        /// 責任人工號
+        /// </summary>
+        [Column("DUTY_USER")]
+        [Display(Name = "責任人工號")]
+        public string DutyUser { get; set; }
+
+        /// <summary>
+        /// 建立者
+        /// </summary>
+        [Column("CREATE_USERID")]
+        [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
+        [Display(Name = "建立者")]
+        public decimal CreateUserID { get; set; }
+
+        /// <summary>
+        /// 建立日期
+        /// </summary>
+        [Column("CREATE_DATE")]
+        [DataMember]
+        [Display(Name = "建立日期")]
+        public DateTime CreateDate { get; set; }
+
+        /// <summary>
+        /// 修改者
+        /// </summary>
+        [Column("UPDATE_USERID")]
+        [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
+        [Display(Name = "修改者")]
+        public decimal UpdateUserID { get; set; }
+
+        /// <summary>
+        /// 修改日期
+        /// </summary>
+        [Column("UPDATE_DATE")]
+        [DataMember]
+        [Display(Name = "修改日期")]
+        public DateTime UpdateDate { get; set; }
+
+   
+
+    }
+}