1. 新增鋼板聯測紀錄 條碼批次查詢(缺整批過站)

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -5681,7 +5681,7 @@ namespace AMESCoreStudio.Web.Controllers
         }
 
         [HttpGet]
-        public async Task<IActionResult> PCS022VQuery(int page = 0, int limit = 10)
+        public async Task<IActionResult> PCS022VQuery(int wipID, int ruleStationID,int page = 0, int limit = 10)
         {
             var result = await _pcsApi.GetWipStationBarcodeByPCS022(wipID, ruleStationID, page, limit);
 

AMESCoreStudio.Web/HttpApis/AMES/IPCB.cs

@@ -501,6 +501,17 @@ namespace AMESCoreStudio.Web
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/SteelPlateInfo/ByNo/{id}")]
         ITask<List<SteelPlateInfo>> GetSteelPlateInfoByNo(string id);
+
+        /// <summary>
+        /// 新增鋼板資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpPost("api/SteelPlateMeasure")]
+        ITask<ResultModel<SteelPlateMeasure>> PostSteelPlateMeasure([FromBody, RawJsonContent] string model);
+
+
+        [WebApiClient.Attributes.HttpGet("api/SteelPlateMeasure/BySteelPlateID/{id}")]
+        ITask<ResultModel<SteelPlateMeasureDto>> GetSteelPlateMeasureBySteelPlateID(int id, int page = 0, int limit = 10);
         #endregion
 
         #region PCB014 錫膏使用管控

AMESCoreStudio.Web/Views/PCB/PCB013.cshtml

@@ -193,10 +193,11 @@
             },
             {
                 title: '操作',
-                align: 'center',
+                width: 230,
-                width: 80,
                 templet: function (d) {
-                    return '<a class="layui-btn layui-btn-warm layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a>'
+                    return '<a class="layui-btn layui-btn-warm layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a>\
+                            <a class="layui-btn layui-btn layui-btn-xs" lay-event="detail">新增量測</a>\
+                            <a class="layui-btn layui-btn layui-btn-xs" lay-event="View">檢視量測</a>'
                 }
             }
         ]];
@@ -207,6 +208,18 @@
             }
         }
 
