1. 部分更新

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -1085,8 +1085,8 @@ namespace AMESCoreStudio.Web.Controllers
 
                 var q1 = await _pcsApi.GetWipSopQuery(itemNo: model.wipAtt.ItemNO);
                 model.wipSop = q1.Data;
-                var q2 = await _pcsApi.GetMaterialKpQuery(itemno: model.wipAtt.ItemNO);
+
-                model.materialKp = q2.Data;
+                model.materialKp = await _pcsApi.GetMaterialKpQuery(itemno: model.wipAtt.ItemNO);
 
                 model.wipBoard = await _pcsApi.GetWipBoard(model.wipInfo.WipNO);
 
@@ -1232,11 +1232,11 @@ namespace AMESCoreStudio.Web.Controllers
         public async Task<JsonResult> MaterialKpQueryAsync(string itemno = null, string station = null)
         {
 
-            IResultModel<MaterialKpDto> result = await _pcsApi.GetMaterialKpQuery(itemno: itemno, station: station);
+            IEnumerable<MaterialKpDto> result = await _pcsApi.GetMaterialKpQuery(itemno: itemno, station: station);
 
-            if (result.Data.Count() != 0)
+            if (result.Count() != 0)
             {
-                return Json(new Table() { code = 0, msg = "", data = result.Data, count = 0 });
+                return Json(new Table() { code = 0, msg = "", data = result, count = result.Count() });
             }
             return Json(new Table() { count = 0, data = null });
         }
