Browse Source

協助yiru上傳

1、修正生產工時報工 工單查詢無功能
2、修正組件資料新增 未輸入單位查詢出錯問題
PTD
BB.Wang 2 years ago
parent
commit
d5d8959d82
  1. 8
      AMESCoreStudio.Web/Views/PCS/PCS024.cshtml
  2. 2
      AMESCoreStudio.WebApi/Controllers/AMES/WorkingHoursCollectionsController.cs

8
AMESCoreStudio.Web/Views/PCS/PCS024.cshtml

@ -114,6 +114,14 @@
var unit = $("#unit").val(); var unit = $("#unit").val();
var barcode = $("#barcodeNo").val(); var barcode = $("#barcodeNo").val();
if (unit =="" ) {
alert("请選擇單位名稱!!");
}
else if (barcode ="=" ) {
alert("請先輸入內部條碼!!");
}
else
var table = hg.table.datatable('test', '組件資料', '/PCS/GetBarcodeItemByUnit?unitId=' + unit + '&barcodeNo=' + barcode, {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']); var table = hg.table.datatable('test', '組件資料', '/PCS/GetBarcodeItemByUnit?unitId=' + unit + '&barcodeNo=' + barcode, {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
}; };

2
AMESCoreStudio.WebApi/Controllers/AMES/WorkingHoursCollectionsController.cs

@ -133,6 +133,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
q = q.Where(p => p.StationID == int.Parse(stationid)); q = q.Where(p => p.StationID == int.Parse(stationid));
if (itemno != "*") if (itemno != "*")
q = q.Where(p => p.ItemNo.Equals(itemno)); q = q.Where(p => p.ItemNo.Equals(itemno));
if (wipno != "*")
q = q.Where(p => p.WipNo.Equals(wipno));
var user1 = _context.UserInfoes.Where(w => w.UserName == user).FirstOrDefault(); var user1 = _context.UserInfoes.Where(w => w.UserName == user).FirstOrDefault();
if (user1 != null) if (user1 != null)
q = q.Where(p => p.CreateUserID.Equals(user1.UserID)); q = q.Where(p => p.CreateUserID.Equals(user1.UserID));

Loading…
Cancel
Save