diff --git a/AMESCoreStudio.Web/Controllers/WHSController.cs b/AMESCoreStudio.Web/Controllers/WHSController.cs index 6f2d442..046e555 100644 --- a/AMESCoreStudio.Web/Controllers/WHSController.cs +++ b/AMESCoreStudio.Web/Controllers/WHSController.cs @@ -3802,7 +3802,8 @@ namespace AMESCoreStudio.Web.Controllers var Side = data.Cell(i, 5).GetString().Trim(); var OpCntStr = data.Cell(i, 6).GetString().Trim(); var CtStr = data.Cell(i, 7).GetString().Trim(); - var MachineCntStr = data.Cell(i, 8).GetString().Trim(); + var MachineCntStr = string.IsNullOrEmpty(data.Cell(i, 8).GetString().Trim()) ? "1" : data.Cell(i, 8).GetString().Trim(); + var Remark = data.Cell(i, 9).GetString().Trim(); // 組合唯一鍵 diff --git a/AMESCoreStudio.Web/Views/WHS/WHS023.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS023.cshtml index 3674896..d8c15cf 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS023.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS023.cshtml @@ -49,7 +49,7 @@ { field: 'workingUnitNo', width: 300, - title: '報工生產單代碼' + title: '報工生產單位代碼' }, { field: 'workingUnitName',