@@ -1496,8 +1496,6 @@ namespace AMESCoreStudio.Web.Controllers
         [HttpGet]
         public async Task<IActionResult> PCS012()
         {
-
-
             await GetStations();
             GetLockReasonType();
             GetLockType();
@@ -1536,9 +1534,58 @@ namespace AMESCoreStudio.Web.Controllers
         [HttpGet]
         public async Task<IActionResult> PCS021()
         {
+            var model = new PCS021ViewModel();
             await GetFactoryUnit();
             await GetLineInfo();
-            return View();
+            return View(model);
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> PCS021_GetWip(PCS021ViewModel model)
+        {
+            await GetFactoryUnit();
+            await GetLineInfo();
+            model.WipInfo.WipNO = "WO0001A1";
+            var q = await _pcsApi.GetWipInfoByWipNO(model.WipInfo.WipNO);
+            if (q.Count() != 0)
+            { 
+                model.WipInfo = q.Where(w => w.UnitNO == model.WipInfo.UnitNO).FirstOrDefault();
+                model.wipAtt = await _pcsApi.GetWipAtt(model.WipInfo.WipNO);
+                model.WipSopLog = await _pcsApi.GetWipSopLog(model.WipInfo.WipID);
+                model.wipSop = await _pcsApi.GetWipSop(model.WipSopLog.WipSopID);
+                model.materialKpDto = await _pcsApi.GetMaterialKpQuery(model.wipAtt.ItemNO, model.WipInfo.UnitNO);
+            }
+            //var a = _pcsApi.GetWipInfoByWipNO()
+            //try
+            //{
+            //    int num1 = Convert.ToInt32(HttpContext.Request.Form["Text1"].ToString());
+            //    int num2 = Convert.ToInt32(HttpContext.Request.Form["Text2"].ToString());
+            //    ViewBag.Result = (num1 + num2).ToString();
+            //}
+            //catch (Exception)
+            //{
+            //    ViewBag.Result = "Wrong Input Provided.";
+            //}
+            return View("PCS021",model);
+        }
+
+        [HttpPost]
+        public async Task<IActionResult> PCS021_Input(int inputtxt)
+        {
+            await GetFactoryUnit();
+            await GetLineInfo();
+            //model.WipInfo.WipNO = "WO0001A1";
+            //var q = await _pcsApi.GetWipInfoByWipNO(model.WipInfo.WipNO);
+            //if (q.Count() != 0)
+            //{
+            //    model.WipInfo = q.Where(w => w.UnitNO == model.WipInfo.UnitNO).FirstOrDefault();
+            //    model.wipAtt = await _pcsApi.GetWipAtt(model.WipInfo.WipNO);
+            //    model.WipSopLog = await _pcsApi.GetWipSopLog(model.WipInfo.WipID);
+            //    model.wipSop = await _pcsApi.GetWipSop(model.WipSopLog.WipSopID);
+            //    model.materialKpDto = await _pcsApi.GetMaterialKpQuery(model.wipAtt.ItemNO, model.WipInfo.UnitNO);
+            //}
+
+            return View("PCS021");
         }
         #endregion
 

AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@@ -301,7 +301,7 @@ namespace AMESCoreStudio.Web
         /// <param name="itemno">料號</param>
         /// <param name="station">站別</param>
         [WebApiClient.Attributes.HttpGet("api/MaterialKp/GetMaterialKpQuery")]
-        ITask<ResultModel<MaterialKpDto>> GetMaterialKpQuery(string itemno = null, string station = null);
+        ITask<List<MaterialKpDto>> GetMaterialKpQuery(string itemno = null, string station = null);
         #endregion
 
         #region SOP文件維護
@@ -309,8 +309,9 @@ namespace AMESCoreStudio.Web
         /// SOP文件查詢
         /// </summary>
         /// <returns></returns>
-        [WebApiClient.Attributes.HttpGet("api/WipSop")]
+        [WebApiClient.Attributes.HttpGet("api/WipSop/{id}")]
-        ITask<List<WipSop>> GetWipSop();
+        ITask<WipSop> GetWipSop(int id);
+
 
         /// <summary>
         /// 製程工單鎖定查詢 Query
@@ -346,6 +347,14 @@ namespace AMESCoreStudio.Web
         #endregion
 
         #region WipSopLog 工單對應SOP log
+        /// <summary>
+        /// 查詢工單對應SOP log
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/WipSopLog/{id}")]
+        ITask<WipSopLog> GetWipSopLog(int id);
+
         /// <summary>
         /// 新增工單對應SOP log
         /// </summary>

AMESCoreStudio.Web/ViewModels/PCS/PCS021ViewModel.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using AMESCoreStudio.WebApi.Models.AMES;
+using AMESCoreStudio.WebApi.Models.BAS;
+using AMESCoreStudio.WebApi.DTO.AMES;
+
+namespace AMESCoreStudio.Web.ViewModels.PCS
+{
+    public class PCS021ViewModel
+    {
+
+        public WipInfo WipInfo { get; set; }
+
+        public WipAtt wipAtt { get; set; }
+
+        public WipSop wipSop { get; set; }
+
+        public WipSopLog WipSopLog {get;set;}
+        
+        public IEnumerable<MaterialKpDto> materialKpDto { get; set; }
+
+
+
+        public IEnumerable<WipBarcode> WipBarcodes { get; set; }
+
+        public IEnumerable<RuleStation> RuleStation { get; set; }
+    }
+}

AMESCoreStudio.Web/Views/PCS/PCS021.cshtml

@@ -1,4 +1,5 @@
-@{
+@model AMESCoreStudio.Web.ViewModels.PCS.PCS021ViewModel
+@{
     ViewData["Title"] = "過站作業";
     Layout = "~/Views/Shared/_AMESLayout.cshtml";
 }
@@ -46,7 +47,7 @@
             </div>
         </div>
     </div>
-    <form enctype="multipart/form-data" method="post" asp-action="PCS004Save" class="layui-form">
+    <form enctype="multipart/form-data" method="post" asp-action="PCS021" class="layui-form">
         <div asp-validation-summary="ModelOnly" class="text-danger"></div>
         <div class="layui-card-body">
             <div class="layui-row">
@@ -63,7 +64,7 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label">製程：</label>
                                             <div class="layui-input-inline" style="width:100px">
-                                                <select id="unit" lay-filter="unit" lay-verify="required" style="width:100px" lay-submit asp-items="@ViewBag.FactoryUnitList">
+                                                <select id="unit" lay-filter="unit" lay-verify="required" asp-for="WipInfo.UnitNO" style="width:100px" lay-submit asp-items="@ViewBag.FactoryUnitList">
                                                 </select>
                                             </div>
                                             <input id="unitNo" type="hidden" name="unitNo" value="0" />
@@ -88,7 +89,8 @@
                                             <input id="stationsId" type="hidden" name="stationsId" value="0" />
                                             <label class="layui-form-label">工單號碼：</label>
                                             <div class="layui-input-inline" style="width:100px">
-                                                <input class="layui-input" autocomplete="off" />
+                                                <input type="text" onkeydown="SearchNo(event);" asp-for="WipInfo.WipNO" asp-action="PCS021_GetWip" class="layui-input" autocomplete="off" />
+                                                <input type="submit" id="GetWipData" asp-action="PCS021_GetWip" style="display:none;" />
                                             </div>
                                         </div>
                                     </div>
@@ -106,29 +108,82 @@
                                             <label class="layui-form-label" style="width:150px;text-align:left">1/100</label>
                                         </div>
                                     </div>
-                                    <fieldset class="layui-elem-field layui-field-title" >
+                                    <fieldset class="layui-elem-field layui-field-title">
                                         <legend style="color: #e18917">刷讀條碼</legend>
                                     </fieldset>
                                     <div class="layui-form-item">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">刷讀條碼：</label>
                                             <div class="layui-input-inline">
-                                                <input class="layui-input" autocomplete="off" />
+                                                <input type="text" onkeydown="input(event);" id="inpputtxt" class="layui-input" autocomplete="off" />
+                                                <input type="submit" id="GetWipData" asp-action="PCS021_input" style="display:none;" />
                                             </div>
                                         </div>
                                     </div>
                                 </div>
-                                <fieldset class="layui-elem-field layui-field-title" >
+                                <fieldset class="layui-elem-field layui-field-title">
                                     <legend style="color: #e18917">檢查項目</legend>
                                 </fieldset>
                                 <div class="layui-col-md12">
                                     <div class="layui-form-item">
-                                        <div class="layui-inline">
+                                        @if (Model.materialKpDto != null)
-                                            <label class="layui-form-label">作業項目：</label>
+                                        {
-                                            <div class="layui-input-inline">
+                                            <table id="MydataTable" class="layui-table">
-                                                <input class="layui-input" autocomplete="off" />
+                                                <thead>
-                                            </div>
+                                                    <tr>
-                                        </div>
+                                                        <th>
+                                                            料號
+                                                        </th>
+                                                        <th>
+                                                            KP料號名稱
+                                                        </th>
+                                                        <th>
+                                                            KP料號NO
+                                                        </th>
+                                                        <th>
+                                                            順序
+                                                        </th>
+                                                        <th>
+                                                            前置碼
+                                                        </th>
+                                                        <th>
+                                                            長度
+                                                        </th>
+                                                        <th>
+                                                            站(前段)
+                                                        </th>
+                                                    </tr>
+                                                </thead>
+                                                <tbody>
+                                                    @foreach (var index in Model.materialKpDto)
+                                                    {
+                                                        <tr>
+                                                            <td>
+                                                                @index.ItemName
+                                                            </td>
+                                                            <td>
+                                                                @index.KpName
+                                                            </td>
+                                                            <td>
+                                                                @index.KpNo
+                                                            </td>
+                                                            <td>
+                                                                @index.KpSeq
+                                                            </td>
+                                                            <td>
+                                                                @index.Title
+                                                            </td>
+                                                            <td>
+                                                                @index.Length
+                                                            </td>
+                                                            <td>
+                                                                @index.Station
+                                                            </td>
+                                                        </tr>
+                                                    }
+                                                </tbody>
+                                            </table>
+                                        }
                                     </div>
                                 </div>
                             </div>
@@ -137,7 +192,7 @@
                     </div>
                 </div>
                 <div class="layui-col-md8 element" style="height:100%">
-                    <iframe src="../PDF/33.pdf" frameborder="0" style="height:100%;width:100%"></iframe>
+                    <iframe frameborder="0" style="height:100%;width:100%" src=@if (Model.wipSop != null){ @(Model.wipSop.FilePath)@(Model.wipSop.NewName);}></iframe>
                 </div>
             </div>
         </div>
@@ -204,6 +259,26 @@
                 });
         };
 
