JHUSER
/
AMES_EE
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1. 調整鋼板功能相關程式 

2. 取消MAC卡數量判斷
3. 過站治具新增鋼板編號判定
4. 工單資料-工程資訊 燒機溫度增加 -40~+60度
5. Mail警示類型新增 鋼板量測NG
master
Sai 2 years ago
parent
829cb117ff
commit
ec540c6b10
26 changed files with 1754 additions and 446 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. 287
      AMESCoreStudio.Web/Controllers/PCBController.cs
  2. 83
      AMESCoreStudio.Web/Controllers/PCSController.cs
  3. 66
      AMESCoreStudio.Web/HttpApis/AMES/IPCB.cs
  4. 7
      AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
  5. 100
      AMESCoreStudio.Web/ViewModels/PCB/PCB013ViewModel.cs
  6. 137
      AMESCoreStudio.Web/Views/PCB/PCB013.cshtml
  7. 19
      AMESCoreStudio.Web/Views/PCB/PCB013A.cshtml
  8. 102
      AMESCoreStudio.Web/Views/PCB/PCB013C.cshtml
  9. 88
      AMESCoreStudio.Web/Views/PCB/PCB013U.cshtml
  10. 88
      AMESCoreStudio.Web/Views/PCB/PCB013V.cshtml
  11. 222
      AMESCoreStudio.Web/Views/PCB/PCB016.cshtml
  12. 2
      AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
  13. 208
      AMESCoreStudio.WebApi/Controllers/AMES/SteelPlateInfoController.cs
  14. 52
      AMESCoreStudio.WebApi/Controllers/AMES/SteelPlateMeasureController.cs
  15. 97
      AMESCoreStudio.WebApi/Controllers/AMES/SteelPlateMeasureNgController.cs
  16. 98
      AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckNewController.cs
  17. 149
      AMESCoreStudio.WebApi/DTO/AMES/PCB013RViewDto.cs
  18. 20
      AMESCoreStudio.WebApi/DTO/AMES/SteelPlateInfoDto.cs
  19. 83
      AMESCoreStudio.WebApi/DTO/AMES/SteelPlateMeasureDto.cs
  20. 8
      AMESCoreStudio.WebApi/Enums/EnumPCB.cs
  21. 14
      AMESCoreStudio.WebApi/Enums/EnumPCS.cs
  22. 7
      AMESCoreStudio.WebApi/Enums/EnumWipAlarm.cs
  23. 47
      AMESCoreStudio.WebApi/Models/AMES/SteelPlateInfo.cs
  24. 112
      AMESCoreStudio.WebApi/Models/AMES/SteelPlateMeasure.cs
  25. 99
      AMESCoreStudio.WebApi/Models/AMES/SteelPlateMeasureNg.cs
  26. 5
      AMESCoreStudio.WebApi/Models/AMESContext.cs

287
AMESCoreStudio.Web/Controllers/PCBController.cs
View File

@ -1,31 +1,21 @@
using Microsoft.AspNetCore.Mvc;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using AMESCoreStudio.CommonTools.Result;
using AMESCoreStudio.Web.Models;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using AMESCoreStudio.WebApi;
using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc.Rendering;
using AMESCoreStudio.WebApi.Models.AMES;
using AMESCoreStudio.WebApi.Models.BAS;
using AMESCoreStudio.Web.ViewModels;
using AMESCoreStudio.Web.ViewModels.PCS;
using AMESCoreStudio.Web.ViewModels.PCB;
using AMESCoreStudio.WebApi.DTO.AMES;
using System.Linq;
using AMESCoreStudio.CommonTools.Result;
using System;
using System.IO;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Hosting;
using System.ComponentModel.DataAnnotations;
using AspNetCore.Reporting;
using System.Text.Encodings;
using AMESCoreStudio.WebApi.Enum;
using AMESCoreStudio.WebApi.Controllers.AMES;
using System.Data.Common;
using Microsoft.EntityFrameworkCore;
using AMESCoreStudio.WebApi.Models.AMES;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Threading.Tasks;
namespace AMESCoreStudio.Web.Controllers
{
@ -39,13 +29,15 @@ namespace AMESCoreStudio.Web.Controllers
private readonly IWebHostEnvironment _env;
public readonly IPCS _pcsApi;
public readonly IBLL _bllApi;
public PCBController(ILogger<PCBController> logger, IPCB pcbApi, IWebHostEnvironment env, IPCS pcsApi, IBLL bllApi)
public readonly ISYS _sysApi;
public PCBController(ILogger<PCBController> logger, IPCB pcbApi, IWebHostEnvironment env, IPCS pcsApi, IBLL bllApi, ISYS sysApi)
{
_logger = logger;
_pcbApi = pcbApi;
_env = env;
_pcsApi = pcsApi;
_bllApi = bllApi;
_sysApi = sysApi;
}
//#region 下拉選單
@ -77,11 +69,15 @@ namespace AMESCoreStudio.Web.Controllers
return View();
}
public async Task<IActionResult> PCB013QueryAsync(string steelPlateNo, string pcbPartNo
, string side, string status, int page = 0, int limit = 10)
public async Task<IActionResult> PCB013QueryAsync(string steelPlateNo, string storageLocation, string item,
string date_str, string date_end, string side, string status, string checkOff, int page = 0, int limit = 10)
{
IResultModel<SteelPlateInfoDto> result = await _pcbApi.GetSteelPlateInfoQuery(steelPlateNo: steelPlateNo, pcbPartNo: pcbPartNo
, side: side, status: status, page: page, limit: limit);
if (checkOff == "on")
checkOff = "Y";
IResultModel<SteelPlateInfoDto> result = await _pcbApi.GetSteelPlateInfoQuery(steelPlateNo: steelPlateNo, storageLocation: storageLocation,
item: item, date_str: date_str, date_end: date_end, side: side, status: status,
checkOff: checkOff, page: page, limit: limit);
if (result.Data.Count() != 0)
{
@ -110,6 +106,9 @@ namespace AMESCoreStudio.Web.Controllers
{
if (ModelState.IsValid)
{
model.SteelPlateNo = model.SteelPlateNo.Trim();
model.Items = model.Items.Trim();
IResultModel result;
if (model.SteelPlateID == 0)
{
@ -146,12 +145,37 @@ namespace AMESCoreStudio.Web.Controllers
}
public IActionResult PCB013A(int steelPlateID, string steelPlateNo)
public async Task<IActionResult> PCB013A(int steelPlateID, string steelPlateNo)
{
GetSteelPlateStatusSelect();
ViewBag.steelPlateID = steelPlateID;
ViewBag.steelPlateNo = steelPlateNo;
return View();
var result = new PCB013ViewModel();
result.SteelPlateID = steelPlateID;
result.SteelPlateNo = steelPlateNo;
var resultSteel = await _pcbApi.GetSteelPlateMeasureBySteelPlateID(steelPlateID);
// 鋼板編號沒有量測資料
if (resultSteel.Data.Count() == 0)
{
result.SpMeasureID = 0;
result.Status = "上線";
}
else
{
var item = resultSteel.Data.OrderByDescending(o => o.SpMeasureID).FirstOrDefault();
// 下線資料空白
if (string.IsNullOrWhiteSpace(item.OffTension1))
{
result.SpMeasureID = item.SpMeasureID;
result.Status = "下線";
}
else
{
result.SpMeasureID = 0;
result.Status = "上線";
}
}
return View(result);
}
/// <summary>
@ -160,48 +184,117 @@ namespace AMESCoreStudio.Web.Controllers
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
public async Task<IActionResult> PCB013ASave(SteelPlateMeasure model)
public async Task<IActionResult> PCB013ASave(PCB013ViewModel model)
{
IResultModel result;
// 量測基準 35 小於通知寄信
if (double.Parse(model.Tension1) < 35 || double.Parse(model.Tension2) < 35 || double.Parse(model.Tension3) < 35 ||
double.Parse(model.Tension4) < 35 || double.Parse(model.Tension5) < 35)
{
model.MeasureResult = "F";
//string Subject = $"FQC自動派送發信 FQC單號:{inhouseNo} 料號:{Material}";
//string Body = $@"FQC單號:{inhouseNo} 料號:{Material} <br/>
// 檢驗結果為:{Result}";
//await _bllApi.PostToMail(Subject, Body, string.Join(',', MailGroup), "", false, path);
}
else
{
model.MeasureResult = "P";
}
model.CreateUserID = GetLogInUserID();
model.CreateDate = DateTime.Now;
model.UpdateUserID = GetLogInUserID();
model.UpdateDate = DateTime.Now;
result = await _pcbApi.PostSteelPlateMeasure(JsonConvert.SerializeObject(model));
#region 紀錄log及改狀態
var SteelPlateMeasureNg = new SteelPlateMeasureNg
{
SteelPlateID = model.SteelPlateID,
Status = model.Status,
Tension1 = model.Tension1,
Tension2 = model.Tension2,
Tension3 = model.Tension3,
Tension4 = model.Tension4,
Tension5 = model.Tension5,
CreateUserID = GetLogInUserID()
};
await _pcbApi.PostSteelPlateMeasureNg(JsonConvert.SerializeObject(SteelPlateMeasureNg));
var data = new SteelPlateInfo
{
SteelPlateID = model.SteelPlateID,
Status = "0",
UpdateUserID = GetLogInUserID(),
};
await _pcbApi.PutSteelPlateInfoByStatus(JsonConvert.SerializeObject(data));
#endregion
#region 寄通知信
string NgMsg = $"{model.Status}量測";
if (double.Parse(model.Tension1) < 35)
NgMsg += $"第一點量測值({model.Tension1})、";
if (double.Parse(model.Tension2) < 35)
NgMsg += $"第二點量測值({model.Tension2})、";
if (double.Parse(model.Tension3) < 35)
NgMsg += $"第三點量測值({model.Tension3})、";
if (double.Parse(model.Tension4) < 35)
NgMsg += $"第四點量測值({model.Tension4})、";
if (double.Parse(model.Tension5) < 35)
NgMsg += $"第五點量測值({model.Tension5})、";
NgMsg = NgMsg.Substring(0, NgMsg.Length - 1) + "小於告警值";
string MailGroup = "STEEL_ALARM";
string Subject = $"[AMES系統通知] 鋼板量測值告警通知";
string Body = $"鋼板編號：{model.SteelPlateNo}<br/>" +
$"量測日期[{DateTime.Now:yyyy/MM/dd}]<br/>" +
$"量測時間[{DateTime.Now:HH:mm:ss}]<br/>" +
$"量測人員[{await GetUserName()}]<br/>{NgMsg}";
await _bllApi.PostToMail(Subject, Body, string.Join(',', MailGroup), "");
WipAlarm wipAlarm = new WipAlarm();
wipAlarm.AlarmTypeID = (int)EnumWipAlarm.EnumTypeId.SteelPlateNg;
wipAlarm.WipNO = model.SteelPlateNo;
wipAlarm.AlarmParam = model.Status;
wipAlarm.AlarmValue = "1";
wipAlarm.AlarmDesc = Subject;
wipAlarm.AlarmDateTime = DateTime.Now;
await _pcbApi.PostWipAlarm(JsonConvert.SerializeObject(wipAlarm));
#endregion
if (result.Success)
{
var _msg = "新增量測記錄成功！";
return RedirectToAction("Refresh", "Home", new { msg = _msg });
return RedirectToAction("Refresh", "Home", new { msg = "量測張力低於基準35，不做紀錄" });
}
else
{
var data = new SteelPlateMeasure();
// 新增一筆 上線
if (model.SpMeasureID == 0)
{
data.SteelPlateID = model.SteelPlateID;
data.OnTension1 = model.Tension1;
data.OnTension2 = model.Tension2;
data.OnTension3 = model.Tension3;
data.OnTension4 = model.Tension4;
data.OnTension5 = model.Tension5;
data.OnUserID = GetLogInUserID();
data.OnDate = DateTime.Now;
result = await _pcbApi.PostSteelPlateMeasure(JsonConvert.SerializeObject(data));
}
// 更新一筆 下線
else
{
data.SpMeasureID = model.SpMeasureID;
data.SteelPlateID = model.SteelPlateID;
data.OffTension1 = model.Tension1;
data.OffTension2 = model.Tension2;
data.OffTension3 = model.Tension3;
data.OffTension4 = model.Tension4;
data.OffTension5 = model.Tension5;
data.OffUserID = GetLogInUserID();
data.OffDate = DateTime.Now;
result = await _pcbApi.PutSteelPlateMeasure(JsonConvert.SerializeObject(data));
}
ModelState.AddModelError("error", result.Msg);
if (result.Success)
{
var _msg = "新增量測記錄成功！";
return RedirectToAction("Refresh", "Home", new { msg = _msg });
}
else
{
ModelState.AddModelError("error", result.Msg);
}
}
if (model.SteelPlateID == 0)
{
return View("PCB013A", model);
}
return View("PCB013A", model);
}
@ -219,6 +312,27 @@ namespace AMESCoreStudio.Web.Controllers
return View();
}
[HttpGet]
public IActionResult PCB016()
{
return View();
}
public async Task<IActionResult> PCB016QueryAsync(string steelPlateNo, string storageLocation, string item,
string date_str, string date_end, string wipNo, int page = 0, int limit = 10)
{
IResultModel<PCB016ViewDto> result = await _pcbApi.GetSteelPlateInfoReport(steelPlateNo: steelPlateNo, storageLocation: storageLocation,
item: item, date_str: date_str, date_end: date_end, wipNo: wipNo, page: page, limit: limit);
if (result.Data.Count() != 0)
{
return Json(new Table() { code = 0, msg = "", data = result.Data, count = result.DataTotal });
}
return Json(new Table() { count = 0, data = null });
}
[HttpGet]
public async Task<IActionResult> PCB013VQuery(int steelPlateID, string steelPlateNo, int page = 0, int limit = 10)
{
@ -312,7 +426,6 @@ namespace AMESCoreStudio.Web.Controllers
}
#endregion
#region PCB015連板綁定作業
public async Task<IActionResult> PCB015(int WipID)
@ -335,14 +448,14 @@ namespace AMESCoreStudio.Web.Controllers
model.ruleStations = await _pcsApi.GetRuleStationByWipNo(model.wipInfo.WipNO, model.wipInfo.FlowRuleID);
}
return View("PCB015V", model);
}
public async Task<IActionResult> PCB015GetGroupAsync(string id, string groupID =null , int page = 0, int limit = 10)
public async Task<IActionResult> PCB015GetGroupAsync(string id, string groupID = null, int page = 0, int limit = 10)
{
var result = await _pcbApi.GetBarcodeGroupsByWipNO(id: id , groupID : groupID, page: page, limit: limit);
var result = await _pcbApi.GetBarcodeGroupsByWipNO(id: id, groupID: groupID, page: page, limit: limit);
//groupID = '' 抓全部
//groupID = 0 不抓資料
@ -352,7 +465,7 @@ namespace AMESCoreStudio.Web.Controllers
}
return Json(new Table() { count = 0, data = null });
}
public async Task<IActionResult> GetWipInfoAsync(string id,string unit_No)
public async Task<IActionResult> GetWipInfoAsync(string id, string unit_No)
{
var result = await _pcsApi.GetWipAtt(id);
@ -369,7 +482,7 @@ namespace AMESCoreStudio.Web.Controllers
if (result != null)
{
return Json(new Result() { success = true, msg = "", data = result });
// return Json(new Table() { code = 0, msg = "", data = result, count = 1 });
// return Json(new Table() { code = 0, msg = "", data = result, count = 1 });
}
}
@ -384,18 +497,18 @@ namespace AMESCoreStudio.Web.Controllers
/// <returns></returns>
public async Task<IActionResult> PCB015DAsync(int id)
{
var result = await _pcsApi.DeleteBarcodeGroupByGroupID(id);
var result = await _pcsApi.DeleteBarcodeGroupByGroupID(id);
return Json(new Result() { success = true, msg = "刪除成功" });
}
public async Task<IActionResult> CheckBarcodeNOandGroupAsync(string BarcodeNo, string WipNo,int WipID,int Boards,string PlanQTY)
public async Task<IActionResult> CheckBarcodeNOandGroupAsync(string BarcodeNo, string WipNo, int WipID, int Boards, string PlanQTY)
{
//生產序號不在工單區間
var WipBarcode = await _pcbApi.GetWipBarcodesCheckInRange(WipNo, BarcodeNo);
int snLen = PlanQTY.Length;
if (snLen < 4) snLen = 4;
if (WipBarcode.Count > 0 )
if (WipBarcode.Count > 0)
{
#region 取區間內最大號
int Maxnumber = 0;
@ -417,7 +530,7 @@ namespace AMESCoreStudio.Web.Controllers
List<string> serialNumbers = Enumerable.Range(0, Boards)
.Select(i =>
{
string newSerialNumber = $"{BarcodeNo.Substring(0, BarcodeNo.Length - snLen)}{(int.Parse(BarcodeNo.Substring(BarcodeNo.Length - snLen)) + i).ToString().PadLeft(snLen, '0')}";
string newSerialNumber = $"{BarcodeNo.Substring(0, BarcodeNo.Length - snLen)}{(int.Parse(BarcodeNo.Substring(BarcodeNo.Length - snLen)) + i).ToString().PadLeft(snLen, '0')}";
return newSerialNumber;
})
.TakeWhile(serialNumber => int.Parse(serialNumber.Substring(serialNumber.Length - snLen)) <= Maxnumber)
@ -439,12 +552,12 @@ namespace AMESCoreStudio.Web.Controllers
var BarcodeGroup = await _pcsApi.GetBarcodeGroupByBarCodeID(BarCodeinto.Select(s => s.BarcodeID).FirstOrDefault());
if (BarcodeGroup.Count() > 0)
{
return Json(new Result() { success = false, msg = "生產序號" + item + "已綁定群組"+ BarcodeGroup.Select(s=>s.GroupID).FirstOrDefault()+ "，不可重覆綁定", data = null });
return Json(new Result() { success = false, msg = "生產序號" + item + "已綁定群組" + BarcodeGroup.Select(s => s.GroupID).FirstOrDefault() + "，不可重覆綁定", data = null });
}
}
else
{
var barcodeInfo = new BarcodeInfo
var barcodeInfo = new BarcodeInfo
{
BarcodeNo = item,
StationID = -1,
@ -455,19 +568,19 @@ namespace AMESCoreStudio.Web.Controllers
SysType = "S",
StatusNo = "-1",
CreateUserID = GetLogInUserID()
};
var PostResult = await _pcsApi.PostBarcodeInfoes(JsonConvert.SerializeObject(barcodeInfo));
};
var PostResult = await _pcsApi.PostBarcodeInfoes(JsonConvert.SerializeObject(barcodeInfo));
}
}
#endregion
#region 綁定Group
var barcodeinfo = await _pcbApi.PostDapperByListBarcodeNO(JsonConvert.SerializeObject(serialNumbers));
int UserID = GetLogInUserID();
List<BarcodeGroup> barcodeGroups = barcodeinfo
.Select((b, index) => new BarcodeGroup
{
@ -481,7 +594,7 @@ namespace AMESCoreStudio.Web.Controllers
var BarCodeGroup = await _pcbApi.PostBarcodeGroupList(JsonConvert.SerializeObject(barcodeGroups));
return Json(new Result() { success = true, msg = "綁定成功", data = BarCodeGroup.Data.Select(s=>s.GroupID).FirstOrDefault() });
return Json(new Result() { success = true, msg = "綁定成功", data = BarCodeGroup.Data.Select(s => s.GroupID).FirstOrDefault() });
#endregion
@ -510,5 +623,21 @@ namespace AMESCoreStudio.Web.Controllers
}
return user_id;
}
/// <summary>
/// 登入User名稱
/// </summary>
/// <param name="userId"></param>
/// <returns></returns>
public async Task<string> GetUserName()
{
int userId = GetLogInUserID();
var user = await _sysApi.GetUserInfo(userId);
if (!user.Any())
return "";
else
return user.FirstOrDefault().UserName;
}
}
}

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

