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

1.修改維修資料統計,增加維修組件料號查詢條件

PTD
Marvin 2 years ago
parent
71ac302d91
commit
0a4477d2f6
4 changed files with 85 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      AMESCoreStudio.Web/Controllers/REPController.cs
  2. 10
      AMESCoreStudio.Web/HttpApis/AMES/IREP.cs
  3. 25
      AMESCoreStudio.Web/Views/REP/REP012.cshtml
  4. 59
      AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs

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

@ -1679,10 +1679,10 @@ namespace AMESCoreStudio.Web.Controllers
}
public async Task<IActionResult> REP012QueryAsync(string productTypeNo, string testTypeNo, string unitNo, string lineID, string stationID, string wipNO, string itemNO, string dateStart, string dateEnd,string modelNO, int page = 0, int limit = 10)
public async Task<IActionResult> REP012QueryAsync(string productTypeNo, string testTypeNo, string unitNo, string lineID, string stationID, string wipNO, string itemNO, string dateStart, string dateEnd, string modelNO, string itemPN, int page = 0, int limit = 10)
{
var result = await _repApi.GetRepairData4REP012(productTypeNo, testTypeNo, unitNo, lineID, stationID, wipNO, itemNO, dateStart, dateEnd, modelNO, page, limit);
var result = await _repApi.GetRepairData4REP012(productTypeNo, testTypeNo, unitNo, lineID, stationID, wipNO, itemNO, dateStart, dateEnd, modelNO, itemPN, page, limit);
if (result.DataTotal > 0)
{
@ -1702,7 +1702,7 @@ namespace AMESCoreStudio.Web.Controllers
{
string[] param = id.Split('_');
var result = await _repApi.GetErrorCode4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9]);
var result = await _repApi.GetErrorCode4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9], param[10]);
return Json(result.Data);
//return Json(new { data = result.Data });
@ -1712,7 +1712,7 @@ namespace AMESCoreStudio.Web.Controllers
{
string[] param = id.Split('_');
var result = await _repApi.GetErrorCode4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9]);
var result = await _repApi.GetErrorCode4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9], param[10]);
if (result.DataTotal > 0)
{
@ -1732,7 +1732,7 @@ namespace AMESCoreStudio.Web.Controllers
{
string[] param = id.Split('_');
var result = await _repApi.GetRMACode4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9]);
var result = await _repApi.GetRMACode4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9], param[10]);
return Json(result.Data);
//return Json(new { data = result.Data });
@ -1742,7 +1742,7 @@ namespace AMESCoreStudio.Web.Controllers
{
string[] param = id.Split('_');
var result = await _repApi.GetRMACode4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9]);
var result = await _repApi.GetRMACode4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9], param[10]);
if (result.DataTotal > 0)
{
@ -1762,7 +1762,7 @@ namespace AMESCoreStudio.Web.Controllers
{
string[] param = id.Split('_');
var result = await _repApi.GetLocation4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9]);
var result = await _repApi.GetLocation4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9], param[10]);
return Json(result.Data);
//return Json(new { data = result.Data });
@ -1772,7 +1772,7 @@ namespace AMESCoreStudio.Web.Controllers
{
string[] param = id.Split('_');
var result = await _repApi.GetLocation4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9]);
var result = await _repApi.GetLocation4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9], param[10]);
if (result.DataTotal > 0)
{
@ -1792,7 +1792,7 @@ namespace AMESCoreStudio.Web.Controllers
{
string[] param = id.Split('_');
var result = await _repApi.GetRepairResponsibleUnit4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9]);
var result = await _repApi.GetRepairResponsibleUnit4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9], param[10]);
return Json(result.Data);
//return Json(new { data = result.Data });
@ -1803,7 +1803,7 @@ namespace AMESCoreStudio.Web.Controllers
string[] param = id.Split('_');
var result = await _repApi.GetRepairResponsibleUnit4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9]);
var result = await _repApi.GetRepairResponsibleUnit4REP012(param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7], param[8], param[9], param[10]);
if (result.DataTotal > 0)
{

10
AMESCoreStudio.Web/HttpApis/AMES/IREP.cs
View File

@ -119,35 +119,35 @@ namespace AMESCoreStudio.Web
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/NgRepairs/GetRepairData4REP012")]
ITask<ResultModel<dynamic>> GetRepairData4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo, int page, int limit);
ITask<ResultModel<dynamic>> GetRepairData4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo, string itemPN, int page, int limit);
/// <summary>
/// 查詢維修資料by不良代碼
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/NgRepairs/GetErrorCode4REP012")]
ITask<ResultModel<dynamic>> GetErrorCode4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo);
ITask<ResultModel<dynamic>> GetErrorCode4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo, string itemPN);
/// <summary>
/// 查詢維修資料by维修代碼
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/NgRepairs/GetRMACode4REP012")]
ITask<ResultModel<dynamic>> GetRMACode4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo);
ITask<ResultModel<dynamic>> GetRMACode4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo, string itemPN);
/// <summary>
/// 查詢維修資料by维修代碼
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/NgRepairs/GetLocation4REP012")]
ITask<ResultModel<dynamic>> GetLocation4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo);
ITask<ResultModel<dynamic>> GetLocation4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo, string itemPN);
/// <summary>
/// 查詢維修資料by维修代碼
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/NgRepairs/GetRepairResponsibleUnit4REP012")]
ITask<ResultModel<dynamic>> GetRepairResponsibleUnit4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo);
ITask<ResultModel<dynamic>> GetRepairResponsibleUnit4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo, string itemPN);
/// <summary>
/// 查詢統計不良代碼by工單號碼