+        function SearchNo(e) {
+            alert(e.data);
+            if (e.keyCode == 13) {
+                $("#GetWipData").click();
+            }
+        };
+
+        function input(e) {
+            if (e.keyCode == 13) {
+                $.ajax({
+                url: "@Url.Action("PCS021_Input", "PCS")",
+                type:"POST",
+                    data: { "inputtxt": $("#inpputtxt").val() },
+                success: function (data) {
+                    $("#txtNamaPetugas").html(data);
+                }
+            });
+            }
+        };
+
         layui.use(['form', 'layer'], function () {
             form = layui.form;
 
@@ -219,17 +294,5 @@
             });
         });
 
-        $('#GetBarCode').click(function () {
-            layui.use('layer', function () {
-                var layer = layui.layer;
-                layer.open({
-                    type: 2,
-                    area: ['1000px', '750px'],
-                    fixed: false, //不固定
-                    maxmin: true,
-                    content: 'PDF/33.pdf'
-                });
-            });
-        });
     </script>
 }

AMESCoreStudio.Web/Views/PCS/PCS030C.cshtml

@@ -41,8 +41,8 @@
                     <label asp-for="FileName" class="layui-form-label"></label>
 
                     <label class="layui-btn">
-                        <input type="file" name="formFile" style="display:none;">
+                        <input type="file" name="formFile" >
-                        <i class="layui-icon">&#xe67c;</i>上傳文件
+                        @*<i class="layui-icon">&#xe67c;</i>上傳文件*@
                     </label>
                 </div>
             </div>

