1. FQC修正

AMESCoreStudio.Web/Controllers/FQCController.cs

@@ -647,11 +647,11 @@ namespace AMESCoreStudio.Web.Controllers
             return View("FQC005U", model);
         }
 
-        [ResponseCache(Duration = 0)]
+
         [HttpGet]
-        public async Task<IActionResult> FQC005QueryAsync(int quotID = 0, int page = 0, int limit = 10)
+        public async Task<IActionResult> FQC005QueryAsync(int quotID = 0 , string AQLType = "", int QCQty = 0, int page = 0, int limit = 10)
         {
-            var result = await _fqcApi.GetQcCriterionQuery(quotID, page, limit);
+            var result = await _fqcApi.GetQcCriterionQuery(quotID, AQLType, QCQty , page, limit);
 
             if (result.Data.Count() != 0)
             {
@@ -1270,6 +1270,22 @@ namespace AMESCoreStudio.Web.Controllers
         }
         #endregion
 
+        #region FQC細項資料
+        /// <summary>
+        /// QC 抽驗細項
+        /// </summary>
+        /// <param name="AQLType">AQL類型</param>
+        /// <param name="QCQty">批量檢驗數</param>
+        /// <returns></returns>
+        [HttpGet]
+        public IActionResult FQC007E(string AQLType, int QCQty)
+        {
+            ViewBag.AQLType = AQLType;
+            ViewBag.QCQty = QCQty;
+            return View();
+        }
+        #endregion
+
         #endregion
 
         #region FQC008 FQC查詢

AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs

@@ -204,11 +204,13 @@ namespace AMESCoreStudio.Web
         /// 查詢抽驗標準維護
         /// </summary>
         /// <param name="quotID">抽驗係數ID</param>
+        /// <param name="AQLType">AQL類型</param>
+        /// <param name="QCQty">批量</param>
         /// <param name="page">頁數</param>
         /// <param name="limit"></param>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/QcCriterion/QcCriterionQuery")]
-        ITask<ResultModel<QcCriterionDto>> GetQcCriterionQuery(int quotID, int page, int limit);
+        ITask<ResultModel<QcCriterionDto>> GetQcCriterionQuery(int quotID, string AQLType , int QCQty, int page, int limit);
 
         /// <summary>
         /// 查詢抽驗標準維護 ID

AMESCoreStudio.Web/Views/FQC/FQC007.cshtml

@@ -31,13 +31,14 @@
                             <i class="layui-icon layui-icon-sm">&#xe62f;</i>
                         </a>
                         @*<i class="layui-icon layui-icon-sm">&#xe615;</i>*@
-
+                        <div style="display:inline ; padding-left:10rem;">
                             <a href="https://sms.avalue.com.tw/SMS/SUP/SFIS_SMS001.aspx?MODEL_NO=@Model.ModelNo" target="_blank"> <i class="layui-icon layui-icon-template"></i><cite>SMS異常紀錄</cite></a>
                             <a href="http://qazone.avalue.com.tw/qazone/sfislinktocfqr.aspx?QA_PRDID=@Model.ItemNo&QF=2" target="_blank"> <i class="layui-icon layui-icon-template"></i><cite>QAZone異常紀錄</cite></a>
                         </div>
                     </div>
                 </div>
             </div>
+        </div>
         <div class="layui-card-body">
             <div class="layui-row">
                 <input type="hidden" id="hInhouseNo" value="@Model.h_InhouseNo" />
@@ -123,10 +124,19 @@
             </div>
             <div class="layui-row">
                 <div class="layui-col-xs1">
-                    <select asp-items="@ViewBag.GetAQL_TypeSelect" class=""></select>
+                    <select asp-for="@Model.AQLType" asp-items="@ViewBag.GetAQL_TypeSelect" class=""></select>
+                </div>
+                <div class="layui-col-xs6">
+                    <a class="layui-btn layui-btn-sm layui-btn-normal" id="attachment" title="文件上傳" lay-submit lay-filter="attachment" onclick="openQC()">
+                        <i class="layui-icon layui-icon-sm">&#xe62f;</i>
+                    </a>
+                </div>
+                <div class="layui-col-xs1">
+                    <label class="layui-form-label-col" style="text-align:right;">本批完成量：</label>
+                    <input type="text" class="layui-input" asp-for="InhouseQty" style="width:50px;"/>
                 </div>
                 <div class="layui-col-xs1">
-                    <label class="layui-form-label-col" style="text-align:right;">本批完成量： @Model.InhouseQty</label>
+                    <label class="layui-form-label-col" style="text-align:right;">AQL： @Model.AQL</label>
                 </div>
                 <div class="layui-col-xs1">
                     <label class="layui-form-label-col" style="text-align:right;">抽樣點數： @Model.QcQty</label>
@@ -550,6 +560,29 @@
             });
         }
 
