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

1. PCS021

PTD
ray 3 years ago
parent
1c831c06ba
commit
a4df8a1bf6
4 changed files with 216 additions and 40 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. 42
      AMESCoreStudio.Web/Controllers/PCSController.cs
  2. 11
      AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
  3. 13
      AMESCoreStudio.Web/Views/PCS/PCS021.cshtml
  4. 190
      AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs

42
AMESCoreStudio.Web/Controllers/PCSController.cs
View File

@ -2174,28 +2174,30 @@ namespace AMESCoreStudio.Web.Controllers
} }
// 判斷作業站與製程順序是否正確 // 判斷作業站與製程順序是否正確
var BarCodeFlow = await _pcsApi.CheckBarCodeFlow(model.WipNO, model.Input, model.UnitNO, model.Station);
if (!BarCodeFlow.Success)
return Json(new Result() { success = BarCodeFlow.Success, msg = BarCodeFlow.Msg, data = Data });
// 下一個作業站是完工站時再判斷是否都有刷組件 // 下一個作業站是完工站時再判斷是否都有刷組件
// 判斷組件是否都有輸入 // 判斷組件是否都有輸入
if (Kp.Count() != model.MaterialKps.Count()) //if (Kp.Count() != model.MaterialKps.Count())
{ //{
Msg += "請確認組件序號是否有多刷或漏刷</br>"; // Msg += "請確認組件序號是否有多刷或漏刷</br>";
} //}
else //else
{ //{
for (int i = 0; i < model.MaterialKps.Count; i++) // for (int i = 0; i < model.MaterialKps.Count; i++)
{ // {
if (Kp[i].Length != model.MaterialKps[i].Length) // if (Kp[i].Length != model.MaterialKps[i].Length)
Msg += "組件序號【" + Kp[i] + "】 與組件名稱【" + model.MaterialKps[i].KpName + "】長度不符合</br>"; // Msg += "組件序號【" + Kp[i] + "】 與組件名稱【" + model.MaterialKps[i].KpName + "】長度不符合</br>";
if (!string.IsNullOrWhiteSpace(model.MaterialKps[i].Title)) // if (!string.IsNullOrWhiteSpace(model.MaterialKps[i].Title))
{ // {
if (!Kp[i].ToUpper().StartsWith(model.MaterialKps[i].Title.ToUpper())) // if (!Kp[i].ToUpper().StartsWith(model.MaterialKps[i].Title.ToUpper()))
Msg += "組件序號【" + Kp[i] + "】 與組件名稱【" + model.MaterialKps[i].Title + "】前置碼不符合</br>"; // Msg += "組件序號【" + Kp[i] + "】 與組件名稱【" + model.MaterialKps[i].Title + "】前置碼不符合</br>";
} // }
} // }
} //}
} }
else else
@ -2317,7 +2319,9 @@ namespace AMESCoreStudio.Web.Controllers
await _pcsApi.PostNgInfo(JsonConvert.SerializeObject(ngInfo)); await _pcsApi.PostNgInfo(JsonConvert.SerializeObject(ngInfo));
} }
Msg = "內部序號【" + Data + "】 過站完成！";
Data = string.Empty; Data = string.Empty;
} }
return Json(new Result() { success = Success, msg = Msg, data = Data }); return Json(new Result() { success = Success, msg = Msg, data = Data });

11
AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
View File

@ -619,6 +619,17 @@ namespace AMESCoreStudio.Web
/// <returns>Success:true or false</returns> /// <returns>Success:true or false</returns>
[WebApiClient.Attributes.HttpGet("api/BarCodeCheck/BarCodeScrapped")] [WebApiClient.Attributes.HttpGet("api/BarCodeCheck/BarCodeScrapped")]
ITask<ResultModel<string>> CheckBarCodeScrapped(string barcode); ITask<ResultModel<string>> CheckBarCodeScrapped(string barcode);
/// <summary>
/// 確認內部條碼流動
/// </summary>
/// <param name="wipno">工單號碼</param>
/// <param name="barcode">內部序號</param>
/// <param name="unitno">生產單位ID</param>
/// <param name="station">作業站ID</param>
/// <returns>Success:true or false</returns>
[WebApiClient.Attributes.HttpGet("api/BarCodeCheck/BarCodeFlow")]
ITask<ResultModel<string>> CheckBarCodeFlow(string wipno, string barcode, string unitno, int station);
#endregion #endregion

13
AMESCoreStudio.Web/Views/PCS/PCS021.cshtml
View File

