1. 修正API JSON result 非ToList時，會顯示lazyLoader屬性出來

2. 修正WIP_INFO_BLOB Model及controll
3. 工單基本資料移除 SMT: AB雙面選項
4. SOP維護查詢移除檔案名稱欄位

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -1503,7 +1503,7 @@ namespace AMESCoreStudio.Web.Controllers
 
                 model.WipSops = await _pcsApi.GetWipSopByWipNo(model.wipInfo.WipNO);
 
-                model.wipInfoBlobs = await _pcsApi.GetWipInfoBlob(model.wipInfo.WipID);
+                model.wipInfoBlobs = await _pcsApi.GetWipInfoBlob(model.wipInfo.WipNO);
             }
             await GetItemsList();
             await GetProductType();
@@ -1590,7 +1590,7 @@ namespace AMESCoreStudio.Web.Controllers
 
                 model.WipSops = await _pcsApi.GetWipSopByWipNo(model.wipInfo.WipNO);
 
-                model.wipInfoBlobs = await _pcsApi.GetWipInfoBlob(model.wipInfo.WipID);
+                model.wipInfoBlobs = await _pcsApi.GetWipInfoBlob(model.wipInfo.WipNO);
             }
             await GetItemsList();
             await GetProductType();
@@ -1884,7 +1884,7 @@ namespace AMESCoreStudio.Web.Controllers
                             await formFile.CopyToAsync(stream);
                         }
 
-                        model.wipInfoBlob.WipID = model.wipInfo.WipID;
+                        model.wipInfoBlob.WipNo = model.wipInfo.WipNO;
                         model.wipInfoBlob.ImageName = FileName;
                         model.wipInfoBlob.Filepath = FilePath;
                         result = await _pcsApi.PostWipInfoBlob(JsonConvert.SerializeObject(model.wipInfoBlob));
@@ -3718,22 +3718,19 @@ namespace AMESCoreStudio.Web.Controllers
         }
 
         /// <summary>
-        /// PCS030 Query
+        /// PCS030 SOP文件查詢 Query
         /// </summary>
-        /// <param name="lockStatus">工單狀態:鎖定|解鎖</param>
+        /// <param name="itemNo">料號</param>
-        /// <param name="lockType">鎖定類型</param>
+        /// <param name="unitNo">生產單位</param>
-        /// <param name="lockReasonType">鎖定原因類別</param>
+        /// <param name="sopType">SOP類型</param>
-        /// <param name="stations">站別</param>
+        /// <param name="date_str">建立日期起</param>
-        /// <param name="wipNO">工單</param>
+        /// <param name="date_end">建立日期迄</param>
-        /// <param name="itemNO">料號</param>
-        /// <param name="dateStr">鎖定日期起</param>
-        /// <param name="dateEnd">鎖定日期迄</param>
         /// <returns></returns>
         public async Task<IActionResult> PCS030QueryAsync(string itemNo, string unitNo
-            , string sopName, string sopType, string date_str, string date_end)
+            , string sopType, string date_str, string date_end)
         {
             IResultModel<MaterialSopDto> result = await _pcsApi.GetMaterialSopQuery(itemNo: itemNo, unitNo: unitNo
-            , sopName: sopName, sopType: sopType, date_str: date_str, date_end: date_end);
+            , sopType: sopType, date_str: date_str, date_end: date_end);
 
             if (result.Data.Count() != 0)
             {

AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@@ -996,8 +996,8 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpPost("api/WipInfoBlob")]
         ITask<ResultModel<WipInfoBlob>> PostWipInfoBlob([FromBody, RawJsonContent] string model);
 
-        [WebApiClient.Attributes.HttpGet("api/WipInfoBlob/{id}")]
+        [WebApiClient.Attributes.HttpGet("api/WipInfoBlob/ByWipNo/{id}")]
-        ITask<List<WipInfoBlob>> GetWipInfoBlob(int id);
+        ITask<List<WipInfoBlob>> GetWipInfoBlob(string id);
         #endregion
 
     }

AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml

