1. AMES_AP Bug修正

2. 過站判斷邏輯修正

AMESCoreStudio.WebApi/Controllers/AMES/BarcodeWipController.cs

@@ -34,15 +34,9 @@ namespace AMESCoreStudio.WebApi.Controllers
 
         // GET: api/BarcodeWip/5
         [HttpGet("{id}/{wipid}")]
-        public async Task<ActionResult<BarcodeWip>> GetBarcodeWipByTwoKey(decimal id, decimal wipid)
+        public async Task<ActionResult<BarcodeWip>> GetBarcodeWipByTwoKey(int id, int wipid)
         {
             var barcodeWip = await _context.BarcodeWips.Where(w => w.BarcodeID == id && w.WipID == wipid).FirstOrDefaultAsync();
-
-            if (barcodeWip == null)
-            {
-                return NotFound();
-            }
-
             return barcodeWip;
         }
 

AMESCoreStudio.WebApi/Controllers/AMES/WipClassController.cs

@@ -0,0 +1,121 @@
+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 WipClassController : ControllerBase
+    {
+        private readonly AMESContext _context;
+
+        public WipClassController(AMESContext context)
+        {
+            _context = context;
+        }
+
+        // GET: api/WipClass
+        [HttpGet]
+        public async Task<ActionResult<IEnumerable<WipClass>>> GetWipClass()
+        {
+            return await _context.WipClass.ToListAsync();
+        }
+
+        // GET: api/WipClass/5
+        [HttpGet("{id}")]
+        public async Task<ActionResult<WipClass>> GetWipClass(int id)
+        {
+            var wipClass = await _context.WipClass.FindAsync(id);
+
+            if (wipClass == null)
+            {
+                return NotFound();
+            }
+
+            return wipClass;
+        }
+
+        /// <summary>
+        /// 更新各班別數量資料檔
+        /// </summary>
+        /// <param name="wipClass"></param>
+        /// <returns></returns>
+        [HttpPut]
+        public async Task<ResultModel<WipClass>> PutWipClass(WipClass wipClass)
+        {
+            ResultModel<WipClass> result = new ResultModel<WipClass>();
+            _context.Entry(wipClass).State = EntityState.Modified;
+            wipClass.UpdateDate = DateTime.Now;
+
+            try
+            {
+                await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = "OK";
+            }
+            catch (Exception ex)
+            {
+                result.Success = false;
+                result.Msg = ex.InnerException.Message;
+
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// 新增各班別數量資料檔
+        /// </summary>
+        /// <param name="wipClass"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<ResultModel<WipClass>> PostWipClass(WipClass wipClass)
+        {
+            ResultModel<WipClass> result = new ResultModel<WipClass>();
+            _context.WipClass.Add(wipClass);
+            try
+            {
+                await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = "OK";
+            }
+            catch (Exception ex)
+            {
+                result.Success = false;
+                result.Msg = ex.InnerException.Message;
+            }
+            return result;
+        }
+
+        // DELETE: api/WipClass/5
+        [HttpDelete("{id}")]
+        public async Task<ActionResult<WipClass>> DeleteWipClass(int id)
+        {
+            var wipClass = await _context.WipClass.FindAsync(id);
+            if (wipClass == null)
+            {
+                return NotFound();
+            }
+
+            _context.WipClass.Remove(wipClass);
+            await _context.SaveChangesAsync();
+
+            return wipClass;
+        }
+
+        private bool WipClassExists(int id)
+        {
+            return _context.WipClass.Any(e => e.WipID == id);
+        }
+    }
+}

AMESCoreStudio.WebApi/Controllers/AMES/WipKpsController.cs

@@ -0,0 +1,113 @@
+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;
+
+namespace AMESCoreStudio.WebApi.Controllers.AMES
+{
+    /// <summary>
+    /// 工單KP資訊資料檔
+    /// </summary>
+    [Route("api/[controller]")]
+    [ApiController]
+    public class WipKpsController : ControllerBase
+    {
+        private readonly AMESContext _context;
+
+        public WipKpsController(AMESContext context)
+        {
+            _context = context;
+        }
+
+        // GET: api/WipKps
+        [HttpGet]
+        public async Task<ActionResult<IEnumerable<WipKp>>> GetWipKps()
+        {
+            return await _context.WipKps.ToListAsync();
+        }
+
+        // GET: api/WipKps/5
+        [HttpGet("{id}")]
+        public async Task<ActionResult<WipKp>> GetWipKp(int id)
+        {
+            var wipKp = await _context.WipKps.FindAsync(id);
+
+            if (wipKp == null)
+            {
+                return NotFound();
+            }
+
+            return wipKp;
+        }
+
+        // PUT: api/WipKps/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> PutWipKp(int id, WipKp wipKp)
+        {
+            if (id != wipKp.WipKpID)
+            {
+                return BadRequest();
+            }
+
+            _context.Entry(wipKp).State = EntityState.Modified;
+
+            try
+            {
+                await _context.SaveChangesAsync();
+            }
+            catch (DbUpdateConcurrencyException)
+            {
+                if (!WipKpExists(id))
+                {
+                    return NotFound();
+                }
+                else
+                {
+                    throw;
+                }
+            }
+
+            return NoContent();
+        }
+
+        // POST: api/WipKps
+        // 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<WipKp>> PostWipKp(WipKp wipKp)
+        {
+            _context.WipKps.Add(wipKp);
+            await _context.SaveChangesAsync();
+
+            return CreatedAtAction("GetWipKp", new { id = wipKp.WipKpID }, wipKp);
+        }
+
+        // DELETE: api/WipKps/5
+        [HttpDelete("{id}")]
+        public async Task<ActionResult<WipKp>> DeleteWipKp(int id)
+        {
+            var wipKp = await _context.WipKps.FindAsync(id);
+            if (wipKp == null)
+            {
+                return NotFound();
+            }
+
+            _context.WipKps.Remove(wipKp);
+            await _context.SaveChangesAsync();
+
+            return wipKp;
+        }
+
+        private bool WipKpExists(int id)
+        {
+            return _context.WipKps.Any(e => e.WipKpID == id);
+        }
+    }
+}

AMESCoreStudio.WebApi/Controllers/AMES/WipTimeController.cs

@@ -0,0 +1,123 @@
+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>
+    /// 工單各站數量資料檔 – By TIME
+    /// </summary>
+    [Route("api/[controller]")]
+    [ApiController]
+    public class WipTimeController : ControllerBase
+    {
+        private readonly AMESContext _context;
+
+        public WipTimeController(AMESContext context)
+        {
+            _context = context;
+        }
+
+        // GET: api/WipTime
+        [HttpGet]
+        public async Task<ActionResult<IEnumerable<WipTime>>> GetWipTimes()
+        {
+            return await _context.WipTimes.ToListAsync();
+        }
+
+        // GET: api/WipTime/5
+        [HttpGet("{id}")]
+        public async Task<ActionResult<WipTime>> GetWipTime(int id)
+        {
+            var wipTime = await _context.WipTimes.FindAsync(id);
+
+            if (wipTime == null)
+            {
+                return NotFound();
+            }
+
+            return wipTime;
+        }
+
+
+        /// <summary>
+        /// 更新工單各站數量資料檔 – By TIME
+        /// </summary>
+        /// <param name="wipTime"></param>
+        /// <returns></returns>
+        [HttpPut]
+        public async Task<ResultModel<WipTime>> PutWipTime(WipTime wipTime)
+        {
+            ResultModel<WipTime> result = new ResultModel<WipTime>();
+            _context.Entry(wipTime).State = EntityState.Modified;
+            wipTime.UpdateDate = DateTime.Now;
+
+            try
+            {
+                await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = "OK";
+            }
+            catch (Exception ex)
+            {
+                result.Success = false;
+                result.Msg = ex.InnerException.Message;
+
+            }
+            return result;
+        }
+
+
+        /// <summary>
+        /// 新增工單各站數量資料檔 – By TIME
+        /// </summary>
+        /// <param name="wipTime"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<ResultModel<WipTime>> PostWipTime(WipTime wipTime)
+        {
+            ResultModel<WipTime> result = new ResultModel<WipTime>();
+            _context.WipTimes.Add(wipTime);
+            try
+            {
+                await _context.SaveChangesAsync();
+                result.Success = true;
+                result.Msg = "OK";
+            }
+            catch (Exception ex)
+            {
+                result.Success = false;
+                result.Msg = ex.InnerException.Message;
+            }
+            return result;
+        }
+
+        // DELETE: api/WipTime/5
+        [HttpDelete("{id}")]
+        public async Task<ActionResult<WipTime>> DeleteWipTime(int id)
+        {
+            var wipTime = await _context.WipTimes.FindAsync(id);
+            if (wipTime == null)
+            {
+                return NotFound();
+            }
+
+            _context.WipTimes.Remove(wipTime);
+            await _context.SaveChangesAsync();
+
+            return wipTime;
+        }
+
+        private bool WipTimeExists(int id)
+        {
+            return _context.WipTimes.Any(e => e.WipID == id);
+        }
+    }
+}