+        function detail(obj) {
+            if (obj.data.steelPlateID) {
+                hg.open('新增量測記錄', '/PCB/PCB013A?steelPlateID=' + obj.data.steelPlateID + '&steelPlateNo=' + obj.data.steelPlateNo, 700, 500);
+            }
+        }
+
+        function View(obj) {
+            if (obj.data.steelPlateID) {
+                hg.open('檢視量測記錄', '/PCB/PCB013V?steelPlateID=' + obj.data.steelPlateID + '&steelPlateNo=' + obj.data.steelPlateNo, 1000, 500);
+            }
+        }
+
         //新增按鈕
         var toolbar = [{
             text: '新增',

AMESCoreStudio.Web/Views/PCB/PCB013A.cshtml

@@ -0,0 +1,113 @@
+@model AMESCoreStudio.WebApi.Models.AMES.SteelPlateMeasure
+@{ Layout = "~/Views/Shared/_AMESLayout.cshtml"; }
+
+<style>
+    .control-label {
+        justify-content: flex-end !important;
+    }
+</style>
+
+<div class="layui-card">
+    <div class="row">
+        <div class="col-sm-12">
+            <form enctype="multipart/form-data" method="post" asp-action="PCB013ASave" class="layui-form">
+                <div asp-validation-summary="ModelOnly" class="text-danger"></div>
+                <input type="hidden" asp-for="SteelPlateID" value="@ViewBag.steelPlateID" />
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label">鋼板編號</label>
+                    <div class="layui-input-inline">
+                        <input value="@ViewBag.steelPlateNo" class="layui-input" autocomplete="off"  />
+                    </div>
+                </div>
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label">量測狀態</label>
+                    <div class="layui-input-inline">
+                        <select asp-items="@ViewBag.GetSteelPlateStatusSelect" asp-for="Status" class="">
+                        </select>
+                        
+                    </div>
+                </div>
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label">張力_1</label>
+                    <div class="layui-input-inline">
+                        <input asp-for="Tension1" onkeyup="clearNoNum(this)" class="layui-input" />
+                        <span asp-validation-for="Tension1" class="layui-bg-red"></span>
+                    </div>
+                </div>
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label">張力_2</label>
+                    <div class="layui-input-inline">
+                        <input asp-for="Tension2" onkeyup="clearNoNum(this)" class="layui-input" />
+                        <span asp-validation-for="Tension2" class="layui-bg-red"></span>
+                    </div>
+                </div>
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label">張力_3</label>
+                    <div class="layui-input-inline">
+                        <input asp-for="Tension3" onkeyup="clearNoNum(this)" class="layui-input" />
+                        <span asp-validation-for="Tension3" class="layui-bg-red"></span>
+                    </div>
+                </div>
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label">張力_4</label>
+                    <div class="layui-input-inline">
+                        <input asp-for="Tension4" onkeyup="clearNoNum(this)" class="layui-input" />
+                        <span asp-validation-for="Tension4" class="layui-bg-red"></span>
+                    </div>
+                </div>
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label">張力_5</label>
+                    <div class="layui-input-inline">
+                        <input asp-for="Tension5" onkeyup="clearNoNum(this)" class="layui-input" />
+                        <span asp-validation-for="Tension5" class="layui-bg-red"></span>
+                    </div>
+                </div>
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label">備註</label>
+                    <div class="layui-input-block">
+                        <input asp-for="Remark" class="layui-input" />
+                    </div>
+                </div>
+
+                <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
+                <div class="layui-row" style="text-align:center">
+                    <div class="layui-col-md12">
+                        <input type="submit" value="保存" class="layui-btn" />
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
+@section Scripts {
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
+        await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
+
+    <script type="text/javascript">
+        layui.use(['form'], function () {
+            form = layui.form;
+        });
+        $(document).ready(function () {
+            var error = '@Html.ValidationMessage("error")';
+            if ($(error).text() != '') {
+                parent.hg.msg(error);
+            }
+        });
+
+        function clearNoNum(obj) {
+            //先把非數字的都替換掉,除了數字和.   
+            obj.value = obj.value.replace(/[^\d.]/g, "");
+        }
+    </script>
+
+
+}

AMESCoreStudio.Web/Views/PCB/PCB013V.cshtml

@@ -0,0 +1,77 @@
+@{
+    ViewData["Title"] = "檢視鋼板量測紀錄";
+    Layout = "~/Views/Shared/_AMESLayout.cshtml";
+}
+
+<div class="layui-card">
+    <div class="layui-card-body">
+        <input id="steelPlateID" name="steelPlateID" value="@ViewBag.steelPlateID" type="hidden" />
+        <input id="steelPlateNo" name="steelPlateNo" value="@ViewBag.steelPlateNo" type="hidden" />
+        <table class="layui-hide" id="test" lay-filter="test"></table>
+    </div>
+</div>
+
+@section Scripts{
+    <script type="text/javascript">
+        //监听表单提交事件
+        hg.form.onsubmit('querysubmit', function (data) {
+            table && table.reload(data);
+        });
+        var tableCols = [[
+            {
+                field: 'status',
+                title: '量測狀態',
+                sort: true
+            },
+            {
+                field: 'measureResult',
+                title: '結果',
+                sort: true
+            },
+            {
+                field: 'tension1',
+                title: '張力1',
+                width: 70
+            },
+            {
+                field: 'tension2',
+                title: '張力2',
+                width: 70
+            },
+            {
+                field: 'tension3',
+                title: '張力3',
+                width: 70
+            },
+            {
+                field: 'tension4',
+                title: '張力4',
+                width: 70
+            },
+            {
+                field: 'tension5',
+                title: '張力5',
+                width: 70
+            },
+            {
+                field: 'remark',
+                title: '備註',
+                sort: true
+            },
+            {
+                field: 'userName',
+                title: '量測人員',
+                sort: true
+            },
+            {
+                field: 'createDate',
+                title: '量測時間',
+                sort: true,
+                templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd HH:mm:ss") }}</div>'
+            }]
+        ];
+
+    //基本数据表格
+        var table = hg.table.datatable('test', '鋼板量測紀錄', '/PCB/PCB013VQuery?steelPlateID=' + steelPlateID.value + '&steelPlateNo=' + steelPlateNo.value, {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+    </script>
+}

AMESCoreStudio.WebApi/Controllers/AMES/SteelPlateMeasureController.cs

@@ -8,6 +8,7 @@ using Microsoft.EntityFrameworkCore;
 using AMESCoreStudio.WebApi;
 using AMESCoreStudio.WebApi.Models.AMES;
 using AMESCoreStudio.CommonTools.Result;
+using AMESCoreStudio.WebApi.DTO.AMES;
 
 namespace AMESCoreStudio.WebApi.Controllers.AMES
 {
@@ -46,6 +47,62 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return steelPlateMeasure;
         }
 
+        /// <summary>
+        /// 鋼板編號紀錄 By 鋼板編號
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="page"></param>
+        /// <param name="limit"></param>
+        /// <returns></returns>
+        [HttpGet("BySteelPlateID/{id}")]
+        public async Task<ResultModel<SteelPlateMeasureDto>> GetSteelPlateMeasureBySteelPlateID(int id, int page = 0, int limit = 10)
+        {
+            var q = from q1 in _context.SteelPlateMeasures.Where(w => w.SteelPlateID == id)
+                    join q2 in _context.SteelPlateInfos on q1.SteelPlateID equals q2.SteelPlateID
+                    join q3 in _context.UserInfoes on q1.CreateUserID equals q3.UserID
+                    select new SteelPlateMeasureDto
+                    {
+                        SpMeasureID = q1.SpMeasureID,
+                        SteelPlateID = q1.SteelPlateID,
+                        SteelPlateNo = q2.SteelPlateNo,
+                        MeasureResult = q1.MeasureResult,
+                        Tension1 = q1.Tension1,
+                        Tension2 = q1.Tension2,
+                        Tension3 = q1.Tension3,
+                        Tension4 = q1.Tension4,
+                        Tension5 = q1.Tension5,
+                        Remark = q1.Remark,
+                        Status = q1.Status,
+                        CreateUserID = q1.CreateUserID,
+                        CreateDate = q1.CreateDate,
+                        CreateUserName = q3.UserName
+                    };
+             
+            ResultModel<SteelPlateMeasureDto> result = new ResultModel<SteelPlateMeasureDto>();
+            //紀錄筆數
+            result.DataTotal = q.Count();
+
+            //Table 頁數
+            if (page > 0)
+            {
+                q = q.Skip((page - 1) * limit).Take(limit);
+            }
+
+            result.Data = await q.OrderBy(o => o.CreateDate).ToListAsync();
+            result.Data.Select(s => s.Status
+         = Enum.EnumPCB.GetDisplayName((Enum.EnumPCB.EnumSteelPlateStatus)System.Enum.Parse(typeof(Enum.EnumPCB.EnumSteelPlateStatus), s.Status))).ToList();
+            if (result == null)
+            {
+                result.Msg = "查無資料";
+                result.Success = false;
+                return result;
+            }
+
+            result.Success = true;
+            result.Msg = "OK";
+            return result;
+        }
+
         /// <summary>
         /// 更新鋼板量測記錄資料檔
         /// </summary>
@@ -76,10 +133,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         /// <summary>
         /// 新增鋼板量測記錄資料檔
         /// </summary>
-        /// <param name="solderPasteRecord"></param>
+        /// <param name="steelPlateMeasure"></param>
         /// <returns></returns>
         [HttpPost]
-        public async Task<ResultModel<SteelPlateMeasure>> PostSolderPasteRecord(SteelPlateMeasure steelPlateMeasure)
+        public async Task<ResultModel<SteelPlateMeasure>> PostSteelPlateMeasure(SteelPlateMeasure steelPlateMeasure)
         {
             ResultModel<SteelPlateMeasure> result = new ResultModel<SteelPlateMeasure>();
             Helper helper = new Helper(_context);

AMESCoreStudio.WebApi/DTO/AMES/SteelPlateMeasureDto.cs

@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace AMESCoreStudio.WebApi.DTO.AMES
+{
+    /// <summary>
+    /// SteelPlateInfoDto 鋼板紀錄資料檔Dto
+    /// </summary>
+    public partial class SteelPlateMeasureDto
+    {
+        /// <summary>
+        /// 鋼板量測記錄ID
+        /// </summary>
+
+        public int SpMeasureID { get; set; }
+
+        /// <summary>
+        /// 鋼板ID
+        /// </summary>
+
+        public int SteelPlateID { get; set; }
+
+        /// <summary>
+        /// 鋼板編號
+        /// </summary>
+
+        public string SteelPlateNo { get; set; }
+
+        /// <summary>
+        /// 張力_1
+        /// </summary>
+        public string Tension1 { get; set; }
+
+        /// <summary>
+        /// 張力_2
+        /// </summary>
+        public string Tension2 { get; set; }
+
+        /// <summary>
+        /// 張力_3
+        /// </summary>
+        public string Tension3 { get; set; }
+
+        /// <summary>
+        /// 張力_4
+        /// </summary>
+        public string Tension4 { get; set; }
+
+        /// <summary>
+        /// 張力_5
+        /// </summary>
+        public string Tension5 { get; set; }
+
+        /// <summary>
+        /// 檢查狀態
+        /// </summary>
+        public string Status { get; set; }
+
+        /// <summary>
+        /// 備註
+        /// </summary>
+
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 判定結果 P=PASS ; F=FAIL ; N=未量測
+        /// </summary>
+        public string MeasureResult { get; set; }
+
+        /// <summary>
+        /// 建立UserID
+        /// </summary>
+
+        public int CreateUserID { get; set; } = 0;
+
+        /// <summary>
+        /// 建立User
+        /// </summary>
+        public string CreateUserName { get; set; }
+
+        /// <summary>
+        /// 建立日期
+        /// </summary>
+ 
+        public DateTime CreateDate { get; set; } = DateTime.Now;
+
+    }
+}

AMESCoreStudio.WebApi/Enums/EnumPCB.cs

@@ -0,0 +1,53 @@
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System;
+using System.Linq;
+using System.Reflection;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace AMESCoreStudio.WebApi.Enum
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class EnumPCB
+    {
+        /// <summary>
+        /// 鋼板量測狀態
+        /// </summary>
+        public enum EnumSteelPlateStatus
+        {
+            /// <summary>
+            /// 上線前
+            /// </summary>
+            [Display(Name = "上線前")]
+            A = 1,
+
+            /// <summary>
+            /// 清洗後
+            /// </summary>
+            [Display(Name = "清洗後")]
+            B = 2,
+
+            /// <summary>
+            /// 每周點檢
+            /// </summary>
+            [Display(Name = "每周點檢")]
+            C = 3
+        }
+
+        /// <summary>
+        /// Get Enum Display
+        /// </summary>
+        /// <param name="enumValue"></param>
+        /// <returns></returns>
+        public static string GetDisplayName(System.Enum enumValue)
+        {
+            return enumValue.GetType()?
+           .GetMember(enumValue.ToString())?.First()?
+           .GetCustomAttribute<DisplayAttribute>()?
+           .Name;
+        }
+    }
+}