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 /// 預計開工日 /// RuleStation [HttpPost] - public async Task GetBarcodeOther(string itemNo, string lotNo, int num, string wipNo , DateTime wipShcDate) + public async Task 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> GetSerialRuleByQurey(string itemNo, string lotNo, int num, DateTime wipShcDate); + ITask> 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;