AMESCoreStudio.WebApi/Controllers/BAS/RulesController.cs

@@ -140,7 +140,7 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
         }
 
         /// <summary>
-        /// 根據下一站別IDD查詢
+        /// 根據下一站別ID查詢
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>

AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs

@@ -41,7 +41,6 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         public async Task<ActionResult<ResultModel<string>>> CheckBarCodeCheck([FromBody] BarCodeCheckDto barCodeCheckDto)
         {
             ResultModel<string> resultModel = new ResultModel<string> { Success = false };
-            //resultModel = (ResultModel<string>)await CheckWipNoSationAsync("1", "1", 1, 1);
 
             #region 欄位資料空值判斷
             if (string.IsNullOrWhiteSpace(barCodeCheckDto.wipNo))
@@ -88,18 +87,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             #endregion
 
             #region 宣告參數
-            // 工單ID
-            int wipID = 0;
-            // 內部條碼ID
-            int barCodeID = 0;
-            // 流程ID
-            int flowRule = 0;
-            // 流程站別順序ID
-            int ruleStation = 0;
             // 料號ID
             int itemID = 0;
-            // 作業站順序
-            int stationSEQ = 0;
             // 料號
             string item = string.Empty;
             // 站別測試類別
@@ -111,11 +100,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
 
             // 抓流程ID
             var q_wipinfo = await wipInfosController.GetWipInfoByWipNo(barCodeCheckDto.wipNo);
-            flowRule = q_wipinfo.Value.Where(w => w.UnitNO == barCodeCheckDto.unitNo).FirstOrDefault().FlowRuleID;
+            barCodeCheckDto.flowRule = q_wipinfo.Value.Where(w => w.UnitNO == barCodeCheckDto.unitNo).FirstOrDefault().FlowRuleID;
 
             #region 判斷工單狀態
             resultModel = (ResultModel<string>)await CheckWipNoSationAsync(wipNo: barCodeCheckDto.wipNo, unitNo: barCodeCheckDto.unitNo
-                           , flowRuleID: flowRule, line: barCodeCheckDto.line, station: barCodeCheckDto.station);
+                           , flowRuleID: barCodeCheckDto.flowRule, line: barCodeCheckDto.line, station: barCodeCheckDto.station);
 
             if (!resultModel.Success)
                 return resultModel;