+        // OpenQC
+        function openQC() {
+           layui.use('layer', function () {
+           var layer = layui.layer;
+           layer.open({
+               title: 'QC',
+               type: 2,
+               area: ['700px', '500px'],
+               btn:['確定','取消'],
+               fixed: false, //不固定
+               maxmin: false,
+               content: '/FQC/FQC007E?AQLType=@Model.AQLType&QCQty=@Model.InhouseQty',
+               yes: function (index, layero) {
+                   //var body = layer.getChildFrame('body', index);
+                   var obj = layero.find("iframe")[0].contentWindow;
+                   //@Model.AQL = obj.$("#aql").val();
+                   console.log(obj.$("#critID").val());
+                   layer.close(index);
+               }
+              });
+            });
+        }
+
         $(document).ready(function () {
             var error = '@Html.ValidationMessage("error")';
             $("#CustomerMedical").attr("disabled", "disabled");

AMESCoreStudio.Web/Views/FQC/FQC007E.cshtml

@@ -0,0 +1,93 @@
+@{
+    Layout = "~/Views/Shared/_AMESLayout.cshtml"; }
+
+<style>
+    .control-label {
+        justify-content: flex-end !important;
+    }
+</style>
+
+<div class="layui-card">
+    <form class="layui-form">
+        <input id="seqID" name="seqID" value="@ViewBag.AQLType" type="hidden" />
+        <input id="boxNo" name="boxNo" value="@ViewBag.QCQty" type="hidden" />
+        <input id="critID" name="critID" type="hidden" />
+        <input id="aql" name="aql" type="hidden" />
+        <input id="quotDescription" name="quotDescription" type="hidden" />
+        <input id="qcQty" name="qcQty" type="hidden" />
+        <input id="reQty" name="reQty" type="hidden" />
+        <input id="acQty" name="acQty" type="hidden" />
+        <div class="layui-inline layui-show-xs-block">
+            <button style="display:none;" class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="querysubmit">
+                <i class="layui-icon layui-icon-sm">&#xe615;</i>
+            </button>
+        </div>
+        <table class="layui-hide" id="View" lay-filter="View"></table>
+
+        <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>
+
+@section Scripts {
+    @{ await Html.RenderPartialAsync("_ValidationScriptsPartial");
+        await Html.RenderPartialAsync("_FileinputScriptsPartial"); }
+
+    <script type="text/javascript">
+        layui.use('table', function () {
+            var table = layui.table;
+
+
+        });
+
+
+
+    //监听表单提交事件
+    hg.form.onsubmit('querysubmit', function (data) {
+        hg.msghide("重新載入資料..");
+        table && table.reload(data);
+    });
+
+        var tableCols = [[
+            {
+                field: 'quotName',
+                title: '係數名稱',
+                sort: true
+            },
+            {
+                field: 'quotDescription',
+                title: '描述',
+                sort: true
+            },
+            {
+                field: 'aqlType',
+                title: '類型',
+                sort: true
+            },
+            {
+                field: 'aql',
+                title: 'AQL',
+                sort: true
+            }]
+        ];
+
+    //基本数据表格
+    //var table = hg.table.datatable('test', '在製條碼資料', '/FQC/GetFQC007V/', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
+        var table = hg.table.datatable('View', '抽驗係數維護', '/FQC/FQC005Query?AQLType=@ViewBag.AQLType&QCQty=@ViewBag.QCQty', {}, tableCols, false, false, 'full-100', {});
+
+        table.onrowclick(function (obj) {
+            console.log(obj);
+            $('#critID').val(obj.data.critID);
+            $('#aql').val(obj.data.aql);
+            $('#quotDescription').val(obj.data.quotDescription);
+            $('#qcQty').val(obj.data.qcQty);
+            $('#reQty').val(obj.data.reQty);
+            $('#acQty').val(obj.data.acQty);
+        });
+    </script>
+}

AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseMasterController.cs

@@ -216,9 +216,6 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                        ModelNo = q1.ModelNo,
                                        InhouseQty = q1.InhouseQty,
                                        SpecialPo = q2.SpecialPo,
-                                       QcQty = q3.QcQty,
-                                       AcQty = q3.AcQty,
-                                       ReQty = q3.ReQty,
                                        StatusName = q1.Status == "P" ? "允收Pass" : q1.Status == "R" ? "批退Reject" : "",
                                        FqcID = q2.WipNo == null ? 0 : q2.FqcID,
                                        InhouseMemo = q2.InhouseMemo,
@@ -242,8 +239,19 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                        InspectionType = q2.InspectionType,
                                        MajorQty = q2.MajorQty,
                                        MinorQty = q2.MinorQty,
-                                       EndTime = q2.EndTime.ToString("yyyy/MM/dd")
+                                       WipECN = q4.GetWipAtt.ECN,
-
+                                       EndTime = q2.EndTime.ToString("yyyy/MM/dd"),
+                                       //QuotDescription = q3.GetQcQuot.QuotDescription,
+                                       CritID = q3.CritID,
+                                       QcQty = q3.QcQty,
+                                       AcQty = q3.AcQty,
+                                       ReQty = q3.ReQty,
+                                       //AQL = q3.GetQcQuot.Aql,
+                                       //AQLType = q3.GetQcQuot.AqlType,
+                                       PLMECN = q2.PLM_ECN,
+                                       ECN_Memo = q2.ECN_Memo,
+                                       Note = q2.Note,
+                                       InspectionStatus = q2.InspectionStatus
                                    };
 
             var query = await q.Distinct().ToListAsync();

AMESCoreStudio.WebApi/Controllers/AMES/QcCriterionController.cs

@@ -79,8 +79,17 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return 0;
         }
 
