From fa7d994f448403ebcd6b64eaaef56dd8425463cf Mon Sep 17 00:00:00 2001
From: ray <newkyonew@hotmail.com>
Date: Wed, 8 Feb 2023 00:18:05 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=AD=A3=E5=91=BC=E5=8F=ABAPI?=
 =?UTF-8?q?=E5=87=BA=E8=B2=A8=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AMESCoreStudio.Web/Controllers/PCSController.cs | 2 +-
 AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs        | 2 +-
 AMESCoreStudio.Web/Views/PCS/PCS001N.cshtml     | 2 +-
 AMESCoreStudio.Web/Views/PCS/PCS003.cshtml      | 4 +++-
 AMESCoreStudio.Web/Views/PCS/PCS034.cshtml      | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index be7f4611..fee2c106 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -1413,7 +1413,7 @@ namespace AMESCoreStudio.Web.Controllers
         /// <param name="wipShcDate">預計開工日</param>
         /// <returns>RuleStation </returns>
         [HttpPost]
-        public async Task<JsonResult> GetBarcodeOther(string itemNo, string lotNo, int num, string wipNo , DateTime wipShcDate)
+        public async Task<JsonResult> GetBarcodeOther(string itemNo, string lotNo, int num, string wipNo , string wipShcDate)
         {
             var result = await _pcsApi.GetSerialRuleByQurey(itemNo, lotNo.Trim().ToUpper(), num, wipShcDate);
             string StartNO = "";
diff --git a/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs b/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
index bf651dd1..851e31e2 100644
--- a/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
+++ b/AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
@@ -1305,7 +1305,7 @@ namespace AMESCoreStudio.Web
 
         #region 取出貨序號
         [WebApiClient.Attributes.HttpGet("api/SerialRules/ByQurey/{itemNo}/{lotNo}/{num}/{wipShcDate}")]
-        ITask<ResultModel<string>> GetSerialRuleByQurey(string itemNo, string lotNo, int num, DateTime wipShcDate);
+        ITask<ResultModel<string>> GetSerialRuleByQurey(string itemNo, string lotNo, int num, string wipShcDate);
         #endregion
 
         #region 樣品出貨序號紀錄
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS001N.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS001N.cshtml
index aebb978f..fd446cd9 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS001N.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS001N.cshtml
@@ -433,7 +433,7 @@
                 var planQTY = $('#wipInfo_PlanQTY').val();
                 var lotNo = $('#lotNo').val();
                 var wipNo = $('#wipInfo_WipNO').val();
-               var wipShcDate = $('#wipInfo_WipScheduleDate').val();
+                var wipShcDate = $('#wipInfo_WipScheduleDate').val().replace(/\//g, '-');
                 if (wipNo == '' || !wipNo) {
                     parent.hg.msg("請輸入工單號碼");
                     return;
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
index 09ab3b49..06079cf1 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
@@ -1202,7 +1202,7 @@
                 var itemNo = $('#wipAtt_ItemNO').val();
                 var planQTY = $('#wipInfo_PlanQTY').val();
                 var lotNo = $('#lotNo').val();
-                var wipShcDate = $('#wipInfo_WipScheduleDate').val();
+                var wipShcDate = $('#wipInfo_WipScheduleDate').val().replace(/\//g, '-');
 
                 if (itemNo == '' || !itemNo) {
                     parent.hg.msg("請輸入料號");
@@ -1218,6 +1218,8 @@
                     return;
                 }
 
+                console.log(wipShcDate);
+
                 if (lotNo == '' || !lotNo) {
                     lotNo = getLotNo();
                 }
diff --git a/AMESCoreStudio.Web/Views/PCS/PCS034.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS034.cshtml
index 9807607e..245f290a 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS034.cshtml
+++ b/AMESCoreStudio.Web/Views/PCS/PCS034.cshtml
@@ -1156,7 +1156,7 @@
                 var itemNo = $('#wipAtt_ItemNO').val();
                 var planQTY = $('#wipInfo_PlanQTY').val();
                 var lotNo = $('#lotNo').val();
-                var wipShcDate = $('#wipInfo_WipScheduleDate').val();
+                var wipShcDate = $('#wipInfo_WipScheduleDate').val().replace(/\//g, '-');
                 if (itemNo == '' || !itemNo) {
                     parent.hg.msg("請輸入料號");
                     return;