1. 新增PLM料號資料

AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@@ -824,6 +824,16 @@ namespace AMESCoreStudio.Web
 
         #endregion
 
+        #region QRS010
+
+        /// <summary>
+        /// 良率查詢QRS010
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/WipClass/GetYieldData4QRS010")]
+        ITask<ResultModel<dynamic>> GetYieldData4QRS010(string unitNo, string lineID, string stationID, string wipNo, string itemNo, string mfgTypeNo, string dateStart, string dateEnd, int page, int limit);
+
+        #endregion
 
         #region WipKp 工單KP資訊資料檔
         /// <summary>
@@ -849,7 +859,6 @@ namespace AMESCoreStudio.Web
         ITask<ResultModel<WipKp>> PutWipKpByStatus([FromBody, RawJsonContent] string model);
         #endregion
 
-
         #region RuleStation 流程站別資料維護
         /// <summary>
         /// 查詢工單號碼 對應 RuleStation
@@ -871,15 +880,14 @@ namespace AMESCoreStudio.Web
         ITask<List<BarcodeOutfit>> GetBarcodeOutfitByBarcodeNo(string id);
         #endregion
 
-        #region QRS010
+        #region PlmMeterialInfoe PLM轉入料號說明
-
         /// <summary>
-        /// 良率查詢QRS010
+        /// 查詢PLM轉入料號說明
         /// </summary>
+        /// <param name="id">PLM料號</param>
         /// <returns></returns>
-        [WebApiClient.Attributes.HttpGet("api/WipClass/GetYieldData4QRS010")]
+        [WebApiClient.Attributes.HttpGet("api/PlmMeterialInfoe/{id}")]
-        ITask<ResultModel<dynamic>> GetYieldData4QRS010(string unitNo, string lineID, string stationID, string wipNo, string itemNo, string mfgTypeNo, string dateStart, string dateEnd, int page, int limit);
+        ITask<PlmMeterialInfo> GetPlmMeterialInfo(string id);
-
         #endregion
 
     }

AMESCoreStudio.WebApi/Controllers/AMES/PlmMeterialInfoeController.cs

