修改FQC014兩廠異常警示問題

增加昶亨資料庫連線

AMESCoreStudio.Web/Controllers/FQCController.cs

@@ -2705,12 +2705,16 @@ namespace AMESCoreStudio.Web.Controllers
                 }
                 else  // 昶亨
                 {
-                     nginfo = await _esuncApi.GetNgRepairDataByBarcodeNO(item.BarcodeNoH);
+                    //  nginfo = await _esuncApi.GetNgRepairDataByBarcodeNO(item.BarcodeNoH);
+                    nginfo = await _fqcApi.GetNgRepairDataByBarcodeNO_ESUN(item.BarcodeNoH);
+
+                    
                 }
 
 
                 result_data.Add(new
                 {
+                    caseID = item.CaseID,
                     barcodeNo = item.BarcodeNo,
                     factoryNo = Factorydata.Select(s => s.FactoryNo).FirstOrDefault(),
                     wipNoF = item.WipNoF,
@@ -2720,10 +2724,10 @@ namespace AMESCoreStudio.Web.Controllers
                     itemNoH = item.ItemNoH,
                     createDate = item.CreateDate,
                     reasonNo = item.ReasonNo,
-                    stationNo = nginfo.Data.Select(s => s.stationName).FirstOrDefault(),
+                    stationNo = nginfo.Data.Select(s => s.stationname).FirstOrDefault(),
-                    userName = nginfo.Data.Select(s => s.userName).FirstOrDefault(),
+                    userName = nginfo.Data.Select(s => s.username).FirstOrDefault(),
-                    repairNo = nginfo.Data.Select(s => s.repairNo).FirstOrDefault(),
+                    repairNo = nginfo.Data.Select(s => s.repairno).FirstOrDefault(),
-                    repairDesc = nginfo.Data.Select(s => s.repairDesc).FirstOrDefault()
+                    repairDesc = nginfo.Data.Select(s => s.repairdesc).FirstOrDefault()
                 }); 
 
                 
@@ -2777,7 +2781,9 @@ namespace AMESCoreStudio.Web.Controllers
 
                 if (!allowedExtensions.Contains(fileExtension))
                 {
-                    ModelState.AddModelError("error", "僅允許上傳 png、jpg、bmp、gif、xlsx、xls、docx、pdf、pptx、txt、eml、etc 格式的檔案！");
+                    string msg = "檔案格式錯誤，請確認\r\n";
+                    msg += "僅允許上傳 png、jpg、bmp、gif、xlsx、xls、docx、pdf、pptx、txt、eml、etc 格式的檔案！";
+                    ModelState.AddModelError("error", msg);
                     ViewBag.CaseID = model.CaseID;
                     return View("FQC014R");
                 }
@@ -2879,9 +2885,20 @@ namespace AMESCoreStudio.Web.Controllers
         {
             var tt = Request.Cookies["UserID"];
             ViewBag.UserID = tt;
-            await GetUserInfo("1004,1009");
+            // await GetUserInfo("1004,1009");
 
             var result = await _fqcApi.GetNgInfoAlertMaster(id);
+            if (result.UpdateUserID != 0)
+            {
+                var user_info = await _sysApi.GetUserInfo(result.UpdateUserID);
+                ViewBag.UpdateUserName = user_info[0].UserName;
+
+
+                // ViewBag.UpdateUserName = await _sysApi.GetUserData(result.UpdateUserID);
+            }
+            else
+                ViewBag.UpdateUserName = "";
+
             return View(result);
             
         }

AMESCoreStudio.Web/HttpApis/AMES/IFQC.cs

@@ -886,6 +886,15 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpGet("api/NgRepairs/GetNgRepairDataByBarcodeNO")]
         ITask<ResultModel<dynamic>> GetNgRepairDataByBarcodeNO(string barcodeNo);
 
