From f5cb913455725fa7a63a048d7336ff0b6a3a2c43 Mon Sep 17 00:00:00 2001
From: Marvin <marvinhong@163.com>
Date: Tue, 11 Mar 2025 12:25:18 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=89=AF=E7=8E=87=EF=BC=8C?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=BB=98=E8=AE=A4=E5=B8=A6=E5=BD=93=E5=A4=A9?=
 =?UTF-8?q?=E7=9A=84=E6=97=A5=E6=9C=9F=EF=BC=8C=E9=81=BF=E5=85=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=BF=87=E5=A4=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AMESCoreStudio.Web/Controllers/QRSController.cs | 9 +++++++++
 AMESCoreStudio.Web/Views/QRS/QRS010.cshtml      | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/QRSController.cs b/AMESCoreStudio.Web/Controllers/QRSController.cs
index f9da26b..b5f181b 100644
--- a/AMESCoreStudio.Web/Controllers/QRSController.cs
+++ b/AMESCoreStudio.Web/Controllers/QRSController.cs
@@ -1274,11 +1274,20 @@ namespace AMESCoreStudio.Web.Controllers
             await GetStationList();
             await GetMFGTypeList();
 
+            ViewBag.StartDate = System.DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd");
+            ViewBag.EndDate = System.DateTime.Now.ToString("yyyy-MM-dd");
+
             return View();
         }
 
         public async Task<IActionResult> QRS010QueryAsync(string unitNo, string lineID, string stationID, string mfgTypeNo, string wipNO, string itemNO, string dateStart, string dateEnd, string custType, int page = 0, int limit = 10)
         {
+            if (unitNo == null && lineID == null && stationID == null && mfgTypeNo == null && wipNO == null && itemNO == null && dateStart == null && dateEnd == null && custType == null)
+            {
+                dateStart = System.DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd");
+                dateEnd = System.DateTime.Now.ToString("yyyy-MM-dd");
+            }
+
             var result = await _pcsApi.GetYieldData4QRS010(unitNo, lineID, stationID, mfgTypeNo, wipNO, itemNO, dateStart, dateEnd, custType, page, limit);
 
             var query = new QRS010ViewModel();
diff --git a/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml b/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml
index 4ae29b7..bf59a6b 100644
--- a/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml
+++ b/AMESCoreStudio.Web/Views/QRS/QRS010.cshtml
@@ -121,11 +121,11 @@
                         <div class="layui-inline">
                             <label class="layui-form-label">@sharedLocalizer["MFG_DATE"]:</label>
                             <div class="layui-input-inline" style="width:150px">
-                                <input id="dateStart" name="dateStart" autocomplete="off" class="layui-input">
+                                <input id="dateStart" name="dateStart" autocomplete="off" class="layui-input" value="@ViewBag.StartDate">
                             </div>
                             <div class="layui-form-mid">～</div>
                             <div class="layui-input-inline" style="width:150px">
-                                <input id="dateEnd" name="dateEnd" autocomplete="off" class="layui-input">
+                                <input id="dateEnd" name="dateEnd" autocomplete="off" class="layui-input" value="@ViewBag.EndDate">
                             </div>
                         </div>
                     </div>