diff --git a/AMESCoreStudio.Web/Views/PCS/PCS031.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS031.cshtml
index 7b0aae5a..f0fb508f 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS031.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS031.cshtml
@@ -96,16 +96,16 @@
                     </div>
                     <div class="layui-form-item">
                         <div class="layui-col-sm4">
-                          <div class="layui-inline">
-                            <label class="layui-form-label">是否入庫:</label>
-                            <div class="layui-input-inline">
-                                <select name="Status" id="Status" class="custom-select col-sm-2">
-                                    <option value="ALL">全部</option>
-                                    <option value="Y">已入庫</option>
-                                    <option value="N">待入庫</option>
-                                </select>
-                           </div>
-                        </div>
+                            <div class="layui-inline">
+                                <label class="layui-form-label">是否入庫:</label>
+                                <div class="layui-input-inline">
+                                    <select name="Status" id="Status" class="custom-select col-sm-2">
+                                        <option value="ALL">全部</option>
+                                        <option value="Y">已入庫</option>
+                                        <option value="N">待入庫</option>
+                                    </select>
+                                </div>
+                            </div>
                         </div>
                         <div class="layui-col-sm">
                             <div class="layui-inline layui-show-xs-block">
@@ -127,10 +127,18 @@
                             </div>
                         </div>
                     </div>
+                    <div class="layui-col-sm4">
+                        <div class="layui-inline">
+                            <label class="layui-form-label">RecordDate 輸入:</label>
+                            <div class="layui-input-inline" style="width:150px">
+                                <input id="recordDate" name="date_str" autocomplete="off" value="@System.DateTime.Now.ToString("yyyy-MM-dd")" class="layui-input" readonly="">
+                            </div>
+                        </div>
+                    </div>
 
-                   
                 </div>
             </div>
+            
 
         </div>
         <table class="layui-hide" id="query" lay-filter="query"></table>
@@ -161,6 +169,12 @@
                 , format: 'yyyy/MM/dd'
                 , theme: 'grid'
             });