@@ -135,17 +124,16 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 return resultModel;
             #endregion
 
-            wipID = q_wipinfo.Value.Where(w => w.UnitNO == barCodeCheckDto.unitNo).FirstOrDefault().WipID;
+            barCodeCheckDto.wipID = q_wipinfo.Value.Where(w => w.UnitNO == barCodeCheckDto.unitNo).FirstOrDefault().WipID;
-            flowRule = q_wipinfo.Value.Where(w => w.UnitNO == barCodeCheckDto.unitNo).FirstOrDefault().FlowRuleID;
+            barCodeCheckDto.flowRule = q_wipinfo.Value.Where(w => w.UnitNO == barCodeCheckDto.unitNo).FirstOrDefault().FlowRuleID;
-            barCodeID = BarCodeToID(barCodeCheckDto.barcode).Result;
+            barCodeCheckDto.barcodeID = BarCodeToID(barCodeCheckDto.barcode).Result;
             item = q_wipinfo.Value.FirstOrDefault().GetWipAtt.ItemNO;
             itemID = ItemNoToItemID(item).Result;
 
-            var q_rulestation = await ruleStationsController.GetRuleStationByFlow(flowRule, 0, 0);
+            var q_rulestation = await ruleStationsController.GetRuleStationByFlow(barCodeCheckDto.flowRule, 0, 0);
 
             // 抓作業站順序
-            ruleStation = q_rulestation.Value.Where(w => w.StationID == barCodeCheckDto.station).FirstOrDefault().RuleStationID;
+            barCodeCheckDto.ruleStationID = q_rulestation.Value.Where(w => w.StationID == barCodeCheckDto.station).FirstOrDefault().RuleStationID;
-            stationSEQ = q_rulestation.Value.Where(w => w.StationID == barCodeCheckDto.station).FirstOrDefault().Sequence;
             stationTestType = q_rulestation.Value.Where(w => w.StationID == barCodeCheckDto.station).FirstOrDefault().Station.TestType;
 
             // 維修過站 組件需獨立判斷
@@ -161,8 +149,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
 
                 // 用BarCodeID And WipID 取BarCodeItem
 
-                var q_BarCodeItem = await barcodeItemsController.GetBarcodeItemByBarCodeID(barCodeID);
+                var q_BarCodeItem = await barcodeItemsController.GetBarcodeItemByBarCodeID(barCodeCheckDto.barcodeID);
-                q_BarCodeItem = q_BarCodeItem.Value.Where(w => w.WipID == wipID).ToList();
+                q_BarCodeItem = q_BarCodeItem.Value.Where(w => w.WipID == barCodeCheckDto.wipID).ToList();
 
                 foreach (var KPs in barCodeCheckDto.inputItems)
                 {
@@ -272,15 +260,15 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         }
 
                         barCodeItem.PartNo = KPs.inputData;
