1.新增外包管理模组OCM

1.1.新增工单资料查询OCM011

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -3984,16 +3984,45 @@ namespace AMESCoreStudio.Web.Controllers
         #region PCS005 工單資料查詢
         public async Task<IActionResult> PCS005(string id)
         {
-            if (id != null)
+            string[] param = id.Split('_');
+            if (param[0] != null && param[0] != "")
             {
-                await GetFactoryUnit(id);
+                await GetFactoryUnit(param[0]);
-                ViewBag.UnitNo = id;
+                ViewBag.UnitNo = param[0];
             }
             else
             {
                 await GetFactoryUnit();
             }
 
+            if (param[1] != null && param[1] == "OC")
+            {
+                if (Request.Cookies["_AMESCookie"] != null)
+                {
+                    var userID = "";
+                    HttpContext.Request.Cookies.TryGetValue("UserID", out userID);
+                    if (userID != null)
+                    {
+                        if (int.Parse(userID.ToString()) >= 0)
+                        {
+                            int user_id = int.Parse(userID.ToString());
+                            var user_info = await _sysApi.GetUserData(user_id);
+
+                            if (user_info.DataTotal > 0)
+                            {
+                                foreach (var item in user_info.Data)
+                                {
+                                    JObject jo = JObject.Parse(item.ToString());
+                                    string factoryNo = jo["factoryNo"].ToString();
+                                    ViewBag.UserFactory = factoryNo;
+                                }
+                            }
+                        }
+                    }
+
+                }
+            }
+
             //await GetFactoryUnit();
             return View();
         }
@@ -4001,24 +4030,36 @@ namespace AMESCoreStudio.Web.Controllers
         /// <summary>
         /// PCS005 Query
         /// </summary>
-        /// <param name="unitno">生產單位</param>
+        /// <param name="unitNo">生產單位</param>
         /// <param name="wipNo">工單號碼</param>
         /// <param name="itemNo">料號</param>
+        /// <param name="factoryNo">廠別</param>
         /// <returns></returns>
-        public async Task<IActionResult> PCS005QueryAsync(string unitno, string wipNo, string itemNo, int page = 0, int limit = 10)
+        public async Task<IActionResult> PCS005QueryAsync(string unitNo, string wipNo, string itemNo, string factoryNo, int page = 0, int limit = 10)
         {
-            if (unitno == null)
+            string[] param = Request.Path.ToString().Replace("/PCS/PCS005Query/", "").Split('_');
+            if (param[0] != null && param[0] != "")
             {
-                string unit_no = Request.Path.ToString().Replace("/PCS/PCS005Query/", "");
+                unitNo = param[0];
-                if (unit_no != "")
+            }
+            if (param[1] != null && param[1] != "")
             {
-                    unitno = unit_no;
+                wipNo = param[1];
+            }
+            if (param[2] != null && param[2] != "")
+            {
+                itemNo = param[2];
             }
+            if (param[3] != null && param[3] != "")
+            {
+                factoryNo = param[3];
             }
 
-            IResultModel<dynamic> result = await _pcsApi.GetWipInfoSelectParameter(unitno: unitno
+
+            IResultModel<dynamic> result = await _pcsApi.GetWipInfoSelectParameter(unitno: unitNo
                 , wipno: wipNo
                 , itemno: itemNo
+                , factoryno: factoryNo
                 , page: page
                 , limit: limit);
 

AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@@ -90,7 +90,7 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpGet("api/WipInfos/GetWipInfoSelectParameter")]
         //ITask<List<WipInfo>> GetWipInfoSelectParameter(string unitno = null, string wipno = null);
         ITask<ResultModel<dynamic>> GetWipInfoSelectParameter(string unitno = null, string wipno = null, int lineid = 0
-            , string itemno = null, DateTime? date_str = null, DateTime? date_end = null, string wipType = null, int page = 0, int limit = 10);
+            , string itemno = null, DateTime? date_str = null, DateTime? date_end = null, string wipType = null, string factoryno = null, int page = 0, int limit = 10);
 
         /// <summary>
         /// 查詢工單基本資料+是否已過站

AMESCoreStudio.Web/HttpApis/ISYS.cs

@@ -349,6 +349,13 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpGet("api/UserInfoes/{id}")]
         ITask<List<UserInfo>> GetUserInfo(int id);
 
+        /// <summary>
+        /// 根據ID獲取指定用户關聯資料
+        /// </summary>
+        /// <returns></returns>
+        [WebApiClient.Attributes.HttpGet("api/UserInfoes/GetUserData")]
+        ITask<ResultModel<dynamic>> GetUserData(int id);
+
         /// <summary>
         /// 獲取用户資料
         /// </summary>