@ -1562,10 +1562,15 @@ namespace AMESCoreStudio.Web.Controllers
if (!string.IsNullOrWhiteSpace(outfitNo))
{
var q = await _pcsApi.GetOutfitInfoAndOutfitVariety(outfitNo);
var q1 = await _pcsApi.GetSteelPlateInfoByNo(outfitNo);
if (q.Any())
{
return Json(new { useTimes = q.FirstOrDefault().useTimes, useLimitTimes = q.FirstOrDefault().useLimitTimes });
}
else if (q1.Any())
{
return Json(new { useTimes = q1.FirstOrDefault().BeUseTimes, useLimitTimes = q1.FirstOrDefault().UsedTimes });
}
else
return Json(new { useTimes = 0, useLimitTimes = 0 });
}
@ -1779,18 +1784,21 @@ namespace AMESCoreStudio.Web.Controllers
!string.IsNullOrWhiteSpace(w.EndNO)).ToList();
if (CreateMac.Count != 0)
{
var q = await _pcsApi.GetMACInfo(model.wipAtt.ItemNO);
var MacQty = q == null ? 1 : q.Qty;
var result_wipMac = await _pcsApi.GetWipMAC(model.wipInfo.WipNO);
if (result_wipMac.Sum(s => s.Qty) >= model.wipInfo.PlanQTY * MacQty)
{
Msg += "，該筆工單已取滿MAC數量，請在確認";
}
else
{
// 判斷MAC是否正確
Msg += CheckMACData(CreateMac, model.wipInfo.UnitNO);
}
// 判斷MAC是否正確
Msg += CheckMACData(CreateMac, model.wipInfo.UnitNO);
// 取消數量判斷
//var q = await _pcsApi.GetMACInfo(model.wipAtt.ItemNO);
//var MacQty = q == null ? 2 : q.Qty;
//var result_wipMac = await _pcsApi.GetWipMAC(model.wipInfo.WipNO);
//if (result_wipMac.Sum(s => s.Qty) >= model.wipInfo.PlanQTY * MacQty)
//{
// Msg += "，該筆工單已取滿MAC數量，請在確認";
//}
//else
//{
// // 判斷MAC是否正確
// Msg += CheckMACData(CreateMac, model.wipInfo.UnitNO);
//}
}
// 判斷出貨序號是否錯誤
@ -2488,18 +2496,21 @@ namespace AMESCoreStudio.Web.Controllers
!string.IsNullOrWhiteSpace(w.EndNO)).ToList();
if (CreateMac.Count != 0)
{
var q = await _pcsApi.GetMACInfo(model.wipAtt.ItemNO);
var MacQty = q == null ? 1 : q.Qty;
var result_wipMac = await _pcsApi.GetWipMAC(model.wipInfo.WipNO);
if (result_wipMac.Sum(s => s.Qty) >= model.wipInfo.PlanQTY * MacQty)
{
Msg += "，該筆工單已取滿MAC數量，請在確認";
}
else
{
// 判斷MAC是否正確
Msg += CheckMACData(CreateMac, model.wipInfo.UnitNO);
}
// 判斷MAC是否正確
Msg += CheckMACData(CreateMac, model.wipInfo.UnitNO);
// 取消數量判斷
//var q = await _pcsApi.GetMACInfo(model.wipAtt.ItemNO);
//var MacQty = q == null ? 2 : q.Qty;
//var result_wipMac = await _pcsApi.GetWipMAC(model.wipInfo.WipNO);
//if (result_wipMac.Sum(s => s.Qty) >= model.wipInfo.PlanQTY * MacQty)
//{
// Msg += "，該筆工單已取滿MAC數量，請在確認";
//}
//else
//{
// // 判斷MAC是否正確
// Msg += CheckMACData(CreateMac, model.wipInfo.UnitNO);
//}
}
if (!string.IsNullOrWhiteSpace(Msg))
@ -8903,7 +8914,7 @@ namespace AMESCoreStudio.Web.Controllers
string Msg = string.Empty;
bool Success = true;
int USERID = GetLogInUserID();
string filePath = $".\\logs\\PCBA-{System.DateTime.Now.ToString("yyyyMMdd")}-{USERID.ToString()}.txt" ; // 替换为实际文件路径
string filePath = $".\\logs\\PCBA-{System.DateTime.Now.ToString("yyyyMMdd")}-{USERID.ToString()}.txt"; // 替换为实际文件路径
@ -9063,8 +9074,8 @@ namespace AMESCoreStudio.Web.Controllers
}
}
WriteTextToFile(filePath, $"{model.WipNO}-{model.UnitNO} 無序號過站 站別: {NowStation.StationDesc}-{ NowStation.StationID} {Msg}");
#endregion
@ -9171,12 +9182,12 @@ namespace AMESCoreStudio.Web.Controllers
{
// 抓作前一站作業站
var RuleStations1 = await _pcsApi.GetRuleStationByFlowDto(model.FlowRuleID);
if (RuleStations1.Count() > 0)
{
var RuleStations2 = RuleStations1.Where(w => w.StationType == "M").ToList();
var NowStation = RuleStations2.Where(w => w.StationID == model.Station);
var RuleStations2 = RuleStations1.Where(w => w.StationType == "M").ToList();
var NowStation = RuleStations2.Where(w => w.StationID == model.Station);
if (NowStation != null)
{
var PriorStation = RuleStations1.Where(w => w.Sequence == NowStation.FirstOrDefault().Sequence - 1);
@ -9236,9 +9247,9 @@ namespace AMESCoreStudio.Web.Controllers
//以Group 過站
GroupID = BarcodeGroups.Select(s => s.GroupID).FirstOrDefault();
var BarcodeGroup = await _pcsApi.GetBarcodeGroupByGroupID(GroupID);
var SN = await _pcsApi.PostDapperByListBarcodeID(JsonConvert.SerializeObject(BarcodeGroup.Select(s=>s.BarcodeID).ToList()));
BarcodeNo = SN.Select(s=>s.BarcodeNo).ToList();
var SN = await _pcsApi.PostDapperByListBarcodeID(JsonConvert.SerializeObject(BarcodeGroup.Select(s => s.BarcodeID).ToList()));
BarcodeNo = SN.Select(s => s.BarcodeNo).ToList();
}
}
else
@ -9269,7 +9280,7 @@ namespace AMESCoreStudio.Web.Controllers
}
}
WriteTextToFile(filePath, $"{PriorModel.WipNO}-{PriorModel.UnitNO} 有序號補過前站: {PriorModel.StationDesc}-{ PriorModel.Station} {Msg}");
}
#endregion
@ -9299,7 +9310,7 @@ namespace AMESCoreStudio.Web.Controllers
#endregion
#region 判斷是否拆站
if (model.DisGroup &&GroupID != 0)
if (model.DisGroup && GroupID != 0)
{
await _pcsApi.DeleteBarcodeGroupByGroupID(GroupID);
}
@ -9550,7 +9561,7 @@ namespace AMESCoreStudio.Web.Controllers
using (StreamWriter writer = new StreamWriter(filePath, true))
{
writer.WriteLine(System.DateTime.Now.ToString() + " : ");
writer.WriteLine(content);

66
AMESCoreStudio.Web/HttpApis/AMES/IPCB.cs
View File

@ -464,15 +464,20 @@ namespace AMESCoreStudio.Web
/// 鋼板資料查詢
/// </summary>
/// <param name="steelPlateNo">鋼板編號</param>
/// <param name="pcbPartNo">PCB板號</param>
/// <param name="storageLocation">儲存位置</param>
/// <param name="item">料號</param>
/// <param name="side">正背面</param>
/// <param name="status">狀態</param>
/// <param name="date_str">到廠日_起</param>
/// <param name="date_end">到廠日_迄</param>
/// <param name="checkOff">鋼板未下線狀態 Y/N</param>
/// <param name="page">頁數</param>
/// <param name="limit">筆數</param>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/SteelPlateInfo/SteelPlateInfoQuery")]
ITask<ResultModel<SteelPlateInfoDto>> GetSteelPlateInfoQuery(string steelPlateNo = null, string pcbPartNo = null
, string side = null, string status = null, int page = 0, int limit = 10);
ITask<ResultModel<SteelPlateInfoDto>> GetSteelPlateInfoQuery(string steelPlateNo = null, string storageLocation = null ,
string item = null, string date_str = null , string date_end = null
, string side = null, string status = null,string checkOff = null , int page = 0, int limit = 10);
/// <summary>
/// 新增鋼板資料
@ -488,6 +493,13 @@ namespace AMESCoreStudio.Web
[WebApiClient.Attributes.HttpPut("api/SteelPlateInfo")]
ITask<ResultModel<SteelPlateInfo>> PutSteelPlateInfo([FromBody, RawJsonContent] string model);
/// <summary>
/// 更新鋼板基本資料 狀態
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpPut("api/SteelPlateInfo/ByStatus")]
ITask<ResultModel<SteelPlateMeasure>> PutSteelPlateInfoByStatus([FromBody, RawJsonContent] string model);
/// <summary>
/// 查詢鋼板資料 ID
/// </summary>
@ -503,15 +515,61 @@ namespace AMESCoreStudio.Web
ITask<List<SteelPlateInfo>> GetSteelPlateInfoByNo(string id);
/// <summary>
/// 新增鋼板資料
/// 新增鋼板量測資料
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpPost("api/SteelPlateMeasure")]
ITask<ResultModel<SteelPlateMeasure>> PostSteelPlateMeasure([FromBody, RawJsonContent] string model);
/// <summary>
/// 更新鋼板量測資料
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpPut("api/SteelPlateMeasure")]
ITask<ResultModel<SteelPlateMeasure>> PutSteelPlateMeasure([FromBody, RawJsonContent] string model);
/// <summary>
/// 查詢 鋼板量測記錄By 鋼板ID
/// </summary>
/// <param name="id"></param>
/// <param name="page"></param>
/// <param name="limit"></param>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/SteelPlateMeasure/BySteelPlateID/{id}")]
ITask<ResultModel<SteelPlateMeasureDto>> GetSteelPlateMeasureBySteelPlateID(int id, int page = 0, int limit = 10);
/// <summary>
/// 新增鋼板量測NG資料
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpPost("api/SteelPlateMeasureNg")]
ITask<ResultModel<SteelPlateMeasureNg>> PostSteelPlateMeasureNg([FromBody, RawJsonContent] string model);
/// <summary>
/// 鋼板資料查詢 Report
/// </summary>
/// <param name="steelPlateNo">鋼板編號</param>
/// <param name="storageLocation">儲存位置</param>
/// <param name="item">料號</param>
/// <param name="side">正背面</param>
/// <param name="status">狀態</param>
/// <param name="date_str">到廠日_起</param>
/// <param name="date_end">到廠日_迄</param>
/// <param name="checkOff">鋼板未下線狀態 Y/N</param>
/// <param name="page">頁數</param>
/// <param name="limit">筆數</param>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/SteelPlateInfo/SteelPlateInfoReport")]
ITask<ResultModel<PCB016ViewDto>> GetSteelPlateInfoReport(string steelPlateNo = null, string storageLocation = null,
string item = null, string date_str = null, string date_end = null
, string wipNo = null, int page = 0, int limit = 10);
/// <summary>
/// 新增警報資料
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpPost("api/WipAlarms")]
ITask<ResultModel<WipAlarm>> PostWipAlarm([FromBody, RawJsonContent] string model);
#endregion
#region PCB014 錫膏使用管控

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