-                        barCodeItem.RuleStationID = ruleStation;
+                        barCodeItem.RuleStationID = barCodeCheckDto.ruleStationID;
                         barCodeItem.UpdateDate = DateTime.Now;
                         update_BarCodeItem.Add(barCodeItem);
 
                         insert_BarCodeItemChange.Add(new BarcodeItemChange
                         {
-                            WipID = wipID,
+                            WipID = barCodeCheckDto.wipID,
-                            RuleStationID = ruleStation,
+                            RuleStationID = barCodeCheckDto.ruleStationID,
-                            BarcodeID = barCodeID,
+                            BarcodeID = barCodeCheckDto.barcodeID,
                             ItemNo = barCodeItem.ItemNo,
                             PartNoOld = KPs.oldInputData,
                             ChangeType = "RP",
@@ -298,8 +286,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             #region 過站判斷正常 往下處理Table
 
             #region 內部序號輸入後新增 or 更新
-            var barcodeInfo = barcodeInfoesController.GetBarcodeInfoes(barCodeID).Result.Value.FirstOrDefault();
+            var barcodeInfo = barcodeInfoesController.GetBarcodeInfoes(barCodeCheckDto.barcodeID).Result.Value.FirstOrDefault();
-            barcodeInfo.RuleStationID = ruleStation;
+            barcodeInfo.RuleStationID = barCodeCheckDto.ruleStationID;
             barcodeInfo.RuleStatus = "P";
 
 
@@ -309,9 +297,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 // 新增 BarCodeStation
                 BarcodeStation barcodeStation = new BarcodeStation
                 {
-                    BarcodeID = barCodeID,
+                    BarcodeID = barCodeCheckDto.barcodeID,
-                    WipID = wipID,
+                    WipID = barCodeCheckDto.wipID,
-                    RuleStationID = ruleStation,
+                    RuleStationID = barCodeCheckDto.ruleStationID,
                     RuleStatus = "P", //F 不良 
                     InputDate = DateTime.Now,
                     LineId = barCodeCheckDto.line
@@ -332,6 +320,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 {
                     await barcodeItemChangesController.PostBarcodeItemChanges(item_barCodeItemChange);
                 }
+
+                CU_Tables(barCodeCheckDto);
                 #endregion
                 #endregion
             }
@@ -341,6 +331,194 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         }
         #endregion
 
+
+        #region 判斷過站完成新增or更新 Table
+        private void CU_Tables(BarCodeCheckDto barCodeCheckDto)
+        {
+
+        }
+
+        /// <summary>
+        /// BarcodeInfo-條碼資料檔
+        /// </summary>
+        /// <param name="barCodeCheckDto"></param>
+        /// <returns></returns>
+        private async Task<ResultModel<WipInfo>> Table_WipInfo(BarCodeCheckDto barCodeCheckDto)
+        {
+            WipInfosController wipInfosController = new WipInfosController(_context);
+            var wipinfo = wipInfosController.GetWipInfo(barCodeCheckDto.wipID)
+                             .Result.Value.FirstOrDefault();
+
+
+            return await wipInfosController.PutWipinfo(wipinfo);
+        }
+
+        /// <summary>
+        /// BarcodeInfo-條碼資料檔
+        /// </summary>
+        /// <param name="barCodeCheckDto"></param>
+        /// <returns></returns>
+        private async Task<ResultModel<BarcodeInfo>> Table_BarcodeInfo(BarCodeCheckDto barCodeCheckDto)
+        {
+            BarcodeInfoesController barcodeInfoesController = new BarcodeInfoesController(_context);
+            var barcodeInfo = barcodeInfoesController.GetBarcodeInfoes(barCodeCheckDto.barcodeID)
+                             .Result.Value.FirstOrDefault();
+
+            if (barcodeInfo == null)
+            {
+                barcodeInfo = new BarcodeInfo
+                {
+                    BarcodeNo = barCodeCheckDto.barcode,
+                    RuleStationID = barCodeCheckDto.ruleStationID,
+                    LocationID = -1,
+                    WipID = barCodeCheckDto.wipID,
+                    RuleStatus = barCodeCheckDto.ruleStatus,
+                    StatusID = 1,
+                    SysType = "S",
+                    StatusNo = "BTA",
+                };
+                return await barcodeInfoesController.PostBarcodeInfoes(barcodeInfo);
+            }
+            else
+            {
+                barcodeInfo.RuleStationID = barCodeCheckDto.ruleStationID;
+                barcodeInfo.RuleStatus = barCodeCheckDto.ruleStatus;
+                barcodeInfo.StatusNo = "BTA";
+                barcodeInfo.WipID = barCodeCheckDto.wipID;
+
+                return await barcodeInfoesController.PutBarcodeInfoes(barcodeInfo);
+            }
+        }
+
+        /// <summary>
+        /// BarcodeStation-條碼過站資料檔
+        /// </summary>
+        /// <param name="barCodeCheckDto"></param>
+        /// <returns></returns>
+        private async Task<ResultModel<BarcodeStation>> Table_BarcodeStation(BarCodeCheckDto barCodeCheckDto)
+        {
+            BarcodeStationController barcodeStationController = new BarcodeStationController(_context);
+            // 新增 BarCodeStation
+            BarcodeStation barcodeStation = new BarcodeStation
+            {
+                BarcodeID = barCodeCheckDto.barcodeID,
+                WipID = barCodeCheckDto.wipID,
+                RuleStationID = barCodeCheckDto.ruleStationID,
+                RuleStatus = barCodeCheckDto.ruleStatus, //F 不良 
+                InputDate = DateTime.Now,
+                LineId = barCodeCheckDto.line
+            };
+            return await barcodeStationController.PostBarcodeStation(barcodeStation);
+        }
+
+        /// <summary>
+        /// BarcodeWip-檔案用途    條碼工單資料檔
+        /// </summary>
+        /// <param name="barCodeCheckDto"></param>
+        /// <returns></returns>
+        private async Task<ResultModel<BarcodeWip>> Table_BarcodeWip(BarCodeCheckDto barCodeCheckDto)
+        {
+            BarcodeWipController barcodeWipController = new BarcodeWipController(_context);
+
+            var barcodeWip = barcodeWipController.GetBarcodeWipByTwoKey(barCodeCheckDto.barcodeID, barCodeCheckDto.wipID).Result.Value;
+
+            if (barcodeWip == null)
+            {
+                barcodeWip = new BarcodeWip
+                {
+                    BarcodeID = barCodeCheckDto.barcodeID,
+                    WipID = barCodeCheckDto.wipID
+                };
+
+                return await barcodeWipController.PostBarcodeWip(barcodeWip);
+            }
+            else
+            {
+                return await barcodeWipController.PutBarcodeWip(barcodeWip);
+            }
+        }
+
+        /// <summary>
+        /// WipStation
+        /// </summary>
+        /// <returns></returns>
+        private async Task<ResultModel<WipStation>> Table_WipStation(BarCodeCheckDto barCodeCheckDto)
+        {
+            WipStationController wipStationController = new WipStationController(_context);
+
+            var wipStation = new WipStation
+            {
+                WipID = barCodeCheckDto.wipID,
+                RuleStatus = barCodeCheckDto.ruleStatus,
+                RuleStationID = barCodeCheckDto.ruleStationID,
+                FirstCnt = 1,
+                PassCnt = 1,
+            };
+
+            return await wipStationController.PostWipStation(wipStation);
+        }
+
+        /// <summary>
+        /// WipClass-各班別數量資料檔
+        /// </summary>
+        /// <returns></returns>
+        private async Task<ResultModel<WipClass>> Table_WipClass(BarCodeCheckDto barCodeCheckDto)
+        {
+            // 取ClassID 
+            int ClassID = 0;
+            ClassInfoesController classInfoesController = new ClassInfoesController(_context);
+            var classInfo = await classInfoesController.GetClassInfoByUnit(barCodeCheckDto.unitNo);
+            if (classInfo.Value.Count() != 0)
+            {
+                //ClassID = classInfo.Value.Where(w => w.)
+            }
+
+            WipClassController wipClassController = new WipClassController(_context);
+
+            var wipClass = new WipClass
+            {
+                WipID = barCodeCheckDto.wipID,
+                ClassID = ClassID,
+                RuleStatus = barCodeCheckDto.ruleStatus,
+                RuleStationID = barCodeCheckDto.ruleStationID,
+                FirstCnt = 1,
+                PassCnt = 1,
+            };
+
+            return await wipClassController.PostWipClass(wipClass);
+        }
+
+        /// <summary>
+        /// WipTime-工單各站數量資料檔 – By TIME
+        /// </summary>
+        /// <returns></returns>
+        private async Task<ResultModel<WipTime>> Table_WipTime(BarCodeCheckDto barCodeCheckDto)
+        {
+            // SegmentID 
+            int SegmentID = 0;
+            TimeSegmentsController timeSegmentsController = new TimeSegmentsController(_context);
+            var timeSegment = await timeSegmentsController.GetTimeSegment();
+            if (timeSegment.Value.Count() != 0)
+            {
+                //ClassID = classInfo.Value.Where(w => w.)
+            }
+
+            WipTimeController wipTimeController = new WipTimeController(_context);
+
+            var wipTime = new WipTime
+            {
+                WipID = barCodeCheckDto.wipID,
+                SegmentID = SegmentID,
+                RuleStatus = barCodeCheckDto.ruleStatus,
+                RuleStationID = barCodeCheckDto.ruleStationID,
+                FirstCnt = 1,
+                PassCnt = 1,
+            };
+
+            return await wipTimeController.PostWipTime(wipTime);
+        }
+
+        #endregion
         /// <summary>
         /// 判斷工單狀態
         /// </summary>
@@ -1119,11 +1297,15 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             if (rules.Value.Count() != 0)
             {
                 // 反查上一站是否有資料
-                var ruleSationID = rules.Value.Select(s => s.RuleStationID).ToList();
+                var ruleSationID = rules.Value.Select(s => new { s.RuleStationID, s.RuleStatus }).ToList();
-                if (!barCodeStations.Where(w => ruleSationID.Contains(w.RuleStationID)).Any())
+                foreach (var item in ruleSationID)
                 {
-                    resultModel.Msg = "找不到上一個作業站過站紀錄，請確認";
+                    if (!barCodeStations.Where(w => w.RuleStationID == item.RuleStationID 
-                    return resultModel;
+                                               && w.RuleStatus == item.RuleStatus).Any())
+                    {
+                        resultModel.Msg = "找不到上一個作業站過站紀錄，請確認";
+                        return resultModel;
+                    }
                 }
             }
 

AMESCoreStudio.WebApi/DTO/BLL/BarCodeCheckDto.cs

@@ -24,6 +24,12 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         [DataMember]
         public string wipNo { get; set; }
 
+        /// <summary>
+        /// 工單ID
+        /// </summary>
+        [DataMember]
+        public int wipID { get; set; } = 0;
+
         /// <summary>
         /// 內部條碼
         /// </summary>
@@ -31,23 +37,47 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         public string barcode { get; set; }
 
         /// <summary>
-        /// 過站狀態 M:一般 S:維修
+        /// 內部條碼ID
+        /// </summary>
+        [DataMember]
+        public int barcodeID { get; set; } = 0;
+
+        /// <summary>
+        /// 條碼狀態 M:一般 S:維修
         /// </summary>
         [DataMember]
         public string barcodeType { get; set; } = "M";
 
+        /// <summary>
+        /// 條碼過站狀態 P:Pass F:Fail
+        /// </summary>
+        [DataMember]
+        public string ruleStatus { get; set; } = "P";
+
         /// <summary>
         /// 生產單位
         /// </summary>
         [DataMember]
         public string unitNo { get; set; }
 
+        /// <summary>
+        /// 流程ID
+        /// </summary>
+        [DataMember]
+        public int flowRule { get; set; } = 0;
+
         /// <summary>
         /// 作業站
         /// </summary>
         [DataMember]
         public int station { get; set; } = 0;
 
+        /// <summary>
+        /// RuleStationID
+        /// </summary>
+        [DataMember]
+        public int ruleStationID { get; set; } = 0;
+
         /// <summary>
         /// 線別站
         /// </summary>

AMESCoreStudio.WebApi/Models/AMES/WipClass.cs

@@ -0,0 +1,92 @@
+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>
+    /// 各班別數量資料檔
+    /// </summary>
+    [Table("WIP_CLASS", Schema = "JHAMES")]
+    public partial class WipClass
+    {
+        /// <summary>
+        /// 工單ID
+        /// </summary>
+        [Key]
+        [Required]
+        [DataMember]
+        [Column("WIP_ID")]
+        public int WipID { get; set; }
+
+        /// <summary>
+        /// 流程站別ID
+        /// </summary>
+        [Key]
+        [Required]
+        [DataMember]
+        [Column("RULE_STATION_ID")]
+        public int RuleStationID { get; set; }
+
+        /// <summary>
+        /// 過站狀態
+        /// </summary>
+        [Key]
+        [Column("RULE_STATUS")]
+        [DataMember]
+        [StringLength(1)]
+        public string RuleStatus { get; set; }
+
+        /// <summary>
+        /// 班別ID
+        /// </summary>
+        [Key]
+        [DataMember]
+        [Column("CLASS_ID")]
+        public int ClassID { get; set; }
+
+        /// <summary>
+        /// 第一次過站數量
+        /// </summary>
+        [DataMember]
+        [Column("FIRST_CNT")]
+        public int FirstCnt { get; set; } = 0;
+
+        /// <summary>
+        /// 生產數量
+        /// </summary>
+        [DataMember]
+        [Column("PASS_CNT")]
+        public int PassCnt { get; set; } = 0;
+
+        /// <summary>
+        /// 建立UserID
+        /// </summary>
+        [Column("CREATE_USERID")]
+        [Required]
+        [DataMember]
+        public int CreateUserID { get; set; } = 0;
+
+        /// <summary>
+        /// 建立日期
+        /// </summary>
+        [Key]
+        [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/WipKp.cs

@@ -0,0 +1,116 @@
+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>
+    /// 工單KP資訊資料檔
+    /// </summary>
+    [Table("WIP_KP", Schema = "JHAMES")]
+    [Index(nameof(ItemNo), nameof(KpNo), Name = "WIP_KP_AK1", IsUnique = true)]
+    public partial class WipKp
+    {
+        /// <summary>
+        /// 工單KP_ID
+        /// </summary>
+        [Key]
+        [Column("WIP_KP_ID")]
+        [Required]
+        [DataMember]
+        public int WipKpID { get; set; }
+
+        /// <summary>
+        /// 料號
+        /// </summary>
+        [DataMember]
+        [Required]
+        [Column("ITEM_NO")]
+        [StringLength(20)]
+        public string ItemNo { get; set; }
+
+        /// <summary>
+        /// KP料號名稱
+        /// </summary>
+        [DataMember]
+        [Required]
+        [Column("KP_NAME")]
+        [StringLength(25)]
+        public string KpName { get; set; }
+
+        /// <summary>
+        /// KP料號NO
+        /// </summary>
+        [DataMember]
+        [Required]
+        [Column("KP_NO")]
+        [StringLength(25)]
+        public string KpNo { get; set; }
+
+        /// <summary>
+        /// 順序
+        /// </summary>
+        [DataMember]
+        [Column("KP_SEQ")]
+        public int? KpSeq { get; set; }
+
+        /// <summary>
+        /// 前置碼
+        /// </summary>
+        [DataMember]
+        [Column("TITLE")]
+        [StringLength(10)]
+        public string Title { get; set; }
+
+        /// <summary>
+        /// 長度
+        /// </summary>
+        [DataMember]
+        [Column("LENGTH")]
+        public int? Length { get; set; }
+
+        /// <summary>
+        /// 生產單位代號
+        /// </summary>
+        [Required]
+        [DataMember]
+        [Column("UNIT_NO")]
+        [StringLength(4)]
+        public string UnitNo { get; set; }
+
+        /// <summary>
+        /// 建立UserID
+        /// </summary>
+        [Column("CREATE_USERID")]
+        [Required]
+        [DataMember]
+        public int CreateUserID { get; set; } = 0;
+
+        /// <summary>
+        /// 建立日期
+        /// </summary>
+        [Required]
+        [Column("CREATE_DATE")]
+        [DataMember]
+        public DateTime CreateDate { get; set; } = DateTime.Now;
+
+        /// <summary>
+        /// 更新UserID
+        /// </summary>
+        [Column("UPDATE_USERID")]
+        [DataMember]
+        public int UpdateUserID { get; set; } = 0;
+
+        /// <summary>
+        /// 更新日期
+        /// </summary>
+        [Column("UPDATE_DATE")]
+        [DataMember]
+        public DateTime? UpdateDate { get; set; } = DateTime.Now;
+    }
+}

AMESCoreStudio.WebApi/Models/AMES/WipTime.cs

@@ -0,0 +1,96 @@
+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>
+    /// 工單各站數量資料檔 – By TIME
+    /// </summary>
+    [Table("WIP_TIME", Schema = "JHAMES")]
+    public partial class WipTime
+    {
+        /// <summary>
+        /// 工單ID
+        /// </summary>
+        [Key]
+        [Required]
+        [DataMember]
+        [Column("WIP_ID")]
+        public int WipID { get; set; }
+
+        /// <summary>
+        /// 流程站別ID
+        /// </summary>
+        [Key]
+        [Required]
+        [DataMember]
+        [Column("RULE_STATION_ID")]
+        public int RuleStationID { get; set; }
+
+        /// <summary>
+        /// 過站狀態
+        /// </summary>
+        [Key]
+        [Required]
+        [DataMember]
+        [Column("RULE_STATUS")]
+        [StringLength(1)]
+        public string RuleStatus { get; set; }
+
+        /// <summary>
+        /// 時段
+        /// </summary>
+        [Key]
+        [Required]
+        [DataMember]
+        [Column("SEGMENT_ID")]
+        public int SegmentID { get; set; }
+
+        /// <summary>
+        /// 第一次過站數量
+        /// </summary>
+        [Required]
+        [DataMember]
+        [Column("FIRST_CNT")]
+        public int FirstCnt { get; set; }
+
+        /// <summary>
+        /// 生產過站數量
+        /// </summary>
+        [Required]
+        [DataMember]
+        [Column("PASS_CNT")]
+        public int PassCnt { get; set; }
+
+        /// <summary>
+        /// 建立UserID
+        /// </summary>
+        [Column("CREATE_USERID")]
+        [Required]
+        [DataMember]
+        public int CreateUserID { get; set; } = 0;
+
+        /// <summary>
+        /// 建立日期
+        /// </summary>
+        [Key]
+        [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/AMESContext.cs

@@ -94,9 +94,9 @@ namespace AMESCoreStudio.WebApi
             //modelBuilder.Entity<NgInfo>().HasOne(r => r.User).WithMany().HasForeignKey(r => r.OperatorID).IsRequired();
 
             modelBuilder.Entity<WipStation>().HasKey(c => new { c.WipID, c.RuleStationID, c.RuleStatus, c.CreateDate});
-            
+            modelBuilder.Entity<WipClass>().HasKey(c => new { c.WipID, c.RuleStationID, c.RuleStatus, c.ClassID, c.CreateDate });
-            
+            modelBuilder.Entity<WipTime>().HasKey(c => new { c.WipID, c.RuleStationID, c.RuleStatus, c.SegmentID, c.CreateDate });
-            
+
             modelBuilder.Entity<InspectionResultBlob>().HasKey(c => new { c.InspectionItemID, c.InspectionID,c.CreateDate });
 
 
@@ -677,6 +677,20 @@ namespace AMESCoreStudio.WebApi
         /// </summary>
         public virtual DbSet<InspectionResultBlob> InspectionResultBlobs { get; set; }
 
+        /// <summary>
+        /// 各班別數量資料檔
+        /// </summary>
+        public virtual DbSet<WipClass> WipClass { get; set; }
+
+        /// <summary>
+        /// 工單各站數量資料檔 – By TIME
+        /// </summary>
+        public virtual DbSet<WipTime> WipTimes { get; set; }
+
+        /// <summary>
+        /// 工單KP資訊資料檔
+        /// </summary>
+        public virtual DbSet<WipKp> WipKps { get; set; }
 
     }
 

AMES程式測試回報(2022-02-12).docx

@@ -0,0 +1,29 @@
+                         AMES專案系統測試報告
+
+測試日期：2022-2-14
+測試版本：AMES 1.0.0
+測試人員：B.B. Wang
+
+測試記錄：
+ 過站時，Table要寫入以下幾個
+
+ 生產序號在測試戰被判Fail，但是下一站卻可以刷Pass過站
+
+
+ 包裝過站，包裝過站的資料，沒有寫入barcode_station
+ 入庫單作業，選擇那些生產序號時，選中的資料移轉時會出錯
+
+
+
+ 包裝裝箱時，出貨序號有綁起訖值？
+
+ 入庫作業時，入庫過的，做過FQC的生產序號，也會跟著跑出來
+WO0002A10001、WO0002A10003已於上一次產生過一張入庫單
+
+ 一張入庫單，有二箱在該入庫單內，但資料只會顯示一筆箱號，資料庫內茶數量是2箱(MASTER)，但DETAIL內只有一箱紀錄
+
+
+ TTT
+
+------------------------------------------------紀錄截止線------------------------------------------------
+

其他專案資料/AMES_AP/AMES_AP/InHouse.cs

@@ -73,6 +73,26 @@ namespace AMES_AP
             var barcodeInfos = JsonConvert.DeserializeObject<List<BarcodeInfo>>(query_extraNo);
 
             // 抓入庫單未批退的包裝箱號
+            var query_InhouseMaster = ApiHelper.GetMethod($"api/FqcInhouseMaster/ByWipNo/{WipNo.Text}");
+            if (query_InhouseMaster == "error" || query_InhouseMaster == "無法連線WebAPI")
+            {
+                MessageBox.Show(query_extraNo);
+                return;
+            }
+            var InhouseMaster = JsonConvert.DeserializeObject<List<FqcInhouseMaster>>(query_InhouseMaster);
+
+            foreach (var item in InhouseMaster.Where(w => w.Status != "R"))
+            {
+                var query_InhouseDetail = ApiHelper.GetMethod($"api/FqcInhouseDetail/{item.InhouseNo}/{item.SeqID}");
+                if (!string.IsNullOrWhiteSpace(query_InhouseDetail))
+                {
+                    var InhouseDetail = JsonConvert.DeserializeObject<List<FqcInhouseDetail>>(query_InhouseDetail);
+
+                    // 將不是批退的包裝箱號排除
+                    barcodeInfos = barcodeInfos.Where(w => !InhouseDetail.Select(s => s.SerialNo).Contains(w.BoxNo)).ToList();
+                }
+            }
+
 
             //建立個矩形，等下計算 CheckBox 嵌入 GridView 的位置
             Rectangle rect = dataGridView1.GetCellDisplayRectangle(0, -1, true);
@@ -118,10 +138,11 @@ namespace AMES_AP
                         ExtraBarcodeNo = ExtraBarcodeNo
                     });
 
-                    DataLeft.RemoveAll(w => w.BarcodeNo == BarcodeNo);
+                    
                 }
             }
