1.

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -1659,6 +1659,9 @@ namespace AMESCoreStudio.Web.Controllers
             bool Success = true;
             string Data = string.Empty;
 
+            if (model.WipID == 0)
+                Msg += "請確認是否有輸入工單相關訊息\r\n";
+
             if (model.MaterialOutfits.Where(w => string.IsNullOrWhiteSpace(w.Inputs)).Any())
                 Msg += "請刷入治具編號\r\n";
 
@@ -1676,19 +1679,30 @@ namespace AMESCoreStudio.Web.Controllers
             if (!string.IsNullOrWhiteSpace(Msg))
                 Success = false;
 
-            // 新增or更新 BarCode_Info
+            //// 新增or更新 BarCode_Info
-            BarcodeInfo barcodeInfo = new BarcodeInfo
+            //BarcodeInfo barcodeInfo = new BarcodeInfo
-            {
+            //{
-                BarcodeNo = model.Input,
+            //    BarcodeNo = model.Input,
-                StatusNo = "SMT",
+            //    StatusNo = "SMT",
-                RuleStationID = model.Station,
+            //    RuleStationID = model.Station,
-                RuleStatus = "P", //F 不良 
+            //    RuleStatus = "P", //F 不良 
-                WipID = model.WipID,
+            //    WipID = model.WipID,
-                StatusID = 1,
+            //    StatusID = 1,
-                CreateUserID = 1
+            //    CreateUserID = 1
-            };
+            //};
-
+            //await _pcsApi.PostBarcodeInfoes(JsonConvert.SerializeObject(barcodeInfo));
-
+
+            //// 新增or更新 BarCodeStation
+            //BarcodeStation barcodeStation = new BarcodeStation
+            //{
+            //    BarcodeID = 1,
+            //    WipID = model.WipID,
+            //    RuleStationID = model.Station,
+            //    RuleStatus = "S",
+            //    InputDate = DateTime.Now,
+            //    LineId = (decimal)model.LineID
+            //};
+            //await _pcsApi.PostBarcodeStation(JsonConvert.SerializeObject(barcodeStation));
 
             return Json(new Result() { success = Success, msg = Msg, data = Data });
         }

AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@@ -189,14 +189,30 @@ namespace AMESCoreStudio.Web
         //ITask<IEnumerable<BarcodeInfo>> GetBarcodeInfoesByNo(string id);
 
         [WebApiClient.Attributes.HttpPost("api/BarcodeInfoes")]
-        ITask<ResultModel<WipBarcodeOther>> PostBarcodeInfoes([FromBody, RawJsonContent] string model);
+        ITask<ResultModel<BarcodeInfo>> PostBarcodeInfoes([FromBody, RawJsonContent] string model);
 
         [WebApiClient.Attributes.HttpPut("api/BarcodeInfoes")]
-        ITask<ResultModel<WipBarcodeOther>> PutBarcodeInfoes([FromBody, RawJsonContent] string model);
+        ITask<ResultModel<BarcodeInfo>> PutBarcodeInfoes([FromBody, RawJsonContent] string model);
         #endregion
 
-        #region 條碼過站資料檔
+        #region BarCodeStation 條碼過站資料檔 PCS021
+        [WebApiClient.Attributes.HttpGet("api/BarcodeStation/GetBarcodeStationByKey")]
+        ITask<BarcodeStation> GetBarcodeStationByKey(string id);
 
+        [WebApiClient.Attributes.HttpPost("api/BarcodeStation")]
+        ITask<ResultModel<BarcodeStation>> PostBarcodeStation([FromBody, RawJsonContent] string model);
+
+        [WebApiClient.Attributes.HttpPut("api/BarcodeStation")]
+        ITask<ResultModel<BarcodeStation>> PutBarcodeStation([FromBody, RawJsonContent] string model);
+
+        #endregion
+
+        #region NgInfo 測試不良基本資料檔 PCS021
+        [WebApiClient.Attributes.HttpPost("api/NgInfo")]
+        ITask<ResultModel<NgInfo>> PostNgInfo([FromBody, RawJsonContent] string model);
+
+        [WebApiClient.Attributes.HttpPut("api/NgInfo")]
+        ITask<ResultModel<NgInfo>> PutNgInfo([FromBody, RawJsonContent] string model);
         #endregion
 
         #region BarcodeType 條碼類別資料檔 PCS001

AMESCoreStudio.Web/Views/PCS/PCS021.cshtml

@@ -97,7 +97,7 @@
                                             <label class="layui-form-label">工單號碼：</label>
                                             <div class="layui-input-inline" style="width:100px">
                                                 <input type="text" onkeydown="SearchNo(event);" asp-for="WipNO" asp-action="PCS021_GetWip" class="layui-input" autocomplete="off" />
