someupdate

Server/Apis/Siger.ApiACC/Controllers/AutomationOperateController.cs

@@ -260,21 +260,37 @@ namespace Siger.ApiACC.Controllers
             return host;
         }
         /// <summary>
-        /// 扫描
+        /// 扫描 
         /// </summary>
         /// <param name="code"></param>
+        /// <param name="id"></param>
         /// <returns></returns>
         [HttpGet]
-        public IActionResult ScanCode(string code)
+        public IActionResult ScanCode(string code,int id)
         {
-            var result = _automationFixtureToolsProduct.GetPlanFixtureInfo(ProjectId, code);
-            if (result==null)
+            if (string.IsNullOrEmpty(code))
+            {
+                var result = _automationFixtureToolsProduct.GetPlanFixtureInfo(ProjectId, code);
+                if (result == null)
+                {
+                    throw new BadRequestException(AccEnum.FixtureOrderNulll);
+                }
+                var sn = _automationTaskList.CreateRandonSn(result.ProductCode);
+                result.Sn = sn;
+                return new ObjectResult(result);
+            }
+            if (id==0)
+            {
+                throw new BadRequestException(RequestEnum.ParameterMiss);
+            }
+            //下料 
+            var unload = _automationFixtureToolsProduct.GetPlanFixtureInfoByLocation(ProjectId, id);
+            if (unload == null)
             {
                 throw new BadRequestException(AccEnum.FixtureOrderNulll);
             }
-            var sn = _automationTaskList.CreateRandonSn(result.ProductCode);
-            result.Sn = sn;
-            return new ObjectResult(result);
+            return new ObjectResult(unload);
+
         }
         /// <summary>
         /// 准备上料 -生成指令 load （立库->上料位）
@@ -676,5 +692,7 @@ namespace Siger.ApiACC.Controllers
                 throw new BadRequestException(CommonEnum.Fail);
             }
         }
+
+   
     }
 }

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/AutomationFixtureToolsProductRepository.cs

@@ -136,7 +136,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                             ProductName = p.product_name,
                             Url=pd.image,
                             FixtureName=t.name,
-                            FixtureGuid=t.guid,
+                            FixtureGuid=t.code,
                             ProductCode =q!=null? q.productcode:"",
                             Location =l!=null? l.locationid:0,
                         };
@@ -218,5 +218,29 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                 throw;
             }
         }
+
+        public ResponsePlanlFixtureInfo GetPlanFixtureInfoByLocation(int projectId, int id)
+        {
+            var query = from d in _context.siger_project_product_plan_detail
+                        join p in _context.siger_project_product_plan on d.PlanId equals p.id
+                        join q in _context.siger_automation_fixture_tools_product on p.product_code equals q.productcode
+                        join t in _context.siger_automation_fixture_tools on q.fixturetools equals t.guid
+                        join l in _context.siger_automation_location on t.guid equals l.fixturetools
+                        join pd in _context.siger_project_product on p.product_id equals pd.id
+                        where q.projectId == projectId && l.id == id
+                        && q.status == (int)RowState.Valid && t.status == (int)RowState.Valid && l.status == (int)RowState.Valid
+                        select new ResponsePlanlFixtureInfo
+                        {
+                            OrderNumber = d.OrderNumber,
+                            ProductName = p.product_name,
+                            Url = pd.image,
+                            FixtureName = t.name,
+                            FixtureGuid = t.code,
+                            ProductCode = q != null ? q.productcode : "",
+                            Location = l != null ? l.locationid : 0,
+                            Sn=l.sn
+                        };
+            return query.FirstOrDefault();
+        }
     }
 }

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/AutomationTaskListRepository.cs

@@ -41,28 +41,49 @@ namespace Siger.Middlelayer.AccRepository.Repositories
 
         }
 
+        /// <summary>
+        /// 长度10 任务编号 PLC限制
+        /// </summary>
+        /// <param name="trigerType"></param>
+        /// <returns></returns>
         public string CrateTaskNumber(TaskTrigerType trigerType)
         {
             var date = DateTime.Now;
-            var lable = date.ToString(UnixTimeHelper.DateTimeFormatYmd)+date.Hour + date.Minute + date.Second;
+            var lable = date.Year+date.Day+date.Hour + date.Minute + date.Second;
             var lableUnix = UnixTimeHelper.GetNow();
-            var radon = new Random().Next(1000, 9999);
+           
             if (trigerType== TaskTrigerType.Auto)
             {
-                return $"A{lableUnix}R{radon}T{lable}";
+                return $"{date.Year}{date.DayOfYear}A{lable}";
             }else
             {
-                return $"M{lableUnix}R{radon}T{lable}";
+                return $"{date.Year}{date.DayOfYear}M{lable}";
             }
         }
-
+        /// <summary>
+        /// 工件长度10 PLC 限制
+        /// </summary>
+        /// <param name="productCode"></param>
+        /// <returns></returns>
         public string CreateRandonSn(string productCode)
         {
             var date = DateTime.Now;
             var serinum = date.DayOfYear+date.Hour + date.Minute + date.Second + date.Millisecond;
+            var dayofyear = GetDayOfYear(date);
+            var lable = $"{date.Year}{dayofyear}{serinum}";
+            return lable;
+        }
+        private string GetDayOfYear(DateTime dt)
+        {
+            var lable = dt.DayOfYear.ToString();
+            var result = string.Empty;
+            for (int i = 0;i< 3- lable.Length;i++)
+            {
+                 result +="0";
+            }
+            return $"{result}{lable}";
+
 
-            var randon = new Random().Next(1000, 9999);
-            return $"{productCode}{date.ToString(UnixTimeHelper.DateTimeFormatYmd)}{serinum}{randon}";
         }
 
         public IPagedCollectionResult<ResponseAutomationTasklist> GetTasklistPagedList(List<int> sections, int taskType, string productCode, string TaskNo, string sn, int status, int actionType, string tiggertime, string comptime, int projectid, int page, int pagesize)

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/Interface/IAutomationFixtureToolsProductRepository.cs

@@ -21,6 +21,14 @@ namespace Siger.Middlelayer.AccRepository.Repositories.Interface
         /// <returns></returns>
         ResponsePlanlFixtureInfo GetPlanFixtureInfo(int projectId, string ordernumber);
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="ordernumber"></param>
+        /// <returns></returns>
+        ResponsePlanlFixtureInfo GetPlanFixtureInfoByLocation(int projectId, int id);
+
         CommonImportResult ImportData(IEnumerable<FixtureToolsProductTemplate> list, int projectid, int userid);
 
         /// <summary>