Browse Source

1. 修正過站判斷

PTD
ray 3 years ago
parent
commit
40b15ffc95
  1. 4
      AMESCoreStudio.Web/Controllers/PCSController.cs
  2. 6
      AMESCoreStudio.Web/Views/PCS/PCS021.cshtml

4
AMESCoreStudio.Web/Controllers/PCSController.cs

@ -3482,9 +3482,9 @@ namespace AMESCoreStudio.Web.Controllers
model.MaterialStationsItems = await _pcsApi.GetMaterialStationsItemByItemID(model.MaterialItem.ItemID); model.MaterialStationsItems = await _pcsApi.GetMaterialStationsItemByItemID(model.MaterialItem.ItemID);
model.MaterialStationsItems = model.MaterialStationsItems.Where(w => w.StationID == model.Station).OrderBy(o => o.StationsItemSeq).ToList(); model.MaterialStationsItems = model.MaterialStationsItems.Where(w => w.StationID == model.Station).OrderBy(o => o.StationsItemSeq).ToList();
if (model.MaterialStationsItems.Count() == 0) if (model.MaterialStationsItems.Count() != 0)
{ {
//ModelState.AddModelError("error", "找不到該站別作業工項"); ModelState.AddModelError("error", "該站別有設定作業工項");
} }
// 治具 // 治具

6
AMESCoreStudio.Web/Views/PCS/PCS021.cshtml

@ -317,7 +317,7 @@
$(document).ready(function () { $(document).ready(function () {
var error = '@Html.ValidationMessage("error")'; var error = '@Html.ValidationMessage("error")';
if ($(error).text() != '') { if ($(error).text() != '') {
parent.hg.msg(error); ShowInputError(error);
} }
if ($("#StationTypeNo").val() == "U" || $("#StationTypeNo").val() == "A") { if ($("#StationTypeNo").val() == "U" || $("#StationTypeNo").val() == "A") {
@ -388,12 +388,12 @@
$("#inputNo").val(''); $("#inputNo").val('');
// 錯誤訊息 // 錯誤訊息
if (!result.success) { if (!result.success) {
parent.hg.msg(result.msg); ShowInputError(result.msg);
} }
else { else {
if (result.msg.length != 0) if (result.msg.length != 0)
{ parent.hg.msghide(result.msg); } { ShowInputOK(result.msg); }
if (result.data.length != 0) { if (result.data.length != 0) {
// 新增資料 // 新增資料

Loading…
Cancel
Save