25
AMESCoreStudio.Web/Views/REP/REP012.cshtml
View File

@ -105,11 +105,6 @@
</div>
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-col-sm3">
<div class="layui-inline">
<label class="layui-form-label">料號:</label>
@ -118,6 +113,10 @@
</div>
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-col-sm3">
<div class="layui-inline">
<label class="layui-form-label">機種:</label>
@ -126,6 +125,14 @@
</div>
</div>
</div>
<div class="layui-col-sm3">
<div class="layui-inline">
<label class="layui-form-label">維修組件料號:</label>
<div class="layui-input-inline" style="width:150px">
<input id="itemPN" name="itemPn" autocomplete="off" class="layui-input" placeholder="請輸入維修組件料號">
</div>
</div>
</div>
<div class="layui-col-sm5">
<div class="layui-inline">
<label class="layui-form-label">維修日期:</label>
@ -368,22 +375,22 @@
$('#btnChart1').click(function ()
{
var param = productTypeNo.value + '_' + testTypeNo.value + '_' + unitNo.value + '_' + lineID.value + '_' + stationID.value + '_' + wipNO.value + '_' + itemNO.value + '_' + dateStart.value + '_' + dateEnd.value + '_' + modelNO.value;
var param = productTypeNo.value + '_' + testTypeNo.value + '_' + unitNo.value + '_' + lineID.value + '_' + stationID.value + '_' + wipNO.value + '_' + itemNO.value + '_' + dateStart.value + '_' + dateEnd.value + '_' + modelNO.value + '_' + itemPN.value;
hg.open('不良代碼統計', '/REP/REP012A/' + param, 800, 600);
});
$('#btnChart2').click(function () {
var param = productTypeNo.value + '_' + testTypeNo.value + '_' + unitNo.value + '_' + lineID.value + '_' + stationID.value + '_' + wipNO.value + '_' + itemNO.value + '_' + dateStart.value + '_' + dateEnd.value + '_' + modelNO.value;
var param = productTypeNo.value + '_' + testTypeNo.value + '_' + unitNo.value + '_' + lineID.value + '_' + stationID.value + '_' + wipNO.value + '_' + itemNO.value + '_' + dateStart.value + '_' + dateEnd.value + '_' + modelNO.value + '_' + itemPN.value;
hg.open('維修代碼統計', '/REP/REP012B/' + param, 800, 600);
});
$('#btnChart3').click(function () {
var param = productTypeNo.value + '_' + testTypeNo.value + '_' + unitNo.value + '_' + lineID.value + '_' + stationID.value + '_' + wipNO.value + '_' + itemNO.value + '_' + dateStart.value + '_' + dateEnd.value + '_' + modelNO.value;
var param = productTypeNo.value + '_' + testTypeNo.value + '_' + unitNo.value + '_' + lineID.value + '_' + stationID.value + '_' + wipNO.value + '_' + itemNO.value + '_' + dateStart.value + '_' + dateEnd.value + '_' + modelNO.value + '_' + itemPN.value;
hg.open('維修位置統計', '/REP/REP012C/' + param, 800, 600);
});
$('#btnChart4').click(function () {
var param = productTypeNo.value + '_' + testTypeNo.value + '_' + unitNo.value + '_' + lineID.value + '_' + stationID.value + '_' + wipNO.value + '_' + itemNO.value + '_' + dateStart.value + '_' + dateEnd.value + '_' + modelNO.value;
var param = productTypeNo.value + '_' + testTypeNo.value + '_' + unitNo.value + '_' + lineID.value + '_' + stationID.value + '_' + wipNO.value + '_' + itemNO.value + '_' + dateStart.value + '_' + dateEnd.value + '_' + modelNO.value + '_' + itemPN.value;
hg.open('責任單位統計', '/REP/REP012D/' + param, 800, 600);
});

59
AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs
View File

