1. 條碼歷程新增 包裝秤重

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -4735,7 +4735,7 @@ namespace AMESCoreStudio.Web.Controllers
             }
 
             // TestLog 
-            var testLogResult = await _pcsApi.GetTestLogByMSSql(result.BarCodeNo);
+            var testLogResult = await _pcsApi.GetTestLog(result.BarCodeNo);
             foreach (var item in testLogResult)
             {
                 var FileName = (string)item.filename;
@@ -4754,12 +4754,34 @@ namespace AMESCoreStudio.Web.Controllers
                     FilePath = $"{(string)item.workOrder}\{FileName}"
                 });
             }
+
+            // 包裝秤重
+            try
+            {
+                var packingWeighResult = await _pcsApi.GetPackingWeigh(result.ExtraBarCodeNo);
+                foreach (var item in packingWeighResult)
+                {
+                    var RecordTime = ((DateTime)item.record_Time).ToString("yyyy/MM/dd HH:mm:ss");
+                    result.packingWeighs.Add(new PackingWeigh
+                    {
+                        Weight = item.weight,
+                        Result = item.result,
+                        Record_Time = RecordTime,
+                        FileName = item.filename
+                    });
+                }
+            }
+            catch
+            {
+
+            }
+
             return View(result);
         }
 
         public async Task<IActionResult> PCS009T(string sn, string id)
         {
-            var query = await _pcsApi.GetTestLogByMSSql(sn);
+            var query = await _pcsApi.GetTestLog(sn);
             var result = new List<PCS009TViewModel>();
 
             if (query.Any())

AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@@ -1935,11 +1935,12 @@ namespace AMESCoreStudio.Web
         ITask<List<dynamic>> GetTestLog(string id);
 
         /// <summary>
-        /// Test Log 查詢
+        /// 包裝秤重 查詢
         /// </summary>
+        /// <param name="id">出貨序號</param>
         /// <returns></returns>
-        [WebApiClient.Attributes.HttpGet("api/TestLog/ByMSSql/{id}")]
+        [WebApiClient.Attributes.HttpGet("api/TestLog/PackingWeigh/{id}")]
-        ITask<List<dynamic>> GetTestLogByMSSql(string id);
+        ITask<List<dynamic>> GetPackingWeigh(string id);
 
         #endregion
 

AMESCoreStudio.Web/ViewModels/PCS/PCS009RViewModel.cs

@@ -21,6 +21,7 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
             Outfits = new List<Outfit>();
             nGInfoDtos = new List<NGInfoDto>();
             testLogs = new List<TestLog>();
+            packingWeighs = new List<PackingWeigh>();
         }
 
         /// <summary>
@@ -101,6 +102,13 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
             get; set;
         }
 
+        /// <summary>
+        /// 包裝秤重
+        /// </summary>
+        public List<PackingWeigh> packingWeighs
+        {
+            get; set;
+        }
     }
 
     /// <summary>
@@ -319,4 +327,35 @@ namespace AMESCoreStudio.Web.ViewModels.PCS
         /// </summary>
         public string FilePath { get; set; }
     }
+
+    /// <summary>
+    /// 包裝秤重
+    /// </summary>
+    public class PackingWeigh
+    {
+        /// <summary>
+        /// 重量
+        /// </summary>
+        public string Weight { get; set; }
+
+        /// <summary>
+        /// 結果
+        /// </summary>
+        public string Result { get; set; }
+
+        /// <summary>
+        /// 測試時間 RECORD_TIME
+        /// </summary>
+        public string Record_Time { get; set; }
+
+        /// <summary>
+        /// 檔案名稱
+        /// </summary>
+        public string FileName { get; set; }
+
+        /// <summary>
+        /// 檔案路徑
+        /// </summary>
+        public string FilePath { get; set; }
+    }
 }

AMESCoreStudio.Web/Views/PCS/PCS009R.cshtml

@@ -280,6 +280,60 @@
                 </div>
             }
 