-                                                <input type="hidden" asp-for="WipID" />
+                                                <input type="hidden" asp-for="WipID" value="@Model.WipID"/>
                                                 <input type="submit" id="GetWipData" asp-action="PCS021_GetWip" style="display:none;" />
                                             </div>
                                         </div>

AMESCoreStudio.WebApi/Controllers/AMES/BarcodeInfoesController.cs

@@ -12,7 +12,7 @@ using AMESCoreStudio.CommonTools.Result;
 namespace AMESCoreStudio.WebApi.Controllers.AMES
 {
     /// <summary>
-    /// 工廠资料维护
+    /// 條碼變更資料表
     /// </summary>
     [Route("api/[controller]")]
     [ApiController]

AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs

@@ -0,0 +1,146 @@
+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>
+    /// 條碼過站資料檔
+    /// </summary>
+    [Route("api/[controller]")]
+    [ApiController]
+    public class BarcodeStationController : ControllerBase
+    {
+        private readonly AMESContext _context;
+
+        public BarcodeStationController(AMESContext context)
+        {
+            _context = context;
+        }
+
+        // GET: api/BarcodeStation
+        [HttpGet]
+        public async Task<ActionResult<IEnumerable<BarcodeStation>>> GetBarcodeStation()
+        {
+            return await _context.BarcodeStation.ToListAsync();
+        }
+
+        // GET: api/BarcodeStation/5
+        [HttpGet("{id}")]
+        public async Task<ActionResult<BarcodeStation>> GetBarcodeStation(decimal id)
+        {
+            var barcodeStation = await _context.BarcodeStation.FindAsync(id);
+
+            if (barcodeStation == null)
+            {
+                return NotFound();
+            }
+
+            return barcodeStation;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="barcodeID">內務條碼ID</param>
+        /// <param name="wipID">工單ID</param>
+        /// <param name="ruleStationID">流程站別ID</param>
+        /// <param name="ruleStatus"></param>
+        /// <returns></returns>
+        // GET: api/BarcodeStation/5
+        [HttpGet("Key")]
+        public async Task<ActionResult<BarcodeStation>> GetBarcodeStationByKey(decimal barcodeID, decimal wipID
+           , decimal ruleStationID, string ruleStatus)
+        {
+            var barcodeStation = await _context.BarcodeStation
+                .Where(w => w.BarcodeID == barcodeID
+                && w.WipID == wipID
+                && w.RuleStationID == ruleStationID
+                && w.RuleStatus == ruleStatus).FirstOrDefaultAsync();
+
+
+            if (barcodeStation == null)
+            {
+                return NotFound();
+            }
+
+            return barcodeStation;
+        }
+
+        // PUT: api/BarcodeStation/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]
+        public async Task<ResultModel<BarcodeStation>> PutBarcodeStation([FromBody]BarcodeStation barcodeStation)
+        {
+            ResultModel<BarcodeStation> result = new ResultModel<BarcodeStation>();
+            _context.Attach(barcodeStation);
+
+            // 指定更新某個欄位
+            _context.Entry(barcodeStation).Property(p => p.LineId).IsModified = true;
+
+            try
+            {
+                await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = "OK";
+            }
+            catch (Exception ex)
+            {
+                result.Success = false;
+                result.Msg = ex.Message;
+            }
+            return result;
+        }
+
+        // POST: api/BarcodeStation
+        // 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<ResultModel<BarcodeStation>> PostBarcodeStation([FromBody] BarcodeStation barcodeStation)
+        {
+            ResultModel<BarcodeStation> result = new ResultModel<BarcodeStation>();
+            _context.BarcodeStation.Add(barcodeStation);
+            try
+            {
+                await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = "OK";
+            }
+            catch (Exception ex)
+            {
+                result.Success = false;
+                result.Msg = ex.Message;
+            }
+            return result;
+        }
+
+        // DELETE: api/BarcodeStation/5
+        [HttpDelete("{id}")]
+        public async Task<ActionResult<BarcodeStation>> DeleteBarcodeStation(decimal id)
+        {
+            var barcodeStation = await _context.BarcodeStation.FindAsync(id);
+            if (barcodeStation == null)
+            {
+                return NotFound();
+            }
+
+            _context.BarcodeStation.Remove(barcodeStation);
+            await _context.SaveChangesAsync();
+
+            return barcodeStation;
+        }
+
+        private bool BarcodeStationExists(decimal id)
+        {
+            return _context.BarcodeStation.Any(e => e.BarcodeID == id);
+        }
+    }
+}

AMESCoreStudio.WebApi/Controllers/AMES/NgInfoeController.cs → AMESCoreStudio.WebApi/Controllers/AMES/NgInfoController.cs

@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using AMESCoreStudio.WebApi;
 using AMESCoreStudio.WebApi.Models.AMES;
+using AMESCoreStudio.CommonTools.Result;
 
 namespace AMESCoreStudio.WebApi.Controllers.AMES
 {
@@ -15,11 +16,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
     /// </summary>
     [Route("api/[controller]")]
     [ApiController]
-    public class NgInfoeController : ControllerBase
+    public class NgInfoController : ControllerBase
     {
         private readonly AMESContext _context;
 
-        public NgInfoeController(AMESContext context)
+        public NgInfoController(AMESContext context)
         {
             _context = context;
         }
@@ -48,59 +49,49 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         // PUT: api/NgInfoe/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}")]
+        [HttpPut]
-        public async Task<IActionResult> PutNgInfo(decimal id, NgInfo ngInfo)
+        public async Task<ResultModel<NgInfo>> PutNgInfo([FromBody] NgInfo ngInfo)
         {
-            if (id != ngInfo.NgID)
+            ResultModel<NgInfo> result = new ResultModel<NgInfo>();
-            {
+            _context.Attach(ngInfo);
-                return BadRequest();
-            }
 
-            _context.Entry(ngInfo).State = EntityState.Modified;
+            // 指定更新某個欄位
+            _context.Entry(ngInfo).Property(p => p.CreateUserID).IsModified = true;
 
             try
             {
                 await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = "OK";
             }
-            catch (DbUpdateConcurrencyException)
+            catch (Exception ex)
             {
-                if (!NgInfoExists(id))
+                result.Success = false;
-                {
+                result.Msg = ex.Message;
-                    return NotFound();
-                }
-                else
-                {
-                    throw;
-                }
             }
-
+            return result;
-            return NoContent();
         }
 
         // POST: api/NgInfoe
         // 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<NgInfo>> PostNgInfo(NgInfo ngInfo)
+        public async Task<ResultModel<NgInfo>> PostNgInfo([FromBody] NgInfo ngInfo)
         {
+            ResultModel<NgInfo> result = new ResultModel<NgInfo>();
             _context.NgInfos.Add(ngInfo);
             try
             {
                 await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = "OK";
             }
-            catch (DbUpdateException)
+            catch (Exception ex)
             {
-                if (NgInfoExists(ngInfo.NgID))
+                result.Success = false;
-                {
+                result.Msg = ex.Message;
-                    return Conflict();
-                }
-                else
-                {
-                    throw;
-                }
             }
-
+            return result;
-            return CreatedAtAction("GetNgInfo", new { id = ngInfo.NgID }, ngInfo);
         }
 
         // DELETE: api/NgInfoe/5

AMESCoreStudio.WebApi/Models/AMES/BarcodeInfo.cs

@@ -85,14 +85,14 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// </summary>
         [Column("SYSTYPE")]
         [DataMember]
-        public string SysType { get; set; }
+        public string SysType { get; set; } = "S";
 
         /// <summary>
         /// 條碼流程狀態
         /// </summary>
         [Column("STATUS_ID")]
         [DataMember]
-        public int StatusID { get; set; }
+        public int StatusID { get; set; } = 1;
 
         /// <summary>
         /// 建立者

AMESCoreStudio.WebApi/Models/AMES/BarcodeStation.cs

@@ -11,38 +11,105 @@ namespace AMESCoreStudio.WebApi.Models.AMES
     /// 條碼過站資料檔
     /// </summary>
     [Table("BARCODE_STATION")]
-
+    [DataContract]
     public partial class BarcodeStation
     {
-        //[Key]
+        /// <summary>
+        /// 內部條碼ID
+        /// </summary>
+        [Key]
         [Column("BARCODE_ID", TypeName = "NUMBER")]
-        public decimal BarcodeId { get; set; }
+        [DataMember]
-        //[Key]
+        [Display(Name = "內部條碼ID")]
+        public decimal BarcodeID { get; set; }
+
+        /// <summary>
+        /// 工單ID
+        /// </summary>
+        [Key]
         [Column("WIP_ID", TypeName = "NUMBER")]
-        public decimal WipId { get; set; }
+        [DataMember]
-        //[Key]
+        [Display(Name = "工單ID")]
+        public decimal WipID { get; set; }
+
+        /// <summary>
+        /// 流程站別ID
+        /// </summary>
+        [Key]
         [Column("RULE_STATION_ID", TypeName = "NUMBER")]
-        public decimal RuleStationId { get; set; }
+        [DataMember]
-        //[Key]
+        [Display(Name = "流程站別ID")]
+        public decimal RuleStationID { get; set; }
+
+        /// <summary>
+        /// 規則狀態值
+        /// </summary>
+        [Key]
         [Column("RULE_STATUS")]
         [StringLength(1)]
+        [DataMember]
+        [Display(Name = "規則狀態值")]
         public string RuleStatus { get; set; }
+
+        /// <summary>
+        /// 投入日期
+        /// </summary>
         [Key]
         [Column("INPUT_DATE", TypeName = "DATE")]
+        [DataMember]
+        [Display(Name = "投入日期")]
         public DateTime InputDate { get; set; }
+
+        /// <summary>
+        /// 系统狀態
+        /// </summary>
         [Required]
         [Column("SYSTYPE")]
         [StringLength(1)]
-        public string Systype { get; set; }
+        [DataMember]
+        [Display(Name = "系统狀態")]
+        public string Systype { get; set; } = "S";
+
+
+        /// <summary>
+        /// 線别ID
+        /// </summary>
         [Column("LINE_ID", TypeName = "NUMBER")]
-        public decimal LineId { get; set; }
+        [DataMember]
+        [Display(Name = "線别ID")]
+        public decimal LineId { get; set; } = -1;
+
+        /// <summary>
+        /// 站别的次數
+        /// </summary>
         [Column("STATION_FLAG", TypeName = "NUMBER")]
-        public decimal? StationFlag { get; set; }
+        [DataMember]
+        [Display(Name = "站别的次數")]
+        public decimal StationFlag { get; set; } = 1;
+
+        /// <summary>
+        /// 過站次數（不限定工單）
+        /// </summary>
         [Column("STATION_TIMES", TypeName = "NUMBER")]
-        public decimal StationTimes { get; set; }
+        [DataMember]
-        [Column("CREATE_USERID", TypeName = "NUMBER")]
+        [Display(Name = "過站次數")]
-        public decimal CreateUserid { get; set; }
+        public decimal StationTimes { get; set; } = 1;
-        [Column("CREATE_DATE", TypeName = "DATE")]
+
-        public DateTime CreateDate { get; set; }
+        /// <summary>
+        /// 建立者
+        /// </summary>
+        [Column("CREATE_USERID")]
+        [DataMember]
+        [Required(ErrorMessage = "{0},不能空白")]
+        [Display(Name = "建立者")]
+        public int CreateUserID { get; set; } = 0;
+
+        /// <summary>
+        /// 建立時間
+        /// </summary>
+        [Column("CREATE_DATE")]
+        [DataMember]
+        [Display(Name = "建立時間")]
+        public DateTime CreateDate { get; set; } = DateTime.Now;
     }
 }

AMESCoreStudio.WebApi/Models/AMESContext.cs

@@ -42,6 +42,7 @@ namespace AMESCoreStudio.WebApi
             modelBuilder.Entity<PartMap>().HasKey(c => new { c.CorpSN });
             modelBuilder.Entity<WipSopLog>().HasKey(c => new { c.WipID, c.WipSopID });
             modelBuilder.Entity<BarcodeWip>().HasKey(c => new { c.WipID, c.BarcodeID });
+            modelBuilder.Entity<BarcodeStation>().HasKey(c => new { c.BarcodeID ,c.WipID, c.RuleStationID ,c.RuleStatus ,c.InputDate });
 
             modelBuilder.Entity<WipRule>().HasKey(c => new { c.WipNO, c.RuleStationID, c.KeyNo });
             modelBuilder.Entity<WipMAC>().HasKey(c => new { c.WipNO, c.StartNO, c.EndNO });
@@ -63,6 +64,7 @@ namespace AMESCoreStudio.WebApi
             modelBuilder.Entity<MACInfo>().HasKey(c => new { c.Class, c.ClassGroup });
 
             modelBuilder.Entity<RoleModule>().HasOne(r => r.Module).WithMany().HasForeignKey(r => r.ModuleID).IsRequired();
+
         }
 
         /// <summary>
@@ -480,6 +482,11 @@ namespace AMESCoreStudio.WebApi
         /// </summary>
         public virtual DbSet<NgInfo> NgInfos { get; set; }
 
+        /// <summary>
+        /// 測試不良基本資料檔
+        /// </summary>
+        public DbSet<AMESCoreStudio.WebApi.Models.AMES.BarcodeStation> BarcodeStation { get; set; }
+
         /// <summary>
         /// 條碼過站資料檔
         /// </summary>