Merge branch 'master' of http://test.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

.gitignore

-#Ignore thumbnails created by Windows
-Thumbs.db
-#Ignore files built by Visual Studio
-*.obj
-*.exe
-*.pdb
-<<<<<<< HEAD
+# Visual Studio 
+
+# User-specific files
+*.suo
 *.user
-*.aps
-*.pch
-*.vspscc
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+[Xx]64/
+[Xx]86/
+[Bb]uild/
+bld/
+[Bb]in/
+[Oo]bj/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+artifacts/
+
 *_i.c
 *_p.c
-*.ncb
-*.suo
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
 *.tlb
+*.tli
 *.tlh
-*.bak
-*.cache
-*.ilk
+*.tmp
+*.tmp_proj
 *.log
-[Bb]in
-[Dd]ebug*/
-*.lib
-*.sbr
-obj/
-[Rr]elease*/
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
 _ReSharper*/
-[Tt]est[Rr]esult*
-.vs/
-#Nuget packages folder
-packages/
-Server/.vs/SigerData/v15/Server/sqlite3/storage.ide
-*.pyc
-[Bb]in/
-[Oo]bj/
-[Ll]og/
-*.dll
-/Server/Apis/Siger.ApiACC/obj/Debug/netcoreapp3.1/Siger.ApiACC.MvcApplicationPartsAssemblyInfo.cs
-*.cache
-*.txt
-*.json
-*.targets
-/Server/Schedule/Siger.Schedule.ToolsModule/obj/Debug/netstandard2.0/Siger.Schedule.ToolsModule.AssemblyInfo.cs
-*.props
-*.png
-*.xml
-*.svg
-*.so
-*.zip
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+*.publishproj
+*.pubxml
+PublishProfiles/
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignoreable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directory
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# LightSwitch generated files
+GeneratedArtifacts/
+ModelManifest.xml
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+.DS_Store
+.vs
+/Server/.vs

Html/src/view/fml/operation_manage/feedingBlanking.vue

@@ -541,7 +541,7 @@ export default {
             ).then((res) => {
                 if (res.data.ret == 1) {
                     this.$Message.success(this.$t(res.data.msg));
-                    this.orderDetail = {};
+                    // this.orderDetail = {};
                 } else {
                     this.$Message.error(this.$t(res.data.msg));
                 }

Server/.vs/SigerData/config/applicationhost.config

@@ -163,7 +163,7 @@
       </site>
       <site name="Siger.ApiConfig" id="2">
         <application path="/" applicationPool="Siger.ApiConfig AppPool">
-          <virtualDirectory path="/" physicalPath="D:\Code\20201209\siger-main\Server\Apis\Siger.ApiConfig" />
+          <virtualDirectory path="/" physicalPath="E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Siger.ApiConfig" />
         </application>
         <bindings>
           <binding protocol="http" bindingInformation="*:9002:localhost" />
@@ -211,7 +211,7 @@
       </site>
       <site name="Siger.ApiDashboard" id="8">
         <application path="/" applicationPool="Siger.ApiDashboard AppPool">
-          <virtualDirectory path="/" physicalPath="D:\Code\20201209\siger-main\Server\Apis\Siger.ApiDashboard" />
+          <virtualDirectory path="/" physicalPath="E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Siger.ApiDashboard" />
         </application>
         <bindings>
           <binding protocol="http" bindingInformation="*:9007:localhost" />
@@ -1030,7 +1030,7 @@
       <handlers>
         <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
       </handlers>
-      <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" hostingModel="InProcess" startupTimeLimit="3600" requestTimeout="23:00:00" />
+      <aspNetCore processPath="%LAUNCHER_PATH%" stdoutLogEnabled="false" hostingModel="InProcess" startupTimeLimit="3600" requestTimeout="23:00:00" />
       <httpCompression>
         <dynamicTypes>
           <add mimeType="text/event-stream" enabled="false" />
@@ -1126,7 +1126,7 @@
       <handlers>
         <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
       </handlers>
-      <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" hostingModel="InProcess" startupTimeLimit="3600" requestTimeout="23:00:00" />
+      <aspNetCore processPath="%LAUNCHER_PATH%" stdoutLogEnabled="false" hostingModel="InProcess" startupTimeLimit="3600" requestTimeout="23:00:00" />
       <httpCompression>
         <dynamicTypes>
           <add mimeType="text/event-stream" enabled="false" />

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

@@ -42,10 +42,11 @@ namespace Siger.ApiACC.Controllers
         private readonly IAutomationFixtureToolsRepository _automationFixtureTools;
         private readonly IProductRouteRepository _productRoute;
         private readonly IAutomationSectionPropertyRepository _automationSectionProperty;
+        private readonly IAutomationProduceHistoryRepository _automationProduceHistory;
 
-        public AutomationController(IUnitOfWork unitOfWork,ISigerProjectLevelSectionRepository sigerProjectLevelSection,IAutomationLineMode automationLineMode,IAutomationMachineStatus automationMachineStatus,ISigerDict sigerDict,IAutomationTaskListRepository automationTaskList,
+        public AutomationController(IUnitOfWork unitOfWork, ISigerProjectLevelSectionRepository sigerProjectLevelSection, IAutomationLineMode automationLineMode, IAutomationMachineStatus automationMachineStatus, ISigerDict sigerDict, IAutomationTaskListRepository automationTaskList,
             ISigerProjectMachineAttributionRepository sigerProjectMachineAttribution, IAutomationFixtureMonitor automationFixtureMonitor, IAutomationLocationRepository automationLocation, IProductionBeatSetRepository productionBeatSet, IAutomationFixtureToolsProductRepository automationFixtureToolsProduct,
-         IAutomationFixtureToolsRepository automationFixtureTools, IProductRouteRepository productRoute, IAutomationSectionPropertyRepository automationSectionProperty)
+         IAutomationFixtureToolsRepository automationFixtureTools, IProductRouteRepository productRoute, IAutomationSectionPropertyRepository automationSectionProperty, IAutomationProduceHistoryRepository automationProduceHistory)
         {
             _unitOfWork = unitOfWork;
             _sigerProjectLevelSection = sigerProjectLevelSection;
@@ -61,33 +62,36 @@ namespace Siger.ApiACC.Controllers
             _automationFixtureTools = automationFixtureTools;
             _productRoute = productRoute;
             _automationSectionProperty = automationSectionProperty;
+            _automationProduceHistory = automationProduceHistory;
         }
- 
+
         /// <summary>
         /// 设备状态接口 用于 保存 设备当前可用状态
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost]
-        public IActionResult MachineStatus([FromBody]RequestAutomationMachine request)
+        public IActionResult MachineStatus([FromBody] RequestAutomationMachine request)
         {
-            var machineAttr = _sigerProjectMachineAttribution.Get(f => f.projectid == PID && f.machine == request.machineid && f.status==(int)RowState.Valid);
-            if (machineAttr==null)
+            var machineAttr = _sigerProjectMachineAttribution.Get(f => f.projectid == PID && f.machine == request.machineid && f.status == (int)RowState.Valid);
+            if (machineAttr == null)
             {
                 throw new BadRequestException(ConfigEnum.MachineAttributionNotFound);
             }
-            var exitsObj = _automationMachineStatus.Get(f => f.machineid == request.machineid );
-            if (exitsObj==null)
+            var exitsObj = _automationMachineStatus.Get(f => f.machineid == request.machineid);
+            if (exitsObj == null)
             {
-                _automationMachineStatus.Insert(new siger_automation_machine_status{ 
-                     section=machineAttr.station,
-                     machineid=request.machineid,
-                     projectId=PID,
-                     updatetime=DateTime.Now,
-                     enable=request.enable==1?1:0,
-                     status=request.status
+                _automationMachineStatus.Insert(new siger_automation_machine_status
+                {
+                    section = machineAttr.station,
+                    machineid = request.machineid,
+                    projectId = PID,
+                    updatetime = DateTime.Now,
+                    enable = request.enable == 1 ? 1 : 0,
+                    status = request.status
                 });
-            }else
+            }
+            else
             {
                 exitsObj.section = machineAttr.station;
                 exitsObj.enable = request.enable;
@@ -95,25 +99,24 @@ namespace Siger.ApiACC.Controllers
                 exitsObj.updatetime = DateTime.Now;
                 _automationMachineStatus.Update(exitsObj);
             }
-           
-         
+
+
             if (_unitOfWork.Commit() > 0)
             {
                 // 设备空闲，或者完成时触发 自动任务
                 if (request.enable == 1)
                 {
-                    if (request.status == (int)Automation.MachineStatus.Waiting || request.status == (int)Automation.MachineStatus.Complated)
+
+                    if (_automationTaskList.CanTask(PID, machineAttr.station))
                     {
-                        if (_automationTaskList.CanTask(PID, machineAttr.station))
+                        var section = _sigerProjectLevelSection.Get(f => f.id == machineAttr.station);
+                        if (section != null)
                         {
-                            var section = _sigerProjectLevelSection.Get(f => f.id == machineAttr.station);
-                            if (section != null)
-                            {
-                                Logger.WriteLineInfo($"MachineStatus 设备 {section.title}状态 触发自动任务检查");
-                                AutoProcess(section.parentid);
-                            }
+                            Logger.WriteLineInfo($"自动化业务流转--MachineStatus 设备 {section.title}状态 触发自动任务检查 section parentid:{section.parentid}");
+                            AutoProcess(section.parentid);
                         }
                     }
+
                 }
                 return new ObjectResult(CommonEnum.Succefull);
             }
@@ -139,7 +142,7 @@ namespace Siger.ApiACC.Controllers
                 {
                     section = line,
                     projectId = PID,
-                    status = 1, 
+                    status = 1,
                     updatetime = DateTime.Now,
                     mode = mode
                 });
@@ -150,7 +153,7 @@ namespace Siger.ApiACC.Controllers
                 exitObj.mode = mode;
                 _automationLineMode.Update(exitObj);
             }
-        
+
             if (_unitOfWork.Commit() > 0)
             {
                 if (mode == 1)
@@ -160,7 +163,7 @@ namespace Siger.ApiACC.Controllers
                     var tasklist = _automationTaskList.GetList(f => f.projectId == PID && f.status < (int)TaskResultStatus.Complated);
                     if (!tasklist.Any())
                     {
-                        Logger.WriteLineInfo($"LineMode Mode=1 触发自动任务检查");
+                        Logger.WriteLineInfo($"自动化业务流转--LineMode Mode=1 触发自动任务检查 line:{line} mode:{mode}");
                         AutoProcess(line);
                     }
                 }
@@ -200,19 +203,18 @@ namespace Siger.ApiACC.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public IActionResult TaskResult([FromBody]RequestAutomationTaskResult request)
+        public IActionResult TaskResult([FromBody] RequestAutomationTaskResult request)
         {
             //1.检查Tasklist
-            var taskObj = _automationTaskList.Get(f => f.no== request.guid);
+            var taskObj = _automationTaskList.Get(f => f.no == request.guid);
             if (taskObj == null)
             {
                 throw new BadRequestException(CommonEnum.RecordNotFound);
             }
-            if (taskObj.status==(int)TaskResultStatus.Complated)
+            if (taskObj.status == (int)TaskResultStatus.Complated)
             {
                 throw new BadRequestException(AccEnum.AutoTaskDone);
             }
-
             //更新Tasklist
             PlCfeeback(taskObj, request.status);
 
@@ -230,71 +232,145 @@ namespace Siger.ApiACC.Controllers
             var section = _sigerProjectLevelSection.Get(f => f.id == taskObj.sectionid);
             if (section != null)
             {
-                Logger.WriteLineInfo($" 设备{section.title} 任务编号:{taskObj.no} 状态:{request.status} ");
+                Logger.WriteLineInfo($"自动化业务流转--设备{section.title} 任务编号:{taskObj.no} req状态:{request.status} reqGuid:{request.guid}");
                 AutoProcess(section.parentid, taskObj);
             }
 
             return new ObjectResult(CommonEnum.Succefull);
         }
 
-        void PlCfeeback(siger_automation_task_list taskObj,int status )
+        void PlCfeeback(siger_automation_task_list taskObj, int status)
         {
             //2.更新状态
             taskObj.status = status;
+            taskObj.operatetime = DateTime.Now;
             taskObj.completetime = DateTime.Now;
-            _automationTaskList.Update(taskObj);
 
             var monitor = _automationFixtureMonitor.Get(f => f.section == taskObj.sectionid);
-            var sectionProperty = _automationSectionProperty.Get(f => f.sectionid == taskObj.sectionid);
-            if(sectionProperty==null)
+            var sectionProperty = _automationSectionProperty.Get(f => f.sectionid == taskObj.extend1.ToInt());
+            if (sectionProperty == null)
             {
                 Logger.WriteLineInfo($"PlCfeeback 设备属性为维护");
                 throw new BadRequestException(AccEnum.SectionPropertyNull);
             }
+
+            //清空 监控Monitor
+
+
+            //PLC 反馈执行中
+            if(status==(int)TaskResultStatus.Produce)
+            {
+                var location = _automationLocation.Get(f => f.fixturetools == taskObj.fixtureguid && f.locationid == taskObj.locationid);
+                if (location == null)
+                {
+                    Logger.WriteLineInfo($"PlCfeeback 未找到该工装储位信息");
+                    throw new BadRequestException(AccEnum.MachineDisable);
+                }
+
+                if (sectionProperty.propertytype == 1)
+                { //执行中时 Sn 已经出库
+                    //从立库储位拿SN 工件到上料位
+                    if (taskObj.action == TaskAction.Step_LK_SXLW)
+                    {
+                        location.sn = taskObj.sn;
+                        location.ordernumber = taskObj.ordercode;
+                        location.productcode = taskObj.productcode;
+                        location.productid = taskObj.productid;
+                        location.productname = taskObj.productname;
+                        location.route = taskObj.route.ToString();
+                        location.routeid = taskObj.route;
+                        location.status = (int)LocationStatus.Out;
+                        _automationLocation.Update(location);
+                    }
+                }
+            }
+
+
+
+
             //PLC 反馈结束. 
             if (status == (int)TaskResultStatus.Complated)
             {
+                //清空历史监控
+                var monitors = _automationFixtureMonitor.GetList(f => f.section != taskObj.sectionid && f.sn == taskObj.sn);
+                foreach(var obj in monitors)
+                {
+                    _automationFixtureMonitor.Delete(obj);
+                }
+
                 var location = _automationLocation.Get(f => f.fixturetools == taskObj.fixtureguid && f.locationid == taskObj.locationid);
                 if (location == null)
                 {
                     Logger.WriteLineInfo($"PlCfeeback 未找到该工装储位信息");
                     throw new BadRequestException(AccEnum.MachineDisable);
                 }
-
                 // 业务入口： 上料位-》 入库 如果是上料工装 安装完成 ,绑定 储位与装配
                 if (sectionProperty.propertytype == 1)
                 {
-                   
+                    var download = false;
+                    if (sectionProperty.down > 2)
+                    {
+                        // 是拆卸
+                        download = true;
+                    }
                     //绑定SN 工件到立库储位
                     if (taskObj.action == TaskAction.Step_SXLW_LK)
                     {
                         location.fixturetools = taskObj.fixtureguid;
                         location.fixturename = taskObj.fixturename;
                         location.ordernumber = taskObj.ordercode;
-                        location.productcode = taskObj.productcode;
-                        location.productid = taskObj.productid;
-                        location.routeid = taskObj.route;
-                        location.sn = taskObj.sn;
+                        location.productcode = download ? "" : taskObj.productcode;
+                        location.productid = download ? 0 : taskObj.productid;
+                        location.routeid = download ? 0 : taskObj.route;
+                        location.route = download ? "" : taskObj.route.ToString();
+                        location.sn = download ? "" : taskObj.sn;
                         location.status = (int)LocationStatus.In;
                         _automationLocation.Update(location);
+
+                        sectionProperty.upload = 0;
+                        sectionProperty.down = 0;
+                        _automationSectionProperty.Update(sectionProperty);
+
+
                     }
                     //从立库储位拿SN 工件到上料位
-                    if (taskObj.action==TaskAction.Step_LK_SXLW)
+                    if (taskObj.action == TaskAction.Step_LK_SXLW)
                     {
-                        //location.sn = "";
+                        location.sn = taskObj.sn;
+                        location.ordernumber = taskObj.ordercode;
+                        location.productcode = taskObj.productcode;
+                        location.productid = taskObj.productid;
+                        location.productname = taskObj.productname;
+                        location.route = taskObj.route.ToString();
+                        location.routeid = taskObj.route;
                         location.status = (int)LocationStatus.Out;
                         _automationLocation.Update(location);
+
+                    }
+
+                    //上料中
+                    if (sectionProperty.upload != 0)
+                    {
+                        sectionProperty.upload += 1;
+                        _automationSectionProperty.Update(sectionProperty);
+                    }
+                    if (sectionProperty.down != 0)
+                    {
+                        sectionProperty.down += 1;
+                        _automationSectionProperty.Update(sectionProperty);
                     }
+
                 }
                 // CNC 设备
                 if (sectionProperty.propertytype == 2)
                 {
-                    if (taskObj.action== TaskAction.Step_LK_JGZX )
+                    if (taskObj.action == TaskAction.Step_LK_JGZX)
                     {
                         location.status = (int)LocationStatus.Out;
                         _automationLocation.Update(location);
                     }
                 }
+
                 //抽检台 
                 if (sectionProperty.propertytype == 3)
                 {
@@ -302,45 +378,104 @@ namespace Siger.ApiACC.Controllers
                     {
                         location.status = (int)LocationStatus.Out;
                         _automationLocation.Update(location);
+                    }
+                    if (taskObj.action == TaskAction.Step_CJT_SXLW)
+                    {
 
                     }
-                  
+
                 }
                 //清洗机
-                if (sectionProperty.propertytype==4)
+                if (sectionProperty.propertytype == 4)
                 {
-                    if(taskObj.action==TaskAction.Step_QXJ_LK)
+                    if (taskObj.action == TaskAction.Step_QXJ_LK)
                     {
-                        //上料 指定的第一道工序
-                        var route = _productRoute.GetList(f => f.productId == taskObj.productid && f.status == (int)RowState.Valid, "serialNumber", true).FirstOrDefault();
-                        if (route == null)
+                        if (location.status==(int)LocationStatus.In)
                         {
-                            throw new BadRequestException(AccEnum.ProductRouteMissing);
+                            throw new BadRequestException(AccEnum.LocationSnExits); 
                         }
-                        if (route.id == location.routeid)
+                        var currenRute = _productRoute.Get(f => f.id == taskObj.route);
+                        if (currenRute == null)
                         {
-                            Logger.WriteLineInfo($"PlCfeeback 工装储位{taskObj.locationid} 工序{location.routeid}-{location.routenum}完成");
-                            //最后一道工序
-                            location.routeid = 0;
-                            location.status = (int)LocationStatus.In;
-                            _automationLocation.Update(location);
+                            throw new BadRequestException(AccEnum.ProductRouteMissing);
                         }
-                        else
+                        var nextRoute = _productRoute.GetList(f => f.productId == taskObj.productid && f.serialNumber > currenRute.serialNumber && f.status == (int)RowState.Valid, "serialNumber", false).FirstOrDefault();
+                        var route = 0;
+                        if (nextRoute != null)
                         {
-                            Logger.WriteLineInfo($"PlCfeeback 工装储位{taskObj.locationid} 工序{location.routeid}-{location.routenum}为完成");
+                            route = nextRoute.id;
                         }
+                        //更新下一到工序
+                        location.routeid = route;
+                        location.route = route.ToString();
+                        location.status = (int)LocationStatus.In;
+                        _automationLocation.Update(location);
+                        Logger.WriteLineInfo($"PlCfeeback 工装储位{taskObj.locationid} 工序{location.routeid} 下一工序{route}更新完成");
                     }
                 }
-                
-            }
-            
-            if (monitor != null)
-            {
-                monitor.status = status;
-                monitor.route = taskObj.route;
-                monitor.fixtureguid = taskObj.fixtureguid;
-                monitor.fixturename = taskObj.fixturename;
-                _automationFixtureMonitor.Update(monitor);
+
+
+                //添加当前监控
+                if (monitor == null)
+                {
+                    _automationFixtureMonitor.Insert(new siger_automation_fixture_tools_monitor
+                    {
+                        section = taskObj.sectionid,
+                        ordernumber = taskObj.ordercode,
+                        fixtureguid = taskObj.fixtureguid,
+                        fixturename = taskObj.fixturename,
+                        createtime = DateTime.Now,
+                        locationId = taskObj.locationid,
+                        productCode = taskObj.productcode,
+                        productId = taskObj.productid,
+                        productName = taskObj.productname,
+                        projectId = taskObj.projectId,
+                        route = taskObj.route,
+                        sn = taskObj.sn,
+                        status = status,
+                        taskno = taskObj.no,
+                        updatetime = DateTime.Now,
+                    });
+                }
+                else
+                {
+                    monitor.ordernumber = taskObj.ordercode;
+                    monitor.fixtureguid = taskObj.fixtureguid;
+                    monitor.fixturename = taskObj.fixturename;
+                    monitor.createtime = DateTime.Now;
+                    monitor.locationId = taskObj.locationid;
+                    monitor.productCode = taskObj.productcode;
+                    monitor.productId = taskObj.productid;
+                    monitor.productName = taskObj.productname;
+                    monitor.projectId = taskObj.projectId;
+                    monitor.route = taskObj.route;
+                    monitor.sn = taskObj.sn;
+                    monitor.status = status;
+                    monitor.taskno = taskObj.no;
+                    monitor.updatetime = DateTime.Now;
+                    _automationFixtureMonitor.Update(monitor);
+                }
+
+                _automationTaskList.Update(taskObj);
+
+                //添加SN记录
+                _automationProduceHistory.Insert(new siger_automation_produce_history
+                {
+                    section = taskObj.sectionid,
+                    sn = taskObj.sn,
+                    locationid = taskObj.locationid,
+                    productcode = taskObj.productcode,
+                    productname = taskObj.productname,
+                    productid = taskObj.productid,
+                    projectId = taskObj.projectId,
+                    route = taskObj.route.ToString(),
+                    status = 1,
+                    locationname = location.location_cid.ToString(),
+                    updatetime = DateTime.Now,
+
+                });
+
+
             }
         }
 
@@ -348,23 +483,30 @@ namespace Siger.ApiACC.Controllers
         /// 创建自动 Task任务
         /// </summary>
         /// <param name="line"></param>
-        /// <param name="fixture"></param>
-        /// <param name="stationDicts"></param>
         /// <param name="tasklist"></param>
-        void AutoProcess(int line ,siger_automation_task_list tasklist=null)
+        void AutoProcess(int line, siger_automation_task_list tasklist = null)
         {
             var lineMode = _automationLineMode.Get(f => f.projectId == PID && f.section == line);
-            if (lineMode==null)
+            if (lineMode == null)
             {
                 Logger.WriteLineInfo($"AutoProcess 产线模式未找到");
                 throw new BadRequestException(AccEnum.LineModeNotfound);
             }
-            if (lineMode.mode==0)
+            if (lineMode.mode == 0)
             {
                 Logger.WriteLineInfo($"AutoProcess 手动模式 不能创建自动任务");
                 //手动模式时 退出
                 return;
             }
+
+            //增加额外任务判断
+            if (!_automationTaskList.CanTask(PID, 0))
+            {
+                Logger.WriteLineInfo($"自动化业务流转--AutoProcess 已有待执行任务不能创建自动任务");
+                //手动模式时 退出
+                return;
+            }
+
             /*
             //自动Task任务 顺序 
             //1.清洗机下料
@@ -372,16 +514,22 @@ namespace Siger.ApiACC.Controllers
             //3.其他设备下料 
             */
 
-
-            ///* 自动任务创建只有CNC 设备;排除上料设备（手动任务） */
-
+            /* 自动任务创建只有CNC 设备;排除上料设备（手动任务） */
             var sectionPropertys = _automationSectionProperty.GetList(f => f.projectId == PID).ToList();
             if (!sectionPropertys.Any())
             {
                 Logger.WriteLineInfo($"AutoProcess 设备属性未配置");
                 return;
             }
-            var cncStations = sectionPropertys.Where(s=>s.propertytype==2).Select(s => s.sectionid).ToList();
+            //立库工位
+            var invenSection = _automationSectionProperty.Get(f => f.propertytype == 5);
+            if (invenSection == null)
+            {
+                Logger.WriteLineInfo($"AutoProcess 工站立库未找到");
+                return;
+            }
+
+            var cncStations = sectionPropertys.Where(s => s.propertytype == 2).Select(s => s.sectionid).ToList();
             // 获取可用 设备状态列表 排除上料工位
             var machineStatusList = _automationMachineStatus.GetList(f => f.projectId == PID && cncStations.Contains(f.section) && f.enable == 1);
             if (!machineStatusList.Any())
@@ -389,170 +537,150 @@ namespace Siger.ApiACC.Controllers
                 Logger.WriteLineInfo($"AutoProcess 无可用状态的设备");
                 return;
             }
-            //优先级1 ：清洗机完成 。待下料
 
-            var cleanProperty = sectionPropertys.FirstOrDefault(f=>f.propertytype == 4);
-            if (cleanProperty==null)
+            var cleanProperty = sectionPropertys.FirstOrDefault(f => f.propertytype == 4);
+            if (cleanProperty == null)
             {
                 Logger.WriteLineInfo($"AutoProcess 设备属性清洗机未配置");
                 return;
             }
             var cleanMachine = _automationMachineStatus.Get(f => f.section == cleanProperty.sectionid);
-            if (cleanMachine!=null)
+            if (cleanMachine == null)
             {
+                Logger.WriteLineInfo($"AutoProcess 清洗机没找到");
+            }
+            else
+            {
+
+                //优先级1 ：清洗机完成 。待下料
+
                 if (cleanMachine.status == (int)Automation.MachineStatus.Complated)
                 {
                     Logger.WriteLineError($"AutoProcess 有清洗机{ cleanMachine.section}完成，创建清洗机Task");
-                    if (tasklist == null)
+                    //取最近完成的 Task
+                    var lastTask = _automationTaskList.GetList(f => f.sectionid == cleanMachine.section, "id", true).FirstOrDefault();
+                    if (lastTask != null)
                     {
-                        Logger.WriteLineError($"AutoProcess Tasklist 为空");
-
-                        Logger.WriteLineError($"AutoProcess Tasklist 为空，查找设备Monitor{cleanMachine.section }状态");
-                        var machineMonitor = _automationFixtureMonitor.Get(f => f.section == cleanMachine.section);
-                        if (machineMonitor == null)
+                        if(lastTask.action== TaskAction.Step_QXJ_LK)
                         {
-                            Logger.WriteLineError($"AutoProcess 清洗机{cleanMachine.section}machineMonitor 为空");
-                            return;
+                            Logger.WriteLineError($"AutoProcess 清洗机完成，上一个任务与本次任务指令重复");
+                            return; //任务重复
                         }
-                        CreateTask(cleanMachine.section, TaskActionType.Unload, TaskAction.Step_QXJ_LK, machineMonitor.fixtureguid, machineMonitor.ordernumber, machineMonitor.sn, "", machineMonitor.productId, machineMonitor.productCode, machineMonitor.locationId, machineMonitor.route);
-                    }
-                    else
-                    {
-                        var locationObj = _automationLocation.Get(f => f.projectId == PID && f.locationid == tasklist.locationid);
-                        if (locationObj == null)
+                        if (lastTask.status == (int)TaskResultStatus.Complated)
                         {
-                            Logger.WriteLineError($"AutoProcess 立库 为空");
-                            return;
+                            Logger.WriteLineInfo($"自动化业务流转--AutoProcess section{cleanMachine.section} task:{TaskAction.Step_QXJ_LK.ToStr()} sn {lastTask.sn}");
+                            //if (TargetFree(invenSection.sectionid, cleanMachine.section, TaskAction.Step_QXJ_LK))
+                            //{
+                            CreateTask(invenSection.sectionid, cleanMachine.section, TaskActionType.Unload, TaskAction.Step_QXJ_LK, lastTask.fixtureguid, lastTask.fixturename, lastTask.ordercode, lastTask.sn, "无程序", lastTask.productid, lastTask.productcode, lastTask.productname, lastTask.locationid, lastTask.route);
+                            return; //完成当前任务 退出
+                            //}
                         }
-                        //工件回到立库
-                        locationObj.status = (int)LocationStatus.In;
-                        _automationLocation.Update(locationObj);
-
-                        CreateTask(cleanMachine.section, TaskActionType.Unload, TaskAction.Step_QXJ_LK, tasklist.fixtureguid, tasklist.ordercode, tasklist.sn, "无程序", tasklist.productid, tasklist.productcode, tasklist.locationid, tasklist.route);
-                        return; //完成当前任务 退出
                     }
                 }
-                else
-                {
-                    Logger.WriteLineInfo($"AutoProcess 清洗机未完成");
-                }
-            }
-            else
-            {
-                Logger.WriteLineInfo($"AutoProcess 清洗机没找到");
             }
             //优先级2 ：其他设备待上料 (立库->加工中心)
-            var freeMachine = machineStatusList.Where(f=>f.status==(int)Automation.MachineStatus.Waiting);
+            var freeMachine = machineStatusList.Where(f => f.status == (int)Automation.MachineStatus.Waiting);
             if (freeMachine != null)
             {
                 Logger.WriteLineError($"AutoProcess 普通空闲，创建普通设备上料Task");
-                var location = SelectLocation(freeMachine.Select(s=>s.machineid).ToList());
+                var location = SelectLocation(freeMachine.Select(s => s.machineid).ToList());
                 if (location != null)
                 {
-                    // * 更新下一个工序到储位 
-                    var locationObj = _automationLocation.Get(f => f.id == location.lid);
-                    if (locationObj != null)
+                    if(!RepeatTaskCheck(location.section, TaskAction.Step_LK_JGZX))
                     {
-                        var doneRoute = _productRoute.Get(f => f.id == location.route);
-                        if (doneRoute == null)
-                            return;
-
-                        var productRoutes = _productRoute.GetList(f => f.projectId == PID && f.productId == location.productId && f.status == (int)RowState.Valid && f.serialNumber > doneRoute.serialNumber);
-                        if (!productRoutes.Any())
-                        {
-                            locationObj.route = string.Empty;
-                        }
-                        else
-                        {
-                            var nextRoute = productRoutes.OrderBy(d => d.serialNumber).FirstOrDefault();
-
-                            locationObj.routeid = nextRoute != null ? nextRoute.id : 0;
-                            locationObj.route = nextRoute != null ? nextRoute.name : "";
-                        }
-                        //工件已出立库
-                        locationObj.status = (int)LocationStatus.Out;
-                        _automationLocation.Update(locationObj);
-
-                        CreateTask(location.section, TaskActionType.Load, TaskAction.Step_LK_JGZX, location.fixture, location.ordernumber, location.sn, location.pn, location.productId, location.productCode, location.location,location.route);
-                        return; //完成当前任务 退出
+                        Logger.WriteLineError($"AutoProcess CNC加工中心空闲，上一个任务与本次任务指令重复");
+                        return; //任务已经创建
+                    }
+                    Logger.WriteLineInfo($"自动化业务流转--AutoProcess section{location.section} task:{TaskAction.Step_LK_JGZX.ToStr()} sn {location.sn}");
+                    if (TargetFree(location.section, location.section, TaskAction.Step_LK_JGZX))
+                    {
+                        CreateTask(location.section, location.section, TaskActionType.Load, TaskAction.Step_LK_JGZX, location.fixture, location.fixturename, location.ordernumber, location.sn, location.pn, location.productId, location.productCode, location.productName, location.location, location.route);
                     }
+
                 }
             }
             //优先级3：其他设备下料  (加工中心 ->清洗机)
             if (cleanMachine != null)
             {
-                var fullMachine = machineStatusList.FirstOrDefault(f => f.status == (int)Automation.MachineStatus.Complated);
-                if (fullMachine != null && cleanMachine.status == (int)Automation.MachineStatus.Waiting)
+                siger_automation_machine_status fullMachine = null;
+
+                var fullAllMachine = machineStatusList.Where(f => f.status == (int)Automation.MachineStatus.Complated);
+                if (fullAllMachine.Any() && cleanMachine.status == (int)Automation.MachineStatus.Waiting)
                 {
                     Logger.WriteLineError($"AutoProcess 清洗机空闲，创建普通设备下料到清洗机Task ");
-                    //更新清洗机监控
-                    var monitor = _automationFixtureMonitor.Get(cleanMachine.section);
-                    if (monitor == null)
+                    //清洗机上料 为 任务触发 触发
+                    if (tasklist != null && fullAllMachine.Where(p => p.section == tasklist.sectionid).Any())
                     {
-                        _automationFixtureMonitor.Insert(new siger_automation_fixture_tools_monitor
+                        fullMachine = fullAllMachine.Where(p => p.section == tasklist.sectionid).FirstOrDefault();
+                        Logger.WriteLineError($"AutoProcess 清洗机空闲，TaskResult触发 ");
+                        Logger.WriteLineInfo($"自动化业务流转--AutoProcess section{fullMachine.section} task:{TaskAction.Step_JGZX_QXJ.ToStr()} sn {tasklist.sn}");
+
+                        //如果上一个任务也是清洗机上料 （清洗机未下料） 退出
+                        var lastTask = _automationTaskList.GetList(f => f.projectId == PID, "id", true).FirstOrDefault();
+                        if (lastTask.action == TaskAction.Step_JGZX_QXJ && lastTask.status != (int)TaskResultStatus.Complated)
                         {
-                            section = cleanMachine.section,
-                            fixtureguid = tasklist.fixtureguid,
-                            fixturename = tasklist.fixturename,
-                            productCode = tasklist.productcode,
-                            productId = tasklist.productid,
-                            locationId = tasklist.locationid,
-                            ordernumber = tasklist.ordercode,
-                            productName = tasklist.productname,
-                            projectId = tasklist.projectId,
-                            taskno = tasklist.no,
-                            route = tasklist.route,
-                            sn = tasklist.sn,
-                            updatetime = DateTime.Now,
-                            status = 1,
-                            createtime = DateTime.Now,
-
-                        });
+                            Logger.WriteLineError($"AutoProcess 清洗机空闲，上一个任务与本次任务指令重复");
+                            return;
+                        }
+                        if (TargetFree(cleanMachine.section, fullMachine.section, TaskAction.Step_JGZX_QXJ))
+                        {
+                            //创建CNC 下料到清洗机
+                            CreateTask(cleanMachine.section, fullMachine.section, TaskActionType.Unload, TaskAction.Step_JGZX_QXJ, tasklist.fixtureguid, tasklist.fixturename, tasklist.ordercode, tasklist.sn, tasklist.programnumber, tasklist.productid, tasklist.productcode, tasklist.productname, tasklist.locationid, tasklist.route);
+                            return; //完成当前任务 退出
+                        }
                     }
                     else
                     {
-                        monitor.fixtureguid = tasklist.fixtureguid;
-                        monitor.fixturename = tasklist.fixturename;
-                        monitor.productCode = tasklist.productcode;
-                        monitor.productId = tasklist.productid;
-                        monitor.locationId = tasklist.locationid;
-                        monitor.ordernumber = tasklist.ordercode;
-                        monitor.productName = tasklist.productname;
-                        monitor.projectId = tasklist.projectId;
-                        monitor.taskno = tasklist.no;
-                        monitor.route = tasklist.route;
-                        monitor.sn = tasklist.sn;
-                        monitor.updatetime = DateTime.Now;
-                        monitor.status = tasklist.status;
-                    }
-                    //创建CNC 下料到清洗机
-                    CreateTask(fullMachine.section, TaskActionType.Unload, TaskAction.Step_JGZX_QXJ, tasklist.fixtureguid, tasklist.ordercode, tasklist.sn, tasklist.programnumber, tasklist.productid, tasklist.productcode, tasklist.locationid, tasklist.route);
 
-                    return; //完成当前任务 退出
+                        fullMachine = fullAllMachine.First();
+                        if (_automationTaskList.CanTask(PID, fullMachine.section))
+                        {
+                            Logger.WriteLineError($"AutoProcess 清洗机空闲，MachineStatus触发 ");
+                            var lastMonitorItem = _automationFixtureMonitor.GetList(p => p.section == fullMachine.section).OrderByDescending(p => p.id).FirstOrDefault();
+                            if (lastMonitorItem != null)
+                            {
+                                var lastTask = _automationTaskList.GetList(f => f.sectionid == fullMachine.section && f.sn == lastMonitorItem.sn && f.status == (int)Automation.TaskResultStatus.Complated, "id", true).FirstOrDefault();
+                                if (lastTask != null)
+                                {
+                                    Logger.WriteLineInfo($"自动化业务流转--AutoProcess section{fullMachine.section} task:{TaskAction.Step_JGZX_QXJ.ToStr()} sn {lastTask.sn}");
+                                    if (TargetFree(cleanMachine.section, fullMachine.section, TaskAction.Step_JGZX_QXJ))
+                                    {
+                                        CreateTask(cleanMachine.section, fullMachine.section, TaskActionType.Unload, TaskAction.Step_JGZX_QXJ, lastTask.fixtureguid, lastTask.fixturename, lastTask.ordercode, lastTask.sn, lastTask.programnumber, lastTask.productid, lastTask.productcode, lastTask.productname, lastTask.locationid, lastTask.route);
+                                    }
+                                }
+                            }
+                        }
+                    }
                 }
             }
         }
