Browse Source

1. FQC報表調整 沒有電子簽名檔直接秀文字名字

2. 工單維護 加入差異SOP紀錄版本
PTD
Sai 2 years ago
parent
commit
ff8ca4af16
  1. 4
      AMESCoreStudio.Web/Controllers/FQCController.cs
  2. 2
      AMESCoreStudio.Web/Controllers/PCSController.cs
  3. 7469
      AMESCoreStudio.Web/wwwroot/Reports/FQC010View.rdlc

4
AMESCoreStudio.Web/Controllers/FQCController.cs

@ -2005,8 +2005,8 @@ namespace AMESCoreStudio.Web.Controllers
}
// 圖檔轉BASE64
string ApprovedSign = "";
string InspectorSign = "";
string ApprovedSign = null;
string InspectorSign = null;
if (System.IO.File.Exists($"{this._env.WebRootPath}/images/ElectronicSignature/{FQC010Master.Approved}.png"))
{
using (var b = new System.Drawing.Bitmap($"{this._env.WebRootPath}/images/ElectronicSignature/{FQC010Master.Approved}.png"))

2
AMESCoreStudio.Web/Controllers/PCSController.cs

@ -8240,7 +8240,7 @@ namespace AMESCoreStudio.Web.Controllers
foreach (var item in model.WipSops.Where(w => w.WipSOPID != -1))
{
// 判斷是否有紀錄Sop版本,沒有需要建立第一版
if (item.SOPType == "A")
if (item.SOPType == "A" || item.SOPType == "F")
{
var SopVer = await _pcsApi.GetWipSopForSopVer(model.wipInfo.WipNO, model.wipAtt.ItemNO, item.SOPName);
if (SopVer.Success)

7469
AMESCoreStudio.Web/wwwroot/Reports/FQC010View.rdlc

File diff suppressed because it is too large
Loading…
Cancel
Save