+
+        // <summary>
+        /// 查詢工單條碼資料-WipNo
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/NgRepairs/GetNgRepairDataByBarcodeNO_ESUN")]
+        ITask<ResultModel<dynamic>> GetNgRepairDataByBarcodeNO_ESUN(string barcodeNo);
+
+
         /// <summary>
         ///  查詢異常不良警示
         /// </summary>

AMESCoreStudio.Web/Views/FQC/FQC014U.cshtml

@@ -22,7 +22,7 @@
 <div class="layui-card">
     <div class="layui-card-body">
         <div class="col-sm-12">
-            <form enctype="multipart/form-data" method="post" asp-action="FQC014USave">
+            <form enctype="multipart/form-data" method="post" asp-action="FQC014USave"　id="myForm">
                 <div asp-validation-summary="ModelOnly" class="text-danger"></div>
                 <input type="hidden" asp-for="UserID" />
                 <input type="hidden" asp-for="CreateDate" />
@@ -67,9 +67,9 @@
                 <table class="layui-table">
                     <tr>
                         <td><label asp-for="CreateDate" class="control-label"></label></td>
-                        <td><input asp-for="CreateDate" class="layui-input" style="background-color: #D3D3D3;" readonly="readonly" /></td>
+                        <td><input class="layui-input" style="background-color: #D3D3D3;" readonly="readonly" value="@Model.CreateDate.ToString("yyyy-MM-dd")" /></td>
                         <td><label asp-for="FinishDate" class="control-label"></label></td>
-                        <td><input asp-for="FinishDate" class="layui-input" style="background-color: #D3D3D3;" readonly="readonly" /></td>
+                        <td><input class="layui-input" style="background-color: #D3D3D3;" readonly="readonly" value="@Model.FinishDate?.ToString("yyyy-MM-dd")" /></td>
                     </tr>
 
                     <tr>
@@ -134,7 +134,13 @@
 
     var toolbar = [];
 
