- @ViewData["Tips"] Rev.A2
-
-
+
@Html.Raw(ViewData["Tips"]) Rev.A2
+
@section Scripts{
+
-}
\ No newline at end of file
+}
+
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
index 32aa6282..0250177d 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs
@@ -710,6 +710,10 @@ and b.item_no = '{0}' and a.barcode_no = '{1}'", kp_no, barcode_no);
{
kp_sql = "select item_no as kp_no,count(item_no) kp_qty from jhames.barcode_item where barcode_id = " + barcode_id + " group by item_no";
}
+ else
+ {
+ kp_sql = "select item_no as kp_no,count(item_no) kp_qty from jhames.barcode_item where barcode_id = " + barcode_id + " group by item_no";
+ }
using (var cmd = conn.CreateCommand())
{
diff --git a/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs b/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs
index f833c3d9..831a83ba 100644
--- a/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/BLL/RPTController.cs
@@ -98,7 +98,7 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL
result.openOrderWipQty = a.DataTotal;
// 完工入庫數:GetFqcInhouseMasterMultiQuery
- var b = await new FqcInhouseMasterController(_context).GetFqcInhouseMasteMultiQuery("", "", "", "", date_str: sDate, date_end: eDate, "");
+ var b = await new FqcInhouseMasterController(_context).GetFqcInhouseMasteMultiQuery("", "", "", "", date_str: sDate, date_end: eDate, "Y");
//2024-03-26 BB.Wang Modify改為讀取數量(原為入庫單箱數)
//result.finishedProducts = b.DataTotal;
result.finishedProducts = b.Data.Sum(s => int.Parse(s.BoxQty));
@@ -437,10 +437,10 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL
//2024-01-08 BB.Wang Add 調整顯示數據,給客戶看
#region 顯示數據調整
- Random crandom = new Random();
+ //Random crandom = new Random();
- result.productiveForces = result.productiveForces > 99 ? 98 + Math.Round(crandom.NextDouble(), 2) : result.productiveForces < 96 ? 96 + Math.Round(crandom.NextDouble(), 2) : result.productiveForces;
- result.productivity = result.productivity > 95 ? 94 + Math.Round(crandom.NextDouble(), 2) : result.productivity < 93 ? 93 + Math.Round(crandom.NextDouble(), 2) : result.productivity;
+ //result.productiveForces = result.productiveForces > 99 ? 98 + Math.Round(crandom.NextDouble(), 2) : result.productiveForces < 96 ? 96 + Math.Round(crandom.NextDouble(), 2) : result.productiveForces;
+ //result.productivity = result.productivity > 95 ? 94 + Math.Round(crandom.NextDouble(), 2) : result.productivity < 93 ? 93 + Math.Round(crandom.NextDouble(), 2) : result.productivity;
//2024-03-26 BB.Wang 安勤要求取消美化(原為安勤要求)
//result.ipqc = result.ipqc > 100 ? 99 + Math.Round(crandom.NextDouble(), 2) : result.ipqc < 97 ? 97 + Math.Round(crandom.NextDouble(), 2) : result.ipqc;
//result.test = result.test > 99.8 ? 99 + Math.Round(crandom.NextDouble(), 2) : result.test < 99.5 ? 99 + Math.Round(crandom.NextDouble(), 2) : result.test;
@@ -1266,8 +1266,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL
var f_FPYBoard_LEI = await new WipStationController(_context).GetWipStation4QRS014GroupS(null, sDate, sEnd_Date, null, "YS00", "FqcDate");
if (f_FPYBoard_LEI.DataTotal > 0)
{
- double sum_rate = 100.0;
- int sum_idx = 1;
+ //2024-03-26 BB.Wang Modify 修正良率(代小平)
+ //double sum_rate = 100.0;
+ //int sum_idx = 1;
+ double sum_rate = 0.0;
+ int sum_idx = 0;
DataTable dtRate = new DataTable();
dtRate.Columns.Add("STATION_ID");
@@ -1373,8 +1376,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL
var f_FPYSystem_LEI = await new WipStationController(_context).GetWipStation4QRS014GroupB(null, sDate, sEnd_Date, null, "YS00", "FqcDate");
if (f_FPYSystem_LEI.DataTotal > 0)
{
- double sum_rate = 100.0;
- int sum_idx = 1;
+ //2024-03-26 BB.Wang Modify 修正良率(代小平)
+ //double sum_rate = 100.0;
+ //int sum_idx = 1;
+ double sum_rate = 0.0;
+ int sum_idx = 0;
DataTable dtRate = new DataTable();
dtRate.Columns.Add("STATION_ID");
@@ -1480,8 +1486,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL
var f_FPYMedical_LEI = await new WipStationController(_context).GetWipStation4QRS014GroupM(null, sDate, sEnd_Date, null, "YS00", "FqcDate");
if (f_FPYMedical_LEI.DataTotal > 0)
{
- double sum_rate = 100.0;
- int sum_idx = 1;
+ //2024-03-26 BB.Wang Modify 修正良率(代小平)
+ //double sum_rate = 100.0;
+ //int sum_idx = 1;
+ double sum_rate = 0.0;
+ int sum_idx = 0;
DataTable dtRate = new DataTable();
dtRate.Columns.Add("STATION_ID");
@@ -1587,8 +1596,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL
var f_FPYBoard = await new WipStationController(_context).GetWipStation4QRS014GroupS(null, sDate, sEnd_Date, null, werksNo, "FqcDate");
if (f_FPYBoard.DataTotal > 0)
{
- double sum_rate = 100.0;
- int sum_idx = 1;
+ //2024-03-26 BB.Wang Modify 修正良率(代小平)
+ //double sum_rate = 100.0;
+ //int sum_idx = 1;
+ double sum_rate = 0.0;
+ int sum_idx = 0;
DataTable dtRate = new DataTable();
dtRate.Columns.Add("STATION_ID");
@@ -1694,8 +1706,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL
var f_FPYSystem = await new WipStationController(_context).GetWipStation4QRS014GroupB(null, sDate, sEnd_Date, null, werksNo, "FqcDate");
if (f_FPYSystem.DataTotal > 0)
{
- double sum_rate = 100.0;
- int sum_idx = 1;
+ //2024-03-26 BB.Wang Modify 修正良率(代小平)
+ //double sum_rate = 100.0;
+ //int sum_idx = 1;
+ double sum_rate = 0.0;
+ int sum_idx = 0;
DataTable dtRate = new DataTable();
dtRate.Columns.Add("STATION_ID");
@@ -1801,8 +1816,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL
var f_FPYMedical = await new WipStationController(_context).GetWipStation4QRS014GroupM(null, sDate, sEnd_Date, null, werksNo, "FqcDate");
if (f_FPYMedical.DataTotal > 0)
{
- double sum_rate = 100.0;
- int sum_idx = 1;
+ //2024-03-26 BB.Wang Modify 修正良率(代小平)
+ //double sum_rate = 100.0;
+ //int sum_idx = 1;
+ double sum_rate = 0.0;
+ int sum_idx = 0;
DataTable dtRate = new DataTable();
dtRate.Columns.Add("STATION_ID");