@@ -613,7 +613,7 @@
                             <div class="layui-inline">
                                 <label asp-for="wipBoard.BiosVer" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="wipBoard.BiosVer" class="layui-input" placeholder="請輸入BIOS" />
+                                    <input asp-for="wipBoard.BiosVer" class="layui-input" />
                                     <span asp-validation-for="wipBoard.BiosVer" class="layui-bg-red"></span>
                                 </div>
                             </div>
@@ -630,7 +630,7 @@
                             <div class="layui-inline">
                                 <label asp-for="wipBoard.Checksum" class="layui-form-label"></label>
                                 <div class="layui-input-inline">
-                                    <input asp-for="wipBoard.Checksum" class="layui-input" placeholder="請輸入Checksum" />
+                                    <input asp-for="wipBoard.Checksum" class="layui-input" />
                                     <span asp-validation-for="wipBoard.Checksum" class="layui-bg-red"></span>
                                 </div>
                             </div>

AMESCoreStudio.Web/Views/PCS/PCS030.cshtml

@@ -71,15 +71,7 @@
             </div>
             <div class="layui-row">
                 <div class="layui-form-item">
-                    <div class="layui-col-sm4">
+                    <div class="layui-col-sm11">
-                        <div class="layui-inline">
-                            <label class="layui-form-label">檔案名稱:</label>
-                            <div class="layui-input-inline">
-                                <input id="sopName" name="sopName" autocomplete="off" class="layui-input" placeholder="請輸入文件名稱">
-                            </div>
-                        </div>
-                    </div>
-                    <div class="layui-col-sm6">
                         <div class="layui-inline">
                             <label class="layui-form-label">建立日期:</label>
                             <div class="layui-input-inline" style="width:150px">

AMESCoreStudio.WebApi/Code/CustomContractResolver.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Serialization;
+using Newtonsoft.Json;
+using System.Reflection;
+
+namespace AMESCoreStudio.WebApi
+{
+    public class CustomContractResolver : DefaultContractResolver
+    {
+        public static CustomContractResolver Instance { get; } = new CustomContractResolver();
+
+        protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
+        {
+            JsonProperty property = base.CreateProperty(member, memberSerialization);
+            if (member.Name == "LazyLoader")
+            {
+                property.Ignored = true;
+            }
+            return property;
+        }
+    }
+}

AMESCoreStudio.WebApi/Controllers/AMES/FqcResultController.cs

@@ -38,10 +38,6 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         {
             var fqcResult = await _context.FqcResults.FindAsync(id);
 
-            if (fqcResult == null)
-            {
-                return NotFound();
-            }
 
             return fqcResult;
         }

AMESCoreStudio.WebApi/Controllers/AMES/WipInfoBlobController.cs

@@ -37,10 +37,21 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         [HttpGet("{id}")]
         public async Task<ActionResult<IEnumerable<WipInfoBlob>>> GetWipInfoBlob(int id)
         {
-            var wipInfoBlob = await _context.WipInfoBlobs.Where(w => w.WipID == id).ToListAsync();
+            var wipInfoBlob = await _context.WipInfoBlobs.Where(w => w.WipBlobID == id).ToListAsync();
             return wipInfoBlob;
         }
 
+        /// <summary>
+        /// 工單上傳圖檔資料表 By 工單號碼
+        /// </summary>
+        /// <param name="id">工單號碼</param>
+        /// <returns></returns>
+        [HttpGet("ByWipNo/{id}")]
+        public async Task<ActionResult<IEnumerable<WipInfoBlob>>> GetWipInfoBlobByWipNo(string id)
+        {
+            var wipInfoBlob = await _context.WipInfoBlobs.Where(w => w.WipNo == id).ToListAsync();
+            return wipInfoBlob;
+        }
 
 
         /// <summary>
