someupdate

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

@@ -28,8 +28,11 @@ namespace Siger.ApiACC.Controllers
         private readonly IAutomationMachineStatus _automationMachineStatus;
         private readonly ISigerProjectMachineAttributionRepository _sigerProjectMachineAttribution;
         private readonly IAutomationTaskListRepository _automationTaskList;
+        private readonly IProductPlanDetails _planDetails;
+        private readonly IProductPlanRepository _productPlan;
 
-        public AutomationOperateController(IUnitOfWork unitOfWork,ISigerProjectLevelSectionRepository sigerProjectLevelSection , ISigerDict sigerDict,IAutomationMachineStatus  automationMachineStatus,ISigerProjectMachineAttributionRepository sigerProjectMachineAttribution,IAutomationTaskListRepository automationTaskList)
+        public AutomationOperateController(IUnitOfWork unitOfWork,ISigerProjectLevelSectionRepository sigerProjectLevelSection , ISigerDict sigerDict,IAutomationMachineStatus  automationMachineStatus,ISigerProjectMachineAttributionRepository sigerProjectMachineAttribution,IAutomationTaskListRepository automationTaskList,
+            IProductPlanDetails planDetails,IProductPlanRepository productPlan)
         {
             _unitOfWork = unitOfWork;
             _sigerProjectLevelSection = sigerProjectLevelSection;
@@ -37,6 +40,8 @@ namespace Siger.ApiACC.Controllers
             _automationMachineStatus = automationMachineStatus;
             _sigerProjectMachineAttribution = sigerProjectMachineAttribution;
             _automationTaskList = automationTaskList;
+            _planDetails = planDetails;
+            _productPlan = productPlan;
         }
 
         /// <summary>
@@ -163,7 +168,20 @@ namespace Siger.ApiACC.Controllers
             {
                 throw new BadRequestException(AccEnum.TaskProcessing);
             }
+
+            var plandts = _planDetails.Get(f => f.projectId == ProjectId && f.OrderNumber == loading.code);
+            if (plandts==null)
+            {
+                throw new BadRequestException(CncEnum.PlanHasExist);
+            }
+            var plan = _productPlan.Get(f => f.id == plandts.PlanId);
+            if (plan == null)
+            {
+                throw new BadRequestException(CncEnum.PlanHasExist);
+            }
+
             var taskNo = _automationTaskList.CrateTaskNumber(Automation.TaskTrigerType.Manual);
+            var sn = _automationTaskList.CreateRandonSn(plan.product_code);
 
             _automationTaskList.Insert(new siger_automation_task_list
             {
@@ -180,6 +198,9 @@ namespace Siger.ApiACC.Controllers
                  completetime=DateTime.MinValue,
                  trigger= Automation.TaskTrigerType.Manual,
                  projectId=ProjectId,
+                 productid=plan.product_id,
+                 sn=sn,
+                 ordercode=plandts.OrderNumber,
                  remark="手动任务",
                  
             });

Server/Common/Siger.Middlelayer.Share/Helpers/UnixTimeHelper.cs

@@ -15,6 +15,7 @@ namespace Siger.Middlelayer.Common.Helpers
         public const string DateTimeFormatYmd = "yyyyMMdd";
 
         public const string TimeFormat = "HH:mm:ss";
+        public const string DateTimeFormatYYmmdd = "yyMMdd";
 
         /// <summary>
         /// unix time to date-->yyyyMMdd

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

@@ -165,5 +165,7 @@ namespace Siger.Middlelayer.AccRepository
         public DbSet<siger_automation_machine_status> siger_automation_machine_status { get; set; }
 
         public DbSet<siger_automation_produce_history> siger_automation_produce_history { get; set; }
+
+        public DbSet<siger_automation_fixture_tools_monitor> siger_automation_fixture_tools_moniter { get; set; }
     }
 }

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Entities/siger_automation_fixture_tools_monitor.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Siger.Middlelayer.AccRepository.Entities
+{
+    public class siger_automation_fixture_tools_monitor:AccEntityBase
+    {
+        /// <summary>
+        /// 工装ID
+        /// </summary>
+        public int fixtureId { get; set; }
+        /// <summary>
+        /// 当前工站ID
+        /// </summary>
+        public int section { get; set; }
+        /// <summary>
+        /// 当前Sn
+        /// </summary>
+        public string sn { get; set; }
+        /// <summary>
+        /// 工序ID
+        /// </summary>
+        public int route { get; set; }
+        /// <summary>
+        /// 工序描述
+        /// </summary>
+        public string routedesc { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime createtime { get; set; }
+        /// <summary>
+        /// 更新时间
+        /// </summary>
+        public DateTime updatetime { get; set; }
+    }
+}

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Entities/siger_automation_task_list.cs

@@ -26,7 +26,7 @@ namespace Siger.Middlelayer.AccRepository.Entities
         /// <summary>
         /// 工件ID
         /// </summary>
-        public int materialid { get; set; }
+        public string sn { get; set; }
         /// <summary>
         /// 工单号
         /// </summary>

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

+using Siger.Middlelayer.AccRepository.Entities;
+using Siger.Middlelayer.AccRepository.Repositories.Interface;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Siger.Middlelayer.AccRepository.Repositories
+{
+    internal class AutomationFixtureMonitor : AccRepositoryBase<siger_automation_fixture_tools_monitor>, IAutomationFixtureMonitor
+    {
+        public AutomationFixtureMonitor(ApiAccDbContext context) : base(context)
+        {
+        }
+    }
+}

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

@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
 using Siger.Middlelayer.AccRepository.Entities;
 using Siger.Middlelayer.AccRepository.Repositories.Interface;
 using Siger.Middlelayer.Common.Helpers;
@@ -45,5 +46,14 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                 return $"M{radon}T{lable}";
             }
         }
+
+        public string CreateRandonSn(string productCode)
+        {
+            var date = DateTime.Now;
+            var serinum = date.DayOfYear+date.Hour + date.Minute + date.Second + date.Millisecond;
+
+            var randon = new Random().Next(1000, 9999);
+            return $"{productCode}{date.ToString(UnixTimeHelper.DateTimeFormatYmd)}{serinum}{randon}";
+        }
     }
 }

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

+using Siger.Middlelayer.AccRepository.Entities;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Siger.Middlelayer.AccRepository.Repositories.Interface
+{
+    public interface IAutomationFixtureMonitor : IAccRepositoryBase<siger_automation_fixture_tools_monitor>
+    {
+    }
+}

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

@@ -16,5 +16,11 @@ namespace Siger.Middlelayer.AccRepository.Repositories.Interface
         /// <param name="section"></param>
         /// <returns></returns>
         bool CanTask(int projectId,int section);
+
+        /// <summary>
+        /// 创建随机工件号码 SN
+        /// </summary>
+        /// <returns></returns>
+        string CreateRandonSn(string productCode);
     }
 }