報工明細查詢修正

AMESCoreStudio.Web/Controllers/QRSController.cs

@@ -11149,6 +11149,7 @@ namespace AMESCoreStudio.Web.Controllers
 
         public async Task<IActionResult> QRS029()
         {
+            ViewBag.ActualDate = System.DateTime.Now.ToString("yyyy/MM");
             return View();
         }
         [ResponseCache(Duration = 0)]

AMESCoreStudio.Web/Views/QRS/QRS029.cshtml

@@ -40,16 +40,16 @@
             <div class="layui-row">
                 <div class="layui-form-item">
                   
-                    <div class="layui-col-sm6">
+                    <div class="layui-col-sm3">
                         <div class="layui-inline">
-                            <label class="layui-form-label">生產日期:</label>
+                            <label class="layui-form-label">報工月份:</label>
                             <div class="layui-input-inline" style="width:150px">
-                                <input id="dateStr" name="date_str" autocomplete="off" class="layui-input" readonly="">
+                                <input id="dateStr" name="date_str" autocomplete="off" class="layui-input" readonly="" value="@ViewBag.ActualDate">
                             </div>
                         </div>
                        
                     </div>
-                       <div class="layui-col-sm">
+                    <div class="layui-col-sm4">
                         <div class="layui-inline layui-show-xs-block">
                             <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="querysubmit">
                                 <i class="layui-icon layui-icon-sm">&#xe615;</i>
@@ -78,7 +78,7 @@
             laydate.render({
                 elem: '#dateStr'
                 , trigger: 'click'
-                , format: 'yyyy/MM/dd'
+                , format: 'yyyy/MM'
                 , theme: 'grid'
             });
 
@@ -113,8 +113,8 @@
                 field: 'actualdate',
                 width: 140,
                 title: '報工日期',
-                sort: true,
+                sort: true
-                totalRow: true
+
             },
             {
                 field: 'wiP_NO',
@@ -125,41 +125,41 @@
             {
                 field: 'actualtime',
                 title: '作業工時',
-                width: 100
+                width: 120
 
             },
             {
                 field: 'st',
-                width: 100,
+                width: 120,
                 title: '標工'           
             },
             {
                 field: 'resttime',
-                width: 100,
+                width: 120,
                 title: '休息時間'
               
             },
             {
                 field: 'actualtimedetail',
-                width: 100,
+                width: 120,
                 title: '報工工時明細'
                            
             },
             {
                 field: 'productiontime',
-                width: 100,
+                width: 120,
-                title: '報工工時'
+                title: 'SAP報工工時'
 
             },
             {
                 field: 'actualtimedetailexcept',
-                width: 100,
+                width: 120,
                 title: '與報工工時差異'
             },
             {
                 field: 'productioncntsap',
-                width: 100,
+                width: 120,
-                title: '報工數量'
+                title: 'SAP報工數量'
             },
             {
                 field: 'types',
@@ -196,7 +196,7 @@
         });
         //基本数据表格
         function tt() {
-            table = hg.table.datatable('query', '報工明細查詢', '/QRS/QRS029Query?' + 'actualDate=' + $("#dateStr").val() , {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports'], true);
+            table = hg.table.datatable('query', '報工明細查詢', '/QRS/QRS029Query?' + 'actualDate=' + $("#dateStr").val() , {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
         }
 
 

AMESCoreStudio.WebApi/Controllers/AMES/ActualTimeController.cs

@@ -104,12 +104,23 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         }
 
                         result.DataTotal = list.Count();
+
+                        //Table 頁數
+                        if (page > 0)
+                        {
+                            list = list.Skip((page - 1) * limit).Take(limit).ToList();
+                        }
                         result.Data = list;
                     }
                    
                 }
             }
 
+           
+
+
+         
+
             if (result == null)
             {
                 result.Msg = "查無資料";