AMESCoreStudio.Web/Views/Shared/PCS/_SOPPartial.cshtml

@@ -1,10 +1,21 @@
-@{
+@model AMESCoreStudio.Web.ViewModels.PCS.PCS021ViewModel
+@{
     //ViewData["Title"] = "製程工單鎖定查詢";
     Layout = "~/Views/Shared/_AMESLayout.cshtml";
 }
 <div class="layui-card">
-    <div class="layui-card-body">
+    <div>
-        <table class="layui-hide" id="test" lay-filter="test"></table>
+        <hr />
+        <dl class="dl-horizontal">
+            <dt>編號</dt>
+            <dd>@Model.wipSop.NewName</dd>
+            <dt>屬性</dt>
+            <dd>
+                @Model.wipSop.NewName
+            </dd>
+            <dt>名稱</dt>
+            <dd>@Model.wipSop.NewName</dd>
+        </dl>
     </div>
 </div>
 
@@ -14,101 +25,5 @@
             var layer = layui.layer, table = layui.table;
         });
 
-        //监听表单提交事件
-        hg.form.onsubmit('querysubmit', function (data) {
-            table && table.reload(data);
-        });
-        var tableCols = [[
-            {
-                field: 'factoryID',
-                width: 160,
-                title: '工廠編號',
-                sort: true
-            },
-            {
-                field: 'factoryNo',
-                width: 200,
-                title: '工廠代碼'
-            },
-            {
-                field: 'factoryNameCh',
-                minWidth: 200,
-                title: '中文名稱'
-            },
-            {
-                field: 'factoryNameEn',
-                title: '英文名稱',
-                width: 160
-            },
-            {
-                field: 'telNo',
-                title: '電話',
-                width: 160
-            },
-            {
-                field: 'center',
-                width: 160,
-                title: '操作',
-                templet: function (d) {
-                    var btn = '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a>';
-                    if (d.statusNo == "A")
-                        btn += ' <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" lay-event="del">停用</a>';
-                    else
-                        btn += ' <a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="del">啟用</a>';
-                    return btn
-                    //return '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a> <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" lay-event="del">删除</a>'
-                }
-            }]
-        ];
-
-        //通过行tool编辑，lay-event="edit"
-        function edit(obj) {
-            if (obj.data.factoryID) {
-                hg.open('修改工廠資料', '/BAS/BAS001U/' + obj.data.factoryID, 480, 480);
-            }
-        }
-
-        //通过行tool删除，lay-event="del"
-        function del(obj) {
-            var str;
-            if (obj.data.statusNo == "A")
-                str = "停用";
-            else
-                str = "啟用";
-            if (obj.data.factoryID) {
-                hg.confirm("系統：" + obj.data.factoryNameCh + "，確定要" + str + "嗎？", function () {
-                    $.ajax({
-                        url: '/BAS/BAS001D',
-                        data: { id: obj.data.factoryID },
-                        type: 'POST',
-                        success: function (data) {
-                            if (data.success) {
-                                //obj.del(); //只删本地数据
-                                hg.msghide(str + "成功！");
-                                table && table.reload(data);
-                            }
-                            else {
-                                hg.msg(data.msg);
-                            }
-                        },
-                        error: function () {
-                            hg.msg("网络请求失败！");
-                        }
-                    });
-                });
-            }
-        }
-        var toolbar = [{
-            text: '新增',
-            layuiicon: '&#xe608;',
-            class: 'layui-btn-normal',
-            handler: function () {
-                hg.open('新增工廠', '/BAS/BAS001C', 480, 480);
-
-            }
-        }
-        ];
-        //基本数据表格
-        var table = hg.table.datatable('test', '工廠資料維護', '/BAS/GetFactoryInfoes', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
     </script>
 }