+            @if (Model.packingWeighs.Count != 0)
+            {
+                <div class="layui-row">
+                    <fieldset class="layui-elem-field layui-field-title">
+                        <legend style="color: #e18917">包裝秤重</legend>
+                    </fieldset>
+                    <table class="layui-table" lay-even lay-size="sm">
+                        <thead>
+                            <tr>
+                                <th>
+                                    結果
+                                </th>
+                                <th>
+                                    秤重時間
+                                </th>
+                                <th>
+                                    秤重值
+                                </th>
+                                <th>
+                                    檔案名稱
+                                </th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach (var index in Model.packingWeighs)
+                            {
+                                <tr>
+                                    <td>
+                                        @if (index.Result == "FAIL")
+                                        {
+                                            <span style="color:red">@index.Result</span>
+                                        }
+                                        else
+                                        {
+                                            <span style="color:blue">@index.Result</span>
+                                        }
+                                    </td>
+                                    <td>
+                                        @index.Record_Time
+                                    </td>
+                                    <td>
+                                        @index.Weight
+                                    </td>
+                                    <td>
+                                        @index.FileName
+                                        @*<a class="layui-btn layui-btn-primary layui-border-blue layui-btn-sm" onclick='Filedownload(this);'>檔案下載</a>*@
+                                    </td>
+                                </tr>
+                            }
+                        </tbody>
+                    </table>
+                </div>
+            }
+
             <div class="layui-row">
                 <fieldset class="layui-elem-field layui-field-title">
                     <legend style="color: #e18917">組件清單</legend>

AMESCoreStudio.WebApi/Controllers/BLL/TestLogController.cs

@@ -41,30 +41,36 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL
             _context = context;
         }
 
-
         /// <summary>
         /// 查詢 TestLog
         /// </summary>
         /// <param name="id">條碼</param>
         /// <returns></returns>
         [HttpGet("{id}")]
-        public List<dynamic> GetTestLog(string id)
+        public async Task<List<dynamic>> GetTestLog(string id)
         {
-            var query = @$" SELECT * FROM JHAMES.TEST_FUNCTION_TABLE WHERE SN=:id";
+            var context = _config.GetConnectionString("TestLogConnection");
-
+            using (IDbConnection _TestLog_context = new SqlConnection(context))
+            {
+                if (_TestLog_context.State != ConnectionState.Open)
+                {
+                    _TestLog_context.Open();
+                }
+                var query = @$" SELECT * FROM TestAutomate.dbo.TEST_FUNCTION_TABLE WHERE SN=@id";
                 DynamicParameters p = new DynamicParameters();
                 p.Add("id", id, DbType.String);
-            var q = _context.Database.DapperQuery<dynamic>(query, p);
+                var q = await _TestLog_context.QueryAsync<dynamic>(query, p);
                 return q.ToList();
             }
+        }
 
         /// <summary>
-        /// 查詢 TestLog ByMSSql
+        /// 查詢 是否有掃毒資料
         /// </summary>
-        /// <param name="id">條碼</param>
+        /// <param name="id">工單號碼</param>
         /// <returns></returns>
-        [HttpGet("ByMSSql/{id}")]
+        [HttpGet("AcnvirusLog/{id}")]
-        public async Task<List<dynamic>> GetTestLogByMSSql(string id)
+        public async Task<List<dynamic>> GetSacnvirus(string id)
         {
             var context = _config.GetConnectionString("TestLogConnection");
             using (IDbConnection _TestLog_context = new SqlConnection(context))
@@ -73,7 +79,7 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL
                 {
                     _TestLog_context.Open();
                 }
-                var query = @$" SELECT * FROM TestAutomate.dbo.TEST_FUNCTION_TABLE WHERE SN=@id";
+                var query = @$" SELECT * FROM iFactory.PE.Sacnvirus_Table_View WHERE WIP=@id";
                 DynamicParameters p = new DynamicParameters();
                 p.Add("id", id, DbType.String);
                 var q = await _TestLog_context.QueryAsync<dynamic>(query, p);
@@ -82,12 +88,12 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL
         }
 
         /// <summary>
-        /// 查詢 是否有掃毒資料
+        /// 查詢 是否有包裝秤重
         /// </summary>
-        /// <param name="id">工單號碼</param>
+        /// <param name="id">出貨序號</param>
         /// <returns></returns>
-        [HttpGet("AcnvirusLog/{id}")]
+        [HttpGet("PackingWeigh/{id}")]
-        public async Task<List<dynamic>> GetSacnvirus(string id)
+        public async Task<List<dynamic>> GetPackingWeighing(string id)
         {
             var context = _config.GetConnectionString("TestLogConnection");
             using (IDbConnection _TestLog_context = new SqlConnection(context))
@@ -96,9 +102,10 @@ namespace AMESCoreStudio.WebApi.Controllers.BLL
                 {
                     _TestLog_context.Open();
                 }
-                var query = @$" SELECT * FROM iFactory.PE.Sacnvirus_Table_View WHERE WIP=@id";
+                var query = @$" SELECT * FROM TestAutomate.dbo.Packing_Weighing_View
+                                WHERE SN =@Sn ";
                 DynamicParameters p = new DynamicParameters();
-                p.Add("id", id, DbType.String);
+                p.Add("Sn", id, DbType.String);
                 var q = await _TestLog_context.QueryAsync<dynamic>(query, p);
                 return q.ToList();
             }