@ -198,12 +198,13 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
/// <param name="dateStart"></param>
/// <param name="dateEnd"></param>
/// <param name="modelNo"></param>
/// <param name="itemPN"></param>
/// <param name="page"></param>
/// <param name="limit"></param>
/// <returns></returns>
[Route("[action]")]
[HttpGet]
public async Task<ResultModel<dynamic>> GetRepairData4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo, int page = 0, int limit = 10)
public async Task<ResultModel<dynamic>> GetRepairData4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo, string itemPN, int page = 0, int limit = 10)
{
ResultModel<dynamic> result = new ResultModel<dynamic>();
var q = from q1 in _context.NgRepairs
@ -332,6 +333,14 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
}
}
if (itemPN != null)
{
if (itemPN != "")
{
q = q.Where(w => w.PartNo == itemPN);
}
}
if (dateStart != null && dateEnd != null)
{
if (dateStart != "" && dateEnd != "")
@ -1029,10 +1038,11 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
/// <param name="dateStart"></param>
/// <param name="dateEnd"></param>
/// <param name="modelNo"></param>
/// <param name="itemPN"></param>
/// <returns></returns>
[Route("[action]")]
[HttpGet]
public async Task<ResultModel<dynamic>> GetErrorCode4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo)
public async Task<ResultModel<dynamic>> GetErrorCode4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo,string itemPN)
{
ResultModel<dynamic> result = new ResultModel<dynamic>();
var q = from q1 in _context.NgRepairs
@ -1061,6 +1071,7 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
q1.RepairNo,
q1.RepairTypeNo,
q1.RepairDesc,
q1.PartNo,
q8.LocationNo,
q9.RRDesc
};
@ -1116,6 +1127,14 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
}
}
if (itemPN != null)
{
if (itemPN != "")
{
q = q.Where(w => w.PartNo == itemPN);
}
}
if (dateStart != null && dateEnd != null)
{
if (dateStart != "" && dateEnd != "")
@ -1170,10 +1189,11 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
/// <param name="dateStart"></param>
/// <param name="dateEnd"></param>
/// <param name="modelNo"></param>
/// <param name="itemPN"></param>
/// <returns></returns>
[Route("[action]")]
[HttpGet]
public async Task<ResultModel<dynamic>> GetRMACode4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo)
public async Task<ResultModel<dynamic>> GetRMACode4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo,string itemPN)
{
ResultModel<dynamic> result = new ResultModel<dynamic>();
var q = from q1 in _context.NgRepairs
@ -1202,6 +1222,7 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
q1.RepairNo,
q1.RepairTypeNo,
q1.RepairDesc,
q1.PartNo,
q8.LocationNo,
q9.RRDesc
};
@ -1257,6 +1278,14 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
}
}
if (itemPN != null)
{
if (itemPN != "")
{
q = q.Where(w => w.PartNo == itemPN);
}
}
if (dateStart != null && dateEnd != null)
{
if (dateStart != "" && dateEnd != "")
@ -1312,10 +1341,11 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
/// <param name="dateStart"></param>
/// <param name="dateEnd"></param>
/// <param name="modelNo"></param>
/// <param name="itemPN"></param>
/// <returns></returns>
[Route("[action]")]
[HttpGet]
public async Task<ResultModel<dynamic>> GetLocation4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo)
public async Task<ResultModel<dynamic>> GetLocation4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo,string itemPN)
{
ResultModel<dynamic> result = new ResultModel<dynamic>();
var q = from q1 in _context.NgRepairs
@ -1344,6 +1374,7 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
q1.RepairNo,
q1.RepairTypeNo,
q1.RepairDesc,
q1.PartNo,
q8.LocationNo,
q9.RRDesc
};
@ -1399,6 +1430,14 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
}
}
if (itemPN != null)
{
if (itemPN != "")
{
q = q.Where(w => w.PartNo == itemPN);
}
}
if (dateStart != null && dateEnd != null)
{
if (dateStart != "" && dateEnd != "")
@ -1454,10 +1493,11 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
/// <param name="dateStart"></param>
/// <param name="dateEnd"></param>
/// <param name="modelNo"></param>
/// <param name="itemPN"></param>
/// <returns></returns>
[Route("[action]")]
[HttpGet]
public async Task<ResultModel<dynamic>> GetRepairResponsibleUnit4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo)
public async Task<ResultModel<dynamic>> GetRepairResponsibleUnit4REP012(string productType, string testType, string unitNo, string lineID, string stationID, string wipNo, string itemNo, string dateStart, string dateEnd, string modelNo,string itemPN)
{
ResultModel<dynamic> result = new ResultModel<dynamic>();
var q = from q1 in _context.NgRepairs
@ -1486,6 +1526,7 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
q1.RepairNo,
q1.RepairTypeNo,
q1.RepairDesc,
q1.PartNo,
q8.LocationNo,
q9.RRDesc
};
@ -1541,6 +1582,14 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
}
}
if (itemPN != null)
{
if (itemPN != "")
{
q = q.Where(w => w.PartNo == itemPN);
}
}
if (dateStart != null && dateEnd != null)
{
if (dateStart != "" && dateEnd != "")

Write Preview
Loading…
Cancel
Save