-
+        
 
         /// <summary>
         /// 创建自动任务
         /// </summary>
-        /// <param name="section"></param>
+        /// <param name="toSection"></param>
+        /// <param name="fromSection"></param>
         /// <param name="actionType"></param>
         /// <param name="taskAction"></param>
         /// <param name="guid">工装GUID</param>
+        /// <param name="fixtruename"></param>
         /// <param name="orderno">订单</param>
         /// <param name="sn">工件</param>
+        /// <param name="program"></param>
+        /// <param name="productId"></param>
         /// <param name="productCode">产品CODE</param>
+        /// <param name="productName"></param>
         /// <param name="locationid">储位ID</param>
-        void CreateTask(int section,TaskActionType actionType, TaskAction taskAction,string guid,string orderno,string sn,string program,int productId,string productCode,int locationid,int route)
+        /// <param name="route"></param>
+        void CreateTask(int toSection, int fromSection, TaskActionType actionType, TaskAction taskAction, string guid, string fixtruename, string orderno, string sn, string program, int productId, string productCode, string productName, int locationid, int route)
         {
             var taskNo = _automationTaskList.CrateTaskNumber(Automation.TaskTrigerType.Auto);
             _automationTaskList.Insert(new siger_automation_task_list
             {
-                no= taskNo,
+                no = taskNo,
                 projectId = PID,
-                sectionid = section,
+                sectionid = toSection,
                 trigger = TaskTrigerType.Auto,
                 action = taskAction,
                 actiontype = ExcueType.None,
@@ -563,52 +691,23 @@ namespace Siger.ApiACC.Controllers
                 send = 0,
                 operater = 0,
                 status = 1,
-                fixtureguid= guid,
+                fixtureguid = guid,
+                fixturename = fixtruename,
                 productid = productId,
+                productname = productName,
                 productcode = productCode,
-                programnumber=program,
-                locationid= locationid,
-                ordercode= orderno,
-                sn= sn, 
-                remark= EnumHelper.GetEnumDesc(taskAction),
-                route=route,
+                programnumber = program,
+                locationid = locationid,
+                ordercode = orderno,
+                sn = sn,
+                remark = EnumHelper.GetEnumDesc(taskAction),
+                route = route,
+                extend1 = fromSection.ToString()
             });
-            var monitor = _automationFixtureMonitor.Get(f => f.section == section);
-            if (monitor == null)
-            {
-                _automationFixtureMonitor.Insert(new siger_automation_fixture_tools_monitor
-                {
-                    projectId=PID,
-                    section=section,
-                    fixtureguid=guid,
-                    productId=productId,
-                    productCode=productCode,
-                    locationId=locationid,
-                    createtime=DateTime.Now,
-                    ordernumber=orderno,
-                    route=route,
-                    status=1,
-                    sn=sn,
-                    taskno=taskNo, 
-                });
-            }
-            else
-            {
-                monitor.sn = sn;
-                monitor.route = route;
-                monitor.locationId = locationid;
-                monitor.productCode = productCode;
-                monitor.productId = productId;
-                monitor.fixtureguid = guid;
-                monitor.taskno = taskNo;
-                _automationFixtureMonitor.Update(monitor);
-            }
-
-
             if (_unitOfWork.Commit() > 0)
-                Logger.WriteLineInfo($"CreateTask sectionId:{section}工站 {EnumHelper.GetEnumDesc(taskAction)} 完成");
+                Logger.WriteLineInfo($"CreateTask {taskNo} sectionId:{fromSection}工站->{toSection}工站 {EnumHelper.GetEnumDesc(taskAction)} 完成");
             else
-                Logger.WriteLineInfo($"CreateTask sectionId:{section}工站 {EnumHelper.GetEnumDesc(taskAction)}失败");
+                Logger.WriteLineInfo($"CreateTask {taskNo} sectionId:{fromSection}工站->{toSection}工站 {EnumHelper.GetEnumDesc(taskAction)}失败");
         }
         /// <summary>
         /// 自动匹配储位 储位 ->CNC 