-    var tableCols = [[
+        var tableCols = [[
+            {
+                field: 'caseID',
+                width: 100,
+                title: 'CaseID',
+                sort: true
+            },
         {
             field: 'barcodeNo',
             width: 100,
@@ -182,6 +188,7 @@
             field: 'createDate',
             width: 100,
             title: '警報異常時間',
+            templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}</div>',
             sort: true
         },
         {
@@ -213,6 +220,19 @@
             width: 100,
             title: '作業人員',
             sort: true
+        },
+        {
+            field: 'right',
+            width: 130,
+            title: '操作',
+            fixed: 'right',
+            templet: function (d) {
+                btn = `<a class="layui-btn layui-bg-blue layui-btn-xs" lay-event="Download">下載</a>`
+                if (d.statusNo != "已結案") {
+                    btn += `<a class="layui-btn layui-btn-xs" lay-event="Upload">上傳</a>`
+                }
+                return btn
+            }
         }
 
         ]];
@@ -220,6 +240,21 @@
         var caseID = $("#CaseID").val();
 
         var table = hg.table.datatable('test', '異常不良警示資料維護', '/FQC/GetNGINFOAlertDetailByQuery?caseID=' + caseID, {}, tableCols, '', false, 'full-100');
+       
+        //上傳
+        function Upload(obj) {
+            if (obj.data.caseID) {
+
+                hg.open('上傳檔案', '/FQC/FQC014R/' + obj.data.caseID, 800, 550);
+            }
+        };
+        //下載
+        function Download(obj) {
+            if (obj.data.caseID) {
+
+                hg.open('下載檔案', '/FQC/FQC014RV/' + obj.data.caseID, 800, 550);
+            }
+        };
 
 
     </script>
@@ -232,3 +267,19 @@
     {{ d.wipNoF }}
     {{#  } }}
 </script>
+<script>
+    document.getElementById('myForm').addEventListener('submit', function (event) {
+        // 获取 select 元素的值
+        var status = document.querySelector('select[name="StatusNo"]').value;
+
+        // 如果值是 "F"（已完結），则弹出确认框
+        if (status === 'F') {
+            var confirmFinish = confirm("請問此CASE是否確定處理完成？");
+            // 如果用户点击了 "取消"，则阻止表单提交
+            if (!confirmFinish) {
+                event.preventDefault(); // 阻止表单提交
+            }
+            // 如果用户点击 "確定"，则继续执行表单提交，服务器会处理 FQC014USave
+        }
+    });
+</script>

AMESCoreStudio.Web/Views/FQC/FQC014UV.cshtml

@@ -22,7 +22,7 @@
 <div class="layui-card">
     <div class="layui-card-body">
         <div class="col-sm-12">
-            <form enctype="multipart/form-data" method="post">
+            <form enctype="multipart/form-data" method="post"　id="myForm">
                 <div asp-validation-summary="ModelOnly" class="text-danger"></div>
                 <input type="hidden" asp-for="UserID" />
                 <input type="hidden" asp-for="CreateDate" />
@@ -67,19 +67,13 @@
                 <table class="layui-table">
                     <tr>
                         <td><label asp-for="CreateDate" class="control-label"></label></td>
-                        <td><input asp-for="CreateDate" class="layui-input" style="background-color: #D3D3D3;" readonly="readonly" /></td>
+                        <td><input class="layui-input" style="background-color: #D3D3D3;" readonly="readonly" value="@Model.CreateDate.ToString("yyyy-MM-dd")" /></td>
                         <td><label asp-for="FinishDate" class="control-label"></label></td>
-                        <td><input asp-for="FinishDate" class="layui-input" style="background-color: #D3D3D3;" readonly="readonly" /></td>
+                        <td><input class="layui-input" style="background-color: #D3D3D3;" readonly="readonly" value="@Model.FinishDate?.ToString("yyyy-MM-dd")" /></td>
                     </tr>
                     <tr>
                         <td><label asp-for="StatusNo" class="control-label"></label></td>
-                        <td>
+                        <td><input asp-for="StatusNo" class="layui-input" style="background-color: #D3D3D3;" readonly="readonly" id="statusInput" /></td>
-                            <select asp-for="StatusNo" class="custom-select col-sm-9">
-                                <option value="E">處理中</option>
-                                <option value="F">已完結</option>
-                            </select>
-                        </td>
-
                     </tr>
                     <tr>
                         <td><label asp-for="ShortTerm" class="control-label"></label></td>
@@ -104,7 +98,8 @@
                     </tr>
                     <tr>
                         <td><label asp-for="UpdateUserID" class="control-label"></label></td>
-                        <td colspan="3"><select asp-for="UpdateUserID" asp-items="@ViewBag.UserList" class="custom-select"></select></td>
+
+                        <td colspan="3"><input value="@ViewBag.UpdateUserName" class="layui-input" style="background-color: #D3D3D3;" readonly="readonly" /></tdtd>
                     </tr>
                 </table>
                 <span style="color: firebrick;word-break: break-all;" class="text-danger offset-sm-3">@Html.ValidationMessage("error")</span>
@@ -178,6 +173,7 @@
             field: 'createDate',
             width: 100,
             title: '警報異常時間',
+            templet: '<div>{{ layui.util.toDateString(d.createDate, "yyyy/MM/dd") }}</div>',
             sort: true
         },
         {
@@ -209,6 +205,16 @@
             width: 100,
             title: '作業人員',
             sort: true
+        },
+        {
+            field: 'right',
+            width: 130,
+            title: '操作',
+            fixed: 'right',
+            templet: function (d) {
+                btn = `<a class="layui-btn layui-bg-blue layui-btn-xs" lay-event="Download">下載</a>`
+                return btn
+            }
         }
 
         ]];
@@ -216,6 +222,20 @@
         var caseID = $("#CaseID").val();
 
         var table = hg.table.datatable('test', '異常不良警示資料維護', '/FQC/GetNGINFOAlertDetailByQuery?caseID=' + caseID, {}, tableCols, '', false, 'full-100');
