1.新增外包模組的條碼生產履歷查詢OCM012

2.新增外包模組的在製分布圖OCM013
3.新增外包模組的未結工單查詢OCM014

AMESCoreStudio.Web/Controllers/PCSController.cs

@@ -4235,6 +4235,53 @@ namespace AMESCoreStudio.Web.Controllers
         #region PCS008 未結工單查詢
         public async Task<IActionResult> PCS008(string id)
         {
+            if (id != null)
+            {
+                string[] param = id.Split('_');
+                if (param[0] != null && param[0] != "")
+                {
+                    await GetFactoryUnit(param[0]);
+                    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;
+                                    }
+                                }
+                            }
+                        }
+
+                    }
+                }
+            }
+            else
+            {
+                await GetFactoryUnit();
+            }
+
+            /*
             if (id != null)
             {
                 await GetFactoryUnit(id);
@@ -4244,16 +4291,17 @@ namespace AMESCoreStudio.Web.Controllers
             {
                 await GetFactoryUnit();
             }
+            */
 
             //await GetFactoryUnit();
             return View();
         }
 
         [HttpGet]
-        public async Task<IActionResult> PCS008V(string unitNo, string wipNo, string itemNo, string dateStr, string dateEnd)
+        public async Task<IActionResult> PCS008V(string unitNo, string wipNo, string itemNo, string dateStr, string dateEnd,string factoryNo)
         {
             IResultModel<dynamic> result = await _pcsApi.GetWipInfoPCS008(unitno: unitNo, wipno: wipNo, itemno: itemNo,
-                date_str: dateStr, date_end: dateEnd);
+                date_str: dateStr, date_end: dateEnd, factoryno: factoryNo);
 
             string wipDataList = "<font size='3'>";
             if (result.DataTotal > 0)

AMESCoreStudio.Web/Controllers/QRSController.cs

@@ -19,21 +19,61 @@ namespace AMESCoreStudio.Web.Controllers
         public readonly IPPS _ppsApi;
         public readonly IBAS _basApi;
         public readonly IPCS _pcsApi;
+        public readonly ISYS _sysApi;
         private readonly IWebHostEnvironment _env;
 
-        public QRSController(ILogger<QRSController> logger, IREP repApi, IPPS ppsApi, IBAS basApi, IPCS pcsApi, IWebHostEnvironment env)
+        public QRSController(ILogger<QRSController> logger, IREP repApi, IPPS ppsApi, IBAS basApi, IPCS pcsApi, ISYS sysApi, IWebHostEnvironment env)
         {
             _logger = logger;
             _repApi = repApi;
             _ppsApi = ppsApi;
             _basApi = basApi;
             _pcsApi = pcsApi;
+            _sysApi = sysApi;
             _env = env;
         }
 
         public async Task<IActionResult> QRS009(string id)
         {
-            IResultModel<dynamic> result = await _pcsApi.GetWipInfo4QRS009(id);
+            string unitNo = null, factoryNo = null;
+            if (id != null)
+            {
+                string[] param = id.Split('_');
+                if (param[0] != null && param[0] != "")
+                {
+                    unitNo = param[0];
+                }
+                if (param.Length > 1)
+                {
+                    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());
+                                            factoryNo = jo["factoryNo"].ToString();
+                                        }
+                                    }
+                                }
+                            }
+
+                        }
+                    }
+                }
+            }
+            IResultModel<dynamic> result = await _pcsApi.GetWipInfo4QRS009(unitNo, factoryNo);
 
             string wipDataList = "<font size='3'>";
             if (result.DataTotal > 0)

AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@@ -112,7 +112,7 @@ namespace AMESCoreStudio.Web
         [WebApiClient.Attributes.HttpGet("api/WipInfos/GetWipInfoPCS008")]
         //ITask<List<WipInfo>> GetWipInfoSelectParameter(string unitno = null, string wipno = null);
         ITask<ResultModel<dynamic>> GetWipInfoPCS008(string unitno = null, string wipno = null, int lineid = 0
-            , string itemno = null, string date_str = null, string date_end = null, int page = 0, int limit = 10);
+            , string itemno = null, string date_str = null, string date_end = null, string factoryno = null, int page = 0, int limit = 10);
 
         /// <summary>
         /// 查詢工單基本資料-WipID
@@ -984,7 +984,7 @@ namespace AMESCoreStudio.Web
         /// </summary>
         /// <returns></returns>
         [WebApiClient.Attributes.HttpGet("api/WipInfos/GetWipInfo4QRS009")]
-        ITask<ResultModel<dynamic>> GetWipInfo4QRS009(string unitNo);
+        ITask<ResultModel<dynamic>> GetWipInfo4QRS009(string unitNo,string factoryNo);
 
 
         /// <summary>

AMESCoreStudio.Web/Views/PCS/PCS008.cshtml

@@ -45,6 +45,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 class="layui-form-item">
@@ -96,6 +97,7 @@
 
             form.on('submit(querysubmit)', function () {
                 var data = $("#myForm").serialize();
+                //alert(data);
                 hg.open('未結工單分布圖', '/PCS/PCS008V?' + data, '', '', true);
             });
 

AMESCoreStudio.WebApi/Controllers/AMES/WipInfosController.cs

@@ -54,10 +54,11 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
         /// 查詢工單資料QRS009
         /// </summary>
         /// <param name="unitNo"></param>
+        /// <param name="factoryNo"></param>
         /// <returns></returns>
         [Route("[action]")]
         [HttpGet]
-        public async Task<ResultModel<dynamic>> GetWipInfo4QRS009(string unitNo)
+        public async Task<ResultModel<dynamic>> GetWipInfo4QRS009(string unitNo,string factoryNo)
         {
             ResultModel<dynamic> result = new ResultModel<dynamic>();
             var q = from q1 in _context.WipInfos
@@ -77,7 +78,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         q1.CreateDate,
                         q2.ItemNO,
                         q3.LineDesc,
-                        q4.UnitName
+                        q4.UnitName,
+                        q1.WerksNO
                     };
 
             q = q.Where(w => w.StatusNO == "A");
@@ -85,6 +87,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             {
                 q = q.Where(w => w.UnitNO.Equals(unitNo));
             }
+            if (factoryNo != null)
+            {
+                q = q.Where(w => w.WerksNO.Equals(factoryNo));
+            }
 
             //紀錄筆數
             result.DataTotal = q.Count();
@@ -480,7 +486,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
                         q1.CreateDate,
                         q2.ItemNO,
                         q3.LineDesc,
-                        q4.UnitName
+                        q4.UnitName,
+                        q1.WerksNO
                     };
 
             if (statusNo == null)
@@ -502,6 +509,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
             {
                 q = q.Where(w => w.UnitNO.Equals(value.unitno));
             }
+            if (value.factoryno != null)
+            {
+                q = q.Where(w => w.WerksNO.Equals(value.factoryno));
+            }
 
             DateTime dateTime = DateTime.Now;
             if (DateTime.TryParse(value.date_str, out dateTime))