1. 修正條碼生產履歷 無顯示入庫單號問題

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -4538,6 +4538,15 @@ namespace AMESCoreStudio.Web.Controllers
             result.ExtraBarCodeNo = result_barcodeinfo.ExtraBarcodeNo;
             result.BoxNo = result_barcodeinfo.BoxNo;
             result.StatusNo = result_barcodeinfo.StatusNo;
+            // 取入庫單號
+            if(!string.IsNullOrWhiteSpace(result.BoxNo))
+            {
+                var FqcInhouse = await _pcsApi.GetFqcInhouseDetailBySerialNo(result.BoxNo);
+                if (FqcInhouse.Count() != 0)
+                {
+                    result.InhouseNo = FqcInhouse.OrderByDescending(o => o.UpdateDate).FirstOrDefault().InhouseNo;  
+                }
+            }
 
             // 工單資料
             var result_barcodestation = await _pcsApi.GetBarcodeStationByBarCodeID(result_barcodeinfo.BarcodeID);
@@ -4578,7 +4587,6 @@ namespace AMESCoreStudio.Web.Controllers
             // 組件清單
             result.BarCodeKPs = await _pcsApi.GetBarcodeItemByBarCodeIDPCS009(result_barcodeinfo.BarcodeID);
 
-
             // 治具清單
             var barcodeoutfits = await _pcsApi.GetBarcodeOutfitByBarcodeNo(result.BarCodeNo);
             foreach (var barcodeoutfit in barcodeoutfits.OrderBy(o => o.CreateDate))

AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@@ -1314,6 +1314,16 @@ namespace AMESCoreStudio.Web
         ITask<ResultModel<WipReturn>> PostWipReturn([FromBody, RawJsonContent] string model);
         #endregion
 
+        #region FQCInhouseDetail 箱號取入庫單號
+        /// <summary>
+        /// 箱號取入庫單號
+        /// </summary>
+        /// <param name="id">箱號</param>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/FqcInhouseDetail/BySerialNo/{id}")]
+        ITask<List<FqcInhouseDetail>> GetFqcInhouseDetailBySerialNo(string id);
+        #endregion
+
         #region 取出貨序號
         [WebApiClient.Attributes.HttpGet("api/SerialRules/ByQurey/{itemNo}/{lotNo}/{num}/{wipShcDate}")]
         ITask<ResultModel<string>> GetSerialRuleByQurey(string itemNo, string lotNo, int num, string wipShcDate);

AMESCoreStudio.Web/Views/PCS/PCS009.cshtml

@@ -42,7 +42,7 @@
         <div class="layui-card-body">
             <div class="layui-row" style="text-align:center">
                 <div class="layui-col-md3" style="text-align:center">
-                    <label class="layui-form-label">內部條碼:</label>
+                    <label class="layui-form-label">生產序號:</label>
                     <div class="layui-input-inline">
                         <input asp-for="BarCodeNo" class="layui-input">
                     </div>
@@ -54,7 +54,7 @@
                     </div>
                 </div>
                 <div class="layui-col-md3" style="text-align:center">
-                    <label class="layui-form-label">外部條碼:</label>
+                    <label class="layui-form-label">出貨序號:</label>
                     <div class="layui-input-inline">
                         <input asp-for="ExtraBarCodeNo" class="layui-input">
                     </div>
@@ -110,12 +110,12 @@
                 var tableCols = [[
                     {
                         field: 'barcodeNo',
-                        title: '內部條碼',
+                        title: '生產序號',
                         sort: true
                     },
                     {
                         field: 'extraBarcodeNo',
-                        title: '客戶條碼',
+                        title: '出貨序號',
                         sort: true
                     },
                     {

AMESCoreStudio.Web/Views/PCS/PCS009R.cshtml

@@ -20,7 +20,7 @@
             </fieldset>
             <div class="layui-row">
                 <div class="layui-col-xs2">
-                    <label class="layui-form-label-col" style="text-align:right;">內部條碼：</label>
+                    <label class="layui-form-label-col" style="text-align:right;">生產序號：</label>
                 </div>
                 <div class="layui-col-xs2">
                     <div class="layui-form-item">
@@ -30,7 +30,7 @@
                     </div>
                 </div>
                 <div class="layui-col-xs2">
-                    <label class="layui-form-label-col" style="text-align:right;">外部條碼：</label>
+                    <label class="layui-form-label-col" style="text-align:right;">出貨序號：</label>
                 </div>
                 <div class="layui-col-xs2">
                     <div class="layui-form-item">
@@ -40,7 +40,7 @@
                     </div>
                 </div>
                 <div class="layui-col-xs2">
-                    <label class="layui-form-label-col" style="text-align:right;">包裝條碼：</label>
+                    <label class="layui-form-label-col" style="text-align:right;">包裝箱號：</label>
                 </div>
                 <div class="layui-col-xs2">
                     <div class="layui-form-item">

AMESCoreStudio.WebApi/Controllers/AMES/FqcInhouseDetailController.cs

@@ -49,6 +49,18 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             return fqcInhouseDetail;
         }
 
+        /// <summary>
+        /// Query By 箱號
+        /// </summary>
+        /// <param name="id">箱號</param>
+        /// <returns></returns>
+        [HttpGet("BySerialNo/{id}")]
+        public async Task<ActionResult<IEnumerable<FqcInhouseDetail>>> GetFqcInhouseDetailBySerialNo(string id)
+        {
+            var fqcInhouseDetail = await _context.FqcInhouseDetails.Where(w => w.SerialNo == id).ToListAsync();
+            return fqcInhouseDetail;
+        }
+
         /// <summary>
         /// FQC細項資料
         /// </summary>

AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs

@@ -13,7 +13,6 @@ using System.Data;
 using System.Dynamic;
 using Microsoft.Extensions.Configuration;
 using Microsoft.EntityFrameworkCore.SqlServer;
-using AMESCoreStudio.WebApi.Controllers.BAS;
 
 namespace AMESCoreStudio.WebApi.Controllers.AMES
 {