-
+            var RemoveBarCode = DataRight.Select(s => s.BarcodeNo).ToList();
+            DataLeft.RemoveAll(w => RemoveBarCode.Contains(w.BarcodeNo));
             GetDataGridView();
         }
 
@@ -142,11 +163,10 @@ namespace AMES_AP
                         BarcodeNo = BarcodeNo,
                         ExtraBarcodeNo = ExtraBarcodeNo
                     });
-
-                    DataRight.RemoveAll(w => w.BarcodeNo == BarcodeNo);
                 }
             }
-
+            var RemoveBarCode = DataLeft.Select(s => s.BarcodeNo).ToList();
+            DataRight.RemoveAll(w => RemoveBarCode.Contains(w.BarcodeNo));
             GetDataGridView();
         }
 

其他專案資料/AMES_AP/AMES_AP/Models/BarCodeCheckDto.cs

@@ -0,0 +1,135 @@
+using System;
+using System.Collections.Generic;
+
+
+namespace AMES_AP.Models
+{
+    /// <summary>
+    /// (過站資料)BarCodeCheck Dto
+    /// </summary>
+
+    public class BarCodeCheckDto
+    {
+        public BarCodeCheckDto()
+        {
+            inputItems = new List<inputItem>();
+            outfits = new List<Outfit>();
+        }
+
+        /// <summary>
+        /// 工單號碼
+        /// </summary>
+
+        public string wipNo { get; set; }
+
+        /// <summary>
+        /// 工單ID
+        /// </summary>
+
+        public int wipID { get; set; } = 0;
+
+        /// <summary>
+        /// 內部條碼
+        /// </summary>
+
+        public string barcode { get; set; }
+
+        /// <summary>
+        /// 內部條碼ID
+        /// </summary>
+
+        public int barcodeID { get; set; } = 0;
+
+        /// <summary>
+        /// 條碼狀態 M:一般 S:維修
+        /// </summary>
+
+        public string barcodeType { get; set; } = "M";
+
+        /// <summary>
+        /// 條碼過站狀態 P:Pass F:Fail
+        /// </summary>
+
+        public string ruleStatus { get; set; } = "P";
+
+        /// <summary>
+        /// 生產單位
+        /// </summary>
+
+        public string unitNo { get; set; }
+
+        /// <summary>
+        /// 流程ID
+        /// </summary>
+
+        public int flowRule { get; set; } = 0;
+
+        /// <summary>
+        /// 作業站
+        /// </summary>
+
+        public int station { get; set; } = 0;
+
+        /// <summary>
+        /// RuleStationID
+        /// </summary>
+
+        public int ruleStationID { get; set; } = 0;
+
+        /// <summary>
+        /// 線別站
+        /// </summary>
+
+        public int line { get; set; } = 0;
+
+        /// <summary>
+        /// 紀錄組件或不良代碼
+        /// </summary>
+
+        public List<inputItem> inputItems { get; set; }
+
+        /// <summary>
+        /// 治具條碼
+        /// </summary>
+
+        public List<Outfit> outfits { get; set; }
+
+
+        /// <summary>
+        /// 紀錄組件或不良代碼
+        /// </summary>
+        
+        public class inputItem
+        {
+            /// <summary>
+            /// 刷入類型 NG or KP(Item_No)
+            /// </summary>
+
+            public string inputType { get; set; }
+
+            /// <summary>
+            /// 刷入組件資料或不良代碼
+            /// </summary>
+
+            public string inputData { get; set; }
+
+            /// <summary>
+            /// 組件:舊組件序號
+            /// </summary>
+
+            public string oldInputData { get; set; }
+        }
+
+        /// <summary>
+        /// 治具條碼
+        /// </summary>
+        public class Outfit
+        {
+            /// <summary>
+            /// 刷入治具條碼
+            /// </summary>
+
+            public string inputData { get; set; }
+        }
+    }
+}

