From 6e7bd2ab3b3ac07e78ce3436c19ee5cb146e9a7b Mon Sep 17 00:00:00 2001
From: Marvin <marvinhong@163.com>
Date: Fri, 26 Jan 2024 23:21:48 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95KeyParts?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A22=EF=BC=8C=E4=BF=AE=E6=AD=A3=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BAExcel=E5=A4=9A=E4=B8=80=E4=B8=AA=E7=A9=BA=E7=99=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/QRSController.cs              | 48 +++++++++----------
 AMESCoreStudio.WebApi/Models/AMESContext.cs   |  2 +
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/AMESCoreStudio.Web/Controllers/QRSController.cs b/AMESCoreStudio.Web/Controllers/QRSController.cs
index cfee432e..c42ae3d7 100644
--- a/AMESCoreStudio.Web/Controllers/QRSController.cs
+++ b/AMESCoreStudio.Web/Controllers/QRSController.cs
@@ -9883,25 +9883,25 @@ namespace AMESCoreStudio.Web.Controllers
                                 switch (i)
                                 {
                                     case 0:
-                                        kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;" + jp[i].Name + "</td>";
+                                        kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>" + jp[i].Name + "</td>";
                                         break;
                                     case 1:
-                                        kpDataList = kpDataList + "<td style = 'text-align:left'>&nbsp;" + jp[i].Name + "</td>";
+                                        kpDataList = kpDataList + "<td style = 'text-align:left'>" + jp[i].Name + "</td>";
                                         break;
                                     case 2:
-                                        kpDataList = kpDataList + "<td width = '200' style = 'text-align:left'>&nbsp;" + jp[i].Name + "</td>";
+                                        kpDataList = kpDataList + "<td width = '200' style = 'text-align:left'>" + jp[i].Name + "</td>";
                                         break;
                                     case 3:
-                                        kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;" + jp[i].Name + "</td>";
+                                        kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>" + jp[i].Name + "</td>";
                                         break;
                                     case 4:
-                                        //kpDataList = kpDataList + "<td width = '120' style = 'text-align:left'>&nbsp;" + jp[i].Name + "</td>";
+                                        //kpDataList = kpDataList + "<td width = '120' style = 'text-align:left'>" + jp[i].Name + "</td>";
                                         break;
                                     case 5:
-                                        kpDataList = kpDataList + "<td width = '120' style = 'text-align:left'>&nbsp;" + jp[i].Name + "</td>";
+                                        kpDataList = kpDataList + "<td width = '120' style = 'text-align:left'>" + jp[i].Name + "</td>";
                                         break;
                                     case 6:
-                                        kpDataList = kpDataList + "<td width = '120' style = 'text-align:left'>&nbsp;" + jp[i].Name + "</td>";
+                                        kpDataList = kpDataList + "<td width = '120' style = 'text-align:left'>" + jp[i].Name + "</td>";
                                         break;
                                     default:
                                         string kp_name = jp[i].Name.Replace("kP_", "");
@@ -9914,11 +9914,11 @@ namespace AMESCoreStudio.Web.Controllers
                                                 var kp_item = await _kcsApi.GetItems(kp_no);
                                                 if (kp_item.Count > 0)
                                                 {
-                                                    kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_item[0].ItemName + "</td>";
+                                                    kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>" + kp_item[0].ItemName + "</td>";
                                                 }
                                                 else
                                                 {
-                                                    kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_no + "</td>";
+                                                    kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>" + kp_no + "</td>";
                                                 }
                                             }
                                             else
@@ -9927,11 +9927,11 @@ namespace AMESCoreStudio.Web.Controllers
                                                 var kp_item = await _kcsApi.GetItems(kp_no);
                                                 if (kp_item.Count > 0)
                                                 {
-                                                    kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_item[0].ItemName + "</td>";
+                                                    kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>" + kp_item[0].ItemName + "</td>";
                                                 }
                                                 else
                                                 {
-                                                    kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_no + "</td>";
+                                                    kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>" + kp_no + "</td>";
                                                 }
                                             }
                                         }
