From d5d8959d8205a6b7bc092fd29c9a40222a2a0ad5 Mon Sep 17 00:00:00 2001
From: "BB.Wang" <BB.Wang@git.com>
Date: Thu, 16 Mar 2023 11:46:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=94=E5=8A=A9yiru=E4=B8=8A=E5=82=B3=201?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=AD=A3=E7=94=9F=E7=94=A2=E5=B7=A5=E6=99=82?=
 =?UTF-8?q?=E5=A0=B1=E5=B7=A5=20=E5=B7=A5=E5=96=AE=E6=9F=A5=E8=A9=A2?=
 =?UTF-8?q?=E7=84=A1=E5=8A=9F=E8=83=BD=202=E3=80=81=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E7=B5=84=E4=BB=B6=E8=B3=87=E6=96=99=E6=96=B0=E5=A2=9E=20?=
 =?UTF-8?q?=E6=9C=AA=E8=BC=B8=E5=85=A5=E5=96=AE=E4=BD=8D=E6=9F=A5=E8=A9=A2?=
 =?UTF-8?q?=E5=87=BA=E9=8C=AF=E5=95=8F=E9=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AMESCoreStudio.Web/Views/PCS/PCS024.cshtml             | 10 +++++++++-
 .../Controllers/AMES/CZmomaterialListController.cs     |  8 ++++----
 .../AMES/WorkingHoursCollectionsController.cs          |  2 ++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/AMESCoreStudio.Web/Views/PCS/PCS024.cshtml b/AMESCoreStudio.Web/Views/PCS/PCS024.cshtml
index 7d8623e2..19d7e1b4 100644
--- a/AMESCoreStudio.Web/Views/PCS/PCS024.cshtml
+++ b/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']);
 
         };
 
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/CZmomaterialListController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/CZmomaterialListController.cs
index 2823ef0b..3481af82 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/CZmomaterialListController.cs
+++ b/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)
-                    join q2 in _context.PlmMeterialInfos.Where( w=> w.MeterialDesc.ToUpper().Contains("POWER CORD") && w.MeterialNo.StartsWith("E17")) on q1.MaterialNo equals q2.MeterialNo
+            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
                     select new
                     {
                         q1.MoID,
                         q1.MaterialNo,
                         q1.DemandQty,
                         q1.RealsendQty
-                        
+
                     };
-          
+
             return await q.ToListAsync();
         }
 
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/WorkingHoursCollectionsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/WorkingHoursCollectionsController.cs
index 65bd3102..b2ff6f82 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/WorkingHoursCollectionsController.cs
+++ b/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));