其他專案資料/AMES_AP/AMES_AP/Models/ResultModel.cs

@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+
+namespace AMES_AP.Models
+{
+    /// <summary>
+    /// 返回成功模型
+    /// </summary>
+    public class ResultModel 
+    {
+        public bool Success { get; set; }
+
+        public string Msg { get; set; }
+
+        public int Status { get; set; }
+
+        /// <summary>
+        /// 資料筆數
+        /// </summary>
+        public int DataTotal { get; set; } = 0;
+
+        public IEnumerable<string> Data { get; set; }
+
+    }
+}

其他專案資料/AMES_AP/AMES_AP/StockControlForm.cs

@@ -33,7 +33,7 @@ namespace AMES_AP
             comboBox1.DisplayMember = "Value";
             comboBox1.ValueMember = "Key";
 
-            materialCheckedListBox1.Items.Add("CE",false);
+            materialCheckedListBox1.Items.Add("CE", false);
             materialCheckedListBox1.Items.Add("FCC", false);
             materialCheckedListBox1.Items.Add("ROHS", false);
             materialCheckedListBox1.Items.Add("UL", false);
@@ -189,7 +189,7 @@ namespace AMES_AP
 
                 var barcodeInfos = JsonConvert.DeserializeObject<List<BarcodeInfo>>(query_barCode).FirstOrDefault();
 
