From f134b12edd9b29e6469f8c03ae7a7bf0df061c29 Mon Sep 17 00:00:00 2001 From: "BB.Wang" Date: Wed, 29 Nov 2023 23:23:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E4=B8=8A=E5=82=B3=E5=93=81?= =?UTF-8?q?=E8=B3=AA=E7=9C=8B=E6=9D=BF=EF=BC=8C=E4=B8=A6=E4=B8=94=E5=B0=87?= =?UTF-8?q?=E4=B8=8A=E4=B8=80=E7=89=88=E4=BA=BA=E5=93=A1=E4=B8=8A=E5=82=B3?= =?UTF-8?q?=E9=8C=AF=E8=AA=A4=E7=9A=84=E8=B3=87=E6=96=99=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E6=81=A2=E5=BE=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs | 9 ++++++--- AMESCoreStudio.WebApi/Models/AMESContext.cs | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs index a17015df..e71f4671 100644 --- a/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs @@ -865,7 +865,10 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL if (dtSMS_TB.Rows.Count > 0) { var dRate1 = dtSMS_TB.Select("C_MONTH='" + C_MONTH + "'")[0]["QTY"]; - var dRate2 = await Get_CFQR_UnFinished_Rate(sCarTypeID, C_YEAR, C_MONTH, PRODUCT_TYPE_ID); + + //2023-11-27 BB.Wang 調整 總結案數 + //var dRate2 = await Get_CFQR_UnFinished_Rate(sCarTypeID, C_YEAR, C_MONTH, PRODUCT_TYPE_ID); + var dRate2 = await Get_CFQR_Finished_Rate(sCarTypeID, C_YEAR, C_MONTH, PRODUCT_TYPE_ID); int iTotal = 0; for (int i = 1; i <= 12; i++) @@ -875,7 +878,7 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL //2023-11-27 BB.Wang 調整 總結案數與未結件數 //var dRate = dRate1 + "|" + dRate2 + "|" + iTotal.ToString(); - var dRate = dRate1 + "|" + (iTotal - int.Parse(dRate2)).ToString() + "|" + iTotal.ToString(); + var dRate = dRate1 + "|" + dRate2 + "|" + iTotal.ToString(); if (dRate.ToString().Equals("")) { return "0|0|0"; } @@ -1029,7 +1032,7 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL for (int i = 0; i < dtSMS_TB.Rows.Count; i++) { - iTotal = iTotal + int.Parse(dtSMS_TB.Rows[i]["QTY"].ToString()); + iTotal = iTotal + int.Parse(dtSMS_TB.Rows[i]["QTY"].ToString()); } return iTotal.ToString(); diff --git a/AMESCoreStudio.WebApi/Models/AMESContext.cs b/AMESCoreStudio.WebApi/Models/AMESContext.cs index b4bbffe7..c0d88000 100644 --- a/AMESCoreStudio.WebApi/Models/AMESContext.cs +++ b/AMESCoreStudio.WebApi/Models/AMESContext.cs @@ -511,6 +511,11 @@ namespace AMESCoreStudio.WebApi /// public DbSet StandardWorkTimes { get; set; } + /// + ///新增預設工時資料 + /// + public DbSet StandardWorktimeDefault { get; set; } + /// ///每日出勤資料 ///