@ -1686,5 +1686,12 @@ namespace AMESCoreStudio.Web
/// <returns></returns>
[WebApiClient.Attributes.HttpPost("api/BarcodeInfoes/DapperByListBarcodeID")]
ITask<List<BarcodeInfo>> PostDapperByListBarcodeID([FromBody, RawJsonContent] string model);
/// <summary>
/// 查詢鋼板資料 By No
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/SteelPlateInfo/ByNo/{id}")]
ITask<List<SteelPlateInfo>> GetSteelPlateInfoByNo(string id);
}
}

100
AMESCoreStudio.Web/ViewModels/PCB/PCB013ViewModel.cs
View File

@ -0,0 +1,100 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
using System.Runtime.Serialization;
#nullable disable
namespace AMESCoreStudio.Web.ViewModels.PCB
{
/// <summary>
/// 鋼板量測記錄 ViewModel
/// </summary>
public partial class PCB013ViewModel
{
/// <summary>
/// 鋼板量測記錄ID
/// </summary>
[DataMember]
public int SpMeasureID { get; set; }
/// <summary>
/// 鋼板ID
/// </summary>
[DataMember]
public int SteelPlateID { get; set; }
/// <summary>
/// 鋼板編號
/// </summary>
[DataMember]
public string SteelPlateNo { get; set; }
/// <summary>
/// 張力_1
/// </summary>
[DataMember]
[Display(Name = "張力_1")]
[Required(ErrorMessage = "{0},不能空白")]
public string Tension1 { get; set; }
/// <summary>
/// 張力_2
/// </summary>
[DataMember]
[Display(Name = "張力_2")]
[Required(ErrorMessage = "{0},不能空白")]
public string Tension2 { get; set; }
/// <summary>
/// 張力_3
/// </summary>
[DataMember]
[Display(Name = "張力_3")]
[Required(ErrorMessage = "{0},不能空白")]
public string Tension3 { get; set; }
/// <summary>
/// 張力_4
/// </summary>
[DataMember]
[Display(Name = "張力_4")]
[Required(ErrorMessage = "{0},不能空白")]
public string Tension4 { get; set; }
/// <summary>
/// 張力_5
/// </summary>
[DataMember]
[Display(Name = "張力_5")]
[Required(ErrorMessage = "{0},不能空白")]
public string Tension5 { get; set; }
/// <summary>
/// 建立UserID
/// </summary>
[DataMember]
public int? UserID { get; set; }
/// <summary>
/// 建立日期
/// </summary>
[DataMember]
public DateTime? Date { get; set; } = DateTime.Now;
/// <summary>
/// 狀態
/// </summary>
[DataMember]
public string Status { get; set; }
/// <summary>
/// 備註
/// </summary>
[DataMember]
public string Remark { get; set; }
}
}

137
AMESCoreStudio.Web/Views/PCB/PCB013.cshtml
View File

@ -43,9 +43,9 @@
<div class="layui-form">
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-col-sm3">
<div class="layui-col-sm4">
<div class="layui-inline">
<label class="layui-form-label" style="width:60px">鋼板編號:</label>
<label class="layui-form-label">鋼板編號:</label>
<div class="layui-input-inline" style="width:150px">
<input id="steelPlateNo" name="steelPlateNo" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" class="layui-input">
</div>
@ -53,27 +53,60 @@
</div>
<div class="layui-col-sm3">
<div class="layui-inline">
<label class="layui-form-label" style="width:60px">PCB板號:</label>
<label class="layui-form-label">工程編號:</label>
<div class="layui-input-inline" style="width:150px">
<input id="pcbPartNo" name="pcbPartNo" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" class="layui-input">
<input id="item" name="item" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" class="layui-input">
</div>
</div>
</div>
<div class="layui-col-sm2">
<div class="layui-col-sm3">
<div class="layui-inline">
<label class="layui-form-label" style="width:60px">儲存位置:</label>
<div class="layui-input-inline" style="width:150px">
<input id="storageLocation" name="storageLocation" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" class="layui-input">
</div>
</div>
</div>
<div class="layui-col-sm1">
<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>
</button>
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-col-sm4">
<div class="layui-inline">
<label class="layui-form-label">到廠日期:</label>
<div class="layui-input-inline" style="width:80px">
<input id="date_str" name="date_str" autocomplete="off" class="layui-input" readonly="">
</div>
<div class="layui-form-mid">～</div>
<div class="layui-input-inline" style="width:80px">
<input id="date_end" name="date_end" autocomplete="off" class="layui-input" readonly="">
</div>
</div>
</div>
<div class="layui-col-sm3">
<div class="layui-inline">
<label class="layui-form-label" style="width:50px">正背面:</label>
<label class="layui-form-label">正背面:</label>
<div class="layui-input-inline" style="width:80px">
<select id="Side" lay-filter="Side" name="Side" class="">
<option value="">全部</option>
<option value="11">B/背面</option>
<option value="12">A/正面</option>
<option value="11">A面</option>
<option value="12">B面</option>
<option value="13">AB面</option>
</select>
</div>
</div>
</div>
<div class="layui-col-sm2">
<div class="layui-col-sm3">
<div class="layui-inline">
<label class="layui-form-label" style="width:50px">狀態:</label>
<label class="layui-form-label" style="width:60px">鋼板狀態:</label>
<div class="layui-input-inline" style="width:80px">
<select id="status" lay-filter="status" name="status" class="">
<option value="">全部</option>
@ -83,13 +116,12 @@
</div>
</div>
</div>
<div class="layui-col-sm1">
<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>
</button>
<div class="layui-col-sm2">
<div class="layui-inline">
<input type="checkbox" id="checkOff" name="checkOff" lay-skin="primary" title="鋼板未下線">
</div>
</div>
</div>
</div>
</div>
@ -101,34 +133,21 @@
<script type="text/javascript">
layui.use(['form', 'layer', 'laydate'], function () {
form = layui.form;
//laydate = layui.laydate;
//laydate.render({
// elem: '#dateStr'
// , trigger: 'click'
// , format: 'yyyy/MM/dd'
// , theme: 'grid'
//});
//laydate.render({
// elem: '#dateEnd'
// , trigger: 'click'
// , format: 'yyyy/MM/dd'
// , theme: 'grid'
//});
//form.on('select(factory)', function (data) {
// $("#factoryID").val(data.value);
// //roleName = data.elem[data.elem.selectedIndex].text;
// var qs = $('button[lay-filter="querysubmit"]');
// qs.click();
// //hg.msghide("刷新資料！");
// //table && table.reload();
//});
});
laydate = layui.laydate;
laydate.render({
elem: '#date_str'
, trigger: 'click'
, format: 'yyyy/MM/dd'
, theme: 'grid'
});
laydate.render({
elem: '#date_end'
, trigger: 'click'
, format: 'yyyy/MM/dd'
, theme: 'grid'
});
});
//监听表单提交事件
hg.form.onsubmit('querysubmit', function (data) {
hg.msghide("重新載入資料..");
@ -142,19 +161,30 @@
sort: true
},
{
field: 'specification',
title: '規格',
field: 'items',
title: '使用料號',
},
{
field: 'pcbPartNo',
title: 'PCB板編號',
field: 'storageLocation',
title: '儲存位置',
sort: true
},
{
field: 'arrivalDate',
title: '到廠日',
sort: true,
templet: '<div>{{ layui.util.toDateString(d.arrivalDate, "yyyy/MM/dd") }}</div>'
},
{
field: 'sideName',
title: '正背面',
width: 70
},
{
field: 'boards',
title: '鋼板可使用次數',
sort: true
},
{
field: 'boards',
title: '連板數',
@ -195,22 +225,25 @@
title: '操作',
width: 230,
templet: function (d) {
return '<a class="layui-btn layui-btn-warm layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a>\
<a class="layui-btn layui-btn layui-btn-xs" lay-event="detail">新增量測</a>\
<a class="layui-btn layui-btn layui-btn-xs" lay-event="View">檢視量測</a>'
var aa = '<a class="layui-btn layui-btn-warm layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a>\
<a class="layui-btn layui-btn layui-btn-xs" lay-event="View">檢視量測</a>'
if (d.statusName != '失效') {
aa += '<a class="layui-btn layui-btn layui-btn-xs" lay-event="detail">新增量測</a>';
}
return aa;
}
}
]];
//通过行tool編輯，lay-event="edit"
function edit(obj) {
if (obj.data.steelPlateID) {
hg.open('修改鋼板基本資料', '/PCB/PCB013U?id=' + obj.data.steelPlateID, 700, 500);
hg.open('修改鋼板基本資料', '/PCB/PCB013U?id=' + obj.data.steelPlateID, 900, 500);
}
}
function detail(obj) {
if (obj.data.steelPlateID) {
hg.open('新增量測記錄', '/PCB/PCB013A?steelPlateID=' + obj.data.steelPlateID + '&steelPlateNo=' + obj.data.steelPlateNo, 700, 550);
hg.open('新增量測記錄', '/PCB/PCB013A?steelPlateID=' + obj.data.steelPlateID + '&steelPlateNo=' + obj.data.steelPlateNo, 900, 550);
}
}
@ -226,7 +259,7 @@
layuiicon: '&#xe608;',
class: 'layui-btn',
handler: function () {
hg.open('新增鋼板基本資料', '/PCB/PCB013C', 700, 500);
hg.open('新增鋼板基本資料', '/PCB/PCB013C', 900, 500);
}
}];

