JHSYS
/
AMES
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1,修改週別

PTD
Marvin 2 years ago
parent
d27fae44d2
commit
46d9000267
2 changed files with 12 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      AMESCoreStudio.Web/Controllers/QRSController.cs
  2. 4
      AMESCoreStudio.Web/Views/QRS/QRS014.cshtml

20
AMESCoreStudio.Web/Controllers/QRSController.cs
View File

@ -9231,7 +9231,7 @@ namespace AMESCoreStudio.Web.Controllers
string rateDataList = "<font size='3'>"; string rateDataList = "<font size='3'>";
rateDataList = rateDataList + "<table border='1' width='100%'><tr><td width='80' style='text-align:center'>類別</td><td width='80' style='text-align:center'>周次</td><td style='text-align:center'>通過筆數</td><td width='200' style='text-align:center'>不良筆數</td><td width='160' style='text-align:center'>通過率</td></tr>"; rateDataList = rateDataList + "<table border='1' width='100%'><tr><td width='80' style='text-align:center'>類別</td><td width='80' style='text-align:center'>週別</td><td style='text-align:center'>通過筆數</td><td width='200' style='text-align:center'>不良筆數</td><td width='160' style='text-align:center'>通過率</td></tr>";
//單板FPY //單板FPY
//rateDataList = rateDataList + @"<tr><td>" + DateTime.Now.Year.ToString() + "-單板" + "</td>"; //rateDataList = rateDataList + @"<tr><td>" + DateTime.Now.Year.ToString() + "-單板" + "</td>";
@ -9243,8 +9243,8 @@ namespace AMESCoreStudio.Web.Controllers
#region 單板 #region 單板
var wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupSByWeek(itemNO, dateStart, dateEnd, modelNO, werksNo, dateType); var wipStation = await _pcsApi.GetWipStation4QRS014GroupSByWeek(itemNO, dateStart, dateEnd, modelNO, werksNo, dateType);
if (wipStaiton01.DataTotal > 0) if (wipStation.DataTotal > 0)
{ {
DataTable dtRate = new DataTable(); DataTable dtRate = new DataTable();
dtRate.Columns.Add("WEEK_CODE"); dtRate.Columns.Add("WEEK_CODE");
@ -9253,7 +9253,7 @@ namespace AMESCoreStudio.Web.Controllers
dtRate.PrimaryKey = new DataColumn[] { dtRate.Columns[0] }; dtRate.PrimaryKey = new DataColumn[] { dtRate.Columns[0] };
dtRate.AcceptChanges(); dtRate.AcceptChanges();
foreach (var data in wipStaiton01.Data) foreach (var data in wipStation.Data)
{ {
JObject j0 = JObject.Parse(data.ToString()); JObject j0 = JObject.Parse(data.ToString());
string weekCode = j0["weekCode"].ToString(); string weekCode = j0["weekCode"].ToString();
@ -9333,8 +9333,8 @@ namespace AMESCoreStudio.Web.Controllers
#region 系統 #region 系統
wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupBByWeek(itemNO, dateStart, dateEnd, modelNO, werksNo, dateType); wipStation = await _pcsApi.GetWipStation4QRS014GroupBByWeek(itemNO, dateStart, dateEnd, modelNO, werksNo, dateType);
if (wipStaiton01.DataTotal > 0) if (wipStation.DataTotal > 0)
{ {
double sum_rate = 100.0; double sum_rate = 100.0;
int sum_idx = 1; int sum_idx = 1;
@ -9345,7 +9345,7 @@ namespace AMESCoreStudio.Web.Controllers
dtRate.PrimaryKey = new DataColumn[] { dtRate.Columns[0] }; dtRate.PrimaryKey = new DataColumn[] { dtRate.Columns[0] };
dtRate.AcceptChanges(); dtRate.AcceptChanges();
foreach (var data in wipStaiton01.Data) foreach (var data in wipStation.Data)
{ {
JObject j0 = JObject.Parse(data.ToString()); JObject j0 = JObject.Parse(data.ToString());
string weekCode = j0["weekCode"].ToString(); string weekCode = j0["weekCode"].ToString();
@ -9425,8 +9425,8 @@ namespace AMESCoreStudio.Web.Controllers
#region 醫療 #region 醫療
wipStaiton01 = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart, dateEnd, modelNO, werksNo, dateType); wipStation = await _pcsApi.GetWipStation4QRS014GroupM(itemNO, dateStart, dateEnd, modelNO, werksNo, dateType);
if (wipStaiton01.DataTotal > 0) if (wipStation.DataTotal > 0)
{ {
double sum_rate = 100.0; double sum_rate = 100.0;
int sum_idx = 1; int sum_idx = 1;
@ -9437,7 +9437,7 @@ namespace AMESCoreStudio.Web.Controllers
dtRate.PrimaryKey = new DataColumn[] { dtRate.Columns[0] }; dtRate.PrimaryKey = new DataColumn[] { dtRate.Columns[0] };
dtRate.AcceptChanges(); dtRate.AcceptChanges();
foreach (var data in wipStaiton01.Data) foreach (var data in wipStation.Data)
{ {
JObject j0 = JObject.Parse(data.ToString()); JObject j0 = JObject.Parse(data.ToString());
string weekCode = j0["weekCode"].ToString(); string weekCode = j0["weekCode"].ToString();

4
AMESCoreStudio.Web/Views/QRS/QRS014.cshtml
View File

@ -85,8 +85,8 @@
<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>
<button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit onclick="result_c()" lay-filter="querysubmit" title="周匯總"> <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> <i class="layui-icon layui-icon-sm">&#xe615;週匯總</i>
</button> </button>
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save