Merge branch 'main' of http://175.27.215.92:3000/liulb/AUCMA_SCADA

Admin.Core.Api/obj/Debug/net6.0/Admin.Core.Api.GeneratedMSBuildEditorConfig.editorconfig

@@ -9,9 +9,9 @@ build_property.EnforceExtendedAnalyzerRules =
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Admin.Core.Api
 build_property.RootNamespace = Admin.Core.Api
-build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api\
+build_property.ProjectDir = E:\桌面\AUCMA_SCADA\Admin.Core.Api\
 build_property.RazorLangVersion = 6.0
 build_property.SupportLocalizedComponentNames = 
 build_property.GenerateRazorMetadataSourceChecksumAttributes = 
-build_property.MSBuildProjectDirectory = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Api
+build_property.MSBuildProjectDirectory = E:\桌面\AUCMA_SCADA\Admin.Core.Api
 build_property._RazorSourceGeneratorDebug = 

Aucma.Core.OldBoxFoam/ViewModels/OldBoxFoamPageViewModel.cs

@@ -765,7 +765,16 @@ namespace Aucma.Core.OldBoxFoam.ViewModels
                 {
                     foreach (var plan in planInfoList)
                     {
-                        plan.ShiftType = 0;
+                        if (plan.PlanAmount > plan.CompleteAmount)
+                        {
+                            plan.PlanAmount = plan.PlanAmount - plan.CompleteAmount;
+                            plan.CompleteAmount = 0;
+                            plan.ShiftType = 1;
+                        }
+                        else
+                        {
+                            plan.ShiftType = 0;
+                        }
 
                         bool updateFlag = _boxFoamPlanServices.UpdateAsync(plan).Result;
                         if (updateFlag)

HwControlLib/obj/Debug/net6.0-windows/GeneratedInternalTypeHelper.g.i.cs

@@ -15,7 +15,7 @@ namespace XamlGeneratedNamespace {
     /// GeneratedInternalTypeHelper
     /// </summary>
     [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.12.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "7.0.4.0")]
     [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
     public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper {
         

HwControlLib/obj/Debug/net6.0-windows/HwControlLib.GeneratedMSBuildEditorConfig.editorconfig

@@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly =
 build_property.EnforceExtendedAnalyzerRules = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = HwControlLib
-build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\HwControlLib\
+build_property.ProjectDir = E:\桌面\AUCMA_SCADA\HwControlLib\

HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.i.cache

@@ -4,7 +4,7 @@
 library
 C#
 .cs
-D:\Project\gitea\AUCMA\SCADA\HwControlLib\obj\Debug\net6.0-windows\
+E:\桌面\AUCMA_SCADA\HwControlLib\obj\Debug\net6.0-windows\
 HwControlLib
 none
 false
@@ -13,8 +13,8 @@ TRACE;DEBUG;NET;NET6_0;NETCOREAPP
 1204305769
 
 71208292394
-194-2067936865
+194-1617825143
 Themes\Generic.xaml;
 
-False
+True