@ -125,6 +125,7 @@
<input type="text" onkeydown="input(event);" id="inpputtxt" asp-for="Input" class="layui-input" autocomplete="off" /> <input type="text" onkeydown="input(event);" id="inpputtxt" asp-for="Input" class="layui-input" autocomplete="off" />
</div> </div>
</div> </div>
@*<span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>*@
</div> </div>
</div> </div>
<fieldset class="layui-elem-field layui-field-title"> <fieldset class="layui-elem-field layui-field-title">
@ -138,6 +139,7 @@
<td><input type="button" value="Remove" onclick="Remove(this)" /></td> <td><input type="button" value="Remove" onclick="Remove(this)" /></td>
</tr> </tr>
</tfoot>*@ </tfoot>*@
</table> </table>
</fieldset> </fieldset>
<fieldset class="layui-elem-field layui-field-title"> <fieldset class="layui-elem-field layui-field-title">
@ -168,7 +170,7 @@
@index.StationsItemNo @index.StationsItemNo
</td> </td>
<td> <td>
<input asp-for="@index.StationsItemDesc" name="MaterialStationsItems[@i].StationsItemDesc" readonly="readonly"/> <input asp-for="@index.StationsItemDesc" name="MaterialStationsItems[@i].StationsItemDesc" readonly="readonly" />
</td> </td>
</tr> </tr>
i++; i++;
@ -214,16 +216,16 @@
<input type="text" asp-for="@index.KpName" name="MaterialKps[@j].KpName" style="width:100px" readonly="readonly" /> <input type="text" asp-for="@index.KpName" name="MaterialKps[@j].KpName" style="width:100px" readonly="readonly" />
</td> </td>
<td> <td>
<input type="text" asp-for="@index.KpNo" name="MaterialKps[@j].KpNo" style="width:30px" readonly="readonly"/> <input type="text" asp-for="@index.KpNo" name="MaterialKps[@j].KpNo" style="width:30px" readonly="readonly" />
</td> </td>
<td> <td>
<input type="text" asp-for="@index.KpSeq" name="MaterialKps[@j].KpSeq" style="width:30px" readonly="readonly"/> <input type="text" asp-for="@index.KpSeq" name="MaterialKps[@j].KpSeq" style="width:30px" readonly="readonly" />
</td> </td>
<td> <td>
<input type="text" asp-for="@index.Title" name="MaterialKps[@j].Title" style="width:50px" readonly="readonly"/> <input type="text" asp-for="@index.Title" name="MaterialKps[@j].Title" style="width:50px" readonly="readonly" />
</td> </td>
<td> <td>
<input asp-for="@index.Length" name="MaterialKps[@j].Length" style="width:30px" readonly="readonly"/> <input asp-for="@index.Length" name="MaterialKps[@j].Length" style="width:30px" readonly="readonly" />
</td> </td>
<td> <td>
@index.StationType @index.StationType
@ -373,6 +375,7 @@
parent.hg.msg(result.msg); parent.hg.msg(result.msg);
} }
else { else {
parent.hg.msg(result.msg);
if (result.data.length != 0) { if (result.data.length != 0) {
TableAddRow(result.data); TableAddRow(result.data);
} }

190
AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
View File

@ -207,7 +207,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
if (BarCodeID == 0) if (BarCodeID == 0)
{ {
resultModel.Msg = "找不到內部序號【" + barcode + "】 對應BarCodeID"; //resultModel.Msg = "找不到內部序號【" + barcode + "】 對應BarCodeID";
resultModel.Success = true;
return Ok(resultModel); return Ok(resultModel);
} }
@ -242,6 +243,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
var q = await barcodeInfoesController.GetBarcodeInfoesByNo(barcode); var q = await barcodeInfoesController.GetBarcodeInfoesByNo(barcode);
if (q.Value.Count() == 0) if (q.Value.Count() == 0)
{ {
resultModel.Success = true;
resultModel.Msg = "找不到內部序號【" + barcode + "】 對應BarCodeID"; resultModel.Msg = "找不到內部序號【" + barcode + "】 對應BarCodeID";
return Ok(resultModel); return Ok(resultModel);
} }
@ -306,7 +308,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
if (unitno == "D") if (unitno == "D")
{ {
int? WipID = wipinfo.Where(w => w.UnitNO == "S").Select(s => s.WipID).FirstOrDefault(); int? WipID = wipinfo.Where(w => w.UnitNO == "S").Select(s => s.WipID).FirstOrDefault();
if (WipID == 0) if (WipID == null)
{ {
resultModel.Msg = "該工單號碼【" + wipno + "】的前製程生產單位尚未建立工單基本資料"; resultModel.Msg = "該工單號碼【" + wipno + "】的前製程生產單位尚未建立工單基本資料";
return Ok(resultModel); return Ok(resultModel);
@ -322,7 +324,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
else if (unitno == "T") else if (unitno == "T")
{ {
int? WipID = wipinfo.Where(w => w.UnitNO == "B").Select(s => s.WipID).FirstOrDefault(); int? WipID = wipinfo.Where(w => w.UnitNO == "B").Select(s => s.WipID).FirstOrDefault();
if (WipID == 0) if (WipID == null)
{ {
resultModel.Msg = "該工單號碼【" + wipno + "】的前製程生產單位尚未建立工單基本資料"; resultModel.Msg = "該工單號碼【" + wipno + "】的前製程生產單位尚未建立工單基本資料";
return Ok(resultModel); return Ok(resultModel);
@ -337,7 +339,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
else if (unitno == "P") else if (unitno == "P")
{ {
int? WipID = wipinfo.Where(w => w.UnitNO == "T").Select(s => s.WipID).FirstOrDefault(); int? WipID = wipinfo.Where(w => w.UnitNO == "T").Select(s => s.WipID).FirstOrDefault();
if (WipID == 0) if (WipID == null)
{ {
resultModel.Msg = "該工單號碼【" + wipno + "】的前製程生產單位尚未建立工單基本資料"; resultModel.Msg = "該工單號碼【" + wipno + "】的前製程生產單位尚未建立工單基本資料";
return Ok(resultModel); return Ok(resultModel);
@ -373,9 +375,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
// 該作業站 RuleStationID // 該作業站 RuleStationID
int? RuleStationID = ruleStations.Value.Where(w => w.StationID == station).Select(s => s.RuleStationID).FirstOrDefault(); int? RuleStationID = ruleStations.Value.Where(w => w.StationID == station).Select(s => s.RuleStationID).FirstOrDefault();
// 該作業站順序 if (RuleStationID == null)
int? Sequence = ruleStations.Value.Where(w => w.StationID == station).Select(s => s.Sequence).FirstOrDefault();
if (RuleStationID == 0)
{ {
resultModel.Msg = "該工單號碼【" + wipno + "】的流程未設定此作業站"; resultModel.Msg = "該工單號碼【" + wipno + "】的流程未設定此作業站";
return Ok(resultModel); return Ok(resultModel);
@ -383,22 +383,28 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
// 取目前工單ID // 取目前工單ID
int wipID = q1.WipID; int wipID = q1.WipID;
// 該筆工單ID過站紀錄 // 該筆工單ID過站紀錄
var BarCodeStationByWipID = BarCodeStations.Value.Where(w => w.WipID == wipID).ToList(); var BarCodeStationByWipID = BarCodeStations.Value.Where(w => w.WipID == wipID).ToList();
foreach (var item in ruleStations.Value.OrderBy(o => o.Sequence)) if (BarCodeStationByWipID.Where(w => w.RuleStationID == RuleStationID && w.RuleStatus == "P").Any())
{ {
resultModel.Msg = "內部序號【" + barcode + "】該作業站已有過站紀錄，請確認";
return Ok(resultModel);
} }
int LastStopRuleStationID = await GetBarCodeLastStopRuleStationID(wipno, station);
if (LastStopRuleStationID != 0)
{
if (!BarCodeStationByWipID.Where(w => w.RuleStationID == LastStopRuleStationID && w.RuleStatus == "P").Any())
{
resultModel.Msg = "內部序號【" + barcode + "】找不到上一個作業站過站紀錄，請確認";
return Ok(resultModel);
}
}
#endregion #endregion
return Ok(ruleStations); resultModel.Success = true;
//if (q.Value.Any(w => w.RuleStatus == "S")) return Ok(resultModel);
//{
// resultModel.Msg = "內部序號【" + barcode + "】已報廢或轉賣, 不可繼續過站!";
// return Ok(resultModel);
//}
} }
/// <summary> /// <summary>
@ -480,5 +486,157 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
return q.Value.FirstOrDefault().BarcodeID; return q.Value.FirstOrDefault().BarcodeID;
} }
/// <summary>
/// 取得上一個作業站RuleStationID
/// </summary>
/// <param name="wipno">工單號碼</param>
/// <param name="stationID">作業站ID</param>
/// <returns>0:沒有上一站</returns>
private async Task<int> GetBarCodeLastStopRuleStationID(string wipno, int stationID)
{
WipInfosController wipInfosController = new WipInfosController(_context);
var q = wipInfosController.GetWipInfoByWipNo(wipno);
if (q.Result.Value.Count() == 0)
return 0;
var q1 = q.Result.Value.ToList();
List<int> FlowRuleID = new List<int>();
List<string> Unit = new List<string>();
// 取生產單位順序
if (q1.Where(w => w.UnitNO == "S" || w.UnitNO == "D").Any())
{
// SMT DIP
Unit.Add("S");
Unit.Add("D");
}
else if (q1.Where(w => w.UnitNO == "B" || w.UnitNO == "T").Any())
{
// 組裝 測試 包裝
Unit.Add("B");
Unit.Add("T");
Unit.Add("P");
}
// 抓各生產單位的流程ID
foreach (string str in Unit)
{
int WipFlowRule = q1.Where(w => w.UnitNO == str).Select(s => s.FlowRuleID).FirstOrDefault();
FlowRuleID.Add(WipFlowRule);
}
// 將工單-生產單位 流程ID取rulestation的作業站排順序
RuleStationsController ruleStationsController = new RuleStationsController(_context);
List<dynamic> dy = new List<dynamic>();
int index = 1;
foreach (int i in FlowRuleID)
{
if (i == 0)
continue;
var ruleStations = await ruleStationsController.GetRuleStationByFlow(i, 0);
if (ruleStations.Value.Count() != 0)
{
foreach (var item in ruleStations.Value.Where(w => w.StationType == "M").OrderBy(o => o.Sequence))
{
var x = new
{
index,
item.RuleStationID
};
dy.Add(x);
index++;
}
}
}
if (dy.Where(w => w.RuleStationID == stationID).Select(s => s.index).FirstOrDefault() == null)
return 0;
int NowIndex = dy.Where(w => w.RuleStationID == stationID).Select(s => s.index).FirstOrDefault();
if (dy.Where(w => w.index == (NowIndex - 1)).Select(s => s.RuleStationID).FirstOrDefault() == null)
return 0;
return dy.Where(w => w.index == (NowIndex - 1)).Select(s => s.RuleStationID).FirstOrDefault();
int NextStopStationID = dy.Where(w => w.index == (NowIndex + 1)).Select(s => s.RuleStationID).FirstOrDefault();
}
/// <summary>
/// 取得下一個作業站RuleStationID
/// </summary>
/// <param name="wipno">工單號碼</param>
/// <param name="stationID">作業站ID</param>
/// <returns>0:沒有下一站</returns>
private async Task<int> GetBarCodeNextStopRuleStationID(string wipno, int stationID)
{
WipInfosController wipInfosController = new WipInfosController(_context);
var q = wipInfosController.GetWipInfoByWipNo(wipno);
if (q.Result.Value.Count() == 0)
return 0;
var q1 = q.Result.Value.ToList();
List<int> FlowRuleID = new List<int>();
List<string> Unit = new List<string>();
// 取生產單位順序
if (q1.Where(w => w.UnitNO == "S" || w.UnitNO == "D").Any())
{
// SMT DIP
Unit.Add("S");
Unit.Add("D");
}
else if (q1.Where(w => w.UnitNO == "B" || w.UnitNO == "T").Any())
{
// 組裝 測試 包裝
Unit.Add("B");
Unit.Add("T");
Unit.Add("P");
}
// 抓各生產單位的流程ID
foreach (string str in Unit)
{
int WipFlowRule = q1.Where(w => w.UnitNO == str).Select(s => s.FlowRuleID).FirstOrDefault();
FlowRuleID.Add(WipFlowRule);
}
// 將工單-生產單位 流程ID取rulestation的作業站排順序
RuleStationsController ruleStationsController = new RuleStationsController(_context);
List<dynamic> dy = new List<dynamic>();
int index = 1;
foreach (int i in FlowRuleID)
{
if (i == 0)
continue;
var ruleStations = await ruleStationsController.GetRuleStationByFlow(i, 0);
if (ruleStations.Value.Count() != 0)
{
foreach (var item in ruleStations.Value.Where(w => w.StationType == "M").OrderBy(o => o.Sequence))
{
var x = new
{
index,
item.RuleStationID
};
dy.Add(x);
index++;
}
}
}
if (dy.Where(w => w.RuleStationID == stationID).Select(s => s.index).FirstOrDefault() == null)
return 0;
int NowIndex = dy.Where(w => w.RuleStationID == stationID).Select(s => s.index).FirstOrDefault();
if (dy.Where(w => w.index == (NowIndex + 1)).Select(s => s.RuleStationID).FirstOrDefault() == null)
return 0;
return dy.Where(w => w.index == (NowIndex + 1)).Select(s => s.RuleStationID).FirstOrDefault();
}
} }
} }

Write Preview
Loading…
Cancel
Save