@@ -0,0 +1,126 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using AMESCoreStudio.WebApi;
+using AMESCoreStudio.WebApi.Models.AMES;
+using AMESCoreStudio.CommonTools.Result;
+
+namespace AMESCoreStudio.WebApi.Controllers.AMES
+{
+    /// <summary>
+    /// PLM轉入料號說明
+    /// </summary>
+    [Route("api/[controller]")]
+    [ApiController]
+    public class PlmMeterialInfoeController : ControllerBase
+    {
+        private readonly AMESContext _context;
+
+        public PlmMeterialInfoeController(AMESContext context)
+        {
+            _context = context;
+        }
+
+        // GET: api/PlmMeterialInfoe
+        [HttpGet]
+        public async Task<ActionResult<IEnumerable<PlmMeterialInfo>>> GetPlmMeterialInfos()
+        {
+            return await _context.PlmMeterialInfos.ToListAsync();
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="id">PLM料號</param>
+        /// <returns></returns>
+        [HttpGet("{id}")]
+        public async Task<ActionResult<PlmMeterialInfo>> GetPlmMeterialInfo(string id)
+        {
+            var plmMeterialInfo = await _context.PlmMeterialInfos.FindAsync(id);
+            return plmMeterialInfo;
+        }
+
+        // PUT: api/PlmMeterialInfoe/5
+        // To protect from overposting attacks, enable the specific properties you want to bind to, for
+        // more details, see https://go.microsoft.com/fwlink/?linkid=2123754.
+        [HttpPut("{id}")]
+        public async Task<IActionResult> PutPlmMeterialInfo(string id, PlmMeterialInfo plmMeterialInfo)
+        {
+            if (id != plmMeterialInfo.MeterialNo)
+            {
+                return BadRequest();
+            }
+
+            _context.Entry(plmMeterialInfo).State = EntityState.Modified;
+
+            try
+            {
+                await _context.SaveChangesAsync();
+            }
+            catch (DbUpdateConcurrencyException)
+            {
+                if (!PlmMeterialInfoExists(id))
+                {
+                    return NotFound();
+                }
+                else
+                {
+                    throw;
+                }
+            }
+
+            return NoContent();
+        }
+
+        // POST: api/PlmMeterialInfoe
+        // To protect from overposting attacks, enable the specific properties you want to bind to, for
+        // more details, see https://go.microsoft.com/fwlink/?linkid=2123754.
+        [HttpPost]
+        public async Task<ActionResult<PlmMeterialInfo>> PostPlmMeterialInfo(PlmMeterialInfo plmMeterialInfo)
+        {
+            _context.PlmMeterialInfos.Add(plmMeterialInfo);
+            try
+            {
+                await _context.SaveChangesAsync();
+            }
+            catch (DbUpdateException)
+            {
+                if (PlmMeterialInfoExists(plmMeterialInfo.MeterialNo))
+                {
+                    return Conflict();
+                }
+                else
+                {
+                    throw;
+                }
+            }
+
+            return CreatedAtAction("GetPlmMeterialInfo", new { id = plmMeterialInfo.MeterialNo }, plmMeterialInfo);
+        }
+
+        // DELETE: api/PlmMeterialInfoe/5
+        [HttpDelete("{id}")]
+        public async Task<ActionResult<PlmMeterialInfo>> DeletePlmMeterialInfo(string id)
+        {
+            var plmMeterialInfo = await _context.PlmMeterialInfos.FindAsync(id);
+            if (plmMeterialInfo == null)
+            {
+                return NotFound();
+            }
+
+            _context.PlmMeterialInfos.Remove(plmMeterialInfo);
+            await _context.SaveChangesAsync();
+
+            return plmMeterialInfo;
+        }
+
+        private bool PlmMeterialInfoExists(string id)
+        {
+            return _context.PlmMeterialInfos.Any(e => e.MeterialNo == id);
+        }
+    }
+}

AMESCoreStudio.WebApi/Controllers/AMES/WipBarcodeController.cs

@@ -67,6 +67,20 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return WipBarcodes;
         }
 
+        /// <summary>
+        /// 查詢工單資料Barcode By 條碼前置碼
+        /// </summary>
+        /// <param name="id">工單號碼</param>
+        /// <returns></returns>
+        // GET: api/WipBarcode/4
+        [HttpGet("BarcodeNo/{id}")]
+        public async Task<ActionResult<IEnumerable<WipBarcode>>> GetWipBarcodeBarcodeNo(string id)
+        {
+            IQueryable<WipBarcode> q = _context.WipBarcodes.Where(p => p.StartNO.StartsWith(id));
+            var WipBarcodes = await q.ToListAsync();
+            return WipBarcodes;
+        }
+
         /// <summary>
         /// 新增工單資料-條碼Barcode
         /// </summary>

AMESCoreStudio.WebApi/Models/AMES/PlmMeterialInfo.cs