@@ -616,31 +715,28 @@ namespace Siger.ApiACC.Controllers
         ResponseAutomationLocationRouteInfo SelectLocation(List<int> machines)
         {
             // 当前空闲设备能加工的产品
-            var beats = _productionBeatSet.GetList(f => f.projectID == PID && machines.Contains(f.machineID)  && f.status==(int)RowState.Valid).ToList();
+            var beats = _productionBeatSet.GetList(f => f.projectID == PID && machines.Contains(f.machineID) && f.status == (int)RowState.Valid).ToList();
             var TempList = new List<ResponseAutoRouteInfo>();
             foreach (var b in beats)
             {
                 Logger.WriteLineError($"SelectLocation 设备{b.machineID}标准节拍{b.route_number}{b.route_name}");
-                var autoLocationIds = _automationLocation.GetList(f => f.projectId == b.projectID && f.routeid == b.route_number.ToInt() && f.productid == b.product_name.ToInt());
+                var autoLocationIds = _automationLocation.GetList(f => f.status == (int)RowState.Valid && f.projectId == b.projectID && f.routeid == b.route_number.ToInt() && f.productid == b.product_name.ToInt());
                 if (!autoLocationIds.Any())
                 {
-                    Logger.WriteLineError($"SelectLocation 设备{b.machineID} routeid:{b.route_number}-{b.route_name}productId:{b.product_name} 没有匹配到当前储位");
                     continue;
                 }
                 foreach (var autoLocation in autoLocationIds)
                 {
                     if (string.IsNullOrEmpty(autoLocation.sn))
                     {
-                        Logger.WriteLineError($"SelectLocation 设备{b.machineID} routeid:{b.route_number}-{b.route_name}productId:{b.product_name} 储位{autoLocation.locationid}没有SN工件");
                         continue;
                     }
                     if (autoLocation.status == 2)
                     {
                         //SN不在立库内
-                        Logger.WriteLineError($"SelectLocation 设备{b.machineID} routeid:{b.route_number}-{b.route_name}productId:{b.product_name} 储位{autoLocation.locationid}工件Sn:{autoLocation.sn}不在储位上");
                         continue;
                     }
-                    if(autoLocation.routeid==0)
+                    if (autoLocation.routeid == 0)
                     {
                         Logger.WriteLineError($"SelectLocation 有效订单号{autoLocation.ordernumber} 工序{b.route_number}-{b.route_name}完成");
                         continue;
@@ -654,7 +750,7 @@ namespace Siger.ApiACC.Controllers
                         Machine = b.machineID,
                         Pn = b.process_number,
                         ProductId = b.product_name.ToInt(),
-                        ProductCode=autoLocation.productcode,
+                        ProductCode = autoLocation.productcode,
                         ProductName = b.product_name_text,
                         Location = autoLocation.locationid,
                         Route = b.route_number.ToInt(),
@@ -663,8 +759,6 @@ namespace Siger.ApiACC.Controllers
                         Sn = autoLocation.sn,
                         LId = autoLocation.id
                     });
-
-                    Logger.WriteLineError($"SelectLocation 有效订单号{autoLocation.ordernumber}");
                 }
             }
             if (!TempList.Any())
@@ -675,7 +769,7 @@ namespace Siger.ApiACC.Controllers
 
             var ordernos = TempList.Select(f => f.OrderNo).ToList();
 
-            
+
 
             // 取产品交期最近的订单
             var planOrder = _automationFixtureToolsProduct.GetDeliveryOrder(ordernos, PID);
@@ -685,27 +779,54 @@ namespace Siger.ApiACC.Controllers
                 return null;
             }
             var order = planOrder.FirstOrDefault();
-            var autoRouteInfo = TempList.Where(f => f.OrderNo == order.ordernumber).OrderBy(d=>d.Sn);
+            var autoRouteInfo = TempList.Where(f => f.OrderNo == order.ordernumber).OrderBy(d => d.Sn);
             var result = autoRouteInfo.FirstOrDefault();
             return new ResponseAutomationLocationRouteInfo
             {
-                section=result.Section,
-                machine=result.Machine,
+                section = result.Section,
+                machine = result.Machine,
                 fixture = result.FixtureGuid,
                 fixturename = result.FixtureName,
-                ordernumber =result.OrderNo,
-                location=result.Location,
-                productId=result.ProductId,
+                ordernumber = result.OrderNo,
+                location = result.Location,
+                productId = result.ProductId,
                 productCode = result.ProductCode,
                 productName = result.ProductName,
-                sn =result.Sn,
-                pn= result.Pn,
-                route=result.Route,
-                lid=result.LId
+                sn = result.Sn,
+                pn = result.Pn,
+                route = result.Route,
+                lid = result.LId
             };
         }
 
 
+        /// <summary>
+        /// 当前发起工站 任务重复检查
+        /// </summary>
+        /// <param name="section"></param>
+        /// <returns></returns>
+        bool RepeatTaskCheck(int section, TaskAction taskAction)
+        {
+            var lastTask = _automationTaskList.GetList(f => f.projectId == PID, "id", true).FirstOrDefault();
+            if (lastTask.extend1==section.ToStr() && lastTask.action == taskAction && lastTask.status != (int)TaskResultStatus.Complated)
+            {
+                return false;
+            }
+            return true;
+        }
 
+        bool TargetFree( int toSection, int fromSection, TaskAction taskAction)
+        {
+            var moniter = _automationFixtureMonitor.Get(f => f.section == toSection);
+            if (moniter != null)
+            {
+                if (!string.IsNullOrEmpty(moniter.sn))
+                {
+                    Logger.WriteLineInfo($"CreateTask  sectionId:{fromSection}工站->{toSection}工站 {EnumHelper.GetEnumDesc(taskAction)} 无法创建任务,{toSection} 工站上有SN在加工");
+                    return false;
+                }
+            }
+            return true;
+        }
     }
 }

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

@@ -76,13 +76,7 @@ namespace Siger.ApiACC.Controllers
         [HttpGet]
         public IActionResult GetloadStation(int line,int type)
         {
-            var stationDicts = _sigerDict.GetDataByCat(AccDictCost.Automation, ProjectId);
-            if (!stationDicts.Any())
-            {
-                Logger.WriteLineInfo($"GetloadStation 未配置设备类型字典");
-                throw new BadRequestException(CommonEnum.RecordNotFound);
-            }
-            var loadStation=new List<string>();
+          
             //上下料
             if (type==0)
             {
@@ -140,23 +134,27 @@ namespace Siger.ApiACC.Controllers
         [HttpGet]
         public IActionResult GetLoadingState(int section)
         {
-            var monitor = _automationFixtureMonitor.Get(f => f.section == section);
-            var state = (int)Automation.TaskResultStatus.Waiting;
-            if (monitor!=null)
+           
+            var sectionProperty = _sectionPropertyRepository.Get(f=>f.sectionid==section);
+            if (sectionProperty==null)
             {
-                var taskobj = _automationTaskList.Get(f => f.no == monitor.taskno);
-                state = taskobj != null ? taskobj.status : (int)Automation.TaskResultStatus.Waiting;
+                throw new BadRequestException(CommonEnum.RecordNotFound);
             }
+            if (sectionProperty.upload==0 && sectionProperty.down==0)
+            {
+                throw new BadRequestException(CommonEnum.RecordNotFound);
+            }
+            var monitor = _automationTaskList.GetList(f =>f.sectionid==section ,"id",true).FirstOrDefault();
             var result = new ResponsePlanlFixtureInfo
             {
-                OrderNumber = monitor!=null? monitor.ordernumber:"",
+                OrderNumber = monitor!=null? monitor.ordercode:"",
                 FixtureGuid = monitor != null ? monitor.fixtureguid:"",
                 FixtureName = monitor != null ? monitor.fixturename:"",
-                ProductCode = monitor != null ? monitor.productCode:"",
-                ProductName = monitor != null ? monitor.productName:"",
+                ProductCode = monitor != null ? monitor.productcode:"",
+                ProductName = monitor != null ? monitor.productname:"",
                 Sn = monitor != null ? monitor.sn:"",
-                status = state,
-                Location = monitor != null ? monitor.locationId:0,
+                status = monitor != null ? monitor.status : 0,
+                Location = monitor != null ? monitor.locationid:0,
             };
             return new ObjectResult(result);
         }
@@ -187,11 +185,11 @@ namespace Siger.ApiACC.Controllers
             {
                 throw new BadRequestException(AccEnum.LineIsAutoMode);
             }
-            var section = taskobj.sectionid;
+            var section = taskobj.extend1.ToInt();
             //抽检台-》上料位特殊逻辑
-            if (taskobj.action == Automation.TaskAction.Step_CJT_SXLW)
+            if (taskobj.action == Automation.TaskAction.Step_LK_CJT || taskobj.action == Automation.TaskAction.Step_CJT_SXLW)
             {
-                section = taskobj.extend1.ToInt();
+                section = taskobj.sectionid;
             }
 
             var attr = _sigerProjectMachineAttribution.Get(f => f.station == section && f.status == 1);
@@ -296,10 +294,7 @@ namespace Siger.ApiACC.Controllers
             }
             //下料 
             var unload = _automationFixtureToolsProduct.GetPlanFixtureInfoByLocation(ProjectId, id);
-            if (unload == null)
-            {
-                throw new BadRequestException(AccEnum.FixtureOrderNulll);
-            }
+            
             return new ObjectResult(unload);
 
         }
@@ -312,32 +307,24 @@ namespace Siger.ApiACC.Controllers
         public IActionResult Loading([FromBody]requestAutomationLoading loading)
         {
 
-            var machineAttr = _sigerProjectMachineAttribution.Get(f => f.station == loading.section && f.status == (int)RowState.Valid);
-            if (machineAttr==null)
+            var upload = _sectionPropertyRepository.Get(f => f.sectionid == loading.section);
+            if (upload==null)
             {
-                throw new BadRequestException(CommonEnum.RecordNotFound);
+                throw new BadRequestException(AccEnum.Station_Null);
             }
-            var machineStatus = _automationMachineStatus.Get(f => f.machineid == machineAttr.machine);
-            if (machineStatus == null)
+            if (upload.down != 0)
             {
-                //上料设备状态与PLC 无关，
-                //需要手动插入
-                _automationMachineStatus.Insert(new siger_automation_machine_status
-                {
-                    enable = 1,
-                    section = loading.section,
-                    machineid = machineAttr.machine,
-                    auto=0,
-                    projectId = ProjectId,
-                    status = (int)Automation.MachineStatus.Waiting,
-                    updatetime = DateTime.Now
-                });
+                throw new BadRequestException(AccEnum.Downloading);
             }
-
+            if (upload.upload!=0)
+            {
+                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);
+                throw new BadRequestException(CncEnum.WorkOrderNotExist);
             }
             var plan = _productPlan.Get(f => f.id == plandts.PlanId);
             if (plan == null)
@@ -346,11 +333,13 @@ namespace Siger.ApiACC.Controllers
             }
             //检查工装
             var fixtureToolsObj = _automationFixtureTools.GetProductFixtureLocation(ProjectId,loading.guid,loading.locationid);
-            //var fixtureToolsObj = _automationFixtureToolsProduct.GetFixtureInfoByProductCode(ProjectId, plan.product_code);
             if (fixtureToolsObj == null)
             {
                 throw new BadRequestException(AccEnum.FixtureToolsIsNone);
             }
