協助yiru上傳

1、修正生產工時報工 工單查詢無功能
2、修正組件資料新增 未輸入單位查詢出錯問題

AMESCoreStudio.Web/Views/PCS/PCS024.cshtml

@@ -114,7 +114,15 @@
 
             var unit = $("#unit").val();
             var barcode = $("#barcodeNo").val();
-            var table = hg.table.datatable('test', '組件資料', '/PCS/GetBarcodeItemByUnit?unitId=' + unit + '&barcodeNo=' + barcode, {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+            
+            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']);
 
         };
 

AMESCoreStudio.WebApi/Controllers/AMES/CZmomaterialListController.cs

@@ -50,17 +50,17 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         [HttpGet("ByMoID/{id}")]
         public async Task<ActionResult<IEnumerable<dynamic>>> GetCZmomaterialListByMoID(string id)
         {
-           var q =  from q1 in _context.CZmomaterialLists.Where(w => w.MoID == id)
+            var q = from q1 in _context.CZmomaterialLists.Where(w => w.MoID == id)
-                    join q2 in _context.PlmMeterialInfos.Where( w=> w.MeterialDesc.ToUpper().Contains("POWER CORD") && w.MeterialNo.StartsWith("E17")) on q1.MaterialNo equals q2.MeterialNo
+                    join q2 in _context.PlmMeterialInfos.Where(w => w.MeterialDesc.ToUpper().Contains("POWER CORD") && w.MeterialNo.StartsWith("E17")) on q1.MaterialNo equals q2.MeterialNo
                     select new
                     {
                         q1.MoID,
                         q1.MaterialNo,
                         q1.DemandQty,
                         q1.RealsendQty
-                        
+
                     };
-          
+
             return await q.ToListAsync();
         }
 

AMESCoreStudio.WebApi/Controllers/AMES/WorkingHoursCollectionsController.cs

@@ -133,6 +133,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 q = q.Where(p => p.StationID == int.Parse(stationid));
             if (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();
             if (user1 != null)
                 q = q.Where(p => p.CreateUserID.Equals(user1.UserID));