1.修改直通率，增加周别汇总

AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@@ -1025,6 +1025,13 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpGet("api/WipStation/GetWipStation4QRS014GroupS")]
         ITask<ResultModel<dynamic>> GetWipStation4QRS014GroupS(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo, string dateType);
 
+        /// <summary>
+        /// 查詢單板工單站别资料4QRS014C
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/WipStation/GetWipStation4QRS014GroupSByWeek")]
+        ITask<ResultModel<dynamic>> GetWipStation4QRS014GroupSByWeek(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo, string dateType);
+
         /// <summary>
         /// 查詢系統工單站别资料4QRS014
         /// </summary>
@@ -1032,12 +1039,27 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpGet("api/WipStation/GetWipStation4QRS014GroupB")]
         ITask<ResultModel<dynamic>> GetWipStation4QRS014GroupB(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo, string dateType);
 
+        /// <summary>
+        /// 查詢系統工單站别资料4QRS014C
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/WipStation/GetWipStation4QRS014GroupBByWeek")]
+        ITask<ResultModel<dynamic>> GetWipStation4QRS014GroupBByWeek(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo, string dateType);
+
         /// <summary>
         /// 查詢醫療工單站别资料4QRS014
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/WipStation/GetWipStation4QRS014GroupM")]
         ITask<ResultModel<dynamic>> GetWipStation4QRS014GroupM(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo, string dateType);
+
+        /// <summary>
+        /// 查詢醫療工單站别资料4QRS014
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/WipStation/GetWipStation4QRS014GroupMByWeek")]
+        ITask<ResultModel<dynamic>> GetWipStation4QRS014GroupMByWeek(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo, string dateType);
+
         /// <summary>
         /// 查詢工單站別在製條碼資料
         /// </summary>

AMESCoreStudio.Web/ViewModels/QRS/QRS014CViewModel.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace AMESCoreStudio.Web.ViewModels.QRS
+{
+    public class QRS014CViewModel
+    {
+        public QRS014CViewModel()
+        {
+            FPYDatas = new List<FPY4WeekGroup>();
+        }
+
+        public List<FPY4WeekGroup> FPYDatas { get; set; }
+    }
+    
+    public class FPY4WeekGroup
+    {
+
+        /// <summary>
+        /// 周别
+        /// </summary>
+        public string Week { get; set; }
+
+        /// <summary>
+        /// 良率
+        /// </summary>
+        public double Yield { get; set; }
+    }
+}

AMESCoreStudio.Web/Views/QRS/QRS014.cshtml

@@ -82,8 +82,11 @@
                         <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit onclick="result_a()" lay-filter="querysubmit" title="明細">
                             <i class="layui-icon layui-icon-sm">&#xe615;明細</i>
                         </button>
-                        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit onclick="result_b()" lay-filter="querysubmit" title="匯總">
+                        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit onclick="result_b()" lay-filter="querysubmit" title="月匯總">
-                            <i class="layui-icon layui-icon-sm">&#xe615;匯總</i>
+                            <i class="layui-icon layui-icon-sm">&#xe615;月匯總</i>
+                        </button>
+                        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit onclick="result_c()" lay-filter="querysubmit" title="周匯總">
+                            <i class="layui-icon layui-icon-sm">&#xe615;周匯總</i>
                         </button>
                     </div>
                 </div>
@@ -146,5 +149,19 @@
             hg.open('直通率', '/QRS/QRS014B' + query, '', '', true);
 
         };
+
+        function result_c() {
+            var unitNo = $("#unit").val();
+            var werksNo = $("#werks").val();
+            var itemNO = $("#itemNO").val();
+            var wipNO = $("#wipNO").val();
+            var dateStart = $("#dateStart").val();
+            var dateEnd = $("#dateEnd").val();
+            var modelNO = $("#modelNO").val();
+
+            var query = "?unitNo=" + unitNo + "&werksNo=" + werksNo + "&itemNO=" + itemNO + "&wipNO=" + wipNO + "&dateStart=" + dateStart + "&dateEnd=" + dateEnd + "&modelNO=" + modelNO + "&dateType=" + date_type;
+            hg.open('直通率', '/QRS/QRS014C' + query, '', '', true);
+
+        };
     </script>
 }