+            laydate.render({
+                elem: '#recordDate'
+                , trigger: 'click'
+                , format: 'yyyy-MM-dd'
+                , theme: 'grid'
+            });
         });
 
         $('#inhouseNo1').on('keypress', function (event) {
@@ -341,6 +355,7 @@
 
         function edit(obj) {
             var recordmumber = $("#inhouseNo1").val();
+            var recordDate = $("#recordDate").val();
             if (recordmumber == '') {
                 hg.msg('請輸入recordmumber！');
             }
@@ -348,7 +363,7 @@
                 hg.confirm("送驗單號_箱號：【" + obj.data.inhouseNo + "_" + obj.data.serialNo +  "】，確定要入庫嗎？", function () {
                 $.ajax({
                     url: '/PCS/PCS031inhouse',
-                    data: { InhouseNo: obj.data.inhouseNo, boxNo: obj.data.serialNo, seq: obj.data.seqID, recordNumber: recordmumber, locationNo: obj.data.locationNo },
+                    data: { InhouseNo: obj.data.inhouseNo, boxNo: obj.data.serialNo, seq: obj.data.seqID, recordNumber: recordmumber, locationNo: obj.data.locationNo, recordDate: recordDate },
                     type: 'POST',
                     success: function (data) {
                         if (data.success) {
@@ -374,7 +389,8 @@
             handler: function (obj, row) {
                 if (obj.checkstatus && obj.checkstatus.data.length > 0) {
                     console.log(obj.checkstatus.data.map(function (x) { return x.serialNo }).join(','))
-                   var recordmumber = $("#inhouseNo1").val();
+                    var recordmumber = $("#inhouseNo1").val();
+                    var recorddate = $("#recordDate").val();
                  
                     if (recordmumber == '') {
                         hg.msg('請輸入recordmumber！');
@@ -383,7 +399,7 @@
                         hg.confirm("批量入庫所有选中的数据，確定要入庫吗？", function () {
                             $.ajax({
                                 url: '/PCS/PCS031inhouse_all',
-                                data: { ids: obj.checkstatus.data.map(function (x) { return x.inhouseNo + "," + x.serialNo + "," + x.seqID + "," + recordmumber + "," + x.locationNo }) },
+                                data: { ids: obj.checkstatus.data.map(function (x) { return x.inhouseNo + "," + x.serialNo + "," + x.seqID + "," + recordmumber + "," + x.locationNo + "," + recorddate }) },
                                 type: 'POST',
                                 success: function (data) {
                                     if (data.success) {
diff --git a/AMESCoreStudio.Web/Views/SPC/SPC004V.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC004V.cshtml
index 515f3364..938c93d5 100644
--- a/AMESCoreStudio.Web/Views/SPC/SPC004V.cshtml
+++ b/AMESCoreStudio.Web/Views/SPC/SPC004V.cshtml
@@ -2,6 +2,21 @@
     ViewData["Title"] = "巡檢結果回覆";
     Layout = "~/Views/Shared/_AMESLayout.cshtml";
 }
+<style>
+    /*    .control-label {
+                                                            justify-content: flex-end !important;
+                                                        }
+                                                    */
+
+
+   
+    .layui-table-cell {
+        height: auto;
+        overflow: visible;
+        text-overflow: inherit;
+        white-space: normal
+    }
+</style>
 
 <div class="layui-card">
     <div class="layui-card-header">
diff --git a/AMESCoreStudio.Web/Views/SPC/SPC005C.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC005C.cshtml
index a2382d8c..6f08004c 100644
--- a/AMESCoreStudio.Web/Views/SPC/SPC005C.cshtml
+++ b/AMESCoreStudio.Web/Views/SPC/SPC005C.cshtml
@@ -23,6 +23,13 @@
         margin-top: -10px;
         margin-left: -10px;
         margin-right: -10px;
+
+    }
+    .layui-table-cell {
+        height: auto;
+        overflow: visible;
+        text-overflow: inherit;
+        white-space: normal
     }
 </style>
 
diff --git a/AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml
index 6e307d4e..3c45ea2f 100644
--- a/AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml
+++ b/AMESCoreStudio.Web/Views/SPC/SPC005U.cshtml
@@ -16,6 +16,12 @@
         margin-left: -10px;
         margin-right: -10px;
     }
+    .layui-table-cell {
+        height:auto;
+        overflow:visible;
+        text-overflow:inherit;
+        white-space:normal
+    }
 </style>
 <div class="layui-card">
     <div class="layui-card-body">
diff --git a/AMESCoreStudio.Web/Views/SPC/SPC005V.cshtml b/AMESCoreStudio.Web/Views/SPC/SPC005V.cshtml
index d4cc5e1b..762ee785 100644
--- a/AMESCoreStudio.Web/Views/SPC/SPC005V.cshtml
+++ b/AMESCoreStudio.Web/Views/SPC/SPC005V.cshtml
@@ -15,6 +15,12 @@
         margin-left: -10px;
         margin-right: -10px;
     }
+    .layui-table-cell {
+        height: auto;
+        overflow: visible;
+        text-overflow: inherit;
+        white-space: normal
+    }
 </style>
 <div class="layui-card">
     <div class="layui-card-body">
@@ -112,7 +118,6 @@
                         field: 'inspectionItem',
                         title: '項目',
                         align: 'left',
-                        width: 450,
                         sort: true,
                         templet: function (d) {
                             return d.inspectionItem['inspectionItemName'];
diff --git a/AMESCoreStudio.Web/Views/WHS/WHS019.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS019.cshtml
index 4155f59b..39658087 100644
--- a/AMESCoreStudio.Web/Views/WHS/WHS019.cshtml
+++ b/AMESCoreStudio.Web/Views/WHS/WHS019.cshtml
@@ -267,6 +267,7 @@
             {
                 field: 'closeTime',
                 title: '完工時間',
+                sort: true,
                 templet: '<div>{{ layui.util.toDateString(d.closeTime, "yyyy/MM/dd HH:mm:ss") }}</div>'
             },
             {
diff --git a/AMESCoreStudio.Web/Views/WHS/WHS019C.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS019C.cshtml
index aec6fe9f..d938a581 100644
--- a/AMESCoreStudio.Web/Views/WHS/WHS019C.cshtml
+++ b/AMESCoreStudio.Web/Views/WHS/WHS019C.cshtml
@@ -304,7 +304,7 @@
             elem: '#StartTime'
             , trigger: 'click'
             , type: 'datetime'
-            , format: 'yyyy-MM-dd HH:mm'
+            , format: 'yyyy-MM-dd'
             , theme: 'grid'
         });
         laydate.render({
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/CZmomaterialListController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/CZmomaterialListController.cs
index afeaa4dd..2823ef0b 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/CZmomaterialListController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/CZmomaterialListController.cs
@@ -43,7 +43,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
 
 
         /// <summary>
-        /// 工單發料資料表 by ByMoID 查詢
+        /// 工單發料資料表 查詢POWER CORD,E17 by ByMoID 查詢
         /// </summary>
         /// <param name="id">MoID</param>
         /// <returns></returns>
@@ -65,6 +65,26 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         }
 
 
-      
+        /// <summary>
+        /// 工單發料資料表 查詢工單所有發料 by ByMoID 查詢
+        /// </summary>
+        /// <param name="id">MoID</param>
+        /// <returns></returns>
+        [HttpGet("ByMoID_ALL/{id}")]
+        public async Task<ActionResult<IEnumerable<dynamic>>> GetCZmomaterialListByMoID_ALL(string id)
+        {
+            var q = from q1 in _context.CZmomaterialLists.Where(w => w.MoID == id)
+                    select new
+                    {
+                        q1.MoID,
+                        q1.MaterialNo,
+                        q1.DemandQty,
+                        q1.RealsendQty
+
+                    };
+
+            return await q.ToListAsync();
+        }
+
     }
 }
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WorkingHoursCollectionsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WorkingHoursCollectionsController.cs
index 933d97f4..65bd3102 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WorkingHoursCollectionsController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WorkingHoursCollectionsController.cs
@@ -215,6 +215,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 }
                
             }
+            workingHoursCollectionDtos = workingHoursCollectionDtos.OrderBy(o => o.CloseTime).ToList();
             return workingHoursCollectionDtos;
         }
         //public async Task<ActionResult<IEnumerable<WorkingHoursCollectionDto>>> GetWorkingHoursCollectionDtoByQuery(string unitNo, string lineid, string stationid, string wipno, string itemno, string user, string sdate, string edate)
diff --git a/AMESCoreStudio.WebApi/Models/AMES/FqcInhouseMaster.cs b/AMESCoreStudio.WebApi/Models/AMES/FqcInhouseMaster.cs
index 2131fcab..1601f0d6 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/FqcInhouseMaster.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/FqcInhouseMaster.cs
@@ -209,5 +209,15 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [StringLength(5)]
         public string LocationNo { get; set; }
 
+
+        /// <summary>
+        /// 入庫單備註
+        /// </summary>
+        [DataMember]
+        [Display(Name = "入庫單備註")]
+        [Column("INHOUSE_MEMO")]
+        [StringLength(100)]
+        public string InhouseMemo { get; set; }
+
     }
 }
diff --git a/AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs b/AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs
index 51eeb7db..18640a56 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/PTD101AMESModel.cs
@@ -54,7 +54,11 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// <summary>
         /// 正式資料:Ava.ptdbatch 測試資料 :test-Ava.ptdbatch-test
         /// </summary>
-        public string Key { get; set; } 
+        public string Key { get; set; }
+        /// <summary>
+        /// RecordDate
+        /// </summary>
+        public string RecordDate { get; set; }
 
     }
 }
diff --git a/AMESCoreStudio.WebApi/Models/AMES/WareHouseing.cs b/AMESCoreStudio.WebApi/Models/AMES/WareHouseing.cs
index 7f59e1cb..a27c4858 100644
--- a/AMESCoreStudio.WebApi/Models/AMES/WareHouseing.cs
+++ b/AMESCoreStudio.WebApi/Models/AMES/WareHouseing.cs
@@ -85,5 +85,13 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Display(Name = "庫別")]
         public string LocationNo { get; set; }
 
+        /// <summary>
+        /// RECORD_DATE
+        /// </summary>
+        [Column("RECORD_DATE")]
+        [DataMember]
+        [Display(Name = "RECORDDATE")]
+        public DateTime Record_Date { get; set; }
+
     }
 }