AMESCoreStudio.WebApi/Controllers/AMES/MaterialKpController.cs

@@ -67,7 +67,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         /// <returns></returns>
         [Route("[action]")]
         [HttpGet]
-        public async Task<ResultModel<MaterialKpDto>> GetMaterialKpQuery(string itemno, string station)
+        public async Task<ActionResult<IEnumerable<MaterialKpDto>>> GetMaterialKpQuery(string itemno, string station)
         {
             IQueryable<MaterialKp> q = _context.MaterialKps;
 
@@ -77,9 +77,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             if (!string.IsNullOrWhiteSpace(station))
                 q = q.Where(w => w.StationType == station);
 
-
+            var materialKpDtos = await q.Select(s => new MaterialKpDto
-            ResultModel<MaterialKpDto> result = new ResultModel<MaterialKpDto>();
-            result.Data = await q.Select(s => new MaterialKpDto
             {
               ItemName = s.MaterialItem.ItemNo,
               KpName = s.KpName,
@@ -91,7 +89,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
               Title = s.Title
             }).ToListAsync();
 
-            return result;
+            return materialKpDtos;
         }
 
         /// <summary>

AMESCoreStudio.WebApi/Controllers/AMES/WipSopController.cs

@@ -28,7 +28,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         }
 
         /// <summary>
-        /// 工單投產纪錄資料文件
+        /// SOPFile資料查詢
         /// </summary>
         /// <returns></returns>
         [HttpGet]
@@ -40,6 +40,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return wipSop;
         }
 
+        /// <summary>
+        /// SOPFile資料查詢 by ID
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
         [HttpGet("{id}")]
         public async Task<ActionResult<WipSop>> GetWipSop(int id)
         {
@@ -47,10 +52,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
 
             var wipSop = await q.Where(p => p.WipSopID == id).FirstOrDefaultAsync();
 
-            if (wipSop == null)
+            //if (wipSop == null)
-            {
+            //{
-                return NotFound();
+            //    return NotFound();
-            }
+            //}
 
             return wipSop;
         }

AMESCoreStudio.WebApi/Controllers/AMES/WipSopLogController.cs

@@ -47,10 +47,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
 
             var WipSopLog = await q.Where(p => p.WipID == id).FirstOrDefaultAsync();
 
-            if (WipSopLog == null)
+            //if (WipSopLog == null)
-            {
+            //{
-                return NotFound();
+            //    return NotFound();
-            }
+            //}
 
             return WipSopLog;
         }

AMESCoreStudio.WebApi/Models/AMES/MaterialItem.cs

@@ -67,7 +67,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// <summary>
         /// 更新者ID
         /// </summary>
-        [Column("UPDATE_USERID", TypeName = "NUMBER")]
+        [Column("UPDATE_USERID")]
         [DataMember]
         public int UpdateUserID { get; set; } = 0;
 

AMESCoreStudio.WebApi/Models/AMES/MaterialKp.cs

@@ -53,7 +53,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// <summary>
         /// 順序
         /// </summary>
-        [Column("KP_SEQ", TypeName = "NUMBER")]
+        [Column("KP_SEQ")]
         [Display(Name = "順序")]
         [DataMember]
         public int KpSeq { get; set; }

其他專案資料/AMES程式測試回報(2021-12-10 for Ray).docx

@@ -0,0 +1,24 @@
+                         AMES專案系統測試報告
+
+測試日期：2021-12-10
+測試版本：AMES 1.0.0
+測試人員：B.B. Wang
+
+測試記錄：
+1.工單資料查詢
+ 增加查詢條件：
+工單號碼、料號、製程段、線別
+ 顯示資料
+工單號碼、料號、製程段、線別、工單計畫產量、工單已生產數、計畫開工日
+
+
+2.工單鎖定
+ 使用條碼進行鎖定時，會出現錯誤訊息，找不到工單號碼，但該筆序號對應該工單
+
+3.SOP文件查詢
+ SOP選擇檔案上傳，於對話框選擇檔案後確認，但畫面上部會出現我所選中的提醒，而是點保存後，更新畫面，才看到已有上傳文件
+
+ SOP文件沒辦法更新，不管是因為有新的版本，或是上傳錯誤檔案，都有更新的可能
+
+
+------------------------------------------------紀錄截止線------------------------------------------------