AMESCoreStudio.Web/Views/QRS/QRS014C.cshtml

@@ -0,0 +1,206 @@
+@{
+    Layout = "~/Views/Shared/_AMESLayout.cshtml";
+}
+
+<script src="~/Highcharts-7.1.2/highcharts.js"></script>
+<script src="~/Highcharts-7.1.2/modules/exporting.js"></script>
+<script src="~/Highcharts-7.1.2/modules/export-data.js"></script>
+
+<div class="layui-card">
+    <div class="layui-card-header">
+        <div class="layui-form">
+            <div class="layui-form-item ">
+                <div class="layui-inline"><i class="fa fa-file-text-o fa-fw"></i> @ViewBag.Title</div>
+            </div>
+
+        </div>
+    </div>
+    <div class="layui-card-body">
+        <div id="divChartS" style="width: 100%; height: 300px; margin: 0 auto"></div>
+        <div id="divChartB" style="width: 100%; height: 300px; margin: 0 auto"></div>
+        <div id="divChartM" style="width: 100%; height: 300px; margin: 0 auto"></div>
+        <input type="hidden" id="param_list" value="@ViewData["ParamList"]" />
+        @Html.Raw(ViewData["RateDataList"])
+    </div>
+</div>
+
+@section Scripts {
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
+        await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
+
+    <script type="text/javascript">
+        $(document).ready(function () {
+
+            $.ajax({
+                type: "Post",
+                url: '/QRS/GetYieldData4QRS014CS?id=' + param_list.value,
+                contentType: "application/json; charset=utf-8",
+                dataType: 'json',
+                success: function (response) {
+                    var idx = 0;
+                    var xAxisData = new Array();
+                    var yieldData = new Array();
+                    $.each(response, function (i, item) {
+                        yieldData[idx] = item["yield"];
+                        xAxisData[idx] = item["week"];
+                        idx = idx + 1;
+                    });
+
+                    Highcharts.chart('divChartS', {
+                        title: {
+                            text: '單板直通率圖表'
+                        },
+                        subtitle: {
+                            text: ''
+                        },
+                        xAxis: {
+                            categories: xAxisData
+                        },
+                        yAxis: {
+                            title: {
+                                text: '單板直通率'
+                            }
+                        },
+                        plotOptions: {
+                            line: {
+                                dataLabels: {
+                                    enabled: true
+                                },
+                                enableMouseTracking: false
+                            }
+                        },
+                        series: [{
+                            type: 'column',
+                            name: '週別',
+                            data: yieldData
+                        },
+                        {
+                            type: 'line',
+                            name: '週別',
+                            data: yieldData
+                        }]
+                    });
+                },
+                error: function () {
+                    alert("查無單板直通率資料!");
+                    $("#divChartS").empty();
+                }
+            });
+
+            $.ajax({
+                type: "Post",
+                url: '/QRS/GetYieldData4QRS014CB?id=' + param_list.value,
+                contentType: "application/json; charset=utf-8",
+                dataType: 'json',
+                success: function (response) {
+                    var idx = 0;
+                    var xAxisData = new Array();
+                    var yieldData = new Array();
+                    $.each(response, function (i, item) {
+                        yieldData[idx] = item["yield"];
+                        xAxisData[idx] = item["week"];
+                        idx = idx + 1;
+                    });
+
+                    Highcharts.chart('divChartB', {
+                        title: {
+                            text: '系統直通率圖表'
+                        },
+                        subtitle: {
+                            text: ''
+                        },
+                        xAxis: {
+                            categories: xAxisData
+                        },
+                        yAxis: {
+                            title: {
+                                text: '系統直通率'
+                            }
+                        },
+                        plotOptions: {
+                            line: {
+                                dataLabels: {
+                                    enabled: true
+                                },
+                                enableMouseTracking: false
+                            }
+                        },
+                        series: [{
+                            type: 'column',
+                            name: '週別',
+                            data: yieldData
+                        },
+                        {
+                            type: 'line',
+                            name: '週別',
+                            data: yieldData
+                        }]
+                    });
+                },
+                error: function () {
+                    alert("查無系統直通率資料!");
+                    $("#divChartB").empty();
+                }
+            });
+
+            $.ajax({
+                type: "Post",
+                url: '/QRS/GetYieldData4QRS014CM?id=' + param_list.value,
+                contentType: "application/json; charset=utf-8",
+                dataType: 'json',
+                success: function (response) {
+                    var idx = 0;
+                    var xAxisData = new Array();
+                    var yieldData = new Array();
+                    $.each(response, function (i, item) {
+                        yieldData[idx] = item["week"];
+                        xAxisData[idx] = item["month"];
+                        idx = idx + 1;
+                    });
+
+                    Highcharts.chart('divChartM', {
+                        title: {
+                            text: '醫療直通率圖表'
+                        },
+                        subtitle: {
+                            text: ''
+                        },
+                        xAxis: {
+                            categories: xAxisData
+                        },
+                        yAxis: {
+                            title: {
+                                text: '醫療直通率'
+                            }
+                        },
+                        plotOptions: {
+                            line: {
+                                dataLabels: {
+                                    enabled: true
+                                },
+                                enableMouseTracking: false
+                            }
+                        },
+                        series: [{
+                            type: 'column',
+                            name: '週別',
+                            data: yieldData
+                        },
+                        {
+                            type: 'line',
+                            name: '週別',
+                            data: yieldData
+                        }]
+                    });
+                },
+                error: function () {
+                    alert("查無醫療直通率資料!");
+                    $("#divChartM").empty();
+                }
+            });
+        });
+
+    </script>
+
+
+}