-                if(barcodeInfos == null)
+                if (barcodeInfos == null)
                 {
                     MessageBox.Show($"找不到內部序號【{BarCodeNo.Text}】");
                     return;
@@ -207,6 +207,8 @@ namespace AMES_AP
                     return;
                 }
 
+                //BarCodeCheck();
+                //return;
                 barcodeInfos.BoxNo = NowBoxNo.Text;
 
                 var result = ApiHelper.PutMethod("api/BarcodeInfoes", JsonConvert.SerializeObject(barcodeInfos));
@@ -398,5 +400,22 @@ namespace AMES_AP
             GetBoxData();
         }
 
+        private void BarCodeCheck()
+        {
+            var x = new BarCodeCheckDto
+            {
+                wipNo = txtWipNo.Text,
+                barcode = BarCodeNo.Text,
+                barcodeType = "M",
+                station = int.Parse(StationSelect.SelectedValue.ToString()),
+                line = int.Parse(LineSelect.SelectedValue.ToString()),
+                unitNo = UnitSelect.SelectedValue.ToString()
+            };
+
+            var result = ApiHelper.PostMethod("api/BarCodeCheck/PassIngByCheck", JsonConvert.SerializeObject(x));
+
+            var aa = JsonConvert.DeserializeObject<ResultModel>(result);
+        }
+
     }
 }