拉取更新

BPASmartClient.CustomResource/Pages/View/LoginView.xaml

@@ -15,6 +15,7 @@
     Topmost="False"
     WindowStartupLocation="CenterScreen"
     WindowStyle="None"
+    WindowState="Normal"
     mc:Ignorable="d">
 
     <Window.DataContext>

FryPot_DosingSystem/Control/DosingLogicControl.cs

@@ -425,10 +425,23 @@ namespace FryPot_DosingSystem.Control
         {
             if (RecipeQuene.Count > 0 && OutputMaterialQuene.Count == 0 && InputMaterialQuene.Count == 0)//后续添加其它限制条件
             {
-
+                //NewRecipeModel newRecipe = new NewRecipeModel();
+                MaterialType material = new MaterialType();
                 if (RecipeQuene.TryDequeue(out NewRecipeModel result))
                 {
                     MessageLog.GetInstance.ShowRunLog($"开始制作【{result.RecipeName}】 配方");
+                    //for (int k = 0; k < result.materialCollection.Count-1; k++)
+                    //{
+                    //    for (int j = 0; j < result.materialCollection.Count-1-k; j++)
+                    //    {
+                    //        if (result.materialCollection[j].MaterialLoc > result.materialCollection[j + 1].MaterialLoc)
+                    //        {
+                    //            material = result.materialCollection[j];
+                    //            result.materialCollection[j] = result.materialCollection[j + 1];
+                    //            result.materialCollection[j + 1] = material;
+                    //        }
+                    //    }
+                    //}
                     for (int i = 0; i < result.materialCollection.Count; i++) //遍历单个配方中所有物料
                     {
                         //将配方中原料加入新的队列

FryPot_DosingSystem/ViewModel/RecipeSetDownViewModel.cs

@@ -58,8 +58,6 @@ namespace FryPot_DosingSystem.ViewModel
         public void RecipeSetDown(NewRecipeModel recipeModel)
         {
             ActionManage.GetInstance.Send("RecipeSetDown",recipeModel);
-            
-            
         }
     }
 }

SmartClient.sln

@@ -106,6 +106,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MorkT_BarCou
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.MorkT_Container", "BPASmartClient.MorkT_Container\BPASmartClient.MorkT_Container.csproj", "{1BFE3DEE-D57A-4497-9CFA-7FF8EEA1B883}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FryPot_DosingSystem", "FryPot_DosingSystem\FryPot_DosingSystem.csproj", "{D5134D5F-EDBA-4758-80AD-3D13EAE3D60A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BPASmartClient.HubHelper", "BPASmartClient.HubHelper\BPASmartClient.HubHelper.csproj", "{D3710B72-AC52-44CB-AD70-29055BB14419}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -980,6 +984,46 @@ Global
 		{1BFE3DEE-D57A-4497-9CFA-7FF8EEA1B883}.Release|x64.Build.0 = Release|Any CPU
 		{1BFE3DEE-D57A-4497-9CFA-7FF8EEA1B883}.Release|x86.ActiveCfg = Release|Any CPU
 		{1BFE3DEE-D57A-4497-9CFA-7FF8EEA1B883}.Release|x86.Build.0 = Release|Any CPU
+		{D5134D5F-EDBA-4758-80AD-3D13EAE3D60A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D5134D5F-EDBA-4758-80AD-3D13EAE3D60A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D5134D5F-EDBA-4758-80AD-3D13EAE3D60A}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{D5134D5F-EDBA-4758-80AD-3D13EAE3D60A}.Debug|ARM.Build.0 = Debug|Any CPU
+		{D5134D5F-EDBA-4758-80AD-3D13EAE3D60A}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{D5134D5F-EDBA-4758-80AD-3D13EAE3D60A}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{D5134D5F-EDBA-4758-80AD-3D13EAE3D60A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D5134D5F-EDBA-4758-80AD-3D13EAE3D60A}.Debug|x64.Build.0 = Debug|Any CPU
+		{D5134D5F-EDBA-4758-80AD-3D13EAE3D60A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D5134D5F-EDBA-4758-80AD-3D13EAE3D60A}.Debug|x86.Build.0 = Debug|Any CPU
+		{D5134D5F-EDBA-4758-80AD-3D13EAE3D60A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D5134D5F-EDBA-4758-80AD-3D13EAE3D60A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D5134D5F-EDBA-4758-80AD-3D13EAE3D60A}.Release|ARM.ActiveCfg = Release|Any CPU
+		{D5134D5F-EDBA-4758-80AD-3D13EAE3D60A}.Release|ARM.Build.0 = Release|Any CPU
+		{D5134D5F-EDBA-4758-80AD-3D13EAE3D60A}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{D5134D5F-EDBA-4758-80AD-3D13EAE3D60A}.Release|ARM64.Build.0 = Release|Any CPU
+		{D5134D5F-EDBA-4758-80AD-3D13EAE3D60A}.Release|x64.ActiveCfg = Release|Any CPU
+		{D5134D5F-EDBA-4758-80AD-3D13EAE3D60A}.Release|x64.Build.0 = Release|Any CPU
+		{D5134D5F-EDBA-4758-80AD-3D13EAE3D60A}.Release|x86.ActiveCfg = Release|Any CPU
+		{D5134D5F-EDBA-4758-80AD-3D13EAE3D60A}.Release|x86.Build.0 = Release|Any CPU
+		{D3710B72-AC52-44CB-AD70-29055BB14419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3710B72-AC52-44CB-AD70-29055BB14419}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3710B72-AC52-44CB-AD70-29055BB14419}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{D3710B72-AC52-44CB-AD70-29055BB14419}.Debug|ARM.Build.0 = Debug|Any CPU
+		{D3710B72-AC52-44CB-AD70-29055BB14419}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{D3710B72-AC52-44CB-AD70-29055BB14419}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{D3710B72-AC52-44CB-AD70-29055BB14419}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D3710B72-AC52-44CB-AD70-29055BB14419}.Debug|x64.Build.0 = Debug|Any CPU
+		{D3710B72-AC52-44CB-AD70-29055BB14419}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D3710B72-AC52-44CB-AD70-29055BB14419}.Debug|x86.Build.0 = Debug|Any CPU
+		{D3710B72-AC52-44CB-AD70-29055BB14419}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3710B72-AC52-44CB-AD70-29055BB14419}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3710B72-AC52-44CB-AD70-29055BB14419}.Release|ARM.ActiveCfg = Release|Any CPU
+		{D3710B72-AC52-44CB-AD70-29055BB14419}.Release|ARM.Build.0 = Release|Any CPU
+		{D3710B72-AC52-44CB-AD70-29055BB14419}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{D3710B72-AC52-44CB-AD70-29055BB14419}.Release|ARM64.Build.0 = Release|Any CPU
+		{D3710B72-AC52-44CB-AD70-29055BB14419}.Release|x64.ActiveCfg = Release|Any CPU
+		{D3710B72-AC52-44CB-AD70-29055BB14419}.Release|x64.Build.0 = Release|Any CPU
+		{D3710B72-AC52-44CB-AD70-29055BB14419}.Release|x86.ActiveCfg = Release|Any CPU
+		{D3710B72-AC52-44CB-AD70-29055BB14419}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1029,6 +1073,8 @@ Global
 		{F61AC179-156D-4075-BFEB-355862231F48} = {666CB1A9-562E-453A-A2C7-FD9D77CFDFDD}
 		{048FED78-4BFA-4FCD-8FF2-905E9CA4D7DD} = {9FB27073-61A0-4FE3-94DB-5FDDE062332F}
 		{1BFE3DEE-D57A-4497-9CFA-7FF8EEA1B883} = {9FB27073-61A0-4FE3-94DB-5FDDE062332F}
+		{D5134D5F-EDBA-4758-80AD-3D13EAE3D60A} = {8712125E-14CD-4E1B-A1CE-4BDE03805942}
+		{D3710B72-AC52-44CB-AD70-29055BB14419} = {3D1D0E04-03FD-480A-8CF8-6E01A2E28625}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9AEC9B81-0222-4DE9-B642-D915C29222AC}