AMESCoreStudio.WebApi/Controllers/AMES/WipStationController.cs

@@ -358,6 +358,93 @@ FROM JHAMES.WIP_STATION";
             return result;
         }
 
+        /// <summary>
+        /// 根據料號+時間起迄查詢首次過站紀錄
+        /// </summary>
+        /// <param name="itemNo">料號</param>
+        /// <param name="dateStart">開始日期</param>
+        /// <param name="dateEnd">結束日期</param>
+        /// <param name="modelNo">機種</param>
+        /// <param name="werksNo">生產廠別</param>
+        /// <param name="dateType">日期類別</param>
+        /// <returns></returns>
+        [HttpGet("GetWipStation4QRS014GroupSByWeek")]
+        public async Task<ResultModel<dynamic>> GetWipStation4QRS014GroupSByWeek(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo, string dateType)
+        {
+            string fpyStation = _config["FPYStation"].ToString();
+            string[] fpy_station = fpyStation.Split(',');
+            ResultModel<dynamic> result = new ResultModel<dynamic>();
+
+            var q = from q1 in _context.WipStations
+                    join q2 in _context.WipInfos on q1.WipID equals q2.WipID
+                    join q3 in _context.WipAtts on q2.WipNO equals q3.WipNO
+                    join q4 in _context.Stationses on q1.StationID equals q4.StationID
+                    join q5 in _context.CalendarTables on q1.CreateDate.Date equals q5.TimeID
+                    select new
+                    {
+                        q1.WipID,
+                        q2.WerksNO,
+                        q2.CustomerMedical,
+                        q2.UnitNO,
+                        q3.ItemNO,
+                        q3.ModelNO,
+                        q1.StationID,
+                        q4.StationName,
+                        q1.RuleStatus,
+                        q1.FirstCnt,
+                        q2.WipScheduleDate,
+                        q5.Year,
+                        q5.WeekOfYear
+                    };
+
+            q = q.Where(w => w.CustomerMedical == "N" && w.UnitNO == "S");
+            q = q.Where(w => fpy_station.Contains(w.StationName));
+
+            if (itemNo != null)
+            {
+                if (itemNo != "")
+                    q = q.Where(w => w.ItemNO == itemNo);
+            }
+
+            if (modelNo != null)
+            {
+                if (modelNo != "")
+                    q = q.Where(w => w.ModelNO == modelNo);
+            }
+
+            if (werksNo != null)
+            {
+                if (werksNo != "")
+                    q = q.Where(w => w.WerksNO == werksNo);
+            }
+
+
+            if (dateType == "WipDate" || dateType == null)
+            {
+                if (dateStart != null && dateEnd != null)
+                {
+                    if (dateStart != "" && dateEnd != "")
+                    {
+                        q = q.Where(w => w.WipScheduleDate >= DateTime.Parse(dateStart) && w.WipScheduleDate <= DateTime.Parse(dateEnd));
+                    }
+                }
+            }
+
+            var g = q.GroupBy(x => new { x.Year, x.WeekOfYear, x.RuleStatus }).Select(x => new
+            {
+                WeekCode = x.Key.Year + x.Key.WeekOfYear,
+                RuleStatus = x.Key.RuleStatus,
+                FirstCnt = q.Where(j => j.Year == x.Key.Year && j.WeekOfYear == x.Key.WeekOfYear && j.RuleStatus == x.Key.RuleStatus).Sum(k => k.FirstCnt)
+            });
+
+            result.DataTotal = g.ToList().Count;
+
+            result.Data = await g.ToListAsync();
+
+            return result;
+        }
+
+
         /// <summary>
         /// 根據料號+時間起迄查詢首次過站紀錄
         /// </summary>