19
AMESCoreStudio.Web/Views/PCB/PCB013A.cshtml
View File

@ -1,4 +1,4 @@
@model AMESCoreStudio.WebApi.Models.AMES.SteelPlateMeasure
@model AMESCoreStudio.Web.ViewModels.PCB.PCB013ViewModel
@{ Layout = "~/Views/Shared/_AMESLayout.cshtml"; }
<style>
@ -12,22 +12,21 @@
<div class="col-sm-12">
<form enctype="multipart/form-data" method="post" asp-action="PCB013ASave" class="layui-form">
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
<input type="hidden" asp-for="SteelPlateID" value="@ViewBag.steelPlateID" />
<input type="hidden" asp-for="SpMeasureID" value="@Model.SpMeasureID" />
<input type="hidden" asp-for="SteelPlateID" value="@Model.SteelPlateID" />
<input type="hidden" asp-for="Status" value="@Model.Status" />
<input type="hidden" asp-for="SteelPlateNo" value="@Model.SteelPlateNo" />
<div class="layui-form-item">
<label class="layui-form-label">鋼板編號</label>
<div class="layui-input-inline">
<input value="@ViewBag.steelPlateNo" class="layui-input" autocomplete="off" readonly="" />
<input value="@Model.SteelPlateNo" class="layui-input" autocomplete="off" readonly="" />
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">量測狀態</label>
<div class="layui-input-inline">
<select asp-items="@ViewBag.GetSteelPlateStatusSelect" asp-for="Status" class="">
</select>
</div>
<label class="layui-form-label">@Model.Status</label>
</div>
<div class="layui-form-item">
@ -70,12 +69,12 @@
</div>
</div>
<div class="layui-form-item">
@*<div class="layui-form-item">
<label class="layui-form-label">備註</label>
<div class="layui-input-block">
<input asp-for="Remark" class="layui-input" />
</div>
</div>
</div>*@
<span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
<div class="layui-row" style="text-align:center">

102
AMESCoreStudio.Web/Views/PCB/PCB013C.cshtml
View File