+        //上傳
+        function Upload(obj) {
+            if (obj.data.caseID) {
+
+                hg.open('上傳檔案', '/FQC/FQC014R/' + obj.data.caseID, 800, 550);
+            }
+        };
+        //下載
+        function Download(obj) {
+            if (obj.data.caseID) {
+
+                hg.open('下載檔案', '/FQC/FQC014RV/' + obj.data.caseID, 800, 550);
+            }
+        };
 
 
     </script>
@@ -226,5 +246,20 @@
         {{ d.wipNoF }}
         {{#  } }}
     </script>
+    <script>
+        // 获取 StatusNo 的值（假设它已经绑定了服务器的值）
+        var status = document.querySelector('input[name="StatusNo"]').value;
+        // 获取显示 StatusNo 的 input 元素
+        var statusInput = document.getElementById('statusInput');
+
+        // 根据 StatusNo 的值修改显示文本
+        if (status === 'F') {
+            statusInput.value = '已完結';
+        } else if (status === 'E') {
+            statusInput.value = '處理中';
+        } else {
+            statusInput.value = '未處理';  // 如果有其他情况，清空显示内容
+        }
+    </script>
 
 }

AMESCoreStudio.WebApi/Controllers/AMES/NgRepairsController.cs

@@ -15,6 +15,8 @@ using System.Net.Mail;
 using System.Data.Common;
 using System.Data;
 using System.Dynamic;
+using Dapper;
+using AMESCoreStudio.WebApi.Extensions;
 
 namespace AMESCoreStudio.WebApi.Controllers.AMES
 {
@@ -27,14 +29,19 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
     {
         private readonly AMESContext _context;
         private readonly IConfiguration _config;
+        private readonly ESUNAMESContext _context_esun;
+        private readonly IConfiguration _config_esun;
         /// <summary>
         /// 
         /// </summary>
         /// <param name="context"></param>
-        public NgRepairsController(AMESContext context)
+        public NgRepairsController(AMESContext context, ESUNAMESContext context_esun)
         {
             _config = new ConfigurationBuilder().SetBasePath(Environment.CurrentDirectory).AddJsonFile("appsettings.json").Build();
             _context = context;
+
+            _config_esun = new ConfigurationBuilder().SetBasePath(Environment.CurrentDirectory).AddJsonFile("appsettings.json").Build();
+            _context_esun = context_esun;
         }
 
         /// <summary>
@@ -1642,39 +1649,96 @@ and d.wip_no = '{0}' and a.station_id={1} and b.part_no='{2}'", wipNo, stationID
         public async Task<ResultModel<dynamic>> GetNgRepairDataByBarcodeNO(string barcodeNo)
         {
             ResultModel<dynamic> result = new ResultModel<dynamic>();
-            var q = from q1 in _context.NgRepairs
-                    join q2 in _context.NgInfos on q1.NgID equals q2.NgID
-                    join q3 in _context.BarcodeInfoes on q2.BarcodeID equals q3.BarcodeID
-                    where q3.BarcodeNo == barcodeNo
-                    join q7 in _context.Stationses on q2.StationId equals q7.StationID
-                    join q8 in _context.UserInfoes on q1.CreateUserID equals q8.UserID
-                    join q9 in _context.WipInfos on q3.WipID equals q9.WipID
-                    join q5 in _context.FactoryInfos on q9.WerksNO equals q5.FactoryNo
-                    select new
-                    {
 
-                        q1.CreateDate,
+            var querySql = @"select  
-                        q7.StationName,
+                                q1.create_date CreateDate,
-                        q3.BarcodeNo,
+                                q7.station_name StationName,
-                        q2.TypeNo,
+                                q3.barcode_no BarcodeNo,
-                        q2.StationId,
+                                q2.type_no TypeNo,
-                        q2.ReasonNo,
+                                q2.station_id StationId,
-                        q1.RepairNo,
+                                q2.reason_no ReasonNo,
-                        q1.RepairTypeNo,
+                                q1.repair_no RepairNo,
-                        q1.RepairDesc,
+                                q1.repair_type_no RepairTypeNo,
-                        q1.PartNo,
+                                q1.repair_desc RepairDesc,
-                        UserName = q5.FactoryNameCh + q8.UserName
+                                q1.part_no PartNo,
-                    };
+                                q5.factory_name_ch  || q8.user_name AS UserName
+                                from JHAMES.Barcode_Info q3 ,JHAMES.Stations q7,
+                                     JHSYS.User_Info q8 ,JHAMES.Wip_Info q9 ,
+                                     JHAMES.Factory_Info q5,JHAMES.Ng_Info q2 
+                                LEFT outer join JHAMES.Ng_Repair q1 on q2.NG_ID = q1.NG_ID
+                                where q2.barcode_id = q3.barcode_id 
+                                and q2.station_id = q7.station_id
+                                and q2.Create_UserID = q8.User_ID
+                                and q3.wip_id = q9.wip_id
+                                and q9.werks_no = q5.Factory_No
+                                and q3.Barcode_No = :BarcodeNo ";
+            DynamicParameters p = new DynamicParameters();
+            p.Add("BarcodeNo", barcodeNo);
+
+            var q = _context.Database.DapperQuery<dynamic>(querySql, p).ToList();
+
+
+
+          
+            //紀錄筆數
+            result.DataTotal = q.Count();
+
+            result.Data = q;
 
+            if (result == null)
+            {
+                result.Msg = "查無資料";
+                result.Success = false;
+                return result;
+            }
 
+            result.Success = true;
+            result.Msg = "OK";
+            return result;
+        }
 
+        /// <summary>
+        /// 安勤異常警示使用
+        /// </summary>
+        /// <param name="barcodeNo"></param>
+        /// <returns></returns>
+        [Route("[action]")]
+        [HttpGet]
+        public async Task<ResultModel<dynamic>> GetNgRepairDataByBarcodeNO_ESUN(string barcodeNo)
+        {
 
-            q = q.OrderBy(w => w.CreateDate);
+            ResultModel<dynamic> result = new ResultModel<dynamic>();
+            var querySql = @"select  
+                                q1.create_date CreateDate,
+                                q7.station_name StationName,
+                                q3.barcode_no BarcodeNo,
+                                q2.type_no TypeNo,
+                                q2.station_id StationId,
+                                q2.reason_no ReasonNo,
+                                q1.repair_no RepairNo,
+                                q1.repair_type_no RepairTypeNo,
+                                q1.repair_desc RepairDesc,
+                                q1.part_no PartNo,
+                                q5.factory_name_ch  || q8.user_name AS UserName
+                                from JHAMES.Barcode_Info q3 ,JHAMES.Stations q7,
+                                     JHSYS.User_Info q8 ,JHAMES.Wip_Info q9 ,
+                                     JHAMES.Factory_Info q5,JHAMES.Ng_Info q2 
+                                LEFT outer join JHAMES.Ng_Repair q1 on q2.NG_ID = q1.NG_ID
+                                where q2.barcode_id = q3.barcode_id 
+                                and q2.station_id = q7.station_id
+                                and q2.Create_UserID = q8.User_ID
+                                and q3.wip_id = q9.wip_id
+                                and q9.werks_no = q5.Factory_No
+                                and q3.Barcode_No = :BarcodeNo ";
+            DynamicParameters p = new DynamicParameters();
+            p.Add("BarcodeNo", barcodeNo);
+
+            var q = _context_esun.Database.DapperQuery<dynamic>(querySql, p).ToList();
 
             //紀錄筆數
             result.DataTotal = q.Count();
 
-            result.Data = await q.ToListAsync();
+            result.Data = q;
 
             if (result == null)
             {

AMESCoreStudio.WebApi/Models/AMES/NgInfoAlertMaster.cs

@@ -141,7 +141,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
         public DateTime? FinishDate { get; set; }
 
         /// <summary>
-        /// 警報處理人員
+        /// QA人員
         /// </summary>
         [DataMember]
         [Display(Name = "QA人員")]

AMESCoreStudio.WebApi/Models/ESUNAMESContext.cs

@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
+using AMESCoreStudio.WebApi;
+using AMESCoreStudio.WebApi.Models.SYS;
+using AMESCoreStudio.WebApi.Models.AMES;
+using AMESCoreStudio.WebApi.Models.BAS;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Query.SqlExpressions;
+using System.Reflection;
+
+
+namespace AMESCoreStudio.WebApi
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class ESUNAMESContext : DbContext
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="options"></param>
+        public ESUNAMESContext(DbContextOptions<ESUNAMESContext> options)
+            : base(options)
+        {
+            //Configuration.ProxyCreationEnabled = false;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="datePartArg"></param>
+        /// <param name="date"></param>
+        /// <returns></returns>
+        public int? DatePart(string datePartArg, DateTimeOffset? date) => throw new InvalidOperationException($"{nameof(DatePart)} cannot be called client side.");
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="modelBuilder"></param>
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            var methodInfo = typeof(DbFunctionExtensions).GetMethod(nameof(DatePart));
+
+            var datePartMethodInfo = typeof(ESUNAMESContext)
+                .GetRuntimeMethod(nameof(ESUNAMESContext.DatePart), new[] { typeof(string), typeof(DateTimeOffset) });
+            modelBuilder.HasDbFunction(datePartMethodInfo)
+               .HasTranslation(args =>
+                        new SqlFunctionExpression("DatePart",
+                            new[]
+                            {
+                            new SqlFragmentExpression((args.ToArray()[0] as SqlConstantExpression).Value.ToString()),
+                            args.ToArray()[1]
+                            },
+                            true,
+                            new[] { false, false },
+                            typeof(int?),
+                            null
+                        )
+                    );
+
+       
+        }
+
+    }
+}

AMESCoreStudio.WebApi/Startup.cs

@@ -58,7 +58,9 @@ namespace AMESCoreStudio.WebApi
             services.AddDbContext<QASRVContext>(options =>
              options.UseSqlServer(Configuration.GetConnectionString("QASRVConnection"))
              );
-
+            services.AddDbContext<ESUNAMESContext>(
+               opt => opt.UseLazyLoadingProxies().UseOracle(Configuration.GetConnectionString("ESUNAMESContext"), b => b.UseOracleSQLCompatibility("11"))
+               .UseLoggerFactory(LoggerFactory.Create(builder => builder.AddConsole())));
             services.AddControllers();
 
             services.AddSwaggerGen(c =>

AMESCoreStudio.WebApi/appsettings.json

@@ -11,7 +11,8 @@
     "ESUNContext": "Data Source=.;Initial Catalog=SFIS_ESUN;User Id=sa;Password=20000123;Encrypt=True;TrustServerCertificate=True;Connect Timeout=0;",
     "AVLEContext": "Data Source=GPMDBN;Initial Catalog=iFactory;User Id=ipro_mis;Password=mmii@2019;Encrypt=False;",
     "TestLogConnection": "Data Source=GPMDBN;Initial Catalog=TestAutomate;user id=ipro_mis;password=mmii@2019;Encrypt=False;",
-    "AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=jhdb)));User Id=JHSYS;Password=ASYS666;"
+    "AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=jinhon-info.com.tw)(PORT=1526))(CONNECT_DATA=(SERVICE_NAME=jinhon1)));User Id=JHSYS;Password=ASYS666;",
+    "ESUNAMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=jinhon-info.com.tw)(PORT=1528))(CONNECT_DATA=(SERVICE_NAME=jinhon2)));User Id=JHSYS;Password=ASYS666;"
     //"AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=jhdb)));User Id=system;Password=admin;"
     //"AMESContextO": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=cpadb)));User Id=JHSYS;Password=ASYS666;"
   },