+        /// <summary>
+        /// 查詢抽驗標準維護
+        /// </summary>
+        /// <param name="quotID">抽驗係數ID</param>
+        /// <param name="AQLType">AQL類型</param>
+        /// <param name="QCQty">批量</param>
+        /// <param name="page">頁數</param>
+        /// <param name="limit"></param>
+        /// <returns></returns>
         [HttpGet("QcCriterionQuery")]
-        public async Task<ResultModel<QcCriterionDto>> GetQcCriterionQuery(int quotID = 0, int page = 0, int limit = 10)
+        public async Task<ResultModel<QcCriterionDto>> GetQcCriterionQuery(int quotID = 0, string AQLType = "", int QCQty = 0, int page = 0, int limit = 10)
         {
             ResultModel<QcCriterionDto> result = new ResultModel<QcCriterionDto>();
 
@@ -97,6 +106,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                                                AcQty = q2.AcQty,
                                                ReQty = q2.ReQty,
                                                QcQty = q2.QcQty,
+                                               QcStart = q2.QcStart,
+                                               QcEnd = q2.QcEnd,
                                                IntervalNumber = q2.QcStart + " ~ " + q2.QcEnd,
                                                QuotName = q2.GetQcQuot.QuotName,
                                                CreateDate = q2.CreateDate,
@@ -108,6 +119,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             if (quotID != 0)
                 q = q.Where(w => w.QuotID == quotID);
 
+            if (!string.IsNullOrWhiteSpace(AQLType))
+                q = q.Where(w => w.AqlType == AQLType);
+
+            if (QCQty != 0)
+                q = q.Where(w => w.QcStart <= QCQty && w.QcEnd >= QCQty);
+
             // 紀錄筆數
             result.DataTotal = q.Count();
 

AMESCoreStudio.WebApi/DTO/AMES/FqcDto.cs

@@ -115,7 +115,6 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         [Display(Name = "PASS數量")]
         public int PassQty { get; set; } = 0;
 
-
         /// <summary>
         /// 不良數
         /// </summary>
@@ -123,6 +122,34 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         [Display(Name = "不良數")]
         public int FailQty { get; set; } = 0;
 
+        /// <summary>
+        /// CritID
+        /// </summary>
+        [DataMember]
+        [Display(Name = "抽驗係數ID")]
+        public int CritID { get; set; } = 0;
+
+        /// <summary>
+        /// AQL
+        /// </summary>
+        [DataMember]
+        [Display(Name = "AQL")]
+        public double AQL { get; set; } = 0;
+
+        /// <summary>
+        /// AQL 描述
+        /// </summary>
+        [DataMember]
+        [Display(Name = "AQL 描述")]
+        public string QuotDescription { get; set; }
+
+        /// <summary>
+        /// AQL類型
+        /// </summary>
+        [DataMember]
+        [Display(Name = "AQL類型")]
+        public string AQLType { get; set; }
+
         /// <summary>
         /// 允收數量
         /// </summary>
@@ -194,7 +221,6 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         /// </summary>
         [DataMember]
         [Display(Name = "OS")]
-        [StringLength(20)]
         public string OS { get; set; }
 
         /// <summary>
@@ -293,6 +319,41 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         [DataMember]
         public int MinorQty { get; set; }
 
+        /// <summary>
+        /// Wip_ECN
+        /// </summary>
+        [NotMapped]
+        [DataMember]
+        public string WipECN { get; set; }
+
+        /// <summary>
+        /// PLM_ECN
+        /// </summary>
+        [NotMapped]
+        [DataMember]
+        public string PLMECN { get; set; }
+
+        /// <summary>
+        /// ECN_Memo
+        /// </summary>
+        [NotMapped]
+        [DataMember]
+        public string ECN_Memo { get; set; }
+
+        /// <summary>
+        /// NOTE
+        /// </summary>
+        [NotMapped]
+        [DataMember]
+        public string Note { get; set; }
+
+        /// <summary>
+        /// 檢驗地方 A:廠驗 B:委外 C:免驗
+        /// </summary>
+        [NotMapped]
+        [DataMember]
+        public string InspectionStatus { get; set; }
+
         public List<FqcDetailDto> fqcDetails { get; set; }
 
         /// <summary>

AMESCoreStudio.WebApi/DTO/AMES/QcCriterionDto.cs

@@ -44,7 +44,17 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         public string CritNo { get; set; }
 
         /// <summary>
-        /// 抽樣點數
+        /// 抽樣_起始數量
+        /// </summary>
+        public int QcStart { get; set; }
+
+        /// <summary>
+        /// 抽樣_結束數量
+        /// </summary>
+        public int QcEnd { get; set; }
+
+        /// <summary>
+        /// 抽樣點數 起始數量 ~ 結束數量
         /// </summary>
         public string IntervalNumber { get; set; }
 

AMESCoreStudio.WebApi/Models/AMES/FqcResultMaster.cs

@@ -306,5 +306,37 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         [Required(ErrorMessage = "{0},不能空白")]
         [Column("MINOR_QTY")]
         public int MinorQty { get; set; } = 0;
+
+        /// <summary>
+        /// NOTE
+        /// </summary>
+        [DataMember]
+        [Display(Name = "NOTE")]
+        [Column("NOTE")]
+        public string Note { get; set; }
+
+        /// <summary>
+        /// ECN_MEMO
+        /// </summary>
+        [DataMember]
+        [Display(Name = "ECN_MEMO")]
+        [Column("ECN_MEMO")]
+        public string ECN_Memo { get; set; }
+
+        /// <summary>
+        /// PLM_ECN
+        /// </summary>
+        [DataMember]
+        [Display(Name = "PLM_ECN")]
+        [Column("PLM_ECN")]
+        public string PLM_ECN { get; set; }
+
+        /// <summary>
+        /// 檢驗地方 A:廠驗 B:委外 C:免驗
+        /// </summary>
+        [DataMember]
+        [Display(Name = "PLM_ECN")]
+        [Column("INSPECTION_STATUS")]
+        public string InspectionStatus { get; set; }
     }
 }