+            upload.upload = 1;
+            _sectionPropertyRepository.Update(upload);
+
             var monitor = _automationFixtureMonitor.Get(f => f.section == loading.section);
             if (monitor != null)
             {
@@ -370,6 +359,11 @@ namespace Siger.ApiACC.Controllers
             {
                 throw new BadRequestException(AccEnum.ProductRouteMissing);
             }
+            var invenProperty = _sectionPropertyRepository.Get(f => f.propertytype == 5);
+            if (invenProperty==null)
+            {
+                throw new BadRequestException(AccEnum.SectionPropertyNull);
+            }
             var unixtime = UnixTimeHelper.GetNow();
             _automationTaskList.Insert(new siger_automation_task_list
             {
@@ -397,51 +391,10 @@ namespace Siger.ApiACC.Controllers
                  programnumber="",
                  remark ="手动任务-准备上料",
                  route=route.id,
-                 extend1= unixtime.ToString()
+                 extend1= loading.section.ToStr(),
 
             });
 
-
-            if (monitor==null)
-            {
-                _automationFixtureMonitor.Insert(new siger_automation_fixture_tools_monitor
-                {
-                    fixtureguid = fixtureToolsObj.FixtureGuid,
-                    fixturename = fixtureToolsObj.FixtureCode,
-                    projectId = ProjectId,
-                    section = loading.section,
-                    sn = sn,
-                    createtime = DateTime.Now,
-                    updatetime = DateTime.Now,
-                    status = (int)Automation.MachineStatus.Produce,
-                    productId = plan.product_id,
-                    productCode = plan.product_code, 
-                    productName = plan.product_name,
-                    ordernumber = plandts.OrderNumber,
-                    locationId = fixtureToolsObj.Location,
-                    unixtime = unixtime,
-                    route= route.id,
-                    taskno=taskNo
-                });
-            }
-            else
-            {
-                monitor.sn = sn;
-                monitor.section = loading.section;
-                monitor.updatetime = DateTime.Now;
-                monitor.status = (int)Automation.MachineStatus.Produce;
-                monitor.productId = plan.product_id;
-                monitor.productName = plan.product_name;
-                monitor.productCode = plan.product_code;
-                monitor.ordernumber = plandts.OrderNumber;
-                monitor.locationId = fixtureToolsObj.Location;
-                monitor.unixtime = unixtime;
-                monitor.route = route.id;
-                monitor.taskno = taskNo;
-                _automationFixtureMonitor.Update(monitor);
-            }
-
-
             if (_unitOfWork.Commit() > 0)
             {
                 Logger.WriteLineError($"准备上料任务:{taskNo}创建成功-{EnumHelper.GetEnumDesc(Automation.TaskAction.Step_LK_SXLW)}");
@@ -461,21 +414,32 @@ namespace Siger.ApiACC.Controllers
         [HttpPost]
         public IActionResult CompalateAssemble([FromBody]requestAutoCompalateAssemble assemble)
         {
-            var machineStatus = _automationMachineStatus.Get(f => f.section == assemble.section);
-            if (machineStatus==null)
+
+            var invenProperty = _sectionPropertyRepository.Get(f => f.propertytype == 5);
+            if (invenProperty == null)
             {
-                throw new BadRequestException(CommonEnum.RecordNotFound);
+                throw new BadRequestException(AccEnum.SectionPropertyNull);
             }
-            if (machineStatus.enable == 0)
+            var upload = _sectionPropertyRepository.Get(f => f.sectionid == assemble.section);
+            if (upload == null)
             {
-                throw new BadRequestException(AccEnum.MachineDisable);
+                throw new BadRequestException(AccEnum.Station_Null);
             }
-
-            if (machineStatus.auto == 0)
+            if (upload.down != 0)
             {
-                machineStatus.status = (int)Automation.MachineStatus.Waiting;
+                throw new BadRequestException(AccEnum.Downloading);
             }
-          
+            if (upload.upload==0)
+            {
+                throw new BadRequestException(AccEnum.MachineOnFree); 
+            }
+            if (upload.upload !=2 )
+            {
+                throw new BadRequestException(AccEnum.TaskProcessing);
+            }
+            upload.upload += 1;
+            _sectionPropertyRepository.Update(upload);
+
             var monitor = _automationFixtureMonitor.Get(f => f.projectId == ProjectId && f.section == assemble.section);
             if (monitor==null)
             {
@@ -502,22 +466,25 @@ namespace Siger.ApiACC.Controllers
                 tasktype = Automation.TaskActionType.Load,
                 operater = UserId,
                 operatetime = DateTime.Now,
-                sectionid = assemble.section,
+                sectionid = invenProperty.sectionid,
                 send = 0,
                 status = 1,
                 completetime = DateTime.MinValue,
                 trigger = Automation.TaskTrigerType.Manual,
                 projectId = ProjectId,
                 productid = monitor.productId,
+                productname=monitor.productName,
                 sn = monitor.sn,
                 ordercode = monitor.ordernumber,
                 fixtureguid = monitor.fixtureguid,
+                fixturename=monitor.fixturename,
                 locationid = monitor.locationId,
                 productcode = monitor.productCode,
                 processid = 0,
                 programnumber = "",
                 remark = "手动任务-安装完成",
-                route=monitor.route
+                route=monitor.route,
+                extend1=assemble.section.ToStr()
 
             });
             monitor.taskno = taskNo;
@@ -542,6 +509,26 @@ namespace Siger.ApiACC.Controllers
         [HttpPost]
         public IActionResult Unloading([FromBody]requestAutomationUnloading unloading)
         {
+            var invenProperty = _sectionPropertyRepository.Get(f => f.propertytype == 5);
+            if (invenProperty == null)
+            {
+                throw new BadRequestException(AccEnum.SectionPropertyNull);
+            }
+            var upload = _sectionPropertyRepository.Get(f => f.sectionid == unloading.section);
+            if (upload == null)
+            {
+                throw new BadRequestException(AccEnum.Station_Null);
+            }
+            if (upload.upload!=0)
+            {
+                throw new BadRequestException(AccEnum.Uploading);
+            }
+            if (upload.down != 0)
+            {
+                throw new BadRequestException(AccEnum.TaskProcessing);
+            }
+            upload.down += 1;
+            _sectionPropertyRepository.Update(upload);
 
             var location = _automationLocation.Get(f => f.id == unloading.id);
             if (location==null)
@@ -562,27 +549,51 @@ namespace Siger.ApiACC.Controllers
             {
                 throw new BadRequestException(AccEnum.LineModeNotfound);
             }
-            if (!_automationTaskList.CanTask(ProjectId, unloading.section))
+
+            var machineAttr = _sigerProjectMachineAttribution.Get(f => f.station == unloading.section && f.status == (int)RowState.Valid);
+            if (machineAttr == null)
             {
-                throw new BadRequestException(AccEnum.TaskProcessing);
+                throw new BadRequestException(CommonEnum.RecordNotFound);
             }
 
+            var machineStatus = _automationMachineStatus.Get(f => f.machineid == machineAttr.machine);
+            if (machineStatus.status != (int)Automation.MachineStatus.Waiting)
+            {
+                throw new BadRequestException(AccEnum.MachineBusy);
+            }
+            
             var unixtime = UnixTimeHelper.GetNow();
             //TODO
             //1. 有检验状态  （立库-》检验工位）
             //2. 无检验状态  （立库-》上下料工位）
             var taskNo = _automationTaskList.CrateTaskNumber(Automation.TaskTrigerType.Manual);
             var action = lineMode.inspect == 1 ? Automation.TaskAction.Step_LK_CJT : Automation.TaskAction.Step_LK_SXLW;
-            var section = unloading.section;
+       
+            var invenSection= _sectionPropertyRepository.Get(f => f.propertytype == 5);
+            if (invenSection==null)
+            {
+                throw new BadRequestException(AccEnum.SectionPropertyNull);
+            }
+            var toSection = upload.sectionid;
             if (lineMode.inspect==1)
             {
-                var sectionProperty = _sectionPropertyRepository.Get(f => f.propertytype == 3);
-                if(sectionProperty==null)
+                var QcProperty = _sectionPropertyRepository.Get(f => f.propertytype == 3);
+                if(QcProperty == null)
                 {
                     throw new BadRequestException(AccEnum.SectionPropertyNull);
                 }
-                section = sectionProperty.sectionid;
+
+                toSection = QcProperty.sectionid; 
             }
+
+
+
+            var tasklst = _automationTaskList.GetList(f => f.sectionid == unloading.section && f.action == action && f.status!=(int)TaskResultStatus.Complated);
+            if (tasklst.Any())
+            {
+                throw new BadRequestException(AccEnum.TaskProcessing);
+            }
+
             _automationTaskList.Insert(new siger_automation_task_list
             {
                 no = taskNo,
@@ -592,7 +603,7 @@ namespace Siger.ApiACC.Controllers
                 tasktype = Automation.TaskActionType.Load,
                 operater = UserId,
                 operatetime = DateTime.MinValue,
-                sectionid = unloading.section,
+                sectionid = toSection,
                 send = 0,
                 status = 1,
                 completetime = DateTime.MinValue,
@@ -602,50 +613,15 @@ namespace Siger.ApiACC.Controllers
                 sn = location.sn,
                 ordercode = location.ordernumber,
                 fixtureguid = location.fixturetools,
+                fixturename=location.fixturename,
                 locationid = location.locationid,
                 productcode = location.productcode,
                 processid = 0,
                 programnumber = "",
                 remark =lineMode.inspect==1? "准备下料-》抽检台":"准备下料",
-                extend1= unixtime.ToStr()
+                extend1 = upload.sectionid.ToString()
 
             });
-            var monitor = _automationFixtureMonitor.Get(f => f.section == section);
-            if (monitor == null)
-            {
-                _automationFixtureMonitor.Insert(new siger_automation_fixture_tools_monitor
-                {
-                    fixtureguid = location.fixturetools,
-                    fixturename = location.fixturename,
-                    projectId = ProjectId,
-                    section = section,
-                    sn = location.sn,
-                    createtime = DateTime.Now,
-                    updatetime = DateTime.Now,
-                    status = (int)Automation.MachineStatus.Produce,
-                    productId = location.productid,
-                    productCode = location.productcode,
-                    productName = location.productname,
-                    ordernumber = location.ordernumber,
-                    locationId = location.locationid,
-                    unixtime= unixtime,
-                    taskno= taskNo
-                });
-            }
-            else
-            {
-                monitor.sn = location.sn;
-                monitor.updatetime = DateTime.Now;
-                monitor.status = (int)Automation.MachineStatus.Produce;
-                monitor.productId = location.productid;
-                monitor.productName = location.productname;
-                monitor.productCode = location.productcode;
-                monitor.ordernumber = location.ordernumber;
-                monitor.locationId = location.locationid;
-                monitor.unixtime = unixtime;
-                monitor.taskno = taskNo;
-                _automationFixtureMonitor.Update(monitor);
-            }
 
             if (_unitOfWork.Commit() > 0)
             {
@@ -666,41 +642,39 @@ namespace Siger.ApiACC.Controllers
         [HttpPost]
         public IActionResult Disassemble([FromBody]Requestdisassemble disassemble)
         {
-            if (!_automationTaskList.CanTask(ProjectId, disassemble.section))
-            {
-                throw new BadRequestException(AccEnum.TaskProcessing);
-            }
-            //创建 安装完成动作
-            var monitor = _automationFixtureMonitor.Get(f => f.projectId == ProjectId && f.section == disassemble.section);
-            if (monitor == null)
+
+            var upload = _sectionPropertyRepository.Get(f => f.sectionid == disassemble.section);
+            if (upload == null)
             {
-                throw new BadRequestException(AccEnum.MonitorNotfound);
+                throw new BadRequestException(AccEnum.Station_Null);
             }
-            var tasklist = _automationTaskList.Get(f => f.no == monitor.taskno);
-            if (tasklist==null)
+            if (upload.upload != 0)
             {
-                throw new BadRequestException(AccEnum.MachineDisable);
+                throw new BadRequestException(AccEnum.Uploading);
             }
-            var location = _automationLocation.Get(f => f.id == monitor.locationId);
-            if (location==null)
+            if (upload.down==0)
             {
-                throw new BadRequestException(AccEnum.LocationNoSn);
+                throw new BadRequestException(AccEnum.MachineOnFree);
             }
-            if (string.IsNullOrEmpty(location.sn))
+            if (upload.down != 2)
             {
-                throw new BadRequestException(AccEnum.LocationNoSn);
+                throw new BadRequestException(AccEnum.TaskProcessing);
             }
-            if(location.status== (int)LocationStatus.Out)
+            upload.down += 1;
+            _sectionPropertyRepository.Update(upload);
+
+            //创建 安装完成动作
+            var monitor = _automationFixtureMonitor.Get(f => f.projectId == ProjectId && f.section == disassemble.section);
+            if (monitor == null)
             {
-                throw new BadRequestException(AccEnum.LocationNoSn);
+                throw new BadRequestException(AccEnum.MonitorNotfound);
             }
-
-            if (location!=null)
+            var sectionProperty = _sectionPropertyRepository.Get(f => f.propertytype == 5);
+            if (sectionProperty == null)
             {
-                location.sn = "";
-                location.status= (int)LocationStatus.Out;
-                _automationLocation.Update(location);
+                throw new BadRequestException(AccEnum.SectionPropertyNull);
             }
+            var  unloadSection = sectionProperty.sectionid;
             var taskNo = _automationTaskList.CrateTaskNumber(Automation.TaskTrigerType.Manual);
             _automationTaskList.Insert(new siger_automation_task_list
             {
@@ -711,7 +685,7 @@ namespace Siger.ApiACC.Controllers
                 tasktype = Automation.TaskActionType.Load,
                 operater = UserId,
                 operatetime = DateTime.Now,
-                sectionid = disassemble.section,
+                sectionid = sectionProperty.sectionid,
                 send = 0,
                 status = 1,
                 completetime = DateTime.MinValue,
@@ -726,13 +700,9 @@ namespace Siger.ApiACC.Controllers
                 processid = 0,
                 programnumber = "",
                 remark = "手动任务-拆卸完成",
+                extend1= disassemble.section.ToStr()
             });
 
-            //移出 上料位
-
-            monitor.taskno = taskNo;
-            _automationFixtureMonitor.Update(monitor);
-
             if (_unitOfWork.Commit() > 0)
             {
                 Logger.WriteLineError($"拆卸完成任务{taskNo}创建成功-{EnumHelper.GetEnumDesc(Automation.TaskAction.Step_SXLW_LK)}");

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

@@ -126,6 +126,7 @@ namespace Siger.ApiACC.Controllers
             }
             var dataList = new List<AutomationStateList>();
 
+
             foreach (var item in data)
             {
                 var model = Mapper<ResponseAutomationTasklist, AutomationStateList>.Map(item);
@@ -147,6 +148,7 @@ namespace Siger.ApiACC.Controllers
                         model.status_value = "";
                         break;
                 }
+
                 dataList.Add(model);
             }
             if (dataList.Any())

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

@@ -266,7 +266,11 @@ namespace Siger.ApiACC.Controllers
             {
                 try
                 {
-
+                    //还有未完成任务 退出 等待任务下发
+                    if (!_automationTaskList.CanTask(ProjectId, req.sectionid))
+                    {
+                        return new ObjectResult(CommonEnum.Succefull);
+                    }
                     CreateTaskList(req.sectionid, req.productid, product.code, req.sn, req.routeid.ToInt());
                     AddSnList(req.materialid.ToInt(), inspection, product.code, section.parentid);//把二维码插入到 sn_list表
                 }
@@ -325,47 +329,45 @@ namespace Siger.ApiACC.Controllers
 
         private void CreateTaskList(int section, int productid, string productcode, string sn, int routeid)
         {
-            var monitor = _fixtureMonitor.Get(f => f.section == section);
-            if (monitor==null)
+            var tasklist = _automationTaskList.GetList(f => f.sectionid == section && f.action == Automation.TaskAction.Step_LK_CJT).LastOrDefault();
+            if (tasklist == null)
             {
-                Logger.WriteLineInfo($"检验工站{section} monitor 为空");
-                throw new BadRequestException(CommonEnum.RecordNotFound);
+                throw new BadRequestException(CommonEnum.Fail);
             }
+
             //找到上下料位
-            var tasklst = _automationTaskList.Get(f => f.no == monitor.taskno);
-            if (tasklst==null)
-            {
-                Logger.WriteLineInfo($"检验工站{section} tasklst 为空");
-                throw new BadRequestException(CommonEnum.RecordNotFound);
-            }
+          
             var taskNo = _automationTaskList.CrateTaskNumber(Automation.TaskTrigerType.Manual);            
             _automationTaskList.Insert(new siger_automation_task_list
             {
                 no = taskNo,
                 action = Automation.TaskAction.Step_CJT_SXLW,
                 actiontype = Automation.ExcueType.None,
-                triggertime = DateTime.MinValue,
+                triggertime = DateTime.Now,
                 tasktype = Automation.TaskActionType.Unload,
                 operater = UserId,
                 operatetime = DateTime.Now,
-                sectionid = section,
+                sectionid = tasklist.extend1.ToInt(),
                 send = 0,
                 status = 1,
                 completetime = DateTime.MinValue,
                 trigger = Automation.TaskTrigerType.Manual,
+               
                 projectId = ProjectId,
                 productid = productid,
                 sn = sn,
-                ordercode = "",
-                fixtureguid = monitor.fixtureguid,
-                locationid = monitor.locationId,
+                ordercode = tasklist.ordercode, 
+                fixturename= tasklist.fixturename,
+                productname= tasklist.productname,
+                fixtureguid = tasklist.fixtureguid,
+                locationid = tasklist.locationid,
                 productcode = productcode,
                 processid = routeid,
                 programnumber = "",
                 remark = "质量检验->上下料位置",
-                extend1=tasklst.sectionid.ToString(),//上下料位发起到检验的工站
+                extend1=section.ToStr(),//上下料位发起到检验的工站
             });
-            monitor.taskno = taskNo;
+            
 
             _unitOfWork.Commit();
         }

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

@@ -38,6 +38,7 @@ namespace Siger.ApiACC.Controllers
             _fixtureMonitor = fixtureMonitor;
             _routeRepository = routeRepository;
             _productRepository = productRepository;
+            _taskListRepository = taskListRepository;
         }
 
         [HttpGet]
@@ -67,16 +68,24 @@ namespace Siger.ApiACC.Controllers
         [HttpGet]
         public IActionResult GetMonitorSnProduct(int sectionid)
         {
-            var res = new ResponseMonitorSnProduct();
-            var monitor = _fixtureMonitor.Get(q => q.section == sectionid);            
-            if(monitor != null)
+            var tasklist = _taskListRepository.GetList(f => f.sectionid == sectionid && f.action == Automation.TaskAction.Step_LK_CJT).LastOrDefault();
+            if (tasklist == null)
             {
-                var product = _productRepository.Get(monitor.productId);
-                res.id = monitor.productId;
-                res.name = product?.name ?? "";
-                res.code = monitor.productCode;
-                res.sn = monitor.sn;
+                throw new BadRequestException(CommonEnum.Fail);
+            }
+            if (tasklist.status!=(int)Automation.TaskResultStatus.Complated)
+            {
+                throw new BadRequestException(Siger.Middlelayer.Common.ModuleEnum.AccEnum.TaskProcessing);
             }
+            var res = new ResponseMonitorSnProduct();
+            //var monitor = _fixtureMonitor.Get(q => q.section == sectionid);            
+          
+                var product = _productRepository.Get(tasklist.productid);
+                res.id = tasklist.productid;
+                res.name = product?.name ?? "";
+                res.code = tasklist.productcode;
+                res.sn = tasklist.sn;
+            
             return new ObjectResult(res);
         }
     }

Server/Apis/Siger.ApiACC/Tasks/AutoMES.cs

@@ -5,7 +5,7 @@ using Siger.Middlelayer.Common;
 using Siger.Middlelayer.Common.Configuration;
 using Siger.Middlelayer.Common.Extensions;
 using Siger.Middlelayer.Common.Helpers;
-using Siger.Middlelayer.Common.Log;
+using Siger.Middlelayer.Log;
 using Siger.Middlelayer.Share.Enum.ModuleEnum;
 using System;
 using System.Collections.Generic;
@@ -20,8 +20,7 @@ namespace Siger.ApiACC.Tasks
 
         public void Execute()
         {
-            Logger.WriteLineInfo($"execute mes job");
-
+       
             var projectId = GetProjectId();
             var hostDic = GetHost();
             if (projectId==0 || !hostDic.Any())
@@ -34,23 +33,24 @@ namespace Siger.ApiACC.Tasks
                 var tasklist = dbhelper.GetTaskList(projectId);
                 if (!tasklist.Any())
                 {
+
                     return;
                 }
                 if (!dbhelper.CanTask(projectId))
                 {
                     return;
                 }
-                
+
                 var tasks = tasklist.OrderBy(s => s.actiontype);
                 var task = tasks.FirstOrDefault();
                 if (task.send == 1)
                     return;
 
-                var section = task.sectionid;
+                var section = task.extend1.ToInt();
                 //抽检台-》上料位特殊逻辑
-                if (task.action== Automation.TaskAction.Step_CJT_SXLW)
+                if (task.action==Automation.TaskAction.Step_LK_CJT || task.action == Automation.TaskAction.Step_CJT_SXLW)
                 {
-                    section = task.extend1.ToInt();
+                    section = task.sectionid;
                 }
                 var levelsction = dbhelper.GetLevelsection(section);
                 if (levelsction == null)

Server/Apis/Siger.ApiACC/Tasks/DBhelper.cs

@@ -70,6 +70,15 @@ namespace Siger.ApiACC.Tasks
         {
             return AccDbContext.siger_project_machine_attribution.FirstOrDefault(f => f.station==section && f.status==1);
         }
+        //public int GetPreStation(siger_automation_task_list task )
+        //{
+        //    //取抽检工位发起的上料位ID
+        //    var preTask = AccDbContext.siger_automation_task_list.Where(f => f.sn == task.sn && f.extend1 == task.sectionid.ToString() && f.action == TaskAction.Step_LK_CJT).OrderByDescending(d => d.id).FirstOrDefault();
+        //    if (preTask != null)
+        //        return preTask.sectionid;
+        //    else
+        //        return 0;
+        //}
         public siger_automation_fixture_tools GetFixture(string guid)
         {
             return AccDbContext.siger_automation_fixture_tools.FirstOrDefault(f => f.guid==guid && f.status == 1);

Server/Apis/Siger.ApiDashboard/.config/dotnet-tools.json

+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "5.0.2",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}
\ No newline at end of file

Server/Apis/Siger.ApiDashboard/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -5,6 +5,6 @@
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_PublishTargetUrl>D:\Code\20201209\siger-main\Server\Apis\Siger.ApiDashboard\..\..\Bin\publish\</_PublishTargetUrl>
+    <_PublishTargetUrl>E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Siger.ApiDashboard\..\..\Bin\publish\</_PublishTargetUrl>
   </PropertyGroup>
 </Project>
\ No newline at end of file

Server/Apis/Siger.ApiDashboard/Siger.ApiDashboard.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <UserSecretsId>b7d95c28-1217-4319-8612-09f36318dd1e</UserSecretsId>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

Server/Apis/Siger.Middlelayer.ApiGateway/obj/Debug/netcoreapp3.1/Siger.Middlelayer.ApiGateway.csproj.CoreCompileInputs.cache

-ddbbd5d7368e978aa99d2746abb52756c599301d
+6e924a1fbdf86afac1da6a0c00a1ac24214efd18

Server/Apis/Siger.Middlelayer.ApiGateway/obj/Debug/netcoreapp3.1/Siger.Middlelayer.ApiGateway.csproj.FileListAbsolute.txt

@@ -20,3 +20,25 @@ D:\Code\20201209\siger-main\Server\Apis\Siger.Middlelayer.ApiGateway\obj\Debug\n
 D:\Code\20201209\siger-main\Server\Apis\Siger.Middlelayer.ApiGateway\obj\Debug\netcoreapp3.1\Siger.Middlelayer.ApiGateway.dll
 D:\Code\20201209\siger-main\Server\Apis\Siger.Middlelayer.ApiGateway\obj\Debug\netcoreapp3.1\Siger.Middlelayer.ApiGateway.pdb
 D:\Code\20201209\siger-main\Server\Apis\Siger.Middlelayer.ApiGateway\obj\Debug\netcoreapp3.1\Siger.Middlelayer.ApiGateway.genruntimeconfig.cache
+E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Bin\netcoreapp3.1\Properties\launchSettings.json
+E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Bin\netcoreapp3.1\appsettings.Development.json
+E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Bin\netcoreapp3.1\appsettings.json
+E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Bin\netcoreapp3.1\Siger.Middlelayer.ApiGateway.exe
+E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Bin\netcoreapp3.1\Siger.Middlelayer.ApiGateway.deps.json
+E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Bin\netcoreapp3.1\Siger.Middlelayer.ApiGateway.runtimeconfig.json
+E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Bin\netcoreapp3.1\Siger.Middlelayer.ApiGateway.runtimeconfig.dev.json
+E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Bin\netcoreapp3.1\Siger.Middlelayer.ApiGateway.dll
+E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Bin\netcoreapp3.1\Siger.Middlelayer.ApiGateway.pdb
+E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Siger.Middlelayer.ApiGateway\obj\Debug\netcoreapp3.1\Siger.Middlelayer.ApiGateway.csprojAssemblyReference.cache
+E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Siger.Middlelayer.ApiGateway\obj\Debug\netcoreapp3.1\Siger.Middlelayer.ApiGateway.AssemblyInfoInputs.cache
+E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Siger.Middlelayer.ApiGateway\obj\Debug\netcoreapp3.1\Siger.Middlelayer.ApiGateway.AssemblyInfo.cs
+E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Siger.Middlelayer.ApiGateway\obj\Debug\netcoreapp3.1\Siger.Middlelayer.ApiGateway.csproj.CoreCompileInputs.cache
+E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Siger.Middlelayer.ApiGateway\obj\Debug\netcoreapp3.1\Siger.Middlelayer.ApiGateway.MvcApplicationPartsAssemblyInfo.cs
+E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Siger.Middlelayer.ApiGateway\obj\Debug\netcoreapp3.1\Siger.Middlelayer.ApiGateway.MvcApplicationPartsAssemblyInfo.cache
+E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Siger.Middlelayer.ApiGateway\obj\Debug\netcoreapp3.1\Siger.Middlelayer.ApiGateway.RazorTargetAssemblyInfo.cache
+E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Siger.Middlelayer.ApiGateway\obj\Debug\netcoreapp3.1\Siger.Middlelayer.ApiGateway.csproj.CopyComplete
+E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Siger.Middlelayer.ApiGateway\obj\Debug\netcoreapp3.1\staticwebassets\Siger.Middlelayer.ApiGateway.StaticWebAssets.Manifest.cache
+E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Siger.Middlelayer.ApiGateway\obj\Debug\netcoreapp3.1\staticwebassets\Siger.Middlelayer.ApiGateway.StaticWebAssets.xml
+E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Siger.Middlelayer.ApiGateway\obj\Debug\netcoreapp3.1\Siger.Middlelayer.ApiGateway.dll
+E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Siger.Middlelayer.ApiGateway\obj\Debug\netcoreapp3.1\Siger.Middlelayer.ApiGateway.pdb
+E:\gitlabcode\Laisi_AutoMES2\Server\Apis\Siger.Middlelayer.ApiGateway\obj\Debug\netcoreapp3.1\Siger.Middlelayer.ApiGateway.genruntimeconfig.cache

Server/Apis/Siger.Middlelayer.ApiGateway/obj/Siger.Middlelayer.ApiGateway.csproj.nuget.dgspec.json

 {
   "format": 1,
   "restore": {
-    "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Apis\\Siger.Middlelayer.ApiGateway\\Siger.Middlelayer.ApiGateway.csproj": {}
+    "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Apis\\Siger.Middlelayer.ApiGateway\\Siger.Middlelayer.ApiGateway.csproj": {}
   },
   "projects": {
-    "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Apis\\Siger.ApiCommon\\Siger.ApiCommon.csproj": {
+    "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Apis\\Siger.ApiCommon\\Siger.ApiCommon.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Apis\\Siger.ApiCommon\\Siger.ApiCommon.csproj",
+        "projectUniqueName": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Apis\\Siger.ApiCommon\\Siger.ApiCommon.csproj",
         "projectName": "Siger.ApiCommon",
-        "projectPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Apis\\Siger.ApiCommon\\Siger.ApiCommon.csproj",
-        "packagesPath": "C:\\Users\\siger\\.nuget\\packages\\",
-        "outputPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Apis\\Siger.ApiCommon\\obj\\",
+        "projectPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Apis\\Siger.ApiCommon\\Siger.ApiCommon.csproj",
+        "packagesPath": "C:\\Users\\peter\\.nuget\\packages\\",
+        "outputPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Apis\\Siger.ApiCommon\\obj\\",
         "projectStyle": "PackageReference",
         "fallbackFolders": [
-          "D:\\Microsoft\\Xamarin\\NuGet\\"
+          "C:\\Microsoft\\Xamarin\\NuGet\\",
+          "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
         ],
         "configFilePaths": [
-          "C:\\Users\\siger\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Users\\peter\\AppData\\Roaming\\NuGet\\NuGet.Config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
         ],
@@ -32,14 +33,14 @@
         "frameworks": {
           "netstandard2.0": {
             "projectReferences": {
-              "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj": {
-                "projectPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj"
+              "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj": {
+                "projectPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj"
               },
-              "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Log\\Siger.Middlelayer.Log.csproj": {
-                "projectPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Log\\Siger.Middlelayer.Log.csproj"
+              "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Log\\Siger.Middlelayer.Log.csproj": {
+                "projectPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Log\\Siger.Middlelayer.Log.csproj"
               },
-              "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Infrastructure\\Siger.Middlelayer.Redis\\Siger.Middlelayer.Redis.csproj": {
-                "projectPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Infrastructure\\Siger.Middlelayer.Redis\\Siger.Middlelayer.Redis.csproj"
+              "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Infrastructure\\Siger.Middlelayer.Redis\\Siger.Middlelayer.Redis.csproj": {
+                "projectPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Infrastructure\\Siger.Middlelayer.Redis\\Siger.Middlelayer.Redis.csproj"
               }
             }
           }
@@ -122,24 +123,25 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.201\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
         }
       }
     },
-    "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Apis\\Siger.Middlelayer.ApiGateway\\Siger.Middlelayer.ApiGateway.csproj": {
+    "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Apis\\Siger.Middlelayer.ApiGateway\\Siger.Middlelayer.ApiGateway.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Apis\\Siger.Middlelayer.ApiGateway\\Siger.Middlelayer.ApiGateway.csproj",
+        "projectUniqueName": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Apis\\Siger.Middlelayer.ApiGateway\\Siger.Middlelayer.ApiGateway.csproj",
         "projectName": "Siger.Middlelayer.ApiGateway",
-        "projectPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Apis\\Siger.Middlelayer.ApiGateway\\Siger.Middlelayer.ApiGateway.csproj",
-        "packagesPath": "C:\\Users\\siger\\.nuget\\packages\\",
-        "outputPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Apis\\Siger.Middlelayer.ApiGateway\\obj\\",
+        "projectPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Apis\\Siger.Middlelayer.ApiGateway\\Siger.Middlelayer.ApiGateway.csproj",
+        "packagesPath": "C:\\Users\\peter\\.nuget\\packages\\",
+        "outputPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Apis\\Siger.Middlelayer.ApiGateway\\obj\\",
         "projectStyle": "PackageReference",
         "fallbackFolders": [
-          "D:\\Microsoft\\Xamarin\\NuGet\\"
+          "C:\\Microsoft\\Xamarin\\NuGet\\",
+          "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
         ],
         "configFilePaths": [
-          "C:\\Users\\siger\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Users\\peter\\AppData\\Roaming\\NuGet\\NuGet.Config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
         ],
@@ -154,17 +156,17 @@
         "frameworks": {
           "netcoreapp3.1": {
             "projectReferences": {
-              "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Apis\\Siger.ApiCommon\\Siger.ApiCommon.csproj": {
-                "projectPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Apis\\Siger.ApiCommon\\Siger.ApiCommon.csproj"
+              "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Apis\\Siger.ApiCommon\\Siger.ApiCommon.csproj": {
+                "projectPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Apis\\Siger.ApiCommon\\Siger.ApiCommon.csproj"
               },
-              "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj": {
-                "projectPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj"
+              "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj": {
+                "projectPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj"
               },
-              "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Log\\Siger.Middlelayer.Log.csproj": {
-                "projectPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Log\\Siger.Middlelayer.Log.csproj"
+              "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Log\\Siger.Middlelayer.Log.csproj": {
+                "projectPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Log\\Siger.Middlelayer.Log.csproj"
               },
-              "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Infrastructure\\Siger.Middlelayer.Redis\\Siger.Middlelayer.Redis.csproj": {
-                "projectPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Infrastructure\\Siger.Middlelayer.Redis\\Siger.Middlelayer.Redis.csproj"
+              "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Infrastructure\\Siger.Middlelayer.Redis\\Siger.Middlelayer.Redis.csproj": {
+                "projectPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Infrastructure\\Siger.Middlelayer.Redis\\Siger.Middlelayer.Redis.csproj"
               }
             }
           }
@@ -209,24 +211,25 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.201\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
         }
       }
     },
-    "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj": {
+    "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj",
+        "projectUniqueName": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj",
         "projectName": "Siger.Middlelayer.Common",
-        "projectPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj",
-        "packagesPath": "C:\\Users\\siger\\.nuget\\packages\\",
-        "outputPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\obj\\",
+        "projectPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj",
+        "packagesPath": "C:\\Users\\peter\\.nuget\\packages\\",
+        "outputPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\obj\\",
         "projectStyle": "PackageReference",
         "fallbackFolders": [
-          "D:\\Microsoft\\Xamarin\\NuGet\\"
+          "C:\\Microsoft\\Xamarin\\NuGet\\",
+          "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
         ],
         "configFilePaths": [
-          "C:\\Users\\siger\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Users\\peter\\AppData\\Roaming\\NuGet\\NuGet.Config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
         ],
@@ -297,24 +300,25 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.201\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
         }
       }
     },
-    "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Log\\Siger.Middlelayer.Log.csproj": {
+    "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Log\\Siger.Middlelayer.Log.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Log\\Siger.Middlelayer.Log.csproj",
+        "projectUniqueName": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Log\\Siger.Middlelayer.Log.csproj",
         "projectName": "Siger.Middlelayer.Log",
-        "projectPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Log\\Siger.Middlelayer.Log.csproj",
-        "packagesPath": "C:\\Users\\siger\\.nuget\\packages\\",
-        "outputPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Log\\obj\\",
+        "projectPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Log\\Siger.Middlelayer.Log.csproj",
+        "packagesPath": "C:\\Users\\peter\\.nuget\\packages\\",
+        "outputPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Log\\obj\\",
         "projectStyle": "PackageReference",
         "fallbackFolders": [
-          "D:\\Microsoft\\Xamarin\\NuGet\\"
+          "C:\\Microsoft\\Xamarin\\NuGet\\",
+          "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
         ],
         "configFilePaths": [
-          "C:\\Users\\siger\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Users\\peter\\AppData\\Roaming\\NuGet\\NuGet.Config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
         ],
@@ -329,8 +333,8 @@
         "frameworks": {
           "netstandard2.0": {
             "projectReferences": {
-              "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj": {
-                "projectPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj"
+              "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj": {
+                "projectPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj"
               }
             }
           }
@@ -369,24 +373,25 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.201\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
         }
       }
     },
-    "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Infrastructure\\Siger.Middlelayer.Redis\\Siger.Middlelayer.Redis.csproj": {
+    "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Infrastructure\\Siger.Middlelayer.Redis\\Siger.Middlelayer.Redis.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Infrastructure\\Siger.Middlelayer.Redis\\Siger.Middlelayer.Redis.csproj",
+        "projectUniqueName": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Infrastructure\\Siger.Middlelayer.Redis\\Siger.Middlelayer.Redis.csproj",
         "projectName": "Siger.Middlelayer.Redis",
-        "projectPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Infrastructure\\Siger.Middlelayer.Redis\\Siger.Middlelayer.Redis.csproj",
-        "packagesPath": "C:\\Users\\siger\\.nuget\\packages\\",
-        "outputPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Infrastructure\\Siger.Middlelayer.Redis\\obj\\",
+        "projectPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Infrastructure\\Siger.Middlelayer.Redis\\Siger.Middlelayer.Redis.csproj",
+        "packagesPath": "C:\\Users\\peter\\.nuget\\packages\\",
+        "outputPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Infrastructure\\Siger.Middlelayer.Redis\\obj\\",
         "projectStyle": "PackageReference",
         "fallbackFolders": [
-          "D:\\Microsoft\\Xamarin\\NuGet\\"
+          "C:\\Microsoft\\Xamarin\\NuGet\\",
+          "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
         ],
         "configFilePaths": [
-          "C:\\Users\\siger\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Users\\peter\\AppData\\Roaming\\NuGet\\NuGet.Config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
         ],
@@ -401,8 +406,8 @@
         "frameworks": {
           "netstandard2.0": {
             "projectReferences": {
-              "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj": {
-                "projectPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj"
+              "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj": {
+                "projectPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj"
               }
             }
           }
@@ -437,7 +442,7 @@
           ],
           "assetTargetFallback": true,
           "warn": true,
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.201\\RuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
         }
       }
     }

Server/Apis/Siger.Middlelayer.ApiGateway/obj/Siger.Middlelayer.ApiGateway.csproj.nuget.g.props

@@ -5,14 +5,17 @@
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
     <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\siger\.nuget\packages\;D:\Microsoft\Xamarin\NuGet\</NuGetPackageFolders>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\peter\.nuget\packages\;C:\Microsoft\Xamarin\NuGet\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.5.0</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.7.0</NuGetToolVersion>
   </PropertyGroup>
+  <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <SourceRoot Include="$([MSBuild]::EnsureTrailingSlash($(NuGetPackageFolders)))" />
+  </ItemGroup>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <PkgMicrosoft_CodeAnalysis_Analyzers Condition=" '$(PkgMicrosoft_CodeAnalysis_Analyzers)' == '' ">C:\Users\siger\.nuget\packages\microsoft.codeanalysis.analyzers\2.9.4</PkgMicrosoft_CodeAnalysis_Analyzers>
+    <PkgMicrosoft_CodeAnalysis_Analyzers Condition=" '$(PkgMicrosoft_CodeAnalysis_Analyzers)' == '' ">C:\Users\peter\.nuget\packages\microsoft.codeanalysis.analyzers\2.9.4</PkgMicrosoft_CodeAnalysis_Analyzers>
   </PropertyGroup>
 </Project>
\ No newline at end of file

Server/Apis/Siger.Middlelayer.ApiGateway/obj/project.assets.json

@@ -9622,23 +9622,25 @@
     ]
   },
   "packageFolders": {
-    "C:\\Users\\siger\\.nuget\\packages\\": {},
-    "D:\\Microsoft\\Xamarin\\NuGet\\": {}
+    "C:\\Users\\peter\\.nuget\\packages\\": {},
+    "C:\\Microsoft\\Xamarin\\NuGet\\": {},
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder": {}
   },
   "project": {
     "version": "1.0.0",
     "restore": {
-      "projectUniqueName": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Apis\\Siger.Middlelayer.ApiGateway\\Siger.Middlelayer.ApiGateway.csproj",
+      "projectUniqueName": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Apis\\Siger.Middlelayer.ApiGateway\\Siger.Middlelayer.ApiGateway.csproj",
       "projectName": "Siger.Middlelayer.ApiGateway",
-      "projectPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Apis\\Siger.Middlelayer.ApiGateway\\Siger.Middlelayer.ApiGateway.csproj",
-      "packagesPath": "C:\\Users\\siger\\.nuget\\packages\\",
-      "outputPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Apis\\Siger.Middlelayer.ApiGateway\\obj\\",
+      "projectPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Apis\\Siger.Middlelayer.ApiGateway\\Siger.Middlelayer.ApiGateway.csproj",
+      "packagesPath": "C:\\Users\\peter\\.nuget\\packages\\",
+      "outputPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Apis\\Siger.Middlelayer.ApiGateway\\obj\\",
       "projectStyle": "PackageReference",
       "fallbackFolders": [
-        "D:\\Microsoft\\Xamarin\\NuGet\\"
+        "C:\\Microsoft\\Xamarin\\NuGet\\",
+        "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"
       ],
       "configFilePaths": [
-        "C:\\Users\\siger\\AppData\\Roaming\\NuGet\\NuGet.Config",
+        "C:\\Users\\peter\\AppData\\Roaming\\NuGet\\NuGet.Config",
         "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config",
         "C:\\Program Files (x86)\\NuGet\\Config\\Xamarin.Offline.config"
       ],
@@ -9653,17 +9655,17 @@
       "frameworks": {
         "netcoreapp3.1": {
           "projectReferences": {
-            "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Apis\\Siger.ApiCommon\\Siger.ApiCommon.csproj": {
-              "projectPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Apis\\Siger.ApiCommon\\Siger.ApiCommon.csproj"
+            "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Apis\\Siger.ApiCommon\\Siger.ApiCommon.csproj": {
+              "projectPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Apis\\Siger.ApiCommon\\Siger.ApiCommon.csproj"
             },
-            "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj": {
-              "projectPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj"
+            "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj": {
+              "projectPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Common\\Siger.Middlelayer.Common.csproj"
             },
-            "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Log\\Siger.Middlelayer.Log.csproj": {
-              "projectPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Log\\Siger.Middlelayer.Log.csproj"
+            "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Log\\Siger.Middlelayer.Log.csproj": {
+              "projectPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Common\\Siger.Middlelayer.Log\\Siger.Middlelayer.Log.csproj"
             },
-            "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Infrastructure\\Siger.Middlelayer.Redis\\Siger.Middlelayer.Redis.csproj": {
-              "projectPath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Infrastructure\\Siger.Middlelayer.Redis\\Siger.Middlelayer.Redis.csproj"
+            "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Infrastructure\\Siger.Middlelayer.Redis\\Siger.Middlelayer.Redis.csproj": {
+              "projectPath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Infrastructure\\Siger.Middlelayer.Redis\\Siger.Middlelayer.Redis.csproj"
             }
           }
         }
@@ -9708,7 +9710,7 @@
             "privateAssets": "all"
           }
         },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.201\\RuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\3.1.402\\RuntimeIdentifierGraph.json"
       }
     }
   }

Server/Apis/Siger.Middlelayer.ApiGateway/obj/project.nuget.cache

 {
   "version": 2,
-  "dgSpecHash": "840pD77JjcptqV/xqFv9Cwpcx9wCrMfKAVQkufjcA8vOXoE0hQ5gvghtV9+2SQevaqZXcQ7FkTrNCHDDKHiKQA==",
+  "dgSpecHash": "XRROVs6lnkKA6B7jXsvfIf9tE33x5R/MTRXt6qcEJacTA7YP4zSX8ue1UtkN94kRxvI+pYvJAZ/A98qvNFuEsg==",
   "success": true,
-  "projectFilePath": "D:\\Code\\20201209\\Laisi_AutoMES2\\Server\\Apis\\Siger.Middlelayer.ApiGateway\\Siger.Middlelayer.ApiGateway.csproj",
+  "projectFilePath": "E:\\gitlabcode\\Laisi_AutoMES2\\Server\\Apis\\Siger.Middlelayer.ApiGateway\\Siger.Middlelayer.ApiGateway.csproj",
   "expectedPackageFiles": [
-    "C:\\Users\\siger\\.nuget\\packages\\confluent.kafka\\1.5.1\\confluent.kafka.1.5.1.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\consul\\1.6.1.1\\consul.1.6.1.1.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\csrediscore\\3.6.5\\csrediscore.3.6.5.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\dnsclient\\1.2.0\\dnsclient.1.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\fluentvalidation\\8.5.0\\fluentvalidation.8.5.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\librdkafka.redist\\1.5.0\\librdkafka.redist.1.5.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.authentication.abstractions\\2.2.0\\microsoft.aspnetcore.authentication.abstractions.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.authentication.core\\2.2.0\\microsoft.aspnetcore.authentication.core.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.authorization\\2.2.0\\microsoft.aspnetcore.authorization.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.authorization.policy\\2.2.0\\microsoft.aspnetcore.authorization.policy.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.cors\\2.2.0\\microsoft.aspnetcore.cors.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.hosting.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.abstractions.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.hosting.server.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.server.abstractions.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.html.abstractions\\2.2.0\\microsoft.aspnetcore.html.abstractions.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.http\\2.2.0\\microsoft.aspnetcore.http.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.http.abstractions\\2.2.0\\microsoft.aspnetcore.http.abstractions.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.http.extensions\\2.2.0\\microsoft.aspnetcore.http.extensions.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.http.features\\2.2.0\\microsoft.aspnetcore.http.features.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.jsonpatch\\3.1.5\\microsoft.aspnetcore.jsonpatch.3.1.5.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.middlewareanalysis\\3.0.0\\microsoft.aspnetcore.middlewareanalysis.3.0.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.mvc.abstractions\\2.2.0\\microsoft.aspnetcore.mvc.abstractions.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.mvc.core\\2.2.5\\microsoft.aspnetcore.mvc.core.2.2.5.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.mvc.newtonsoftjson\\3.1.5\\microsoft.aspnetcore.mvc.newtonsoftjson.3.1.5.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.razor\\2.2.0\\microsoft.aspnetcore.razor.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.razor.language\\3.1.0\\microsoft.aspnetcore.razor.language.3.1.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.razor.runtime\\2.2.0\\microsoft.aspnetcore.razor.runtime.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.responsecaching.abstractions\\2.2.0\\microsoft.aspnetcore.responsecaching.abstractions.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.routing\\2.2.0\\microsoft.aspnetcore.routing.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.routing.abstractions\\2.2.0\\microsoft.aspnetcore.routing.abstractions.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.staticfiles\\2.2.0\\microsoft.aspnetcore.staticfiles.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.aspnetcore.webutilities\\2.2.0\\microsoft.aspnetcore.webutilities.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.codeanalysis.analyzers\\2.9.4\\microsoft.codeanalysis.analyzers.2.9.4.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.codeanalysis.common\\3.3.1\\microsoft.codeanalysis.common.3.3.1.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.codeanalysis.csharp\\3.3.1\\microsoft.codeanalysis.csharp.3.3.1.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.codeanalysis.csharp.workspaces\\3.3.1\\microsoft.codeanalysis.csharp.workspaces.3.3.1.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.codeanalysis.razor\\3.1.0\\microsoft.codeanalysis.razor.3.1.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.codeanalysis.workspaces.common\\3.3.1\\microsoft.codeanalysis.workspaces.common.3.3.1.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.csharp\\4.7.0\\microsoft.csharp.4.7.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.dotnet.platformabstractions\\2.1.0\\microsoft.dotnet.platformabstractions.2.1.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.extensions.configuration\\3.1.7\\microsoft.extensions.configuration.3.1.7.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\3.1.7\\microsoft.extensions.configuration.abstractions.3.1.7.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.extensions.configuration.binder\\3.1.7\\microsoft.extensions.configuration.binder.3.1.7.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.extensions.configuration.fileextensions\\3.1.7\\microsoft.extensions.configuration.fileextensions.3.1.7.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.extensions.configuration.ini\\3.1.7\\microsoft.extensions.configuration.ini.3.1.7.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.extensions.configuration.json\\3.1.7\\microsoft.extensions.configuration.json.3.1.7.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\3.1.0\\microsoft.extensions.dependencyinjection.3.1.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\3.1.7\\microsoft.extensions.dependencyinjection.abstractions.3.1.7.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.extensions.dependencymodel\\2.1.0\\microsoft.extensions.dependencymodel.2.1.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.extensions.diagnosticadapter\\3.0.0\\microsoft.extensions.diagnosticadapter.3.0.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\3.1.7\\microsoft.extensions.fileproviders.abstractions.3.1.7.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.extensions.fileproviders.physical\\3.1.7\\microsoft.extensions.fileproviders.physical.3.1.7.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\3.1.7\\microsoft.extensions.filesystemglobbing.3.1.7.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.extensions.hosting.abstractions\\3.1.7\\microsoft.extensions.hosting.abstractions.3.1.7.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\3.1.7\\microsoft.extensions.logging.abstractions.3.1.7.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.extensions.objectpool\\2.2.0\\microsoft.extensions.objectpool.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.extensions.options\\2.2.0\\microsoft.extensions.options.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.extensions.primitives\\3.1.7\\microsoft.extensions.primitives.3.1.7.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.extensions.webencoders\\2.2.0\\microsoft.extensions.webencoders.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.net.http.headers\\2.2.0\\microsoft.net.http.headers.2.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.netcore.platforms\\2.1.2\\microsoft.netcore.platforms.2.1.2.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.openapi\\1.1.4\\microsoft.openapi.1.1.4.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.visualstudio.web.codegeneration\\3.1.3\\microsoft.visualstudio.web.codegeneration.3.1.3.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.visualstudio.web.codegeneration.contracts\\3.1.3\\microsoft.visualstudio.web.codegeneration.contracts.3.1.3.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.visualstudio.web.codegeneration.core\\3.1.3\\microsoft.visualstudio.web.codegeneration.core.3.1.3.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.visualstudio.web.codegeneration.design\\3.1.3\\microsoft.visualstudio.web.codegeneration.design.3.1.3.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.visualstudio.web.codegeneration.entityframeworkcore\\3.1.3\\microsoft.visualstudio.web.codegeneration.entityframeworkcore.3.1.3.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.visualstudio.web.codegeneration.templating\\3.1.3\\microsoft.visualstudio.web.codegeneration.templating.3.1.3.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.visualstudio.web.codegeneration.utils\\3.1.3\\microsoft.visualstudio.web.codegeneration.utils.3.1.3.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.visualstudio.web.codegenerators.mvc\\3.1.3\\microsoft.visualstudio.web.codegenerators.mvc.3.1.3.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.win32.primitives\\4.3.0\\microsoft.win32.primitives.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\microsoft.win32.registry\\4.0.0\\microsoft.win32.registry.4.0.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\mongodb.bson\\2.9.0\\mongodb.bson.2.9.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\mongodb.driver\\2.9.0\\mongodb.driver.2.9.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\mongodb.driver.core\\2.9.0\\mongodb.driver.core.2.9.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\netstandard.library\\1.6.1\\netstandard.library.1.6.1.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\newtonsoft.json\\12.0.3\\newtonsoft.json.12.0.3.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\newtonsoft.json.bson\\1.0.2\\newtonsoft.json.bson.1.0.2.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\nuget.frameworks\\4.7.0\\nuget.frameworks.4.7.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\ocelot\\14.0.0\\ocelot.14.0.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\runtime.native.system\\4.3.0\\runtime.native.system.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\runtime.native.system.io.compression\\4.3.0\\runtime.native.system.io.compression.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\runtime.native.system.net.http\\4.3.0\\runtime.native.system.net.http.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\runtime.native.system.net.security\\4.3.0\\runtime.native.system.net.security.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\sharpcompress\\0.23.0\\sharpcompress.0.23.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\siger.commonutil\\1.0.8\\siger.commonutil.1.0.8.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\5.5.1\\swashbuckle.aspnetcore.swagger.5.5.1.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\5.5.1\\swashbuckle.aspnetcore.swaggergen.5.5.1.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\5.5.1\\swashbuckle.aspnetcore.swaggerui.5.5.1.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.appcontext\\4.3.0\\system.appcontext.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.buffers\\4.5.0\\system.buffers.4.5.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.collections.concurrent\\4.3.0\\system.collections.concurrent.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.collections.immutable\\1.5.0\\system.collections.immutable.1.5.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.collections.nongeneric\\4.0.1\\system.collections.nongeneric.4.0.1.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.collections.specialized\\4.0.1\\system.collections.specialized.4.0.1.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.componentmodel\\4.0.1\\system.componentmodel.4.0.1.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.componentmodel.annotations\\4.7.0\\system.componentmodel.annotations.4.7.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.componentmodel.primitives\\4.1.0\\system.componentmodel.primitives.4.1.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.componentmodel.typeconverter\\4.1.0\\system.componentmodel.typeconverter.4.1.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.composition\\1.0.31\\system.composition.1.0.31.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.composition.attributedmodel\\1.0.31\\system.composition.attributedmodel.1.0.31.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.composition.convention\\1.0.31\\system.composition.convention.1.0.31.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.composition.hosting\\1.0.31\\system.composition.hosting.1.0.31.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.composition.runtime\\1.0.31\\system.composition.runtime.1.0.31.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.composition.typedparts\\1.0.31\\system.composition.typedparts.1.0.31.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.console\\4.3.0\\system.console.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.diagnostics.debug\\4.3.0\\system.diagnostics.debug.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.diagnostics.diagnosticsource\\4.6.0\\system.diagnostics.diagnosticsource.4.6.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.diagnostics.process\\4.1.0\\system.diagnostics.process.4.1.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.diagnostics.textwritertracelistener\\4.0.0\\system.diagnostics.textwritertracelistener.4.0.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.diagnostics.tools\\4.3.0\\system.diagnostics.tools.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.diagnostics.tracesource\\4.0.0\\system.diagnostics.tracesource.4.0.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.diagnostics.tracing\\4.3.0\\system.diagnostics.tracing.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.dynamic.runtime\\4.0.11\\system.dynamic.runtime.4.0.11.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.globalization\\4.3.0\\system.globalization.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.globalization.calendars\\4.3.0\\system.globalization.calendars.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.globalization.extensions\\4.3.0\\system.globalization.extensions.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.io.compression\\4.3.0\\system.io.compression.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.io.compression.zipfile\\4.3.0\\system.io.compression.zipfile.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.io.filesystem\\4.3.0\\system.io.filesystem.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.io.filesystem.primitives\\4.3.0\\system.io.filesystem.primitives.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.linq\\4.3.0\\system.linq.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.linq.expressions\\4.3.0\\system.linq.expressions.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.linq.queryable\\4.0.1\\system.linq.queryable.4.0.1.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.memory\\4.5.3\\system.memory.4.5.3.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.net.http\\4.3.0\\system.net.http.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.net.nameresolution\\4.3.0\\system.net.nameresolution.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.net.primitives\\4.3.0\\system.net.primitives.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.net.security\\4.3.2\\system.net.security.4.3.2.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.net.sockets\\4.3.0\\system.net.sockets.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.reflection.emit\\4.3.0\\system.reflection.emit.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.reflection.emit.lightweight\\4.3.0\\system.reflection.emit.lightweight.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.reflection.extensions\\4.3.0\\system.reflection.extensions.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.reflection.metadata\\1.6.0\\system.reflection.metadata.1.6.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\4.5.2\\system.runtime.compilerservices.unsafe.4.5.2.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.runtime.handles\\4.3.0\\system.runtime.handles.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\system.runtime.interopservices.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.runtime.interopservices.runtimeinformation\\4.3.0\\system.runtime.interopservices.runtimeinformation.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.runtime.numerics\\4.3.0\\system.runtime.numerics.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.runtime.serialization.formatters\\4.3.0\\system.runtime.serialization.formatters.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.runtime.serialization.primitives\\4.3.0\\system.runtime.serialization.primitives.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.security.claims\\4.3.0\\system.security.claims.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.security.cryptography.algorithms\\4.3.0\\system.security.cryptography.algorithms.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.security.cryptography.cng\\4.3.0\\system.security.cryptography.cng.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.security.cryptography.csp\\4.3.0\\system.security.cryptography.csp.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.security.cryptography.encoding\\4.3.0\\system.security.cryptography.encoding.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.security.cryptography.openssl\\4.3.0\\system.security.cryptography.openssl.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.security.cryptography.primitives\\4.3.0\\system.security.cryptography.primitives.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.security.cryptography.x509certificates\\4.3.0\\system.security.cryptography.x509certificates.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.security.principal\\4.3.0\\system.security.principal.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.security.principal.windows\\4.3.0\\system.security.principal.windows.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.security.securestring\\4.0.0\\system.security.securestring.4.0.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.text.encoding.codepages\\4.5.1\\system.text.encoding.codepages.4.5.1.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.text.encoding.extensions\\4.3.0\\system.text.encoding.extensions.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.text.encodings.web\\4.5.0\\system.text.encodings.web.4.5.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.text.json\\4.7.2\\system.text.json.4.7.2.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.text.regularexpressions\\4.3.0\\system.text.regularexpressions.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.threading.tasks.extensions\\4.5.3\\system.threading.tasks.extensions.4.5.3.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.threading.thread\\4.3.0\\system.threading.thread.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.threading.threadpool\\4.3.0\\system.threading.threadpool.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.threading.timer\\4.3.0\\system.threading.timer.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.valuetuple\\4.5.0\\system.valuetuple.4.5.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.xml.readerwriter\\4.3.0\\system.xml.readerwriter.4.3.0.nupkg.sha512",
-    "C:\\Users\\siger\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512"
+    "C:\\Users\\peter\\.nuget\\packages\\confluent.kafka\\1.5.1\\confluent.kafka.1.5.1.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\consul\\1.6.1.1\\consul.1.6.1.1.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\csrediscore\\3.6.5\\csrediscore.3.6.5.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\dnsclient\\1.2.0\\dnsclient.1.2.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\fluentvalidation\\8.5.0\\fluentvalidation.8.5.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\librdkafka.redist\\1.5.0\\librdkafka.redist.1.5.0.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.authentication.abstractions\\2.2.0\\microsoft.aspnetcore.authentication.abstractions.2.2.0.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.authentication.core\\2.2.0\\microsoft.aspnetcore.authentication.core.2.2.0.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.authorization\\2.2.0\\microsoft.aspnetcore.authorization.2.2.0.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.authorization.policy\\2.2.0\\microsoft.aspnetcore.authorization.policy.2.2.0.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.cors\\2.2.0\\microsoft.aspnetcore.cors.2.2.0.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.hosting.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.abstractions.2.2.0.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.hosting.server.abstractions\\2.2.0\\microsoft.aspnetcore.hosting.server.abstractions.2.2.0.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.html.abstractions\\2.2.0\\microsoft.aspnetcore.html.abstractions.2.2.0.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.http\\2.2.0\\microsoft.aspnetcore.http.2.2.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.aspnetcore.http.abstractions\\2.2.0\\microsoft.aspnetcore.http.abstractions.2.2.0.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.http.extensions\\2.2.0\\microsoft.aspnetcore.http.extensions.2.2.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.aspnetcore.http.features\\2.2.0\\microsoft.aspnetcore.http.features.2.2.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.aspnetcore.jsonpatch\\3.1.5\\microsoft.aspnetcore.jsonpatch.3.1.5.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.aspnetcore.middlewareanalysis\\3.0.0\\microsoft.aspnetcore.middlewareanalysis.3.0.0.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.mvc.abstractions\\2.2.0\\microsoft.aspnetcore.mvc.abstractions.2.2.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.aspnetcore.mvc.core\\2.2.5\\microsoft.aspnetcore.mvc.core.2.2.5.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.aspnetcore.mvc.newtonsoftjson\\3.1.5\\microsoft.aspnetcore.mvc.newtonsoftjson.3.1.5.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.razor\\2.2.0\\microsoft.aspnetcore.razor.2.2.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.aspnetcore.razor.language\\3.1.0\\microsoft.aspnetcore.razor.language.3.1.0.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.razor.runtime\\2.2.0\\microsoft.aspnetcore.razor.runtime.2.2.0.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.responsecaching.abstractions\\2.2.0\\microsoft.aspnetcore.responsecaching.abstractions.2.2.0.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.routing\\2.2.0\\microsoft.aspnetcore.routing.2.2.0.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.routing.abstractions\\2.2.0\\microsoft.aspnetcore.routing.abstractions.2.2.0.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.staticfiles\\2.2.0\\microsoft.aspnetcore.staticfiles.2.2.0.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.aspnetcore.webutilities\\2.2.0\\microsoft.aspnetcore.webutilities.2.2.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.codeanalysis.analyzers\\2.9.4\\microsoft.codeanalysis.analyzers.2.9.4.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.codeanalysis.common\\3.3.1\\microsoft.codeanalysis.common.3.3.1.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.codeanalysis.csharp\\3.3.1\\microsoft.codeanalysis.csharp.3.3.1.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.codeanalysis.csharp.workspaces\\3.3.1\\microsoft.codeanalysis.csharp.workspaces.3.3.1.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.codeanalysis.razor\\3.1.0\\microsoft.codeanalysis.razor.3.1.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.codeanalysis.workspaces.common\\3.3.1\\microsoft.codeanalysis.workspaces.common.3.3.1.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.csharp\\4.7.0\\microsoft.csharp.4.7.0.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.dotnet.platformabstractions\\2.1.0\\microsoft.dotnet.platformabstractions.2.1.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.extensions.configuration\\3.1.7\\microsoft.extensions.configuration.3.1.7.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.extensions.configuration.abstractions\\3.1.7\\microsoft.extensions.configuration.abstractions.3.1.7.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.extensions.configuration.binder\\3.1.7\\microsoft.extensions.configuration.binder.3.1.7.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.extensions.configuration.fileextensions\\3.1.7\\microsoft.extensions.configuration.fileextensions.3.1.7.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.extensions.configuration.ini\\3.1.7\\microsoft.extensions.configuration.ini.3.1.7.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.extensions.configuration.json\\3.1.7\\microsoft.extensions.configuration.json.3.1.7.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\3.1.0\\microsoft.extensions.dependencyinjection.3.1.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\3.1.7\\microsoft.extensions.dependencyinjection.abstractions.3.1.7.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.extensions.dependencymodel\\2.1.0\\microsoft.extensions.dependencymodel.2.1.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.extensions.diagnosticadapter\\3.0.0\\microsoft.extensions.diagnosticadapter.3.0.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.extensions.fileproviders.abstractions\\3.1.7\\microsoft.extensions.fileproviders.abstractions.3.1.7.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.extensions.fileproviders.physical\\3.1.7\\microsoft.extensions.fileproviders.physical.3.1.7.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\3.1.7\\microsoft.extensions.filesystemglobbing.3.1.7.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.extensions.hosting.abstractions\\3.1.7\\microsoft.extensions.hosting.abstractions.3.1.7.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.extensions.logging.abstractions\\3.1.7\\microsoft.extensions.logging.abstractions.3.1.7.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.extensions.objectpool\\2.2.0\\microsoft.extensions.objectpool.2.2.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.extensions.options\\2.2.0\\microsoft.extensions.options.2.2.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.extensions.primitives\\3.1.7\\microsoft.extensions.primitives.3.1.7.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.extensions.webencoders\\2.2.0\\microsoft.extensions.webencoders.2.2.0.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.net.http.headers\\2.2.0\\microsoft.net.http.headers.2.2.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.netcore.platforms\\2.1.2\\microsoft.netcore.platforms.2.1.2.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.netcore.targets\\1.1.0\\microsoft.netcore.targets.1.1.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.openapi\\1.1.4\\microsoft.openapi.1.1.4.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.visualstudio.web.codegeneration\\3.1.3\\microsoft.visualstudio.web.codegeneration.3.1.3.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.visualstudio.web.codegeneration.contracts\\3.1.3\\microsoft.visualstudio.web.codegeneration.contracts.3.1.3.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.visualstudio.web.codegeneration.core\\3.1.3\\microsoft.visualstudio.web.codegeneration.core.3.1.3.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.visualstudio.web.codegeneration.design\\3.1.3\\microsoft.visualstudio.web.codegeneration.design.3.1.3.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.visualstudio.web.codegeneration.entityframeworkcore\\3.1.3\\microsoft.visualstudio.web.codegeneration.entityframeworkcore.3.1.3.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.visualstudio.web.codegeneration.templating\\3.1.3\\microsoft.visualstudio.web.codegeneration.templating.3.1.3.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.visualstudio.web.codegeneration.utils\\3.1.3\\microsoft.visualstudio.web.codegeneration.utils.3.1.3.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.visualstudio.web.codegenerators.mvc\\3.1.3\\microsoft.visualstudio.web.codegenerators.mvc.3.1.3.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.win32.primitives\\4.3.0\\microsoft.win32.primitives.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\microsoft.win32.registry\\4.0.0\\microsoft.win32.registry.4.0.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\mongodb.bson\\2.9.0\\mongodb.bson.2.9.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\mongodb.driver\\2.9.0\\mongodb.driver.2.9.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\mongodb.driver.core\\2.9.0\\mongodb.driver.core.2.9.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\netstandard.library\\1.6.1\\netstandard.library.1.6.1.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\newtonsoft.json\\12.0.3\\newtonsoft.json.12.0.3.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\newtonsoft.json.bson\\1.0.2\\newtonsoft.json.bson.1.0.2.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\nuget.frameworks\\4.7.0\\nuget.frameworks.4.7.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\ocelot\\14.0.0\\ocelot.14.0.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\runtime.native.system\\4.3.0\\runtime.native.system.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\runtime.native.system.io.compression\\4.3.0\\runtime.native.system.io.compression.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\runtime.native.system.net.http\\4.3.0\\runtime.native.system.net.http.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\runtime.native.system.net.security\\4.3.0\\runtime.native.system.net.security.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple\\4.3.0\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl\\4.3.2\\runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.2.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\sharpcompress\\0.23.0\\sharpcompress.0.23.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\sharpziplib\\1.2.0\\sharpziplib.1.2.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\siger.commonutil\\1.0.8\\siger.commonutil.1.0.8.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\5.5.1\\swashbuckle.aspnetcore.swagger.5.5.1.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\5.5.1\\swashbuckle.aspnetcore.swaggergen.5.5.1.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\5.5.1\\swashbuckle.aspnetcore.swaggerui.5.5.1.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.appcontext\\4.3.0\\system.appcontext.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.buffers\\4.5.0\\system.buffers.4.5.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.collections\\4.3.0\\system.collections.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.collections.concurrent\\4.3.0\\system.collections.concurrent.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.collections.immutable\\1.5.0\\system.collections.immutable.1.5.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.collections.nongeneric\\4.0.1\\system.collections.nongeneric.4.0.1.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.collections.specialized\\4.0.1\\system.collections.specialized.4.0.1.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.componentmodel\\4.0.1\\system.componentmodel.4.0.1.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.componentmodel.annotations\\4.7.0\\system.componentmodel.annotations.4.7.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.componentmodel.primitives\\4.1.0\\system.componentmodel.primitives.4.1.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.componentmodel.typeconverter\\4.1.0\\system.componentmodel.typeconverter.4.1.0.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.composition\\1.0.31\\system.composition.1.0.31.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.composition.attributedmodel\\1.0.31\\system.composition.attributedmodel.1.0.31.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.composition.convention\\1.0.31\\system.composition.convention.1.0.31.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.composition.hosting\\1.0.31\\system.composition.hosting.1.0.31.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.composition.runtime\\1.0.31\\system.composition.runtime.1.0.31.nupkg.sha512",
+    "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.composition.typedparts\\1.0.31\\system.composition.typedparts.1.0.31.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.console\\4.3.0\\system.console.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.diagnostics.debug\\4.3.0\\system.diagnostics.debug.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.diagnostics.diagnosticsource\\4.6.0\\system.diagnostics.diagnosticsource.4.6.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.diagnostics.process\\4.1.0\\system.diagnostics.process.4.1.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.diagnostics.textwritertracelistener\\4.0.0\\system.diagnostics.textwritertracelistener.4.0.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.diagnostics.tools\\4.3.0\\system.diagnostics.tools.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.diagnostics.tracesource\\4.0.0\\system.diagnostics.tracesource.4.0.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.diagnostics.tracing\\4.3.0\\system.diagnostics.tracing.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.dynamic.runtime\\4.0.11\\system.dynamic.runtime.4.0.11.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.globalization\\4.3.0\\system.globalization.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.globalization.calendars\\4.3.0\\system.globalization.calendars.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.globalization.extensions\\4.3.0\\system.globalization.extensions.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.io\\4.3.0\\system.io.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.io.compression\\4.3.0\\system.io.compression.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.io.compression.zipfile\\4.3.0\\system.io.compression.zipfile.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.io.filesystem\\4.3.0\\system.io.filesystem.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.io.filesystem.primitives\\4.3.0\\system.io.filesystem.primitives.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.linq\\4.3.0\\system.linq.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.linq.expressions\\4.3.0\\system.linq.expressions.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.linq.queryable\\4.0.1\\system.linq.queryable.4.0.1.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.memory\\4.5.3\\system.memory.4.5.3.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.net.http\\4.3.0\\system.net.http.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.net.nameresolution\\4.3.0\\system.net.nameresolution.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.net.primitives\\4.3.0\\system.net.primitives.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.net.security\\4.3.2\\system.net.security.4.3.2.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.net.sockets\\4.3.0\\system.net.sockets.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.objectmodel\\4.3.0\\system.objectmodel.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.reflection.emit\\4.3.0\\system.reflection.emit.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.reflection.emit.lightweight\\4.3.0\\system.reflection.emit.lightweight.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.reflection.extensions\\4.3.0\\system.reflection.extensions.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.reflection.metadata\\1.6.0\\system.reflection.metadata.1.6.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.reflection.primitives\\4.3.0\\system.reflection.primitives.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.reflection.typeextensions\\4.3.0\\system.reflection.typeextensions.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.resources.resourcemanager\\4.3.0\\system.resources.resourcemanager.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.runtime\\4.3.0\\system.runtime.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\4.5.2\\system.runtime.compilerservices.unsafe.4.5.2.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.runtime.extensions\\4.3.0\\system.runtime.extensions.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.runtime.handles\\4.3.0\\system.runtime.handles.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.runtime.interopservices\\4.3.0\\system.runtime.interopservices.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.runtime.interopservices.runtimeinformation\\4.3.0\\system.runtime.interopservices.runtimeinformation.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.runtime.numerics\\4.3.0\\system.runtime.numerics.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.runtime.serialization.formatters\\4.3.0\\system.runtime.serialization.formatters.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.runtime.serialization.primitives\\4.3.0\\system.runtime.serialization.primitives.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.security.claims\\4.3.0\\system.security.claims.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.security.cryptography.algorithms\\4.3.0\\system.security.cryptography.algorithms.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.security.cryptography.cng\\4.3.0\\system.security.cryptography.cng.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.security.cryptography.csp\\4.3.0\\system.security.cryptography.csp.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.security.cryptography.encoding\\4.3.0\\system.security.cryptography.encoding.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.security.cryptography.openssl\\4.3.0\\system.security.cryptography.openssl.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.security.cryptography.primitives\\4.3.0\\system.security.cryptography.primitives.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.security.cryptography.x509certificates\\4.3.0\\system.security.cryptography.x509certificates.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.security.principal\\4.3.0\\system.security.principal.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.security.principal.windows\\4.3.0\\system.security.principal.windows.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.security.securestring\\4.0.0\\system.security.securestring.4.0.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.text.encoding\\4.3.0\\system.text.encoding.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.text.encoding.codepages\\4.5.1\\system.text.encoding.codepages.4.5.1.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.text.encoding.extensions\\4.3.0\\system.text.encoding.extensions.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.text.encodings.web\\4.5.0\\system.text.encodings.web.4.5.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.text.json\\4.7.2\\system.text.json.4.7.2.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.text.regularexpressions\\4.3.0\\system.text.regularexpressions.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.threading\\4.3.0\\system.threading.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.threading.tasks.extensions\\4.5.3\\system.threading.tasks.extensions.4.5.3.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.threading.thread\\4.3.0\\system.threading.thread.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.threading.threadpool\\4.3.0\\system.threading.threadpool.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.threading.timer\\4.3.0\\system.threading.timer.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.valuetuple\\4.5.0\\system.valuetuple.4.5.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.xml.readerwriter\\4.3.0\\system.xml.readerwriter.4.3.0.nupkg.sha512",
+    "C:\\Users\\peter\\.nuget\\packages\\system.xml.xdocument\\4.3.0\\system.xml.xdocument.4.3.0.nupkg.sha512"
   ],
   "logs": []
 }
\ No newline at end of file

Server/Bin/Siger.Middlelayer.AccRepository.xml

@@ -134,6 +134,611 @@
             返工
             </summary>
         </member>
+        <member name="T:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools">
+            <summary>
+            工装台账信息
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools.category">
+            <summary>
+            工装类别
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools.managetype">
+            <summary>
+            管理类型
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools.partnumber">
+            <summary>
+            工装料号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools.name">
+            <summary>
+            工装名称
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools.specification">
+            <summary>
+            规格型号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools.number">
+            <summary>
+            数量
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools.remark">
+            <summary>
+            备注
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools.attachment">
+            <summary>
+            附件
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools.code">
+            <summary>
+            工装编号
+            </summary>
+        </member>
+        <member name="T:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools_assembly">
+            <summary>
+            工装装配信息
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools_assembly.parent">
+            <summary>
+            父工装GUID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools_assembly.son">
+            <summary>
+            工装GUID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools_assembly.attachment">
+            <summary>
+            附件
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools_assembly.filename">
+            <summary>
+            附件名称
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools_monitor.fixtureguid">
+            <summary>
+            工装ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools_monitor.fixturename">
+            <summary>
+            工装编号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools_monitor.section">
+            <summary>
+            当前工站ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools_monitor.sn">
+            <summary>
+            当前Sn
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools_monitor.route">
+            <summary>
+            工序ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools_monitor.routedesc">
+            <summary>
+            工序描述
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools_monitor.createtime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools_monitor.updatetime">
+            <summary>
+            更新时间
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools_monitor.productId">
+            <summary>
+            产品ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools_monitor.productCode">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools_monitor.taskno">
+            <summary>
+            当前任务
+            </summary>
+        </member>
+        <member name="T:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools_product">
+            <summary>
+            工装对应产品
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools_product.fixturetools">
+            <summary>
+            工装GUID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools_product.productid">
+            <summary>
+            产品ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools_product.productcode">
+            <summary>
+            产品CODE
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_fixture_tools_product.remark">
+            <summary>
+            备注
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_line_mode.section">
+            <summary>
+            产线ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_line_mode.mode">
+            <summary>
+            生产线模式 0:手动 1 自动
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_line_mode.inspect">
+            <summary>
+            是否检验 
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_line_mode.updatetime">
+            <summary>
+            更新时间
+            </summary>
+        </member>
+        <member name="T:Siger.Middlelayer.AccRepository.Entities.siger_automation_location">
+            <summary>
+            储位工装信息
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_location.location_cid">
+            <summary>
+            储位自增ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_location.locationid">
+            <summary>
+            储位位置
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_location.fixturetools">
+            <summary>
+            工装GUID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_location.ordernumber">
+            <summary>
+            工件对应的工单号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_location.sn">
+            <summary>
+            工装工件
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_location.routeid">
+            <summary>
+            每加工CNC 设备 经过的工序： 标准节拍表
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_location.route">
+            <summary>
+            每加工CNC 设备 经过的工序： 标准节拍表
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_location.routenum">
+            <summary>
+            工序顺序
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_location.attachment">
+            <summary>
+            附件
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_location.remark">
+            <summary>
+            备注
+            </summary>
+        </member>
+        <member name="T:Siger.Middlelayer.AccRepository.Entities.siger_automation_section_property">
+            <summary>
+            工位属性
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_section_property.sectionid">
+            <summary>
+            工位ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_section_property.propertytype">
+            <summary>
+            1:上下料工位2:加工工位3:检验工位4:清洗5:存储工位
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_section_property.upload">
+            <summary>
+             上料状态 1 当前是上料 2 上料中 3 安装完成
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_section_property.down">
+            <summary>
+            下料状态 1 当前是下料  2 下料中 3 拆卸完成
+            </summary>
+        </member>
+        <member name="T:Siger.Middlelayer.AccRepository.Entities.siger_automation_machine_status">
+            <summary>
+            设备可用状态
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_machine_status.section">
+            <summary>
+            工位ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_machine_status.machineid">
+            <summary>
+            设备ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_machine_status.enable">
+            <summary>
+            1可用 0不可用
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_machine_status.updatetime">
+            <summary>
+            更新时间
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_machine_status.program">
+            <summary>
+            程序号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_machine_status.auto">
+            <summary>
+            1： 自动设备 0：上下料设备
+            </summary>
+        </member>
+        <member name="T:Siger.Middlelayer.AccRepository.Entities.siger_automation_produce_history">
+            <summary>
+            工装台账信息
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_produce_history.statusid">
+            <summary>
+            设备状态ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_produce_history.section">
+            <summary>
+            产线ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_produce_history.productid">
+            <summary>
+            产品ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_produce_history.productcode">
+            <summary>
+            产品编号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_produce_history.productname">
+            <summary>
+            产品名称
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_produce_history.locationid">
+            <summary>
+            储位ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_produce_history.locationname">
+            <summary>
+            储位名称
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_produce_history.sn">
+            <summary>
+            工件编号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_produce_history.route">
+            <summary>
+            工序
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_produce_history.updatetime">
+            <summary>
+            操作时间
+            </summary>
+        </member>
+        <member name="T:Siger.Middlelayer.AccRepository.Entities.siger_automation_section_route">
+            <summary>
+            自动线路径
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_section_route.sectionid">
+            <summary>
+            产线
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_section_route.startsection">
+            <summary>
+            开始工位
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_section_route.endsection">
+            <summary>
+            目标工位
+            </summary>
+        </member>
+        <member name="T:Siger.Middlelayer.AccRepository.Entities.siger_automation_task_list">
+            <summary>
+            工装台账信息
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_task_list.no">
+            <summary>
+            任务编号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_task_list.fixtureguid">
+            <summary>
+            工装GUID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_task_list.fixturename">
+            <summary>
+            工装CODE
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_task_list.sectionid">
+            <summary>
+            工位ID 目的
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_task_list.trigger">
+            <summary>
+            触发方式 产生TASK
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_task_list.tasktype">
+            <summary>
+            任务类型 load ,unload
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_task_list.sn">
+            <summary>
+            工件ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_task_list.ordercode">
+            <summary>
+            工单号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_task_list.productid">
+            <summary>
+            产品ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_task_list.productcode">
+            <summary>
+            产品code
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_task_list.processid">
+            <summary>
+            工序ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_task_list.programnumber">
+            <summary>
+            程序号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_task_list.locationid">
+            <summary>
+            储位位置
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_task_list.actiontype">
+            <summary>
+            Task 执行动作类型 1 手动 2 自动
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_task_list.action">
+            <summary>
+            Task 动作执行
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_task_list.send">
+            <summary>
+            是否已下发PLC  0:未下发 1:已下发
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_task_list.triggertime">
+            <summary>
+            触发时间
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_task_list.completetime">
+            <summary>
+            完成时间
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_task_list.operater">
+            <summary>
+            操作人
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_task_list.operatetime">
+            <summary>
+            操作时间
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_task_list.remark">
+            <summary>
+            备注
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_automation_task_list.extend1">
+            <summary>
+            发起工站ID
+            </summary>
+        </member>
+        <member name="T:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_list">
+            <summary>
+            snList
+            </summary>   
+        </member>
+        <member name="T:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_detail">
+            <summary>
+            siger_check_sn_trace_detail
+            </summary>   
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_detail.abnomal_status">
+            <summary>
+            异常状态 存 abnomal_rule表的key
+            </summary>
+        </member>
+        <member name="T:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_file">
+            <summary>
+            检验数据附件
+            </summary>   
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_file.trace_type">
+            <summary>
+            检验方式1->进料检验2->送检检验3->人工检验
+            </summary>
+        </member>
+        <member name="T:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_inspection">
+            <summary>
+            trace扩展表
+            </summary>   
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_inspection.testroom">
+            <summary>
+            检测室字典key
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_inspection.productid">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_inspection.sectionid">
+            <summary>
+            工位ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_inspection.sn">
+            <summary>
+            二维码
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_inspection.routeid">
+            <summary>
+            工序ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_inspection.check_type">
+            <summary>
+            检验类型
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_inspection.check_status">
+            <summary>
+            1->待接收2->检测完成3->待检验4->检验中
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_inspection.result">
+            <summary>
+            结果
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_inspection.send_mid">
+            <summary>
+            送检人
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_inspection.send_time">
+            <summary>
+            送检时间
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_inspection.check_mid">
+            <summary>
+            检验人
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_inspection.check_time">
+            <summary>
+            检验时间
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_inspection.inspection_type">
+            <summary>
+            扩展表类别 1->送检检验2->人工检验
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_inspection.reason">
+            <summary>
+            送检原因
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_inspection.quantity">
+            <summary>
+            偏差放行数量
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_inspection.recieve_mid">
+            <summary>
+            接收人
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_inspection.recieve_time">
+            <summary>
+            接收时间
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_inspection.checking_mid">
+            <summary>
+            开始检验人
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_check_sn_trace_inspection.checking_time">
+            <summary>
+            开始检验时间
+            </summary>
+        </member>
         <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_project_beat_set.section_id">
             <summary>
             产线id
@@ -196,7 +801,7 @@
         </member>
         <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_project_beat_set.route_number">
             <summary>
-            工序顺序
+            工序ID Route.Id
             </summary>
         </member>
         <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_project_beat_set.route_name">
@@ -729,13 +1334,185 @@
             二维码
             </summary>
         </member>
-        <member name="M:Siger.Middlelayer.AccRepository.Repositories.BasketPositionRepository.GetReportStationDtl(System.Int32,System.DateTime,System.DateTime)">
+        <member name="T:Siger.Middlelayer.AccRepository.Entities.siger_wms_storage">
+            <summary>
+            siger_wms_storage Entity Model
+            </summary>   
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_wms_storage.typeid">
+            <summary>
+            分类
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_wms_storage.name">
+            <summary>
+            仓库名称
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_wms_storage.serial_number">
+            <summary>
+            编号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_wms_storage.address">
+            <summary>
+            仓库详细地址
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_wms_storage.manager">
+            <summary>
+            联系人
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_wms_storage.creator">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_wms_storage.create_time">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_wms_storage.updator">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_wms_storage.update_time">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="T:Siger.Middlelayer.AccRepository.Entities.siger_wms_storage_location">
+            <summary>
+            siger_wms_storage_location Entity Model
+            </summary>   
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_wms_storage_location.storageid">
+            <summary>
+            仓库id
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_wms_storage_location.parentid">
+            <summary>
+            父类
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_wms_storage_location.name">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_wms_storage_location.level">
+            <summary>
+            区分层级 区域1,货架2,层号3,位置4 
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_wms_storage_location.typeid">
+            <summary>
+            分类
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_wms_storage_location.serial_number">
+            <summary>
+            储位编号-只有level=4才有
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_wms_storage_location.creator">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_wms_storage_location.create_time">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_wms_storage_location.updator">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Entities.siger_wms_storage_location.update_time">
+            <summary>
+            
+            </summary>
+        </member>
+        <member name="M:Siger.Middlelayer.AccRepository.Repositories.AutomationFixtureToolsProductRepository.GetDeliveryOrder(System.Collections.Generic.List{System.String},System.Int32)">
+            <summary>
+            获取 交期最早的订单
+            </summary>
+            <param name="productIds"></param>
+            <param name="projectId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Siger.Middlelayer.AccRepository.Repositories.AutomationTaskListRepository.CrateTaskNumber(Siger.Middlelayer.Share.Enum.ModuleEnum.Automation.TaskTrigerType)">
+            <summary>
+            长度10 任务编号 PLC限制
+            </summary>
+            <param name="trigerType"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Siger.Middlelayer.AccRepository.Repositories.AutomationTaskListRepository.CreateRandonSn(System.String)">
+            <summary>
+            工件长度10 PLC 限制
+            </summary>
+            <param name="productCode"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Siger.Middlelayer.AccRepository.Repositories.BasketPositionRepository.GetReportStationDtl(System.Int32,System.DateTime,System.DateTime)">
+            <summary>
+            工站 料框报工记录
+            </summary>
+            <param name="projectId"></param>
+            <param name="begin"></param>
+            <param name="end"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Siger.Middlelayer.AccRepository.Repositories.Interface.IAutomationFixtureToolsProductRepository.GetPlanFixtureInfo(System.Int32,System.String)">
+            <summary>
+            工令单获取 工装信息
+            </summary>
+            <param name="ordernumber"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Siger.Middlelayer.AccRepository.Repositories.Interface.IAutomationFixtureToolsProductRepository.GetPlanFixtureInfoByLocation(System.Int32,System.Int32)">
+            <summary>
+            
+            </summary>
+            <param name="projectId"></param>
+            <param name="ordernumber"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Siger.Middlelayer.AccRepository.Repositories.Interface.IAutomationFixtureToolsProductRepository.GetDeliveryOrder(System.Collections.Generic.List{System.String},System.Int32)">
+            <summary>
+            获取交期最近的订单
+            </summary>
+            <param name="productIds"></param>
+            <param name="projectId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Siger.Middlelayer.AccRepository.Repositories.Interface.IAutomationLocationRepository.GetDataList(System.Int32,System.Int32,System.String)">
+            <summary>
+            获取储位
+            </summary>
+            <param name="projectid">项目ID</param>
+            <param name="hasMaterial">只查有SN</param>
+            <returns></returns>
+        </member>
+        <member name="M:Siger.Middlelayer.AccRepository.Repositories.Interface.IAutomationTaskListRepository.CanTask(System.Int32,System.Int32)">
+            <summary>
+            上下料时候是否能创建任务
+            </summary>
+            <param name="projectId"></param>
+            <param name="section"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Siger.Middlelayer.AccRepository.Repositories.Interface.IAutomationTaskListRepository.CreateRandonSn(System.String)">
             <summary>
-            工站 料框报工记录
+            创建随机工件号码 SN
             </summary>
-            <param name="projectId"></param>
-            <param name="begin"></param>
-            <param name="end"></param>
             <returns></returns>
         </member>
         <member name="M:Siger.Middlelayer.AccRepository.Repositories.Interface.ISeriNumCfg.GetPagedConfigList(System.String,System.Int32,System.Int32,System.Int32)">
@@ -1111,6 +1888,51 @@
             二维码
             </summary>
         </member>
+        <member name="T:Siger.Middlelayer.AccRepository.Request.requestAutomationLoading">
+            <summary>
+             准备上料
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.requestAutomationLoading.guid">
+            <summary>
+            工装GUID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.requestAutomationLoading.locationid">
+            <summary>
+            储位ID
+            </summary>
+        </member>
+        <member name="T:Siger.Middlelayer.AccRepository.Request.requestAutoCompalateAssemble">
+            <summary>
+            安装完成
+            </summary>
+        </member>
+        <member name="T:Siger.Middlelayer.AccRepository.Request.requestAutomationUnloading">
+            <summary>
+            准备下料
+            </summary>
+        </member>
+        <member name="T:Siger.Middlelayer.AccRepository.Request.Requestdisassemble">
+            <summary>
+            拆卸
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestAutomationMachine.machineid">
+            <summary>
+            设备ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestAutomationMachine.enable">
+            <summary>
+            是否可用
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestAutomationMachine.status">
+            <summary>
+            完成状态
+            </summary>
+        </member>
         <member name="P:Siger.Middlelayer.AccRepository.Request.RequestBasketOperate.Uid">
             <summary>
             操作人员
@@ -1296,6 +2118,86 @@
             工单
             </summary>
         </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestAddFixtureTools.categoryid">
+            <summary>
+            工装类别
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestAddFixtureTools.managetype">
+            <summary>
+            管理类型
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestAddFixtureTools.partnumber">
+            <summary>
+            工装料号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestAddFixtureTools.name">
+            <summary>
+            工装名称
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestAddFixtureTools.specifition">
+            <summary>
+            规格型号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestAddFixtureTools.number">
+            <summary>
+            数量
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestAddFixtureTools.remark">
+            <summary>
+            备注
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestAddFixtureTools.fileurl">
+            <summary>
+            附件
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestAddFixtureTools.code">
+            <summary>
+            工装编号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestAddFixtureToolsProduct.fixturetoolid">
+            <summary>
+            工装ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestAddFixtureToolsProduct.productid">
+            <summary>
+            产品ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestAddFixtureToolsProduct.remark">
+            <summary>
+            备注
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestAddAutomationLocation.locationid">
+            <summary>
+            储位位置
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestAddAutomationLocation.fixturetoolid">
+            <summary>
+            工装ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestAddAutomationLocation.fileurl">
+            <summary>
+            附件
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestAddAutomationLocation.remark">
+            <summary>
+            备注
+            </summary>
+        </member>
         <member name="P:Siger.Middlelayer.AccRepository.Request.RequestGeneralReport.section">
             <summary>
             产线 
@@ -1336,6 +2238,41 @@
             OK数量
             </summary>
         </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestPLC.SN">
+            <summary>
+            工件唯一识别SN
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestPLC.Fixture">
+            <summary>
+            工装唯一编号GUID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestPLC.RequestForm">
+            <summary>
+            任务唯一编号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestPLC.RobotStep">
+            <summary>
+            机器人动作指令
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestPLC.RStation">
+            <summary>
+             发起地
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestPLC.StorageNo">
+            <summary>
+            储位位置编号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Request.RequestPLC.Program">
+            <summary>
+            加工程序号 ，上料完成后自动加工需要
+            </summary>
+        </member>
         <member name="P:Siger.Middlelayer.AccRepository.Request.RequestReleaseBox.Waste">
             <summary>
             1 :报废 ：0 正常放行
@@ -1531,6 +2468,71 @@
             产品工艺
             </summary>
         </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseFixtureTools.categoryid">
+            <summary>
+            工装类别ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseFixtureTools.category">
+            <summary>
+            工装类别名称
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseFixtureTools.managetype">
+            <summary>
+            管理类型
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseFixtureTools.partnumber">
+            <summary>
+            工装料号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseFixtureTools.name">
+            <summary>
+            工装名称
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseFixtureTools.specification">
+            <summary>
+            规格型号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseFixtureTools.number">
+            <summary>
+            数量
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseFixtureTools.remark">
+            <summary>
+            备注
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseFixtureTools.fileurl">
+            <summary>
+            附件
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseFixtureTools.code">
+            <summary>
+            工装编号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAumationFixtureToolsProduct.fixturetoolid">
+            <summary>
+            工装ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAumationFixtureToolsProduct.productid">
+            <summary>
+            产品ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAumationFixtureToolsProduct.remark">
+            <summary>
+            备注
+            </summary>
+        </member>
         <member name="P:Siger.Middlelayer.AccRepository.Response.ReposeProductRoute.Wo">
             <summary>
             工单 （plandetails.ordernum）
@@ -1666,6 +2668,156 @@
             二维码
             </summary>
         </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationInfo.wo">
+            <summary>
+            工单信息
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationInfo.sn">
+            <summary>
+            工件编码
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationInfo.locationDesc">
+            <summary>
+            储位位置
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationInfo.fixture">
+            <summary>
+            工装编号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationLocationRouteInfo.lid">
+            <summary>
+            location.id主键
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutoRouteInfo.Location">
+            <summary>
+            储位编号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutoRouteInfo.LId">
+            <summary>
+            location.id
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationLocation.locationid">
+            <summary>
+            储位自增ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationLocation.locaid">
+            <summary>
+            储位填写ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationLocation.fixturetoolid">
+            <summary>
+            工装ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationLocation.sn">
+            <summary>
+            工件
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationLocation.routenumber">
+            <summary>
+            工序顺序
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationLocation.route">
+            <summary>
+            工序萌宠
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationLocation.routeid">
+            <summary>
+            工序id
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationLocation.materialstate">
+            <summary>
+            物料状态
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationLocation.fileurl">
+            <summary>
+            附件
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationLocation.remark">
+            <summary>
+            备注
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationLocationList.typeid">
+            <summary>
+            工装ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationLocationList.locationid">
+            <summary>
+            储位位置
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationLocationList.location">
+            <summary>
+            储位
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationLocationList.wavehouse">
+            <summary>
+            仓库
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationLocationList.fixturetoolid">
+            <summary>
+            工装ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationLocationList.fixtureguid">
+            <summary>
+            工装GUID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationMachineStatus.machineStatus">
+            <summary>
+            设备状态
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationMachineStatus.status">
+            <summary>
+            任务状态
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationTasklist.id">
+            <summary>
+            tasklist.id 回传使用
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationTasklist.trigger">
+            <summary>
+            触发方式
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationTasklist.tasktype">
+            <summary>
+            任务类型
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationTasklist.location">
+            <summary>
+            储位ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseAutomationTasklist.actionType">
+            <summary>
+            执行类型
+            </summary>
+        </member>
         <member name="P:Siger.Middlelayer.AccRepository.Response.BoxPackingDate.Date">
             <summary>
             最早打标日期
@@ -1836,6 +2988,36 @@
             已配置
             </summary>
         </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseProductFixtureInfo.FixtureName">
+            <summary>
+            工装名称
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseProductFixtureInfo.FixtureGuid">
+            <summary>
+            GUID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseProductFixtureInfo.FixtureCode">
+            <summary>
+            工装编号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseProductFixtureInfo.ProductCode">
+            <summary>
+            产品名称
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponseProductFixtureInfo.Location">
+            <summary>
+            储位
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.AccRepository.Response.ResponsePlanlFixtureInfo.OrderNumber">
+            <summary>
+            工令单号
+            </summary>
+        </member>
         <member name="T:Siger.Middlelayer.AccRepository.Response.ResponseProduct">
             <summary>
             基本信息

Server/Bin/Siger.Middlelayer.CncRepository.xml

@@ -1450,6 +1450,16 @@
             <param name="pagesize"></param>
             <returns></returns>
         </member>
+        <member name="P:Siger.Middlelayer.CncRepository.Request.RequestAddBeatAllocation.product_name">
+            <summary>
+            productId
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.CncRepository.Request.RequestAddBeatAllocation.route_id">
+            <summary>
+            产品工序表ID
+            </summary>
+        </member>
         <member name="P:Siger.Middlelayer.CncRepository.Request.RequestAddProduceplan.product_code">
             <summary>
             产品编号

Server/Bin/Siger.Middlelayer.QmsRepository.xml

@@ -371,7 +371,7 @@
         </member>
         <member name="P:Siger.Middlelayer.QmsRepository.Entities.siger_check_sn_trace_inspection.check_type">
             <summary>
-            检验类型 1->首检2->巡检3->末检4->标准件检
+            检验类型
             </summary>
         </member>
         <member name="P:Siger.Middlelayer.QmsRepository.Entities.siger_check_sn_trace_inspection.check_status">
@@ -454,6 +454,96 @@
             
             </summary>   
         </member>
+        <member name="T:Siger.Middlelayer.QmsRepository.Entities.siger_project_beat_set">
+            <summary>
+            siger_project_beat_set Entity Model
+            </summary>   
+        </member>
+        <member name="P:Siger.Middlelayer.QmsRepository.Entities.siger_project_beat_set.section_id">
+            <summary>
+            产线id
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.QmsRepository.Entities.siger_project_beat_set.machineID">
+            <summary>
+            设备id
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.QmsRepository.Entities.siger_project_beat_set.process_number">
+            <summary>
+            加工程序号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.QmsRepository.Entities.siger_project_beat_set.product_name">
+            <summary>
+            产品名称 编号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.QmsRepository.Entities.siger_project_beat_set.drawing_number">
+            <summary>
+            产品图纸号
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.QmsRepository.Entities.siger_project_beat_set.standard_besat">
+            <summary>
+            标准节拍(单位/ 秒 S )
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.QmsRepository.Entities.siger_project_beat_set.daily_standard_output">
+            <summary>
+            日标准产量(单位/pcs个)
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.QmsRepository.Entities.siger_project_beat_set.add_time">
+            <summary>
+            添加时间
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.QmsRepository.Entities.siger_project_beat_set.edit_time">
+            <summary>
+            修改时间
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.QmsRepository.Entities.siger_project_beat_set.product_name_text">
+            <summary>
+            产品名称
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.QmsRepository.Entities.siger_project_beat_set.changemodeltime">
+            <summary>
+            换型时间
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.QmsRepository.Entities.siger_project_beat_set.route_number">
+            <summary>
+            工序顺序
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.QmsRepository.Entities.siger_project_beat_set.route_name">
+            <summary>
+            工序名称
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.QmsRepository.Entities.siger_project_beat_set.updown_besat">
+            <summary>
+            上下料时间
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.QmsRepository.Entities.siger_project_beat_set.yieldrate">
+            <summary>
+            产量比率
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.QmsRepository.Entities.siger_project_beat_set.start_time">
+            <summary>
+            有效开始时间
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.QmsRepository.Entities.siger_project_beat_set.end_time">
+            <summary>
+            有效结束时间
+            </summary>
+        </member>
         <member name="T:Siger.Middlelayer.QmsRepository.Entities.siger_qms_abnormal_rule">
             <summary>
             

Server/Bin/Siger.Middlelayer.Repository.xml

@@ -5494,6 +5494,26 @@
             排序
             </summary>
         </member>
+        <member name="P:Siger.Middlelayer.Repository.Response.ResponseLoadStation.section">
+            <summary>
+            工站ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.Repository.Response.ResponseLoadStation.title">
+            <summary>
+            工站名称
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.Repository.Response.ResponseLoadStation.status">
+            <summary>
+            上料位状态
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.Repository.Response.ResponseLoadStation.upload">
+            <summary>
+            1 :可以上料  2:可以下料
+            </summary>
+        </member>
         <member name="P:Siger.Middlelayer.Repository.Response.Meta.hideInMenu">
             <summary>
             是否隐藏

Server/Bin/Siger.Middlelayer.WmsRepository.xml

@@ -1969,6 +1969,36 @@
             父级树状图中选中的id
             </summary>
         </member>
+        <member name="P:Siger.Middlelayer.WmsRepository.Request.RequestAddLocationModel.warehouseid">
+            <summary>
+            仓库ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.WmsRepository.Request.RequestAddLocationModel.storeID">
+            <summary>
+            储位ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.WmsRepository.Request.RequestAddLocationModel.status">
+            <summary>
+            是否停用0:停用 1:启用
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.WmsRepository.Request.LocationModel.id">
+            <summary>
+            储位类别ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.WmsRepository.Request.LocationModel.val">
+            <summary>
+            储位名称
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.WmsRepository.Request.LocationModel.locationid">
+            <summary>
+            储位自增ID
+            </summary>
+        </member>
         <member name="P:Siger.Middlelayer.WmsRepository.Request.RequestAllocation.id">
             <summary>
             详情id
@@ -2923,6 +2953,31 @@
             规格
             </summary>
         </member>
+        <member name="P:Siger.Middlelayer.WmsRepository.Response.ResponseLocationList.storeID">
+            <summary>
+            前端填写的储位ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.WmsRepository.Response.FiledName.locationid">
+            <summary>
+            储位自增ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.WmsRepository.Response.FiledName.val">
+            <summary>
+            储位名称
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.WmsRepository.Response.FiledName.id">
+            <summary>
+            类别ID
+            </summary>
+        </member>
+        <member name="P:Siger.Middlelayer.WmsRepository.Response.FiledName.name">
+            <summary>
+            类别名称
+            </summary>
+        </member>
         <member name="P:Siger.Middlelayer.WmsRepository.Response.ResponseOrderDetail.orderid">
             <summary>
             入库单id

Server/Common/Siger.Middlelayer.Share/Enum/ModuleEnum/AccEnum.cs

@@ -345,7 +345,13 @@ namespace Siger.Middlelayer.Common.ModuleEnum
         [Description("该储位无工件")]
         LocationNoSn,
         [Description("工站属性为空")]
-        SectionPropertyNull
+        SectionPropertyNull,
+        [Description("该储位已存在工件")]
+        LocationSnExits,
+        [Description("该工站正在上料中")]
+        Uploading,
+        [Description("该工站正在下料中")]
+        Downloading
 
     }
     public enum SeriNumCfg

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

@@ -171,5 +171,7 @@ namespace Siger.Middlelayer.AccRepository
         public DbSet<siger_check_sn_trace_inspection> siger_check_sn_trace_inspection { get; set; }
 
         public DbSet<siger_check_sn_trace_detail> siger_check_sn_trace_detail { get; set; }
+
+        public DbSet<siger_check_sn_list> siger_check_sn_list { get; set; }
     }
 }

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

@@ -19,11 +19,11 @@ namespace Siger.Middlelayer.AccRepository.Entities
         /// </summary>
         public int propertytype { get; set; }
         /// <summary>
-        /// 0:不是上料1:是上料
+        ///  上料状态 1 当前是上料 2 上料中 3 安装完成
         /// </summary>
         public int upload { get; set; }
         /// <summary>
-        /// 0:不是下料1:是下料
+        /// 下料状态 1 当前是下料  2 下料中 3 拆卸完成
         /// </summary>
         public int down { get; set; }
 

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

@@ -24,7 +24,7 @@ namespace Siger.Middlelayer.AccRepository.Entities
         /// </summary>
         public string fixturename { get; set; }
         /// <summary>
-        /// 工位ID
+        /// 工位ID 目的
         /// </summary>
         public int sectionid { get; set; }
         /// <summary>
@@ -103,7 +103,7 @@ namespace Siger.Middlelayer.AccRepository.Entities
         public string remark { get; set; }
 
         /// <summary>
-        /// 准备前往下一个工站ID
+        /// 发起工站ID
         /// </summary>
         public string extend1 { get; set; }
 

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

@@ -229,7 +229,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                         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
+                        && q.status == (int)RowState.Valid && t.status == (int)RowState.Valid 
                         select new ResponsePlanlFixtureInfo
                         {
                             OrderNumber = d.OrderNumber,

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

@@ -250,6 +250,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                             where q.projectId == projectId && !string.IsNullOrEmpty(q.sn)
                             && q.status == (int)RowState.Valid&& t.status == (int)RowState.Valid
                             && l.status == (int)RowState.Valid && w.status == (int)RowState.Valid
+                            && q.routeid==0
                             select new ResponseAutomationLocationList
                             {
                                 id = q.id,

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

 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
@@ -25,18 +26,18 @@ namespace Siger.Middlelayer.AccRepository.Repositories
             _context = context;
         }
 
-        public bool CanTask(int projectId,int section)
+        public bool CanTask(int projectId, int section)
         {
             //已经下发，并且任务完成
-            var taskObjs = _context.siger_automation_task_list.Where(f => f.projectId == projectId && f.send==0 );
+            var taskObjs = _context.siger_automation_task_list.Where(f => f.projectId == projectId && f.send == 0);
             if (taskObjs.Any())
             {
                 return false;
             }
             else
             {
-                var unDolist = _context.siger_automation_task_list.Where(f => f.send==1 && f.status !=(int)TaskResultStatus.Complated).Count();
-                if (unDolist==0)
+                var unDolist = _context.siger_automation_task_list.Where(f => f.send == 1 && (f.status == (int)TaskResultStatus.Produce || f.status == (int)TaskResultStatus.Waiting)).Count();
+                if (unDolist == 0)
                     return true;
                 else
                     return false;
@@ -51,18 +52,59 @@ namespace Siger.Middlelayer.AccRepository.Repositories
         /// <returns></returns>
         public string CrateTaskNumber(TaskTrigerType trigerType)
         {
-            var date = DateTime.Now;
-            var serinum = date.DayOfYear+date.Month +date.Day+ date.Hour + date.Minute + date.Second + date.Millisecond;
-            var dayofyear = GetDayOfYear(date);
-            if (trigerType== TaskTrigerType.Auto)
+            //var date = DateTime.Now;
+            //var serinum = date.DayOfYear+date.Month +date.Day+ date.Hour + date.Minute + date.Second + date.Millisecond;
+            //var dayofyear = GetDayOfYear(date);
+            //if (trigerType== TaskTrigerType.Auto)
+            //{
+            //    return $"A{date.Year}{dayofyear}{serinum}";
+            //}
+            //else
+            //{
+            //    return $"M{date.Year}{dayofyear}{serinum}";
+            //}
+
+            if (trigerType == TaskTrigerType.Auto)
+            {
+                return $"A{GetId()}";
+            }
+            else
+            {
+                return $"M{GetId()}";
+            }
+        }
+
+        public static object objLock = new object();
+        private static int defaultStepLength = 100;
+        private static DateTime dtStart = new DateTime(2020, 1, 1);
+        private static ConcurrentQueue<string> stackIds = new ConcurrentQueue<string>();
+        private static string GetId()
+        {
+            if (stackIds.Count <= 0)
+            {
+                lock (objLock)
+                {
+                    if (stackIds.Count <= 0)
+                    {
+                        var dtTs = (DateTime.Now - dtStart).Ticks;
+                        for (int i = 0; i < defaultStepLength; i++)
+                        {
+                            //todo://增加机器信息；单机暂且放弃
+                            stackIds.Enqueue((dtTs + i).ToString());
+                        }
+                    }
+                }
+            }
+            if (stackIds.TryDequeue(out string actIds))
             {
-                return $"A{date.Year}{dayofyear}{serinum}";
+                return actIds;
             }
             else
             {
-                return $"M{date.Year}{dayofyear}{serinum}";
+                throw new Exception("Id生成器报错，队列异常;");
             }
         }
+
         /// <summary>
         /// 工件长度10 PLC 限制
         /// </summary>
@@ -70,19 +112,22 @@ namespace Siger.Middlelayer.AccRepository.Repositories
         /// <returns></returns>
         public string CreateRandonSn(string productCode)
         {
-            var date = DateTime.Now;
-            var serinum = date.DayOfYear + date.Month + date.Day + date.Hour + date.Minute + date.Second + date.Millisecond;
-            var dayofyear = GetDayOfYear(date);
-            var lable = $"{date.Year}{dayofyear}{serinum}";
+            //var date = DateTime.Now;
+            //var seriNum = $"{date.ToString("HHmmssfff")}";
+            //var serinum = date.DayOfYear + date.Month + date.Day + date.Hour + date.Minute + date.Second + date.Millisecond;
+            //var dayofyear = GetDayOfYear(date);
+            //var lable = $"{date.Year}{dayofyear}{serinum}";
+
+            var lable = $"{Math.Abs(productCode.GetHashCode())}{GetId()}";
             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++)
+            for (int i = 0; i < 3 - lable.Length; i++)
             {
-                 result +="0";
+                result += "0";
             }
             return $"{result}{lable}";
 
@@ -91,7 +136,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
 
         public IPagedCollectionResult<ResponseAutomationTasklist> GetTasklistPagedList(List<int> sections, int taskType, string productCode, string TaskNo, string sn, int status, int actionType, string tirbeigin, string triend, string compbegin, string compend, int projectid, int page, int pagesize, string toexcel)
         {
-            var query = from q in _context.siger_automation_task_list 
+            var query = from q in _context.siger_automation_task_list
                         join t in _context.siger_automation_fixture_tools on q.fixtureguid equals t.guid
                         join r in _context.siger_project_product_route on q.route equals r.id into rtemp
                         from r in rtemp.DefaultIfEmpty()
@@ -100,39 +145,39 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                         where q.projectId == projectid
                         select new ResponseAutomationTasklist
                         {
-                             id=q.id,
-                             taskno=q.no,
-                             sectionid= q.sectionid,
-                             section=$"{lv.title}-{s.title}",
-                             trigger =EnumHelper.GetEnumDesc(q.trigger),
-                             triggervalue=q.triggertime,
-                             triggerTime=q.triggertime==DateTime.MinValue?"":q.triggertime.ToString(),
-                             complatevalue=q.completetime,
-                             complatetime=q.completetime==DateTime.MinValue?"":q.completetime.ToString(),
-                             action=EnumHelper.GetEnumDesc(q.action),
-                             actionType=EnumHelper.GetEnumDesc(q.actiontype),
-                             fixtureCode=t.code,
-                             fixtureName=t.name,
-                             location=q.locationid.ToString(),
-                             sn=q.sn,
-                             ordernumber=q.ordercode,
-                             productCode=q.productcode,
-                             program=q.programnumber,
-                             route=r!=null?$"{r.serialNumber}-{r.name}":"",
-                             send=q.send,
-                             tasktype=EnumHelper.GetEnumDesc(q.tasktype),
-                             tasktypeid = Convert.ToInt32(q.tasktype),
-                             status=q.status,
-                             actionTypeid = Convert.ToInt32(q.actiontype)
+                            id = q.id,
+                            taskno = q.no,
+                            sectionid = q.sectionid,
+                            section = $"{lv.title}-{s.title}",
+                            trigger = EnumHelper.GetEnumDesc(q.trigger),
+                            triggervalue = q.triggertime,
+                            triggerTime = q.triggertime == DateTime.MinValue ? "" : q.triggertime.ToString(),
+                            complatevalue = q.completetime,
+                            complatetime = q.completetime == DateTime.MinValue ? "" : q.completetime.ToString(),
+                            action = EnumHelper.GetEnumDesc(q.action),
+                            actionType = EnumHelper.GetEnumDesc(q.actiontype),
+                            fixtureCode = t.code,
+                            fixtureName = t.name,
+                            location = q.locationid.ToString(),
+                            sn = q.sn,
+                            ordernumber = q.ordercode,
+                            productCode = q.productcode,
+                            program = q.programnumber,
+                            route = r != null ? $"{r.serialNumber}-{r.name}" : "",
+                            send = q.send,
+                            tasktype = EnumHelper.GetEnumDesc(q.tasktype),
+                            tasktypeid = Convert.ToInt32(q.tasktype),
+                            status = q.status,
+                            actionTypeid = Convert.ToInt32(q.actiontype)
 
                         };
             Expression<Func<ResponseAutomationTasklist, bool>> sectonsExpression = f => true;
             if (sections.Any())
             {
-                sectonsExpression = q =>sections.Contains( q.sectionid );
+                sectonsExpression = q => sections.Contains(q.sectionid);
             }
             Expression<Func<ResponseAutomationTasklist, bool>> taskTypeExpression = f => true;
-            if (taskType != 0 )
+            if (taskType != 0)
             {
                 taskTypeExpression = q => q.tasktypeid == taskType;
             }
@@ -152,15 +197,15 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                 snExpression = q => q.sn.Contains(sn);
             }
             Expression<Func<ResponseAutomationTasklist, bool>> actionTypeExpression = f => true;
-            if (actionType!=0)
+            if (actionType != 0)
             {
-                actionTypeExpression = q => q.actionTypeid==actionType;
+                actionTypeExpression = q => q.actionTypeid == actionType;
             }
             Expression<Func<ResponseAutomationTasklist, bool>> triggerTimeTypeExpression = f => true;
             if (!string.IsNullOrEmpty(triend) && !string.IsNullOrEmpty(tirbeigin))
             {
-                
-                triggerTimeTypeExpression = q => q.triggervalue >= tirbeigin.ToDateTime() && q.triggervalue<=triend.ToDateTime();
+
+                triggerTimeTypeExpression = q => q.triggervalue >= tirbeigin.ToDateTime() && q.triggervalue <= triend.ToDateTime();
             }
             Expression<Func<ResponseAutomationTasklist, bool>> comptimeExpression = f => true;
             if (!string.IsNullOrEmpty(compbegin) && !string.IsNullOrEmpty(compend))
@@ -178,12 +223,12 @@ namespace Siger.Middlelayer.AccRepository.Repositories
 
             if (toexcel.ToInt() == 1)
             {
-                var entities = query.Where(expression).AsNoTracking().ToList();
-                return new PagedCollectionResult<ResponseAutomationTasklist>(entities, entities.Count);
+                var entities = query.Where(expression).OrderByDescending(d => d.id).AsNoTracking();
+                return new PagedCollectionResult<ResponseAutomationTasklist>(entities, entities.Count());
             }
             else
             {
-                var entities = query.Where(expression).Skip((page - 1) * pagesize).Take(pagesize).AsNoTracking().ToList();
+                var entities = query.Where(expression).OrderByDescending(d => d.id).Skip((page - 1) * pagesize).Take(pagesize).AsNoTracking();
                 var totalCount = query.Where(expression).Count();
                 return new PagedCollectionResult<ResponseAutomationTasklist>(entities, totalCount);
             }

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Response/ResponseAutomationMachineStatus.cs

@@ -6,6 +6,7 @@ namespace Siger.Middlelayer.AccRepository.Response
 {
     public class ResponseAutomationMachineStatus
     {
+        public int id { get; set; }
         public int sectionid { get; set; }
         public string section { get; set; }
       //  public string machine { get; set; }

Server/PC/Siger.Middlelayer.License/obj/Debug/Siger.Middlelayer.License_MarkupCompile.cache

@@ -4,16 +4,16 @@
 winexe
 C#
 .cs
-D:\Code\20201209\Laisi_AutoMES2\Server\PC\Siger.Middlelayer.License\obj\Debug\
+e:\gitlabcode\Laisi_AutoMES2\Server\PC\Siger.Middlelayer.License\obj\Debug\
 Siger.Middlelayer.License
 none
 false
 DEBUG;TRACE
-D:\Code\20201209\Laisi_AutoMES2\Server\PC\Siger.Middlelayer.License\App.xaml
-11151548125
+e:\gitlabcode\Laisi_AutoMES2\Server\PC\Siger.Middlelayer.License\App.xaml
+1219584333
 
-13-917883170
-121654848548
+13-1176365708
+121219315259
 MainWindow.xaml;
 
 True

Server/PC/Siger.Middlelayer.License/obj/Debug/Siger.Middlelayer.License_MarkupCompile.lref

 
 
-FD:\Code\20201209\Laisi_AutoMES2\Server\PC\Siger.Middlelayer.License\MainWindow.xaml;;
+Fe:\gitlabcode\Laisi_AutoMES2\Server\PC\Siger.Middlelayer.License\MainWindow.xaml;;
 

Server/PC/Siger.Middlelayer.License/obj/Release/Siger.Middlelayer.License_MarkupCompile.cache

@@ -4,15 +4,15 @@
 winexe
 C#
 .cs
-D:\Code\20201209\siger-main\Server\PC\Siger.Middlelayer.License\obj\Release\
+E:\gitlabcode\Laisi_AutoMES2\Server\PC\Siger.Middlelayer.License\obj\Release\
 Siger.Middlelayer.License
 none
 false
 TRACE
-D:\Code\20201209\siger-main\Server\PC\Siger.Middlelayer.License\App.xaml
+E:\gitlabcode\Laisi_AutoMES2\Server\PC\Siger.Middlelayer.License\App.xaml
 11151548125
 
-13-917883170
+13736267385
 121654848548
 MainWindow.xaml;
 

Server/PC/Siger.Middlelayer.License/obj/Release/Siger.Middlelayer.License_MarkupCompile.lref

 
 
-FD:\Code\20201209\siger-main\Server\PC\Siger.Middlelayer.License\MainWindow.xaml;;
+FE:\gitlabcode\Laisi_AutoMES2\Server\PC\Siger.Middlelayer.License\MainWindow.xaml;;
 

Server/Test/SugarDemo/Program.cs

-using System;
+using Siger.Middlelayer.AccRepository.Repositories;
+using Siger.Middlelayer.AccRepository.Repositories.Interface;
+using System;
 
 namespace SugarDemo
 {
@@ -6,6 +8,9 @@ namespace SugarDemo
     {
         static void Main(string[] args)
         {
+            //AutomationTaskListRepository resp = new AutomationTaskListRepository(null);
+            //resp.CreateRandonSn("121313");
+
             Console.WriteLine("Hello World!");
             var model = new SugarHelper();
             //1.0无法解决文件命名的问题

Server/Test/SugarDemo/SugarDemo.csproj

@@ -9,4 +9,8 @@
     <PackageReference Include="sqlSugarCore" Version="5.0.0.11" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\Infrastructure\Repositories\Siger.Middlelayer.AccRepository\Siger.Middlelayer.AccRepository.csproj" />
+  </ItemGroup>
+
 </Project>