@@ -9940,11 +9940,11 @@ namespace AMESCoreStudio.Web.Controllers
                                             var kp_item = await _kcsApi.GetItems(kp_name);
                                             if (kp_item.Count > 0)
                                             {
-                                                kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_item[0].ItemName + "</td>";
+                                                kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>" + kp_item[0].ItemName + "</td>";
                                             }
                                             else
                                             {
-                                                kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_name + "</td>";
+                                                kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>" + kp_name + "</td>";
                                             }
 
                                         }
@@ -9954,17 +9954,17 @@ namespace AMESCoreStudio.Web.Controllers
                                             if (kp_name.StartsWith("MB") && kp_name.IndexOf("MAC") > 0)
                                             {
 
-                                                kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_name + "</td>";
+                                                kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>" + kp_name + "</td>";
                                             }
                                             else
                                             {
                                                 int idx = kp_name.IndexOf("_");
-                                                kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_name.Substring(0, idx) + "</td>";
+                                                kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>" + kp_name.Substring(0, idx) + "</td>";
                                             }
                                         }
                                         else
                                         {
-                                            kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + kp_name + "</td>";
+                                            kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>" + kp_name + "</td>";
                                         }
                                         */
 
@@ -9982,28 +9982,28 @@ namespace AMESCoreStudio.Web.Controllers
                             switch (i)
                             {
                                 case 0:
-                                    kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;" + jp[i].Value + "</td>";
+                                    kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>" + jp[i].Value + "</td>";
                                     break;
                                 case 1:
-                                    kpDataList = kpDataList + "<td style = 'text-align:left'>&nbsp;" + jp[i].Value + "</td>";
+                                    kpDataList = kpDataList + "<td style = 'text-align:left'>" + jp[i].Value + "</td>";
                                     break;
                                 case 2:
-                                    kpDataList = kpDataList + "<td width = '200' style = 'text-align:left'>&nbsp;" + jp[i].Value + "</td>";
+                                    kpDataList = kpDataList + "<td width = '200' style = 'text-align:left'>" + jp[i].Value + "</td>";
                                     break;
                                 case 3:
-                                    kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>&nbsp;" + jp[i].Value + "</td>";
+                                    kpDataList = kpDataList + "<td width = '150' style = 'text-align:left'>" + jp[i].Value + "</td>";
                                     break;
                                 case 4:
-                                    //kpDataList = kpDataList + "<td width = '120' style = 'text-align:left'>&nbsp;" + jp[i].Value + "</td>";
+                                    //kpDataList = kpDataList + "<td width = '120' style = 'text-align:left'>" + jp[i].Value + "</td>";
                                     break;
                                 case 5:
-                                    kpDataList = kpDataList + "<td width = '120' style = 'text-align:left'>&nbsp;" + jp[i].Value + "</td>";
+                                    kpDataList = kpDataList + "<td width = '120' style = 'text-align:left'>" + jp[i].Value + "</td>";
                                     break;
                                 case 6:
-                                    kpDataList = kpDataList + "<td width = '120' style = 'text-align:left'>&nbsp;" + jp[i].Value + "</td>";
+                                    kpDataList = kpDataList + "<td width = '120' style = 'text-align:left'>" + jp[i].Value + "</td>";
                                     break;
                                 default:
-                                    kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>&nbsp;" + jp[i].Value + "</td>";
+                                    kpDataList = kpDataList + "<td width = '160' style = 'text-align:left'>" + jp[i].Value + "</td>";
                                     break;
                             }
 
diff --git a/AMESCoreStudio.WebApi/Models/AMESContext.cs b/AMESCoreStudio.WebApi/Models/AMESContext.cs
index 684a7815..9283bd46 100644
--- a/AMESCoreStudio.WebApi/Models/AMESContext.cs
+++ b/AMESCoreStudio.WebApi/Models/AMESContext.cs
@@ -1014,6 +1014,8 @@ namespace AMESCoreStudio.WebApi
         public DbSet<LabelItemMaster> LabelItemMaster { get; set; }
         public DbSet<LabelItemDetail> LabelItemDetail { get; set; }
         public DbSet<LabelItemParam> LabelItemParam { get; set; }
+
+        public DbSet<NgKeypart> NgKeyparts { get; set; }
     }
 
 }