@@ -454,6 +541,92 @@ FROM JHAMES.WIP_STATION";
             return result;
         }
 
+        /// <summary>
+        /// 根據料號+時間起迄查詢首次過站紀錄
+        /// </summary>
+        /// <param name="itemNo">料號</param>
+        /// <param name="dateStart">開始日期</param>
+        /// <param name="dateEnd">結束日期</param>
+        /// <param name="modelNo">機種</param>
+        /// <param name="werksNo">生產廠別</param>
+        /// <param name="dateType">日期類別</param>
+        /// <returns></returns>
+        [HttpGet("GetWipStation4QRS014GroupBByWeek")]
+        public async Task<ResultModel<dynamic>> GetWipStation4QRS014GroupBByWeek(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo, string dateType)
+        {
+            string fpyStation = _config["FPYStation"].ToString();
+            string[] fpy_station = fpyStation.Split(',');
+
+            ResultModel<dynamic> result = new ResultModel<dynamic>();
+
+            var q = from q1 in _context.WipStations
+                    join q2 in _context.WipInfos on q1.WipID equals q2.WipID
+                    join q3 in _context.WipAtts on q2.WipNO equals q3.WipNO
+                    join q4 in _context.Stationses on q1.StationID equals q4.StationID
+                    join q5 in _context.CalendarTables on q1.CreateDate.Date equals q5.TimeID
+                    select new
+                    {
+                        q1.WipID,
+                        q2.WerksNO,
+                        q2.CustomerMedical,
+                        q2.UnitNO,
+                        q3.ItemNO,
+                        q3.ModelNO,
+                        q1.StationID,
+                        q4.StationName,
+                        q1.RuleStatus,
+                        q1.FirstCnt,
+                        q2.WipScheduleDate,
+                        q5.Year,
+                        q5.WeekOfYear
+                    };
+
+            q = q.Where(w => w.CustomerMedical == "N" && w.UnitNO == "B");
+            q = q.Where(w => fpy_station.Contains(w.StationName));
+
+            if (itemNo != null)
+            {
+                if (itemNo != "")
+                    q = q.Where(w => w.ItemNO == itemNo);
+            }
+
+            if (modelNo != null)
+            {
+                if (modelNo != "")
+                    q = q.Where(w => w.ModelNO == modelNo);
+            }
+
+            if (werksNo != null)
+            {
+                if (werksNo != "")
+                    q = q.Where(w => w.WerksNO == werksNo);
+            }
+
+            if (dateType == "WipDate" || dateType == null)
+            {
+                if (dateStart != null && dateEnd != null)
+                {
+                    if (dateStart != "" && dateEnd != "")
+                    {
+                        q = q.Where(w => w.WipScheduleDate >= DateTime.Parse(dateStart) && w.WipScheduleDate <= DateTime.Parse(dateEnd));
+                    }
+                }
+            }
+
+            var g = q.GroupBy(x => new { x.Year, x.WeekOfYear, x.RuleStatus }).Select(x => new
+            {
+                WeekCode = x.Key.Year + x.Key.WeekOfYear,
+                RuleStatus = x.Key.RuleStatus,
+                FirstCnt = q.Where(j => j.Year == x.Key.Year && j.WeekOfYear == x.Key.WeekOfYear && j.RuleStatus == x.Key.RuleStatus).Sum(k => k.FirstCnt)
+            });
+
+            result.DataTotal = g.ToList().Count;
+
+            result.Data = await g.ToListAsync();
+
+            return result;
+        }
+
         /// <summary>
         /// 根據料號+時間起迄查詢首次過站紀錄
         /// </summary>
