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/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.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/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/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>