@ -1,8 +1,7 @@
@model AMESCoreStudio.WebApi.Models.AMES.SteelPlateInfo
@{ ViewData["Title"] = "FQC001C";
Layout = "~/Views/Shared/_AMESLayout.cshtml"; }
@{ Layout = "~/Views/Shared/_AMESLayout.cshtml"; }
<style>
.control-label {
@ -19,37 +18,53 @@
<div class="layui-form-item">
<label class="layui-form-label">鋼板編號</label>
<div class="layui-input-inline">
<input asp-for="SteelPlateNo" class="layui-input" autocomplete="off" placeholder="請輸入鋼板編號" />
<input asp-for="SteelPlateNo" class="layui-input" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" autocomplete="off" placeholder="請輸入鋼板編號" />
<span asp-validation-for="SteelPlateNo" class="layui-bg-red"></span>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">規格</label>
<label class="layui-form-label">使用機型名稱</label>
<div class="layui-input-block">
<input asp-for="Items" class="layui-input" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" autocomplete="off" placeholder="多筆機型用,區隔"/>
<span asp-validation-for="Items" class="layui-bg-red"></span>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">儲存位置</label>
<div class="layui-input-inline">
<input asp-for="Specification" class="layui-input" autocomplete="off" placeholder="請輸入規格" />
<span asp-validation-for="Specification" class="layui-bg-red"></span>
<input asp-for="StorageLocation" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" class="layui-input" autocomplete="off" placeholder="請輸入儲存位置" />
<span asp-validation-for="StorageLocation" class="layui-bg-red"></span>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">PCB板料號</label>
<label class="layui-form-label">到廠日</label>
<div class="layui-input-inline">
<input asp-for="PcbPartNo" class="layui-input" placeholder="請輸入PCB板料號" />
<span asp-validation-for="PcbPartNo" class="layui-bg-red"></span>
<input asp-for="ArrivalDate" class="layui-input" readonly="" />
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">正背面</label>
<div class="layui-input-inline" style="width:200px;">
<input type="radio" asp-for="Side" value="11" title="B/背面" checked>
<input type="radio" asp-for="Side" value="12" title="A/正面">
<input type="radio" asp-for="Side" value="11" title="A面" checked>
<input type="radio" asp-for="Side" value="12" title="B面">
<input type="radio" asp-for="Side" value="13" title="AB面">
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">鋼板使用次數</label>
<div class="layui-input-inline" style="width: 150px;">
<input asp-for="UsedTimes" class="layui-input" />
<span asp-validation-for="UsedTimes" class="layui-bg-red"></span>
</div>
<label class="layui-form-label">連板數</label>
<div class="layui-input-inline">
<input asp-for="Boards" class="layui-input" style="width: 70px;"/>
<div class="layui-input-inline" style="width: 100px;">
<input asp-for="Boards" class="layui-input" />
<span asp-validation-for="Boards" class="layui-bg-red"></span>
</div>
</div>
@ -57,44 +72,37 @@
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">標準張力_1</label>
<div class="layui-input-inline">
<input asp-for="StandardTension1" onkeyup="clearNoNum(this)" class="layui-input" style="width: 70px;"/>
<label class="layui-form-label">標準張力</label>
<div class="layui-form-mid">1.</div>
<div class="layui-input-inline" style="width: 100px;">
<input asp-for="StandardTension1" onkeyup="clearNoNum(this)" class="layui-input" style="width: 70px;" />
<span asp-validation-for="StandardTension1" class="layui-bg-red"></span>
</div>
<label class="layui-form-label">標準張力_2</label>
<div class="layui-input-inline">
<input asp-for="StandardTension2" onkeyup="clearNoNum(this)" class="layui-input" style="width: 70px;"/>
<div class="layui-form-mid">2.</div>
<div class="layui-input-inline" style="width: 100px;">
<input asp-for="StandardTension2" onkeyup="clearNoNum(this)" class="layui-input" style="width: 70px;" />
<span asp-validation-for="StandardTension2" class="layui-bg-red"></span>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">標準張力_3</label>
<div class="layui-input-inline">
<input asp-for="StandardTension3" onkeyup="clearNoNum(this)" class="layui-input" style="width: 70px;"/>
<div class="layui-form-mid">3.</div>
<div class="layui-input-inline" style="width: 100px;">
<input asp-for="StandardTension3" onkeyup="clearNoNum(this)" class="layui-input" style="width: 70px;" />
<span asp-validation-for="StandardTension3" class="layui-bg-red"></span>
</div>
<label class="layui-form-label">標準張力_4</label>
<div class="layui-input-inline">
<input asp-for="StandardTension4" onkeyup="clearNoNum(this)" class="layui-input" style="width: 70px;"/>
<div class="layui-form-mid">4.</div>
<div class="layui-input-inline" style="width: 100px;">
<input asp-for="StandardTension4" onkeyup="clearNoNum(this)" class="layui-input" style="width: 70px;" />
<span asp-validation-for="StandardTension4" class="layui-bg-red"></span>
</div>
<div class="layui-form-mid">5.</div>
<div class="layui-input-inline" style="width: 100px;">
<input asp-for="StandardTension5" onkeyup="clearNoNum(this)" class="layui-input" style="width: 70px;" />
<span asp-validation-for="StandardTension5" class="layui-bg-red"></span>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">標準張力_5</label>
<div class="layui-input-inline">
<input asp-for="StandardTension5" onkeyup="clearNoNum(this)" class="layui-input" style="width: 70px;"/>
<span asp-validation-for="StandardTension5" class="layui-bg-red"></span>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">狀態</label>
<label class="layui-form-label">鋼板狀態</label>
<div class="layui-input-inline">
<input type="radio" asp-for="Status" value="1" title="有效" checked>
<input type="radio" asp-for="Status" value="0" title="失效">
@ -124,8 +132,16 @@
await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
<script type="text/javascript">
layui.use(['form'], function () {
form = layui.form;
layui.use(['form', 'laydate'], function () {
form = layui.form,
laydate = layui.laydate
laydate.render({
elem: '#ArrivalDate'
, trigger: 'click'
, format: 'yyyy/MM/dd'
, theme: 'grid'
});
});
$(document).ready(function () {
var error = '@Html.ValidationMessage("error")';
@ -135,7 +151,7 @@
});
function clearNoNum(obj) {
//先把非數字的都替換掉,除了數字和.
//先把非數字的都替換掉,除了數字和.
obj.value = obj.value.replace(/[^\d.]/g, "");
}
</script>

88
AMESCoreStudio.Web/Views/PCB/PCB013U.cshtml
View File

@ -13,6 +13,7 @@
<form enctype="multipart/form-data" method="post" asp-action="PCB013" class="layui-form">
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
<input type="hidden" asp-for="SteelPlateID" value="@Model.SteelPlateID" />
<input type="hidden" asp-for="BeUseTimes" value="@Model.BeUseTimes" />
<div class="layui-form-item">
<label class="layui-form-label">鋼板編號</label>
@ -23,31 +24,47 @@
</div>
<div class="layui-form-item">
<label class="layui-form-label">規格</label>
<label class="layui-form-label">使用機型名稱</label>
<div class="layui-input-block">
<input asp-for="Items" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" class="layui-input" autocomplete="off" placeholder="多筆機型用,區隔" />
<span asp-validation-for="Items" class="layui-bg-red"></span>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">儲存位置</label>
<div class="layui-input-inline">
<input asp-for="Specification" class="layui-input" autocomplete="off" placeholder="請輸入規格" />
<span asp-validation-for="Specification" class="layui-bg-red"></span>
<input asp-for="StorageLocation" class="layui-input" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" placeholder="請輸入儲存位置" />
<span asp-validation-for="StorageLocation" class="layui-bg-red"></span>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">PCB板料號</label>
<label class="layui-form-label">到廠日</label>
<div class="layui-input-inline">
<input asp-for="PcbPartNo" class="layui-input" placeholder="請輸入PCB板料號" />
<span asp-validation-for="PcbPartNo" class="layui-bg-red"></span>
<input asp-for="ArrivalDate" class="layui-input" readonly="" />
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">正背面</label>
<div class="layui-input-inline" style="width:200px;">
<input type="radio" asp-for="Side" value="11" title="B/背面" checked>
<input type="radio" asp-for="Side" value="12" title="A/正面">
<input type="radio" asp-for="Side" value="11" title="A面" checked>
<input type="radio" asp-for="Side" value="12" title="B面">
<input type="radio" asp-for="Side" value="13" title="AB面">
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">鋼板使用次數</label>
<div class="layui-input-inline" style="width: 150px;">
<input asp-for="UsedTimes" class="layui-input" />
<span asp-validation-for="UsedTimes" class="layui-bg-red"></span>
</div>
<label class="layui-form-label">連板數</label>
<div class="layui-input-inline">
<input asp-for="Boards" class="layui-input" style="width: 70px;" />
<div class="layui-input-inline" style="width: 100px;">
<input asp-for="Boards" class="layui-input" />
<span asp-validation-for="Boards" class="layui-bg-red"></span>
</div>
</div>
@ -55,44 +72,37 @@
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">標準張力_1</label>
<div class="layui-input-inline">
<label class="layui-form-label">標準張力</label>
<div class="layui-form-mid">1.</div>
<div class="layui-input-inline" style="width: 100px;">
<input asp-for="StandardTension1" onkeyup="clearNoNum(this)" class="layui-input" style="width: 70px;" />
<span asp-validation-for="StandardTension1" class="layui-bg-red"></span>
</div>
<label class="layui-form-label">標準張力_2</label>
<div class="layui-input-inline">
<div class="layui-form-mid">2.</div>
<div class="layui-input-inline" style="width: 100px;">
<input asp-for="StandardTension2" onkeyup="clearNoNum(this)" class="layui-input" style="width: 70px;" />
<span asp-validation-for="StandardTension2" class="layui-bg-red"></span>
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">標準張力_3</label>
<div class="layui-input-inline">
<div class="layui-form-mid">3.</div>
<div class="layui-input-inline" style="width: 100px;">
<input asp-for="StandardTension3" onkeyup="clearNoNum(this)" class="layui-input" style="width: 70px;" />
<span asp-validation-for="StandardTension3" class="layui-bg-red"></span>
</div>
<label class="layui-form-label">標準張力_4</label>
<div class="layui-input-inline">
<div class="layui-form-mid">4.</div>
<div class="layui-input-inline" style="width: 100px;">
<input asp-for="StandardTension4" onkeyup="clearNoNum(this)" class="layui-input" style="width: 70px;" />
<span asp-validation-for="StandardTension4" class="layui-bg-red"></span>
</div>
<div class="layui-form-mid">5.</div>
<div class="layui-input-inline" style="width: 100px;">
<input asp-for="StandardTension5" onkeyup="clearNoNum(this)" class="layui-input" style="width: 70px;" />
<span asp-validation-for="StandardTension5" class="layui-bg-red"></span>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">標準張力_5</label>
<div class="layui-input-inline">
<input asp-for="StandardTension5" onkeyup="clearNoNum(this)" class="layui-input" style="width: 70px;" />
<span asp-validation-for="StandardTension5" class="layui-bg-red"></span>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">狀態</label>
<label class="layui-form-label">鋼板狀態</label>
<div class="layui-input-inline">
<input type="radio" asp-for="Status" value="1" title="有效" checked>
<input type="radio" asp-for="Status" value="0" title="失效">
@ -122,8 +132,16 @@
await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
<script type="text/javascript">
layui.use(['form'], function () {
form = layui.form;
layui.use(['form', 'laydate'], function () {
form = layui.form,
laydate = layui.laydate
laydate.render({
elem: '#ArrivalDate'
, trigger: 'click'
, format: 'yyyy/MM/dd'
, theme: 'grid'
});
});
$(document).ready(function () {
var error = '@Html.ValidationMessage("error")';

88
AMESCoreStudio.Web/Views/PCB/PCB013V.cshtml
View File

@ -19,61 +19,75 @@
});
var tableCols = [[
{
field: 'status',
title: '量測狀態',
field: 'steelPlateNo',
title: '鋼板編號',
},
{
field: 'measureResult',
title: '結果',
templet: function (d) {
var btn;
if (d.measureResult == "P")
btn = 'OK';
else
btn = 'NG';
return btn;
}
field: 'wipNo',
title: '工單',
},
{
field: 'tension1',
title: '張力1',
width: 70
field: 'onDate',
title: '上線日期',
templet: '<div>{{ layui.util.toDateString(d.onDate, "yyyy/MM/dd HH:mm:ss") }}</div>'
},
{
field: 'tension2',
title: '張力2',
width: 70
field: 'onUserName',
title: '登入者',
},
{
field: 'tension3',
title: '張力3',
width: 70
field: 'onTension1',
title: '張力(1)',
width: 50
},
{
field: 'tension4',
title: '張力4',
width: 70
field: 'onTension2',
title: '張力(2)',
width: 50
},
{
field: 'tension5',
title: '張力5',
width: 70
field: 'onTension3',
title: '張力(3)',
width: 50
},
{
field: 'remark',
title: '備註',
field: 'onTension4',
title: '張力(4)',
width: 50
},
{
field: 'createUserName',
title: '量測人員',
sort: true
field: 'onTension5',
title: '張力(5)',
width: 50
},
{
field: 'createDate',
title: '量測時間',
width: 140,
sort: true,
templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd HH:mm:ss") }}</div>'
field: 'offDate',
title: '下線日期',
templet: '<div>{{ layui.util.toDateString(d.offDate, "yyyy/MM/dd HH:mm:ss") }}</div>'
},
{
field: 'offUserName',
title: '登入者',
},
{
field: 'offTension1',
title: '張力(1)',
},
{
field: 'offTension2',
title: '張力(2)',
},
{
field: 'offTension3',
title: '張力(3)',
},
{
field: 'offTension4',
title: '張力(4)',
},
{
field: 'offTension5',
title: '張力(5)',
}]
];

222
AMESCoreStudio.Web/Views/PCB/PCB016.cshtml
View File

@ -0,0 +1,222 @@
@{
Layout = "~/Views/Shared/_AMESLayout.cshtml";
}
<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 class="layui-form">
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-col-sm4">
<div class="layui-inline">
<label class="layui-form-label">鋼板編號:</label>
<div class="layui-input-inline" style="width:150px">
<input id="steelPlateNo" name="steelPlateNo" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" class="layui-input">
</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="item" name="item" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" class="layui-input">
</div>
</div>
</div>
<div class="layui-col-sm3">
<div class="layui-inline">
<label class="layui-form-label" style="width:60px">儲存位置:</label>
<div class="layui-input-inline" style="width:150px">
<input id="storageLocation" name="storageLocation" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" class="layui-input">
</div>
</div>
</div>
<div class="layui-col-sm1">
<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>
</button>
</div>
</div>
</div>
</div>
<div class="layui-row">
<div class="layui-form-item">
<div class="layui-col-sm4">
<div class="layui-inline">
<label class="layui-form-label">到廠日期:</label>
<div class="layui-input-inline" style="width:80px">
<input id="date_str" name="date_str" autocomplete="off" class="layui-input" readonly="">
</div>
<div class="layui-form-mid">～</div>
<div class="layui-input-inline" style="width:80px">
<input id="date_end" name="date_end" autocomplete="off" class="layui-input" readonly="">
</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="wipNo" name="wipNo" autocomplete="off" oninput="let p=this.selectionStart;this.value=this.value.toUpperCase();this.setSelectionRange(p, p);" class="layui-input">
</div>
</div>
</div>
</div>
</div>
</div>
<table class="layui-hide" id="query" lay-filter="query"></table>
</div>
</div>
@section Scripts{
<script type="text/javascript">
layui.use(['form', 'layer', 'laydate'], function () {
form = layui.form;
laydate = layui.laydate;
laydate.render({
elem: '#date_str'
, trigger: 'click'
, format: 'yyyy/MM/dd'
, theme: 'grid'
});
laydate.render({
elem: '#date_end'
, trigger: 'click'
, format: 'yyyy/MM/dd'
, theme: 'grid'
});
});
//监听表单提交事件
hg.form.onsubmit('querysubmit', function (data) {
hg.msghide("重新載入資料..");
table && table.reload(data);
});
var tableCols = [[
{
field: 'steelPlateNo',
title: '鋼板編號',
},
{
field: 'items',
title: '工程編號',
},
{
field: 'arrivalDate',
title: '入廠日',
},
{
field: 'storageLocation',
title: '儲位',
},
{
field: 'usedTimes',
title: '鋼板可使用次數',
},
{
field: 'beUseTimes',
title: '鋼板已使用次數',
},
{
field: 'boards',
title: '連板數',
},
{
field: 'createUserName',
title: '建檔者',
},
{
field: 'remark',
title: '備註',
},
{
field: 'wipNo',
title: '工單',
},
{
field: 'onDate',
title: '上線日期',
templet: '<div>{{ layui.util.toDateString(d.onDate, "yyyy/MM/dd HH:mm:ss") }}</div>'
},
{
field: 'onUserName',
title: '登入者',
},
{
field: 'onTension1',
title: '張力(1)',
width: 50
},
{
field: 'onTension2',
title: '張力(2)',
width: 50
},
{
field: 'onTension3',
title: '張力(3)',
width: 50
},
{
field: 'onTension4',
title: '張力(4)',
width: 50
},
{
field: 'onTension5',
title: '張力(5)',
width: 50
},
{
field: 'offDate',
title: '下線日期',
templet: '<div>{{ layui.util.toDateString(d.offDate, "yyyy/MM/dd HH:mm:ss") }}</div>'
},
{
field: 'offUserName',
title: '登入者',
},
{
field: 'offTension1',
title: '張力(1)',
},
{
field: 'offTension2',
title: '張力(2)',
},
{
field: 'offTension3',
title: '張力(3)',
},
{
field: 'offTension4',
title: '張力(4)',
},
{
field: 'offTension5',
title: '張力(5)',
}]
];
//var mergeName = ['steelPlateNo', 'items', 'arrivalDate', 'storageLocation', 'usedTimes', 'beUseTimes', 'boards', 'createUserName','remark'];
//var mergeIndex = [0,1,2,3,4,5,6,7,8];
@*
var mergeName = ['steelPlateNo', 'items'];
var mergeIndex = [0];*@
//基本資料表格
var table = hg.table.datatable('query', '鋼板量測紀錄', '/PCB/PCB016Query', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
</script>
}

2
AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
View File

@ -2033,7 +2033,7 @@
}
});
}
// 產生MAC
function GetMAC() {
var wipNO = $('#wipAtt_ItemNO').val();

208
AMESCoreStudio.WebApi/Controllers/AMES/SteelPlateInfoController.cs
View File

@ -9,6 +9,9 @@ using AMESCoreStudio.WebApi;
using AMESCoreStudio.WebApi.Models.AMES;
using AMESCoreStudio.WebApi.DTO.AMES;
using AMESCoreStudio.CommonTools.Result;
using Dapper;
using System.Data;
using AMESCoreStudio.WebApi.Extensions;
namespace AMESCoreStudio.WebApi.Controllers.AMES
{
@ -66,26 +69,51 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
/// 鋼板資料查詢
/// </summary>
/// <param name="steelPlateNo">鋼板編號</param>
/// <param name="pcbPartNo">PCB板號</param>
/// <param name="storageLocation">儲存位置</param>
/// <param name="item">料號</param>
/// <param name="side">正背面</param>
/// <param name="status">狀態</param>
/// <param name="date_str">到廠日_起</param>
/// <param name="date_end">到廠日_迄</param>
/// <param name="checkOff">鋼板未下線狀態 Y/N</param>
/// <param name="page">頁數</param>
/// <param name="limit">筆數</param>
/// <returns></returns>
[HttpGet("SteelPlateInfoQuery")]
public async Task<ResultModel<SteelPlateInfoDto>> GetSteelPlateInfoQuery(string steelPlateNo, string pcbPartNo, string side
, string status, int page = 0, int limit = 10)
public async Task<ResultModel<SteelPlateInfoDto>> GetSteelPlateInfoQuery(string steelPlateNo, string storageLocation, string item, string side
, string status, string date_str, string date_end, string checkOff, int page = 0, int limit = 10)
{
// 需要查詢鋼板未下線資料
var SteelPlateIDs = new List<int>();
if (checkOff == "Y")
{
SteelPlateIDs = _context.SteelPlateMeasures.Where(w => w.OffDate == null &&
w.OnDate != null)
.Select(s => s.SteelPlateID)
.Distinct().ToList();
}
var q = await _context.SteelPlateInfos.ToListAsync();
if (SteelPlateIDs.Count() != 0)
{
q = q.Where(w => SteelPlateIDs.Contains(w.SteelPlateID)).ToList();
}
if (!string.IsNullOrWhiteSpace(steelPlateNo))
{
q = q.Where(w => w.SteelPlateNo.Contains(steelPlateNo)).ToList();
q = q.Where(w => w.SteelPlateNo.Contains(steelPlateNo.Trim().ToUpper())).ToList();
}
if (!string.IsNullOrWhiteSpace(pcbPartNo))
if (!string.IsNullOrWhiteSpace(item))
{
q = q.Where(w => w.PcbPartNo.Contains(pcbPartNo)).ToList();
q = q.Where(w => w.Items.Contains(item.Trim().ToUpper())).ToList();
}
if (!string.IsNullOrWhiteSpace(storageLocation))
{
q = q.Where(w => w.StorageLocation == storageLocation.Trim().ToUpper()).ToList();
}
if (!string.IsNullOrWhiteSpace(side))
@ -96,8 +124,20 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
if (!string.IsNullOrWhiteSpace(status))
{
q = q.Where(w => w.Status == status).ToList();
}
DateTime dateTime = DateTime.Now;
if (DateTime.TryParse(date_str, out dateTime))
{
q = q.Where(w => w.ArrivalDate >= DateTime.Parse(date_str)).ToList();
}
if (DateTime.TryParse(date_end, out dateTime))
{
q = q.Where(w => w.ArrivalDate <= DateTime.Parse(date_end)).ToList();
}
ResultModel<SteelPlateInfoDto> result = new ResultModel<SteelPlateInfoDto>();
// Table 頁數
@ -113,21 +153,127 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
{
SteelPlateID = s.SteelPlateID,
SteelPlateNo = s.SteelPlateNo,
Specification = s.Specification,
PcbPartNo = s.PcbPartNo,
ArrivalDate = s.ArrivalDate,
Items = s.Items,
StorageLocation = s.StorageLocation,
StandardTension1 = s.StandardTension1,
StandardTension2 = s.StandardTension2,
StandardTension3 = s.StandardTension3,
StandardTension4 = s.StandardTension4,
StandardTension5 = s.StandardTension5,
Boards = s.Boards,
SideName = s.Side == 11 ? "B/背面" : "A/正面",
UsedTimes = s.UsedTimes,
SideName = s.Side == 11 ? "A面" :
s.Side == 12 ? "B面" : "AB面",
StatusName = s.Status == "0" ? "失效" : "有效",
Remark = s.Remark
}).ToList();
return result;
}
/// <summary>
/// 鋼板資料查詢 Report
/// </summary>
/// <param name="steelPlateNo">鋼板編號</param>
/// <param name="storageLocation">儲存位置</param>
/// <param name="item">料號</param>
/// <param name="wipNo">工工單號碼</param>
/// <param name="date_str">到廠日_起</param>
/// <param name="date_end">到廠日_迄</param>
/// <param name="page">頁數</param>
/// <param name="limit">筆數</param>
/// <returns></returns>
[HttpGet("SteelPlateInfoReport")]
public ResultModel<PCB016ViewDto> GetSteelPlateInfoReport(string steelPlateNo, string storageLocation, string item, string wipNo
, string date_str, string date_end, int page = 0, int limit = 10)
{
var q = from q1 in _context.SteelPlateInfos
join q2 in _context.SteelPlateMeasures on q1.SteelPlateID equals q2.SteelPlateID into s
from q2 in s.DefaultIfEmpty()
join q3 in _context.UserInfoes on q2.OnUserID equals q3.UserID into s1
from q3 in s1.DefaultIfEmpty()
join q4 in _context.UserInfoes on q2.OffUserID equals q4.UserID into s2
from q4 in s2.DefaultIfEmpty()
join q5 in _context.UserInfoes on q1.CreateUserID equals q5.UserID into s3
from q5 in s3.DefaultIfEmpty()
select new PCB016ViewDto
{
SteelPlateID = q1.SteelPlateID,
SteelPlateNo = q1.SteelPlateNo,
Items = q1.Items,
StorageLocation = q1.StorageLocation,
Boards = q1.Boards,
CreateUserName = q3.UserName,
Remark = q1.Remark,
ArrivalDate = q1.ArrivalDate,
BeUseTimes = q1.BeUseTimes,
UsedTimes = q1.UsedTimes,
WipNo = q2.WipNo,
OnTension1 = q2.OnTension1,
OnTension2 = q2.OnTension2,
OnTension3 = q2.OnTension3,
OnTension4 = q2.OnTension4,
OnTension5 = q2.OnTension5,
OnUserName = q4.UserName,
OnDate = q2.OnDate,
OffTension1 = q2.OffTension1,
OffTension2 = q2.OffTension2,
OffTension3 = q2.OffTension3,
OffTension4 = q2.OffTension4,
OffTension5 = q2.OffTension5,
OffUserName = q5.UserName,
OffDate = q2.OffDate,
};
if (!string.IsNullOrWhiteSpace(steelPlateNo))
{
q = q.Where(w => w.SteelPlateNo.Contains(steelPlateNo.Trim().ToUpper()));
}
if (!string.IsNullOrWhiteSpace(item))
{
q = q.Where(w => w.Items.Contains(item.Trim().ToUpper()));
}
if (!string.IsNullOrWhiteSpace(storageLocation))
{
q = q.Where(w => w.StorageLocation == storageLocation.Trim().ToUpper());
}
if (!string.IsNullOrWhiteSpace(wipNo))
{
q = q.Where(w => w.WipNo.Contains(wipNo.Trim().ToUpper()));
}
DateTime dateTime = DateTime.Now;
if (DateTime.TryParse(date_str, out dateTime))
{
q = q.Where(w => w.ArrivalDate >= DateTime.Parse(date_str));
}
if (DateTime.TryParse(date_end, out dateTime))
{
q = q.Where(w => w.ArrivalDate <= DateTime.Parse(date_end));
}
ResultModel<PCB016ViewDto> result = new ResultModel<PCB016ViewDto>();
// Table 頁數
if (page > 0)
{
q = q.Skip((page - 1) * limit).Take(limit);
}
// 紀錄筆數
result.DataTotal = q.Count();
result.Data = q.ToList();
return result;
}
/// <summary>
/// 更新鋼板基本資料檔
/// </summary>
@ -153,6 +299,39 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
return result;
}
/// <summary>
/// 更新鋼板狀態
/// </summary>
/// <param name="steelPlateInfo">data</param>
/// <returns></returns>
[HttpPut("ByStatus")]
public ResultModel<SteelPlateInfo> PutSteelPlateInfoByStatus(SteelPlateInfo steelPlateInfo)
{
ResultModel<SteelPlateInfo> result = new ResultModel<SteelPlateInfo>();
var query = @" UPDATE JHAMES.STEEL_PLATE_INFO SET STATUS = :status ,
UPDATE_USERID = :upuser ,
UPDATE_DATE = sysdate
WHERE STEEL_PLATE_ID = :id ";
DynamicParameters p = new DynamicParameters();
p.Add("id", steelPlateInfo.SteelPlateID, DbType.Int32);
p.Add("status", steelPlateInfo.Status);
p.Add("upuser", steelPlateInfo.UpdateUserID, DbType.Int32);
try
{
_context.Database.DapperExecute(query, p);
result.Success = true;
result.Msg = "OK";
}
catch (Exception ex)
{
result.Success = false;
result.Msg = ex.InnerException.Message;
}
return result;
}
/// <summary>
/// 新增鋼板基本資料檔
/// </summary>
@ -162,6 +341,15 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
public async Task<ResultModel<SteelPlateInfo>> PostSteelPlateInfo(SteelPlateInfo steelPlateInfo)
{
ResultModel<SteelPlateInfo> result = new ResultModel<SteelPlateInfo>();
if (await _context.SteelPlateInfos.Where(w =>
w.SteelPlateNo == steelPlateInfo.SteelPlateNo).AnyAsync())
{
result.Success = false;
result.Msg = "鋼板編號有重複";
return result;
}
Helper helper = new Helper(_context);
steelPlateInfo.SteelPlateID = helper.GetIDKey("STEEL_PLATE_ID").Result;
_context.SteelPlateInfos.Add(steelPlateInfo);

52
AMESCoreStudio.WebApi/Controllers/AMES/SteelPlateMeasureController.cs
View File

@ -59,23 +59,33 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
{
var q = from q1 in _context.SteelPlateMeasures.Where(w => w.SteelPlateID == id)
join q2 in _context.SteelPlateInfos on q1.SteelPlateID equals q2.SteelPlateID
join q3 in _context.UserInfoes on q1.CreateUserID equals q3.UserID
join q3 in _context.UserInfoes on q1.OnUserID equals q3.UserID into s
from q3 in s.DefaultIfEmpty()
join q4 in _context.UserInfoes on q1.OffUserID equals q4.UserID into s1
from q4 in s1.DefaultIfEmpty()
select new SteelPlateMeasureDto
{
SpMeasureID = q1.SpMeasureID,
SteelPlateID = q1.SteelPlateID,
SteelPlateNo = q2.SteelPlateNo,
MeasureResult = q1.MeasureResult,
Tension1 = q1.Tension1,
Tension2 = q1.Tension2,
Tension3 = q1.Tension3,
Tension4 = q1.Tension4,
Tension5 = q1.Tension5,
Remark = q1.Remark,
Status = q1.Status,
CreateUserID = q1.CreateUserID,
CreateDate = q1.CreateDate,
CreateUserName = q3.UserName
WipNo = q1.WipNo,
Items = q2.Items,
OnTension1 = q1.OnTension1,
OnTension2 = q1.OnTension2,
OnTension3 = q1.OnTension3,
OnTension4 = q1.OnTension4,
OnTension5 = q1.OnTension5,
OnUserID = q1.OnUserID,
OnUserName = q3.UserName,
OnDate = q1.OnDate,
OffTension1 = q1.OffTension1,
OffTension2 = q1.OffTension2,
OffTension3 = q1.OffTension3,
OffTension4 = q1.OffTension4,
OffTension5 = q1.OffTension5,
OffUserID = q1.OffUserID,
OffUserName = q4.UserName,
OffDate = q1.OffDate,
};
ResultModel<SteelPlateMeasureDto> result = new ResultModel<SteelPlateMeasureDto>();
@ -88,9 +98,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
q = q.Skip((page - 1) * limit).Take(limit);
}
result.Data = await q.OrderByDescending(o => o.CreateDate).ToListAsync();
result.Data.Select(s => s.Status
= Enum.EnumPCB.GetDisplayName((Enum.EnumPCB.EnumSteelPlateStatus)System.Enum.Parse(typeof(Enum.EnumPCB.EnumSteelPlateStatus), s.Status))).ToList();
result.Data = await q.ToListAsync();
if (result == null)
{
result.Msg = "查無資料";
@ -112,10 +121,15 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
public async Task<ResultModel<SteelPlateMeasure>> PutSteelPlateMeasure(SteelPlateMeasure steelPlateMeasure)
{
ResultModel<SteelPlateMeasure> result = new ResultModel<SteelPlateMeasure>();
_context.Entry(steelPlateMeasure).State = EntityState.Modified;
steelPlateMeasure.UpdateDate = DateTime.Now;
steelPlateMeasure.UpdateUserID = 0;
_context.Attach(steelPlateMeasure);
// 指定更新某個欄位
_context.Entry(steelPlateMeasure).Property(p => p.OffTension1).IsModified = true;
_context.Entry(steelPlateMeasure).Property(p => p.OffTension2).IsModified = true;
_context.Entry(steelPlateMeasure).Property(p => p.OffTension3).IsModified = true;
_context.Entry(steelPlateMeasure).Property(p => p.OffTension4).IsModified = true;
_context.Entry(steelPlateMeasure).Property(p => p.OffTension5).IsModified = true;
_context.Entry(steelPlateMeasure).Property(p => p.OffUserID).IsModified = true;
_context.Entry(steelPlateMeasure).Property(p => p.OffDate).IsModified = true;
try
{
await _context.SaveChangesAsync();

97
AMESCoreStudio.WebApi/Controllers/AMES/SteelPlateMeasureNgController.cs
View File

@ -0,0 +1,97 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using AMESCoreStudio.WebApi;
using AMESCoreStudio.WebApi.Models.AMES;
using AMESCoreStudio.CommonTools.Result;
using AMESCoreStudio.WebApi.DTO.AMES;
namespace AMESCoreStudio.WebApi.Controllers.AMES
{
/// <summary>
/// 鋼板量測NG記錄資料檔
/// </summary>
[Route("api/[controller]")]
[ApiController]
public class SteelPlateMeasureNgController : ControllerBase
{
private readonly AMESContext _context;
public SteelPlateMeasureNgController(AMESContext context)
{
_context = context;
}
// GET: api/SteelPlateMeasure
[HttpGet]
public async Task<ActionResult<IEnumerable<SteelPlateMeasureNg>>> GetSteelPlateMeasureNg()
{
return await _context.SteelPlateMeasuresNg.ToListAsync();
}
// GET: api/SteelPlateMeasure/5
[HttpGet("{id}")]
public async Task<ActionResult<SteelPlateMeasureNg>> GetSteelPlateMeasureNg(int id)
{
var steelPlateMeasure = await _context.SteelPlateMeasuresNg.FindAsync(id);
if (steelPlateMeasure == null)
{
return NotFound();
}
return steelPlateMeasure;
}
/// <summary>
/// 新增鋼板量測Ng記錄資料檔
/// </summary>
/// <param name="steelPlateMeasureNg"></param>
/// <returns></returns>
[HttpPost]
public async Task<ResultModel<SteelPlateMeasureNg>> PostSteelPlateMeasureNg(SteelPlateMeasureNg steelPlateMeasureNg)
{
ResultModel<SteelPlateMeasureNg> result = new ResultModel<SteelPlateMeasureNg>();
Helper helper = new Helper(_context);
steelPlateMeasureNg.SpMeasureNgID = helper.GetIDKey("SP_MEASURE_NG_ID").Result;
_context.SteelPlateMeasuresNg.Add(steelPlateMeasureNg);
try
{
await _context.SaveChangesAsync();
result.Success = true;
result.Msg = "OK";
}
catch (Exception ex)
{
result.Success = false;
result.Msg = ex.InnerException.Message;
}
return result;
}
// DELETE: api/SteelPlateMeasure/5
[HttpDelete("{id}")]
public async Task<ActionResult<SteelPlateMeasureNg>> DeleteSteelPlateMeasureNg(int id)
{
var steelPlateMeasureNg = await _context.SteelPlateMeasuresNg.FindAsync(id);
if (steelPlateMeasureNg == null)
{
return NotFound();
}
_context.SteelPlateMeasuresNg.Remove(steelPlateMeasureNg);
await _context.SaveChangesAsync();
return steelPlateMeasureNg;
}
private bool SteelPlateMeasureExists(int id)
{
return _context.SteelPlateMeasures.Any(e => e.SpMeasureID == id);
}
}
}

98
AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckNewController.cs
View File

@ -847,6 +847,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
foreach (var item in OutfitsItem)
{
var outfitInfo = _context.OutfitInfoes.Where(w => w.OutfitNo == item.inputData.ToUpper()).FirstOrDefault();
#region 治具
if (outfitInfo != null)
{
outfitInfo.UseTimes += 1;
@ -862,32 +863,81 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
{
return ex.InnerException.Message;
}
}
WipAlarmsController wipAlarmsController = new WipAlarmsController(_context);
var wipAlarms = await wipAlarmsController.GetWipAlarmByOutfit(data.wipNo, item.inputData.Trim().ToUpper());
// 判斷確認治具編號是否已到預警提醒
if (outfitInfoesController.GetOutfitInfoByAlertTimes(item.inputData.Trim().ToUpper()).Result.Value == "Y")
{
if (!wipAlarms.Value.Where(w => w.AlarmTypeID == (int)EnumWipAlarm.EnumTypeId.OutfitAlert).Any())
{
string MailGroup = "OUTFIT_ALARM";
string Subject = $"[AMES系統通知] 治具編號:{item.inputData.Trim().ToUpper()}，預警提前通知";
string Body = "";
await new MailController(_context, _config).PostMail(Subject, Body, MailGroup, "", false);
WipAlarmsController wipAlarmsController = new WipAlarmsController(_context);
var wipAlarms = await wipAlarmsController.GetWipAlarmByOutfit(data.wipNo, item.inputData.Trim().ToUpper());
// 判斷確認治具編號是否已到預警提醒
if (outfitInfoesController.GetOutfitInfoByAlertTimes(item.inputData.Trim().ToUpper()).Result.Value == "Y")
WipAlarm wipAlarm = new WipAlarm();
wipAlarm.AlarmTypeID = (int)EnumWipAlarm.EnumTypeId.OutfitAlert;
wipAlarm.WipNO = data.wipNo;
wipAlarm.AlarmParam = item.inputData.ToUpper();
wipAlarm.AlarmValue = "1";
wipAlarm.AlarmDesc = Subject;
wipAlarm.AlarmDateTime = DateTime.Now;
await wipAlarmsController.PostWipAlarm(wipAlarm);
}
}
}
#endregion
#region 鋼板
else
{
if (!wipAlarms.Value.Where(w => w.AlarmTypeID == (int)EnumWipAlarm.EnumTypeId.OutfitAlert).Any())
// 查詢有效鋼板編號
var steelPlate = _context.SteelPlateInfos.Where(w => w.SteelPlateNo.ToUpper() == item.inputData.ToUpper()
&& w.Status == "1").FirstOrDefault();
if (steelPlate != null)
{
string MailGroup = "OUTFIT_ALARM";
string Subject = $"[AMES系統通知] 治具編號:{item.inputData.Trim().ToUpper()}，預警提前通知";
string Body = "";
await new MailController(_context, _config).PostMail(Subject, Body, MailGroup, "", false);
// 查詢鋼板紀錄沒有下線紀錄
var Measure = _context.SteelPlateMeasures.Where(w => w.SteelPlateID == steelPlate.SteelPlateID
&& w.OffUserID == null)
.FirstOrDefault();
if (Measure != null)
{
// 確認第一次紀錄該筆工單號碼
if (!(Measure.WipNo ?? "").Contains(data.wipNo))
{
// 更新工單號碼到鋼板量測紀錄
Measure.WipNo += data.wipNo + ",";
try
{
_context.Entry(Measure).State = EntityState.Modified;
await _context.SaveChangesAsync();
}
catch (Exception ex)
{
return ex.InnerException.Message;
}
WipAlarm wipAlarm = new WipAlarm();
wipAlarm.AlarmTypeID = (int)EnumWipAlarm.EnumTypeId.OutfitAlert;
wipAlarm.WipNO = data.wipNo;
wipAlarm.AlarmParam = item.inputData.ToUpper();
wipAlarm.AlarmValue = "1";
wipAlarm.AlarmDesc = Subject;
wipAlarm.AlarmDateTime = DateTime.Now;
// 累加鋼板已使用次數
// 工單數量
var WipQty = _context.WipInfos.Where(w => w.WipID == data.wipID).FirstOrDefault().PlanQTY;
var Boards = _context.WipAtts.Where(w => w.WipNO == data.wipNo).FirstOrDefault().Boards;
await wipAlarmsController.PostWipAlarm(wipAlarm);
steelPlate.BeUseTimes += WipQty / Boards;
try
{
_context.Entry(steelPlate).State = EntityState.Modified;
await _context.SaveChangesAsync();
}
catch (Exception ex)
{
return ex.InnerException.Message;
}
}
}
}
}
#endregion
//// 確認治具編號使用次數已經超過預計次數
//if (outfitInfoesController.GetOutfitInfoByOverUseTimes("").Result.Value == "Y")
//{
@ -1966,14 +2016,20 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
var outfitNoMsg = string.Empty;
foreach (var outfitNo in outfit)
{
// 治具
var q = _context.OutfitInfoes.Where(w => w.OutfitNo == outfitNo.inputData.ToUpper().Trim()).FirstOrDefault();
if (q == null)
// 鋼板
var q1 = _context.SteelPlateInfos.Where(w => w.SteelPlateNo.ToUpper() == outfitNo.inputData.ToUpper().Trim()
&& w.Status == "1").FirstOrDefault();
if (q == null && q1 == null)
outfitNoMsg += $"{outfitNo.inputData}、";
}
if (!string.IsNullOrWhiteSpace(outfitNoMsg))
{
resultModel.Msg = $"中央治具找不到該治具編號【{outfitNoMsg.Substring(0, outfitNoMsg.Length - 1)}】";
resultModel.Msg = $"中央治具找不到該治具編號或鋼板編號【{outfitNoMsg.Substring(0, outfitNoMsg.Length - 1)}】";
return resultModel;
}

149
AMESCoreStudio.WebApi/DTO/AMES/PCB013RViewDto.cs
View File

@ -0,0 +1,149 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace AMESCoreStudio.WebApi.DTO.AMES
{
/// <summary>
/// 鋼板Report Dto
/// </summary>
public partial class PCB016ViewDto
{
/// <summary>
/// 鋼板ID
/// </summary>
public int SteelPlateID { get; set; }
/// <summary>
/// 鋼板編號
/// </summary>
public string SteelPlateNo { get; set; }
/// <summary>
/// 工程編號
/// </summary>
public string Items { get; set; }
/// <summary>
/// 到廠日
/// </summary>
public DateTime ArrivalDate { get; set; }
/// <summary>
/// 儲存位置
/// </summary>
public string StorageLocation { get; set; }
/// <summary>
/// 正背面(11=A/正面;12=B/背面 ;13=AB面)
/// </summary>
public string SideName { get; set; }
/// <summary>
/// 連板數
/// </summary>
public int Boards { get; set; } = 1;
/// <summary>
/// 鋼板可使用次數
/// </summary>
public int UsedTimes { get; set; } = 1;
/// <summary>
/// 鋼板已使用次數
/// </summary>
public int BeUseTimes { get; set; } = 0;
/// <summary>
/// STATUS 0=失效 ; 1=有效
/// </summary>
public string StatusName { get; set; }
/// <summary>
/// 備註
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 建立UserName
/// </summary>
public string CreateUserName { get; set; }
/// <summary>
/// 工單號碼
/// </summary>
public string WipNo { get; set; }
/// <summary>
/// 上線張力_1
/// </summary>
public string OnTension1 { get; set; }
/// <summary>
/// 上線張力_2
/// </summary>
public string OnTension2 { get; set; }
/// <summary>
/// 上線張力_3
/// </summary>
public string OnTension3 { get; set; }
/// <summary>
/// 上線張力_4
/// </summary>
public string OnTension4 { get; set; }
/// <summary>
/// 上線張力_5
/// </summary>
public string OnTension5 { get; set; }
/// <summary>
/// 上線建立User
/// </summary>
public string OnUserName { get; set; }
/// <summary>
/// 上線建立日期
/// </summary>
public DateTime? OnDate { get; set; }
/// <summary>
/// 下線張力_1
/// </summary>
public string OffTension1 { get; set; }
/// <summary>
/// 下線張力_2
/// </summary>
public string OffTension2 { get; set; }
/// <summary>
/// 下線張力_3
/// </summary>
public string OffTension3 { get; set; }
/// <summary>
/// 下線張力_4
/// </summary>
public string OffTension4 { get; set; }
/// <summary>
/// 下線張力_5
/// </summary>
public string OffTension5 { get; set; }
/// <summary>
/// 下線建立User
/// </summary>
public string OffUserName { get; set; }
/// <summary>
/// 下線建立日期
/// </summary>
public DateTime? OffDate { get; set; }
}
}

20
AMESCoreStudio.WebApi/DTO/AMES/SteelPlateInfoDto.cs
View File

@ -21,17 +21,22 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
public string SteelPlateNo { get; set; }
/// <summary>
/// 規格
/// 工程編號
/// </summary>
public string Specification { get; set; }
public string Items { get; set; }
/// <summary>
/// PCB板料號
/// 到廠日
/// </summary>
public string PcbPartNo { get; set; }
public DateTime ArrivalDate { get; set; }
/// <summary>
/// 正背面 11=B/背面 ; 12=A/正面
/// 儲存位置
/// </summary>
public string StorageLocation { get; set; }
/// <summary>
/// 正背面(11=A/正面;12=B/背面 ;13=AB面)
/// </summary>
public string SideName { get; set; }
@ -40,6 +45,11 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
/// </summary>
public int Boards { get; set; } = 1;
/// <summary>
/// 鋼板可使用次數
/// </summary>
public int UsedTimes { get; set; } = 1;
/// <summary>
/// 標準張力_1
/// </summary>

83
AMESCoreStudio.WebApi/DTO/AMES/SteelPlateMeasureDto.cs
View File

@ -29,62 +29,99 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
public string SteelPlateNo { get; set; }
/// <summary>
/// 張力_1
/// 工單號碼
/// </summary>
public string Tension1 { get; set; }
public string WipNo { get; set; }
/// <summary>
/// 張力_2
/// 鋼板綁定料號
/// </summary>
public string Tension2 { get; set; }
public string Items { get; set; }
/// <summary>
/// 張力_3
/// 上線張力_1
/// </summary>
public string Tension3 { get; set; }
public string OnTension1 { get; set; }
/// <summary>
/// 張力_4
/// 上線張力_2
/// </summary>
public string Tension4 { get; set; }
public string OnTension2 { get; set; }
/// <summary>
/// 張力_5
/// 上線張力_3
/// </summary>
public string Tension5 { get; set; }
public string OnTension3 { get; set; }
/// <summary>
/// 檢查狀態
/// 上線張力_4
/// </summary>
public string Status { get; set; }
public string OnTension4 { get; set; }
/// <summary>
/// 備註
/// 上線張力_5
/// </summary>
public string OnTension5 { get; set; }
public string Remark { get; set; }
/// <summary>
/// 上線建立UserID
/// </summary>
public int? OnUserID { get; set; }
/// <summary>
/// 上線建立User
/// </summary>
public string OnUserName { get; set; }
/// <summary>
/// 上線建立日期
/// </summary>
public DateTime? OnDate { get; set; }
/// <summary>
/// 下線張力_1
/// </summary>
public string OffTension1 { get; set; }
/// <summary>
/// 判定結果 P=PASS ; F=FAIL ; N=未量測
/// 下線張力_2
/// </summary>
public string MeasureResult { get; set; }
public string OffTension2 { get; set; }
/// <summary>
/// 建立UserID
/// 下線張力_3
/// </summary>
public string OffTension3 { get; set; }
public int CreateUserID { get; set; } = 0;
/// <summary>
/// 下線張力_4
/// </summary>
public string OffTension4 { get; set; }
/// <summary>
/// 建立User
/// 下線張力_5
/// </summary>
public string CreateUserName { get; set; }
public string OffTension5 { get; set; }
/// <summary>
/// 建立日期
/// 下線建立UserID
/// </summary>
public DateTime CreateDate { get; set; } = DateTime.Now;
public int? OffUserID { get; set; }
/// <summary>
/// 下線建立User
/// </summary>
public string OffUserName { get; set; }
/// <summary>
/// 下線建立日期
/// </summary>
public DateTime? OffDate { get; set; }
/// <summary>
/// 備註
/// </summary>
public string Remark { get; set; }
}
}

8
AMESCoreStudio.WebApi/Enums/EnumPCB.cs
View File

@ -19,15 +19,15 @@ namespace AMESCoreStudio.WebApi.Enum
public enum EnumSteelPlateStatus
{
/// <summary>
/// 拿取
/// 上線
/// </summary>
[Display(Name = "拿取")]
[Display(Name = "上線")]
A = 1,
/// <summary>
/// 歸還
/// 下線
/// </summary>
[Display(Name = "歸還")]
[Display(Name = "下線")]
B = 2,
}

14
AMESCoreStudio.WebApi/Enums/EnumPCS.cs
View File

@ -230,29 +230,35 @@ namespace AMESCoreStudio.WebApi.Enum
[Display(Name = "-40~+85度")]
B = 3,
/// <summary>
/// -40~+60度
/// </summary>
[Display(Name = "-40~+60度")]
C = 4,
/// <summary>
/// -20~+70度
/// </summary>
[Display(Name = "-20~+70度")]
D = 4,
D = 5,
/// <summary>
/// 50度
/// </summary>
[Display(Name = "50度")]
E = 5,
E = 6,
/// <summary>
/// 55度
/// </summary>
[Display(Name = "55度")]
F = 6,
F = 7,
/// <summary>
/// 40度
/// </summary>
[Display(Name = "40度")]
G = 7,
G = 8,
}
/// <summary>

7
AMESCoreStudio.WebApi/Enums/EnumWipAlarm.cs
View File

@ -45,6 +45,13 @@ namespace AMESCoreStudio.WebApi.Enum
[Description("治具使用次數已超過預計使用次數")]
[Display(Name = "治具使用次數已超過預計使用次數")]
OutfitOutLimit = 5,
/// <summary>
/// 鋼板量測NG
/// </summary>
[Description("鋼板量測NG")]
[Display(Name = "鋼板量測NG")]
SteelPlateNg = 6,
}
/// <summary>

47
AMESCoreStudio.WebApi/Models/AMES/SteelPlateInfo.cs
View File

@ -36,27 +36,50 @@ namespace AMESCoreStudio.WebApi.Models.AMES
public string SteelPlateNo { get; set; }
/// <summary>
/// 規格
/// 料號
/// </summary>
[DataMember]
[Display(Name = "規格")]
[Required(ErrorMessage = "{0},不能空白")]
[Column("SPECIFICATION")]
[StringLength(60)]
public string Specification { get; set; }
[Display(Name = "料號")]
[Column("ITEMS")]
public string Items { get; set; }
/// <summary>
/// PCB板料號
/// 到廠日
/// </summary>
[DataMember]
[Display(Name = "PCB板料號")]
[Display(Name = "到廠日")]
[Column("ARRIVAL_DATE")]
[Required(ErrorMessage = "{0},不能空白")]
[Column("PCB_PART_NO")]
[StringLength(40)]
public string PcbPartNo { get; set; }
[DataType(DataType.Text), DisplayFormat(DataFormatString = "{0:yyyy/MM/dd}", ApplyFormatInEditMode = true)]
public DateTime ArrivalDate { get; set; }
/// <summary>
/// 儲存位置
/// </summary>
[DataMember]
[Display(Name = "儲存位置")]
[Column("STORAGE_LOCATION")]
public string StorageLocation { get; set; }
/// <summary>
/// 鋼板已使用次數
/// </summary>
[DataMember]
[Display(Name = "鋼板已使用次數")]
[Column("BE_USE_TIMES")]
public int BeUseTimes { get; set; } = 0;
/// <summary>
/// 鋼板可使用次數
/// </summary>
[DataMember]
[Display(Name = "鋼板可使用次數")]
[Column("USED_TIMES")]
public int UsedTimes { get; set; } = 1;
/// <summary>
/// 正背面 11=B/背面 ; 12=A/正面
/// 正背面(11=A/正面;12=B/背面 ;13=AB面)
/// </summary>
[DataMember]
[Display(Name = "正背面")]

112
AMESCoreStudio.WebApi/Models/AMES/SteelPlateMeasure.cs
View File

@ -34,112 +34,122 @@ namespace AMESCoreStudio.WebApi.Models.AMES
public int SteelPlateID { get; set; }
/// <summary>
/// 張力_1
/// 工單號碼
/// </summary>
[Required(ErrorMessage = "{0},不能空白")]
[Column("TENSION_1")]
[Column("WIP_NO")]
[DataMember]
public string WipNo { get; set; }
/// <summary>
/// 上線張力_1
/// </summary>
[Column("ON_TENSION_1")]
[StringLength(10)]
[DataMember]
[Display(Name = "張力_1")]
public string Tension1 { get; set; }
public string OnTension1 { get; set; }
/// <summary>
/// 張力_2
/// 上線張力_2
/// </summary>
[Required(ErrorMessage = "{0},不能空白")]
[Column("TENSION_2")]
[Column("ON_TENSION_2")]
[StringLength(10)]
[DataMember]
[Display(Name = "張力_2")]
public string Tension2 { get; set; }
public string OnTension2 { get; set; }
/// <summary>
/// 張力_3
/// 上線張力_3
/// </summary>
[Required(ErrorMessage = "{0},不能空白")]
[Column("TENSION_3")]
[Column("ON_TENSION_3")]
[StringLength(10)]
[DataMember]
[Display(Name = "張力_3")]
public string Tension3 { get; set; }
public string OnTension3 { get; set; }
/// <summary>
/// 張力_4
/// 上線張力_4
/// </summary>
[Required(ErrorMessage = "{0},不能空白")]
[Column("TENSION_4")]
[Column("ON_TENSION_4")]
[StringLength(10)]
[DataMember]
[Display(Name = "張力_4")]
public string Tension4 { get; set; }
public string OnTension4 { get; set; }
/// <summary>
/// 張力_5
/// 上線張力_5
/// </summary>
[Required(ErrorMessage = "{0},不能空白")]
[Column("TENSION_5")]
[Column("ON_TENSION_5")]
[StringLength(10)]
[DataMember]
[Display(Name = "張力_5")]
public string Tension5 { get; set; }
public string OnTension5 { get; set; }
/// <summary>
/// 上線建立UserID
/// </summary>
[Column("ON_USERID")]
[DataMember]
public int? OnUserID { get; set; }
/// <summary>
/// 上線建立日期
/// </summary>
[Column("ON_DATE")]
[DataMember]
public DateTime? OnDate { get; set; }
/// <summary>
/// 檢查狀態
/// 下線張力_1
/// </summary>
[Required(ErrorMessage = "{0},不能空白")]
[Column("STATUS")]
[StringLength(8)]
[Column("OFF_TENSION_1")]
[StringLength(10)]
[DataMember]
[Display(Name = "狀態")]
public string Status { get; set; }
public string OffTension1 { get; set; }
/// <summary>
/// 備註
/// 下線張力_2
/// </summary>
[Column("REMARK")]
[StringLength(1024)]
[Column("OFF_TENSION_2")]
[StringLength(10)]
[DataMember]
[Display(Name = "備註")]
public string Remark { get; set; }
public string OffTension2 { get; set; }
/// <summary>
/// 判定結果 P=PASS ; F=FAIL ; N=未量測
/// 下線張力_3
/// </summary>
[Required]
[Column("MEASURE_RESULT")]
[StringLength(2)]
[Column("OFF_TENSION_3")]
[StringLength(10)]
[DataMember]
[Display(Name = "判定結果")]
public string MeasureResult { get; set; }
public string OffTension3 { get; set; }
/// <summary>
/// 建立UserID
/// 下線張力_4
/// </summary>
[Column("CREATE_USERID")]
[Required]
[Column("OFF_TENSION_4")]
[StringLength(10)]
[DataMember]
public int CreateUserID { get; set; } = 0;
public string OffTension4 { get; set; }
/// <summary>
/// 建立日期
/// 下線張力_5
/// </summary>
[Required]
[Column("CREATE_DATE")]
[Column("OFF_TENSION_5")]
[StringLength(10)]
[DataMember]
public DateTime CreateDate { get; set; } = DateTime.Now;
public string OffTension5 { get; set; }
/// <summary>
/// 更新UserID
/// 下線建立UserID
/// </summary>
[Column("UPDATE_USERID")]
[Column("OFF_USERID")]
[DataMember]
public int UpdateUserID { get; set; } = 0;
public int? OffUserID { get; set; }
/// <summary>
/// 更新日期
/// 下線建立日期
/// </summary>
[Column("UPDATE_DATE")]
[Column("OFF_DATE")]
[DataMember]
public DateTime? UpdateDate { get; set; } = DateTime.Now;
public DateTime? OffDate { get; set; }
}
}