AMESCoreStudio.Web/Views/PCS/PCS005.cshtml

@@ -47,6 +47,7 @@
                                 <select id="unit" lay-filter="unit" name="unit" lay-submit asp-items="@ViewBag.FactoryUnitList">
                                 </select>
                                 <input id="unitNo" type="hidden" name="unitNo" value="@ViewBag.UnitNo" />
+                                <input id="factoryNo" type="hidden" name="factoryNo" value="@ViewBag.UserFactory" />
                             </div>
                         </div>
                     </div>
@@ -218,7 +219,14 @@
         //}
         //];
         //基本数据表格
-        var table = hg.table.datatable('query', '工單資料查詢', '/PCS/PCS005Query/' + unitNo.value, {}, tableCols, "", true, 'full-100', ['filter', 'print', 'exports']);
+        //alert(factoryNo.value);
+        //alert(unitNo.value);
+        //alert(wipNo.value);
+        //alert(itemNo.value);
+        var param = unitNo.value + '_' + wipNo.value + '_' + itemNo.value + '_' + factoryNo.value;
+        //alert(param);
+
+        var table = hg.table.datatable('query', '工單資料查詢', '/PCS/PCS005Query/' + param, {}, tableCols, "", true, 'full-100', ['filter', 'print', 'exports']);
 
         $(document).off('mousedown', '.layui-table-grid-down').
             on('mousedown', '.layui-table-grid-down', function (event) {

AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs

@@ -373,7 +373,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         itemNo = q2.ItemNO,
                         lineDesc = q3.LineDesc,
                         unitName = q4.UnitName,
-                        wipType = q1.WipType
+                        wipType = q1.WipType,
+                        factoryNo=q1.WerksNO
                     };
 
 
@@ -413,6 +414,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                 q = q.Where(w => w.wipType == value.wipType);
             }
 
+            if (!string.IsNullOrWhiteSpace(value.factoryno))
+            {
+                q = q.Where(w => w.factoryNo == value.factoryno);
+            }
+
             // 紀錄筆數
             result.DataTotal = q.Count();
 

AMESCoreStudio.WebApi/Controllers/SYS/UserInfoesController.cs

@@ -67,6 +67,42 @@ namespace AMESCoreStudio.WebApi.Controllers.SYS
             return result;
         }
 
+        /// <summary>
+        /// 查詢用戶數據
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [Route("[action]")]
+        [HttpGet]
+        public async Task<ResultModel<dynamic>> GetUserData(int id)
+        {
+            ResultModel<dynamic> result = new ResultModel<dynamic>();
+            var q = from q1 in _context.UserInfoes
+                    join q2 in _context.FactoryInfos on q1.FactoryID equals q2.FactoryID
+                    select new
+                    {
+                        q1.UserID,
+                        q1.UserName,
+                        q2.FactoryNo
+                    };
+
+            //紀錄筆數
+            result.DataTotal = q.Count();
+
+            result.Data = await q.ToListAsync();
+
+            if (result == null)
+            {
+                result.Msg = "查無資料";
+                result.Success = false;
+                return result;
+            }
+
+            result.Success = true;
+            result.Msg = "OK";
+            return result;
+        }
+
             /// <summary>
             /// 
             /// </summary>

AMESCoreStudio.WebApi/DTO/AMES/WipInfoDto.cs

@@ -44,5 +44,10 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         /// 工單類型
         /// </summary>
         public string wipType { get; set; }
+
+        /// <summary>
+        /// 工單廠別
+        /// </summary>
+        public string factoryno { get; set; }
     }
 }

AMESCoreStudio.WebApi/DTO/AMES/WipQueryDto.cs

@@ -65,6 +65,11 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
         /// </summary>
         public DateTime wipDueDate { get; set; }
 
+        /// <summary>
+        /// 廠商代碼
+        /// </summary>
+        public string factoryNo { get; set; }
+
         /// <summary>
         /// 廠商中文廠名
         /// </summary>

AMESCoreStudio.WebApi/Models/SYS/UserInfo.cs

@@ -49,6 +49,14 @@ namespace AMESCoreStudio.WebApi.Models.SYS
         [Display(Name = "部門編號")]
         public int DeptID { get; set; }
 
+        /// <summary>
+        /// 廠別編號
+        /// </summary>
+        [Column("FACTORY_ID")]
+        [DataMember]
+        [Display(Name = "廠別編號")]
+        public int FactoryID { get; set; }
+
         /// <summary>
         /// 登入帳號
         /// </summary>