@@ -84,9 +95,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         public async Task<ResultModel<WipInfoBlob>> PostWipInfoBlob(WipInfoBlob wipInfoBlob)
         {
             ResultModel<WipInfoBlob> result = new ResultModel<WipInfoBlob>();
-            _context.WipInfoBlobs.Add(wipInfoBlob);
+            Helper helper = new Helper(_context);
+            wipInfoBlob.WipBlobID= helper.GetIDKey("WIP_BLOB_ID").Result;
+            
             try
             {
+                _context.WipInfoBlobs.Add(wipInfoBlob);
                 await _context.SaveChangesAsync();
                 result.Success = true;
                 result.Msg = "OK";
@@ -117,7 +131,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
 
         private bool WipInfoBlobExists(int id)
         {
-            return _context.WipInfoBlobs.Any(e => e.WipID == id);
+            return _context.WipInfoBlobs.Any(e => e.WipBlobID == id);
         }
     }
 }

AMESCoreStudio.WebApi/Enums/EnumPCS.cs

@@ -241,13 +241,6 @@ namespace AMESCoreStudio.WebApi.Enum
             [Display(Name = "B面部份點膠")]
             D = 4,
 
-            /// <summary>
-            /// AB面部份點膠
-            /// </summary>
-            [Display(Name = "AB面部份點膠")]
-            E = 5,
-
-
             /// <summary>
             /// 不須點膠
             /// </summary>

AMESCoreStudio.WebApi/Models/AMES/WipInfoBlob.cs

@@ -16,18 +16,27 @@ namespace AMESCoreStudio.WebApi.Models.AMES
     public partial class WipInfoBlob
     {
         /// <summary>
-        /// 工單ID
+        /// ID
         /// </summary>
         [Key]
-        [Column("WIP_ID")]
+        [Column("WIP_BLOB_ID")]
+        [Required(ErrorMessage = "{0},不能空白")]
         [DataMember]
-        public int WipID { get; set; }
+        public int WipBlobID { get; set; }
 
         /// <summary>
-        /// 圖檔名稱
+        /// 工單號碼
         /// </summary>
         [Key]
         [Required]
+        [Column("WIP_NO")]
+        [DataMember]
+        public string WipNo { get; set; }
+
+        /// <summary>
+        /// 圖檔名稱
+        /// </summary>
+        [Required]
         [Column("IMAGE_NAME")]
         [StringLength(50)]
         [DataMember]

AMESCoreStudio.WebApi/Models/AMESContext.cs

@@ -46,7 +46,7 @@ namespace AMESCoreStudio.WebApi
 
             modelBuilder.Entity<WipRule>().HasKey(c => new { c.WipNO, c.RuleStationID, c.KeyNo });
             modelBuilder.Entity<WipMAC>().HasKey(c => new { c.WipNO, c.StartNO, c.EndNO });
-            modelBuilder.Entity<WipInfoBlob>().HasKey(c => new { c.WipID, c.ImageName});
+            modelBuilder.Entity<WipInfoBlob>().HasKey(c => new { c.WipBlobID, c.WipNo });
             modelBuilder.Entity<BarcodeItem>().HasOne(r => r.B).WithMany().HasForeignKey(r => r.BarcodeID).IsRequired();
             modelBuilder.Entity<BarcodeItem>().HasOne(r => r.I).WithMany().HasForeignKey(r => r.ItemNo).IsRequired();
             modelBuilder.Entity<BarcodeItem>().HasOne(r => r.S).WithMany().HasForeignKey(r => r.RuleStationID).IsRequired();

AMESCoreStudio.WebApi/Startup.cs

@@ -16,6 +16,7 @@ using System.Reflection;
 using Swashbuckle.AspNetCore.Swagger;
 using Microsoft.OpenApi.Models;
 using System.Text.Json.Serialization;
+using Newtonsoft.Json.Serialization;
 
 namespace AMESCoreStudio.WebApi
 {
@@ -87,6 +88,12 @@ namespace AMESCoreStudio.WebApi
                 options.SuppressModelStateInvalidFilter = true;
             });
 
+            // 將API裡LazyLoader 屬性不顯示
+            services.AddMvc().AddNewtonsoftJson(options =>
+            {
+                options.SerializerSettings.ContractResolver = CustomContractResolver.Instance;
+            });
+
             //services.AddControllers().AddJsonOptions(x =>
             //     x.JsonSerializerOptions..ReferenceHandler = ReferenceHandler.Preserve.Ignore);
             //services.AddControllers().AddNewtonsoftJson(x =>