From d3211fcdddd64d5251342892f3ac8e01a8b4fed8 Mon Sep 17 00:00:00 2001
From: Ray <raylin@aten.com>
Date: Thu, 30 Mar 2023 08:30:58 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=B7=A5=E5=96=AE=E7=B6=AD=E8=AD=B7?=
 =?UTF-8?q?=E5=84=B2=E5=AD=98=E6=99=82=20=E5=B7=A5=E5=96=AEKP=E5=9B=9E?=
 =?UTF-8?q?=E5=AF=AB=E5=88=B0=E6=96=99=E8=99=9FKP=20=E6=8E=92=E9=99=A4?=
 =?UTF-8?q?=E9=87=8D=E5=B7=A5=E5=B7=A5=E5=96=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/PCSController.cs              | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/PCSController.cs b/AMESCoreStudio.Web/Controllers/PCSController.cs
index 94fbed14..597733be 100644
--- a/AMESCoreStudio.Web/Controllers/PCSController.cs
+++ b/AMESCoreStudio.Web/Controllers/PCSController.cs
@@ -8056,9 +8056,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                     // 工單 KeyParts WipKp 
                     // 判斷料號KP有資料 沒有資料時 一起新增到料號KP
-                    // 2022.10.12 取消判斷 刪除料號KP，在逐一新增
+                    // 2022.10.12 取消判斷 刪除料號KP，在逐一新增 排除重工工單
                     var materialItem = await _pcsApi.GetMaterialItemByItemNO(model.wipAtt.ItemNO);
-                    if (materialItem != null)
+                    if (materialItem != null && model.wipInfo.WipType != "R")
                     {
                         await _pcsApi.DeleteMaterialKpByItem(materialItem.ItemID);
                     }
@@ -8087,20 +8087,23 @@ namespace AMESCoreStudio.Web.Controllers
                             Msg += result.Msg;
                         }
 
-                        // 新增到料號KP檔 MaterialKp
-                        result = await _pcsApi.PostMaterialKp(JsonConvert.SerializeObject(new MaterialKp
+                        // 新增到料號KP檔 MaterialKp 排除重工工單
+                        if (model.wipInfo.WipType != "R")
                         {
-                            ItemID = materialItem.ItemID,
-                            KpName = item.KpName,
-                            KpNo = item.KpNo,
-                            KpSeq = Convert.ToInt32(item.KpSeq),
-                            Length = item.Length,
-                            StationType = item.UnitNo,
-                            IsRepeat = "N",
-                            Title = item.Title,
-                            CreateUserID = UserID,
-                            UpdateUserID = UserID
-                        }));
+                            result = await _pcsApi.PostMaterialKp(JsonConvert.SerializeObject(new MaterialKp
+                            {
+                                ItemID = materialItem.ItemID,
+                                KpName = item.KpName,
+                                KpNo = item.KpNo,
+                                KpSeq = Convert.ToInt32(item.KpSeq),
+                                Length = item.Length,
+                                StationType = item.UnitNo,
+                                IsRepeat = "N",
+                                Title = item.Title,
+                                CreateUserID = UserID,
+                                UpdateUserID = UserID
+                            }));
+                        }
                         if (!result.Success)
                         {
                             Msg += result.Msg;
@@ -8286,7 +8289,7 @@ namespace AMESCoreStudio.Web.Controllers
             }
 
             var user_info = await _sysApi.GetUserInfo(user_id);
-            
+
             ViewBag.UserName = user_info[0].UserName;
 
             ViewBag.ClearID = id;