From bbf0fb5c5d930808dfa5e5c96a3a6795ce22319e Mon Sep 17 00:00:00 2001 From: yiru Date: Wed, 1 Oct 2025 09:34:56 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=20=E6=A8=99=E6=BA=96=E5=B7=A5?= =?UTF-8?q?=E6=99=82=E5=8C=AF=E5=85=A5=EF=BC=8C=E8=8B=A5=E4=BD=9C=E6=A5=AD?= =?UTF-8?q?=E6=A9=9F=E5=8F=B0=E6=95=B8=E7=82=BA=E7=A9=BA=E5=80=BC=EF=BC=8C?= =?UTF-8?q?=E8=87=AA=E5=8B=95=E5=A1=AB=E5=85=A51=202=E3=80=81=E5=A0=B1?= =?UTF-8?q?=E5=B7=A5=E7=B7=9A=E5=88=A5=E5=9F=BA=E6=9C=AC=E8=B3=87=E6=96=99?= =?UTF-8?q?=20=E6=AC=84=E4=BD=8D=E5=90=8D=E7=A8=B1=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AMESCoreStudio.Web/Controllers/WHSController.cs | 3 ++- AMESCoreStudio.Web/Views/WHS/WHS023.cshtml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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',