AMESCoreStudio.WebApi/Models/AMES/QcCriterion.cs

@@ -125,6 +125,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         /// 抽驗係數資料
         /// </summary>
         [ForeignKey("QuotID")]
+        [NotMapped]
         public virtual QcQuot GetQcQuot { get; set; }
     }
 }

開發文件/QC/DB異動/Table更新.txt

@@ -1,16 +1,17 @@
 QC_ITEM == TYPE 類型
+---------------------------------------------
 
 ALTER TABLE QC_ITEM 
-ADD TYPE VARCHAR2(10) );
+ADD TYPE VARCHAR2(10);
 
 COMMENT ON COLUMN QC_ITEM.TYPE   IS '類型';
 
-
+---------------------------------------------
 FQC_RESULT_MASTER == 批退紀錄 Major 數量 
 			      Minor 數量 
 
 FQC_RESULT_MASTER == 抽樣計畫允收標準 
-
+---------------------------------------------
 
 ALTER TABLE FQC_RESULT_MASTER 
 ADD (INSPECTION_TYPE VARCHAR2(10) DEFAULT 'A' );
@@ -27,3 +28,25 @@ ADD (MINOR_QTY NUMBER DEFAULT 0 NOT NULL);
 COMMENT ON COLUMN FQC_RESULT_MASTER.MAJOR_QTY IS '主要的';
 
 COMMENT ON COLUMN FQC_RESULT_MASTER.MINOR_QTY IS '輕微的';
+
+----------------------------------------------
+
+ALTER TABLE FQC_RESULT_MASTER 
+ADD (NOTE VARCHAR2(500) );
+
+ALTER TABLE FQC_RESULT_MASTER 
+ADD (ECN_MEMO VARCHAR2(500) );
+
+ALTER TABLE FQC_RESULT_MASTER 
+ADD (PLM_ECN VARCHAR2(100) );
+
+ALTER TABLE FQC_RESULT_MASTER 
+ADD (INSPECTIONSTATUS VARCHAR2(20) NOT NULL);
+
+COMMENT ON COLUMN FQC_RESULT_MASTER.NOTE IS 'NOTE';
+
+COMMENT ON COLUMN FQC_RESULT_MASTER.ECN_MEMO IS 'ECN_MEMO';
+
+COMMENT ON COLUMN FQC_RESULT_MASTER.PLM_ECN IS 'PLM_ECN';
+
+COMMENT ON COLUMN FQC_RESULT_MASTER.INSPECTIONSTATUS IS '檢驗地方 A:廠驗 B:委外 C:免驗';