@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.EntityFrameworkCore;
+using System.Runtime.Serialization;
+
+
+#nullable disable
+
+namespace AMESCoreStudio.WebApi.Models.AMES
+{
+    /// <summary>
+    /// PLM轉入料號說明
+    /// </summary>
+    [Table("PLM_METERIAL_INFO", Schema = "JHAMES")]
+    public partial class PlmMeterialInfo
+    {
+        /// <summary>
+        /// 物料
+        /// </summary>
+        [Key]
+        [Column("METERIALNO")]
+        [StringLength(18)]
+        [Required]
+        [DataMember]
+        public string MeterialNo { get; set; }
+
+        /// <summary>
+        /// 物料描述
+        /// </summary>
+        [Required]
+        [DataMember]
+        [Column("METERIAL_DESC")]
+        [StringLength(100)]
+        public string MeterialDesc { get; set; }
+
+        /// <summary>
+        /// 機種系列
+        /// </summary>
+        [Required]
+        [DataMember]
+        [Column("MODELNAME")]
+        [StringLength(18)]
+        public string ModelName { get; set; }
+
+        /// <summary>
+        /// 生產備忘錄
+        /// </summary>
+        [Column("PRODUCTION_MEMO")]
+        [StringLength(500)]
+        [DataMember]
+        public string ProductionMemo { get; set; }
+
+        /// <summary>
+        /// 狀態
+        /// </summary>
+        [Required]
+        [DataMember]
+        [Column("STATUS")]
+        [StringLength(1)]
+        public string Status { get; set; }
+
+        /// <summary>
+        /// EAN
+        /// </summary>
+        [Column("EAN")]
+        [StringLength(20)]
+        [DataMember]
+        public string EAN { get; set; }
+
+        /// <summary>
+        /// 長文
+        /// </summary>
+        [DataMember]
+        [Column("LONG_TEXT")]
+        [StringLength(500)]
+        public string LongText { get; set; }
+
+        /// <summary>
+        /// 建立日期
+        /// </summary>
+        [Required]
+        [Column("CREATE_DATE")]
+        [DataMember]
+        public DateTime CreateDate { get; set; } = DateTime.Now;
+
+
+        /// <summary>
+        /// 更新日期
+        /// </summary>
+        [Column("UPDATE_DATE")]
+        [DataMember]
+        public DateTime? UpdateDate { get; set; } = DateTime.Now;
+
+    }
+}

AMESCoreStudio.WebApi/Models/AMES/WipSystem.cs

@@ -287,5 +287,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Column("UPDATE_DATE", TypeName = "DATE")]
         [DataMember]
         public DateTime UpdateDate { get; set; } = System.DateTime.Now;
+
+
     }
 }

AMESCoreStudio.WebApi/Models/AMESContext.cs

@@ -714,7 +714,7 @@ namespace AMESCoreStudio.WebApi
         /// <summary>
         /// 治具區域資料檔
         /// </summary>
-        //public virtual DbSet<OutfitAreaInfo> OutfitAreaInfoes { get; set; }
+        public virtual DbSet<OutfitAreaInfo> OutfitAreaInfoes { get; set; }
 
         /// <summary>
         /// 設備種類資料檔
@@ -724,21 +724,21 @@ namespace AMESCoreStudio.WebApi
         /// <summary>
         /// 層別資料檔
         /// </summary>
-       // public virtual DbSet<OutfitLevelInfo> OutfitLevelInfoes { get; set; }
+       public virtual DbSet<OutfitLevelInfo> OutfitLevelInfoes { get; set; }
 
         /// <summary>
         /// 位置資料檔
         /// </summary>
-        //public virtual DbSet<OutfitSiteInfo> OutfitSiteInfoes { get; set; }
+        public virtual DbSet<OutfitSiteInfo> OutfitSiteInfoes { get; set; }
 
-        /// <summary>
+        ///// <summary>
-        /// 設備規格資料檔
+        ///// 設備規格資料檔
-        /// </summary>
+        ///// </summary>
         public virtual DbSet<OutfitVarityInfo> OutfitVarityInfoes { get; set; }
 
-        /// <summary>
+        ///// <summary>
-        /// 廠商資料檔
+        ///// 廠商資料檔
-        /// </summary>
+        ///// </summary>
         public virtual DbSet<OutfitVendorInfo> OutfitVendorInfoes { get; set; }
 
         /// <summary>
@@ -746,8 +746,10 @@ namespace AMESCoreStudio.WebApi
         /// </summary>
         public virtual DbSet<OutfitInfo> OutfitInfoes { get; set; }
 
-
+        /// <summary>
-
+        /// PLM轉入料號說明
+        /// </summary>
+        public virtual DbSet<PlmMeterialInfo> PlmMeterialInfos { get; set; }
     }
 
 }