99
AMESCoreStudio.WebApi/Models/AMES/SteelPlateMeasureNg.cs
View File

@ -0,0 +1,99 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Microsoft.EntityFrameworkCore;
using System.Runtime.Serialization;
#nullable disable
namespace AMESCoreStudio.WebApi.Models.AMES
{
/// <summary>
/// 鋼板量測NG記錄資料檔
/// </summary>
[Table("STEEL_PLATE_MEASURE_NG", Schema = "JHAMES")]
public partial class SteelPlateMeasureNg
{
/// <summary>
/// 鋼板量測記錄NG_ID
/// </summary>
[Key]
[Column("SP_MEASURE_NG_ID")]
[DataMember]
[Display(Name = "鋼板量測NG記錄ID")]
public int SpMeasureNgID { get; set; }
/// <summary>
/// 鋼板ID
/// </summary>
[Column("STEEL_PLATE_ID")]
[DataMember]
[Display(Name = "鋼板ID")]
public int SteelPlateID { get; set; }
/// <summary>
/// 量測狀態
/// </summary>
[Column("STATUS")]
[DataMember]
public string Status { get; set; }
/// <summary>
/// 張力_1
/// </summary>
[Column("TENSION_1")]
[DataMember]
[Display(Name = "張力_1")]
public string Tension1 { get; set; }
/// <summary>
/// 張力_2
/// </summary>
[Column("TENSION_2")]
[DataMember]
[Display(Name = "張力_2")]
public string Tension2 { get; set; }
/// <summary>
/// 張力_3
/// </summary>
[Column("TENSION_3")]
[DataMember]
[Display(Name = "張力_3")]
public string Tension3 { get; set; }
/// <summary>
/// 張力_4
/// </summary>
[Column("TENSION_4")]
[DataMember]
[Display(Name = "張力_4")]
public string Tension4 { get; set; }
/// <summary>
/// 張力_5
/// </summary>
[Column("TENSION_5")]
[DataMember]
[Display(Name = "張力_5")]
public string Tension5 { get; set; }
/// <summary>
/// 建立UserID
/// </summary>
[Column("CREATE_USERID")]
[Required]
[DataMember]
public int CreateUserID { get; set; } = 0;
/// <summary>
/// 建立日期
/// </summary>
[Required]
[Column("CREATE_DATE")]
[DataMember]
public DateTime CreateDate { get; set; } = DateTime.Now;
}
}

5
AMESCoreStudio.WebApi/Models/AMESContext.cs
View File

@ -875,6 +875,11 @@ namespace AMESCoreStudio.WebApi
/// </summary>
public virtual DbSet<SteelPlateMeasure> SteelPlateMeasures { get; set; }
/// <summary>
/// 鋼板量測NG記錄資料檔
/// </summary>
public virtual DbSet<SteelPlateMeasureNg> SteelPlateMeasuresNg { get; set; }
/// <summary>
/// 錫膏基本資料檔
/// </summary>

Write Preview
Loading…
Cancel
Save