@@ -549,6 +722,93 @@ FROM JHAMES.WIP_STATION";
             return result;
         }
 
+        /// <summary>
+        /// 根據料號+時間起迄查詢首次過站紀錄
+        /// </summary>
+        /// <param name="itemNo">料號</param>
+        /// <param name="dateStart">開始日期</param>
+        /// <param name="dateEnd">結束日期</param>
+        /// <param name="modelNo">機種</param>
+        /// <param name="werksNo">生產廠別</param>
+        /// <param name="dateType">日期類別</param>
+        /// <returns></returns>
+        [HttpGet("GetWipStation4QRS014GroupMByWeek")]
+        public async Task<ResultModel<dynamic>> GetWipStation4QRS014GroupMByWeek(string itemNo, string dateStart, string dateEnd, string modelNo, string werksNo, string dateType)
+        {
+            string fpyStation = _config["FPYStation"].ToString();
+            string[] fpy_station = fpyStation.Split(',');
+
+            ResultModel<dynamic> result = new ResultModel<dynamic>();
+
+            var q = from q1 in _context.WipStations
+                    join q2 in _context.WipInfos on q1.WipID equals q2.WipID
+                    join q3 in _context.WipAtts on q2.WipNO equals q3.WipNO
+                    join q4 in _context.Stationses on q1.StationID equals q4.StationID
+                    join q5 in _context.CalendarTables on q1.CreateDate.Date equals q5.TimeID
+                    select new
+                    {
+                        q1.WipID,
+                        q2.WerksNO,
+                        q2.CustomerMedical,
+                        q2.UnitNO,
+                        q3.ItemNO,
+                        q3.ModelNO,
+                        q1.StationID,
+                        q4.StationName,
+                        q1.RuleStatus,
+                        q1.FirstCnt,
+                        q2.WipScheduleDate,
+                        q5.Year,
+                        q5.WeekOfYear
+                    };
+
+            q = q.Where(w => w.CustomerMedical == "Y");
+            q = q.Where(w => fpy_station.Contains(w.StationName));
+
+            if (itemNo != null)
+            {
+                if (itemNo != "")
+                    q = q.Where(w => w.ItemNO == itemNo);
+            }
+
+            if (modelNo != null)
+            {
+                if (modelNo != "")
+                    q = q.Where(w => w.ModelNO == modelNo);
+            }
+
+            if (werksNo != null)
+            {
+                if (werksNo != "")
+                    q = q.Where(w => w.WerksNO == werksNo);
+            }
+
+
+            if (dateType == "WipDate" || dateType == null)
+            {
+                if (dateStart != null && dateEnd != null)
+                {
+                    if (dateStart != "" && dateEnd != "")
+                    {
+                        q = q.Where(w => w.WipScheduleDate >= DateTime.Parse(dateStart) && w.WipScheduleDate <= DateTime.Parse(dateEnd));
+                    }
+                }
+            }
+
+            var g = q.GroupBy(x => new { x.Year, x.WeekOfYear, x.RuleStatus }).Select(x => new
+            {
+                WeekCode = x.Key.Year + x.Key.WeekOfYear,
+                RuleStatus = x.Key.RuleStatus,
+                FirstCnt = q.Where(j => j.Year == x.Key.Year && j.WeekOfYear == x.Key.WeekOfYear && j.RuleStatus == x.Key.RuleStatus).Sum(k => k.FirstCnt)
+            });
+
+            result.DataTotal = g.ToList().Count;
+
+            result.Data = await g.ToListAsync();
+
+            return result;
+        }
+
         /// <summary>
         /// 根據料號+時間起迄查詢首次過站紀錄
         /// </summary>