修复

.csharpier.yml

@@ -0,0 +1,264 @@
+CSharpier:
+  MaxLineLength: 200
+  NewLineAtEndOfFile: true
+  SpaceBeforeAndAfterBinaryOperators: true
+  WrapWhenPrecededByComments: true
+  WrapWhenPrecededByDirectives: false
+  AccessorKind:
+    Property: Auto
+    Method: Manual
+  ArrowExpressionStyle:
+    BinaryExpression: Auto
+    InvocationExpression: Auto
+    MethodDeclaration: Auto
+    ObjectCreationExpression: Auto
+    UnaryExpression: Auto
+    ForDeclarations: Auto
+    ForEachDeclarations: Auto
+  BracePlacement:
+    Block: EndOfLine
+    AnonymousFunction: EndOfLine
+    ObjectInitializer: EndOfLine
+    ArrayInitializer: EndOfLine
+    DictionaryInitializer: EndOfLine
+    SwitchSection: EndOfLine
+    TupleElement: EndOfLine
+    QueryClause: EndOfLine
+  DirectivesPlacement:
+    AtTheTopOfFile: false
+    JustAboveUsings: false
+    InsideNamespace: true
+    BeforeAssemblyAttributes: false
+  DocumentationCommentTriviaPlacement:
+    ParameterDescription: AfterColon
+    ReturnsDescription: AfterKeyword
+    RemarksDescription: AfterKeyword
+    SummaryDescription: AfterKeyword
+    ValueDescription: AfterKeyword
+  EmptyBlockStyle:
+    IfStatement: Semicolon
+    WhileStatement: Semicolon
+    DoWhileStatement: Semicolon
+    ForStatement: Semicolon
+    UsingStatement: Semicolon
+    FixedStatement: Semicolon
+    ForeachStatement: Semicolon
+    TryStatement: Braces
+    CatchClause: Braces
+    FinallyClause: Braces
+    ElseClause: Braces
+    UsingDeclaration: Semicolon
+  EmptyLines:
+    BeforeConstructorBody: false
+    BeforePropertyBody: false
+    BeforeMethodBody: false
+    BeforeBlockBody: false
+    BeforeBraces: false
+    BeforeFieldDeclaration: true
+    BeforeInterfaceBody: true
+    BeforeTypeDeclaration: true
+    BeforeClassBody: true
+    BeforeStructBody: true
+    BeforeEnumBody: true
+    BeforeDelegateBody: true
+    BeforeEventField: true
+    BeforeStaticConstructor: true
+  EqualityExpressions:
+    Comparison: Auto
+    CoalesceExpression: Auto
+    ConditionalAccessExpression: Auto
+    ConditionalExpression: Auto
+    EqualityExpression: Auto
+    IsPatternExpression: Auto
+    NullCoalescingAssignmentExpression: Auto
+    NullCoalescingExpression: Auto
+    NullableReferenceTypeAnnotation: Auto
+  ExpressionBody:
+    PropertyDeclaration: Auto
+    MethodDeclaration: Auto
+    ConstructorDeclaration: Auto
+    DestructorDeclaration: Auto
+    InterfaceMemberDeclaration: Auto
+    DelegateDeclaration: Auto
+    EventFieldDeclaration: Auto
+    EventDeclaration: Auto
+    OperatorDeclaration: Auto
+    ConversionOperatorDeclaration: Auto
+    TypeDeclaration: Auto
+  IndentationOptions:
+    UseTabs: false
+    Size: 4
+  KeywordPlacement:
+    InAttributeLists: EndOfLine
+    InUsingDirectives: EndOfLine
+  LineBreaks:
+    BeforeBinaryOperator: false
+    BeforeQueryContinuation: false
+    BeforeLogicalOr: false
+    BeforeLogicalAnd: false
+    BeforeCommaInArgumentList: false
+    BeforeCommaInVariableDeclarations: false
+    BeforeCommaInArrayInitializers: false
+    BeforeCommaInObjectInitializers: false
+    BeforeCommaInCollectionInitializers: false
+    BeforeCommaInDeclarations: false
+    BeforeSemicolonInForStatement: false
+    BeforeSemicolonInDoStatement: false
+    BeforeSemicolonInUsingStatement: false
+    BeforeSemicolonInWhileStatement: false
+    BeforeSemicolonInFixedStatement: false
+    BeforeSemicolonInForeachStatement: false
+    BeforeSemicolonInUsingDeclaration: false
+    BeforeColonInTypeDeclaration: false
+    BeforeColonInBaseList: false
+    BeforeColonInPatternDeclaration: false
+    BeforeColonInParameterList: false
+    BeforeColonInSwitchLabel: false
+    BeforeColonInDocumentationComment: false
+    BeforeQuestionToken: false
+    BeforeArrowToken: false
+    BeforeEqualsToken: false
+  LineBreaksOption:
+    AllowParentheses: true
+    AllowBraces: true
+    AllowSquareBrackets: true
+  ListIndentation:
+    UsingDirectives: true
+    NamespaceMembers: true
+    Members: true
+    Statements: true
+    Properties: true
+    Arguments: true
+    Initializers: true
+    Declarators: true
+    Parameters: true
+  MemberOrdering:
+    StaticBeforeInstance: true
+    OverrideBeforeDefinition: true
+  ModifierOrdering:
+    Accessibility: true
+    Virtual: true
+    Abstract: true
+    Sealed: true
+    Override: true
+    New: true
+    Static: true
+    Readonly: true
+    Async: true
+    Internal: true
+    Private: true
+    Public: true
+    Protected: true
+    ProtectedInternal: true
+    ProtectedOrInternal: true
+    Const: true
+    Volatile: true
+    Unsafe: true
+    Partial: true
+    Event: true
+    Indexer: true
+    Iterator: true
+    Yield: true
+  NamingStyle:
+    Field: PascalCase
+    Property: PascalCase
+    Method: PascalCase
+    Parameter: PascalCase
+    Local: PascalCase
+    Type: PascalCase
+    Namespace: PascalCase
+    EnumMember: PascalCase
+  NewLineAfterStatement:
+    BeforeElse: false
+    BeforeFinally: false
+    BeforeCatch: false
+    BeforeWhile: false
+    BeforeBlock: false
+  NewLineAtEndOfFile:
+    Always: true
+  NewLineBeforeStatement:
+    BeforeBrace: false
+    BeforeReturn: false
+    BeforeYield: false
+    BeforeRightSideOfIf: false
+    BeforeRightSideOfElseIf: false
+    BeforeRightSideOfElse: false
+    BeforeRightSideOfWhile: false
+    BeforeRightSideOfDoWhile: false
+    BeforeRightSideOfFor: false
+    BeforeRightSideOfUsing: false
+    BeforeRightSideOfForeach: false
+    BeforeRightSideOfFixed: false
+    BeforeRightSideOfTry: false
+    BeforeRightSideOfCatch: false
+    BeforeRightSideOfFinally: false
+    BeforeRightSideOfThrow: false
+  NullChecking:
+    UseIsNullCheck: false
+    UseIsNotNullCheck: false
+  ObjectCreationExpressionOptions:
+    UseObjectCreation: false
+    UseCollectionInitializer: false
+    UseObjectInitializer: false
+  OperatorPrecedence:
+    UseBinaryOperator: Auto
+    UsePostfixUnaryOperator: Auto
+    UsePrefixUnaryOperator: Auto
+  Parentheses:
+    InConditionalExpression: Auto
+    InBinaryExpression: Auto
+    InArgumentList: Auto
+    InInvocationExpression: Auto
+    InObjectCreationExpression: Auto
+    InUnaryExpression: Auto
+    InBracketMemberAccessExpression: Auto
+    InPropertyAccessExpression: Auto
+    InIndexerAccessExpression: Auto
+  PropertyDeclaration:
+    Getter: Auto
+    Setter: Auto
+    AccessorsOnSeparateLines: false
+  StatementKind:
+    IfStatement: Auto
+    WhileStatement: Auto
+    DoWhileStatement: Auto
+    ForStatement: Auto
+    UsingStatement: Auto
+    FixedStatement: Auto
+    ForeachStatement: Auto
+  SuppressNullableWarnings:
+    Default: false
+  TrailingTrivia:
+    InsideParens: false
+    InsideBraces: false
+    InsideSquareBrackets: false
+    InsideAttributes: false
+    InsideUsingDirectives: false
+    InsideTypeDeclaration: false
+    InsideMemberDeclaration: false
+    InsideMethodBody: false
+    InsidePropertyBody: false
+    InsideInitializer: false
+    InsideArgumentList: false
+    InsideParameterList: false
+    InsideObjectInitializer: false
+    InsideCollectionInitializer: false
+    InsideArrayInitializer: false
+    InsideBracket: false
+    InsideParenthesis: false
+    InsideBrace: false
+    InsideSquareBracket: false
+    InsideAttributeList: false
+    InsideUsingDirective: false
+    InsideType: false
+    InsideMember: false
+    InsideMethod: false
+    InsideProperty: false
+    InsideInitializerItem: false
+    InsideArgument: false
+    InsideParameter: false
+    InsideObjectInitializerItem: false
+    InsideCollectionInitializerItem: false
+    InsideArrayInitializerItem: false
+    InsideBracketItem: false
+    InsideParenthesisItem: false

ZR.Admin.WebApi/DataProtection/key-20d11d9e-dab5-4f77-b346-e1148913f446.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<key id="20d11d9e-dab5-4f77-b346-e1148913f446" version="1">
+  <creationDate>2024-08-09T01:02:31.521163Z</creationDate>
+  <activationDate>2024-08-11T00:40:18.575418Z</activationDate>
+  <expirationDate>2024-11-07T01:02:31.4752931Z</expirationDate>
+  <descriptor deserializerType="Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AuthenticatedEncryptorDescriptorDeserializer, Microsoft.AspNetCore.DataProtection, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
+    <descriptor>
+      <encryption algorithm="AES_256_CBC" />
+      <validation algorithm="HMACSHA256" />
+      <masterKey p4:requiresEncryption="true" xmlns:p4="http://schemas.asp.net/2015/03/dataProtection">
+        <!-- Warning: the key below is in an unencrypted form. -->
+        <value>yYcrERkCYq9mbtWIP8yZUEQT52Il3bbmkh6w2edZmkT5jNpfV2MwMD+TiA1C522bipCpgYquERwYq8eICROX7Q==</value>
+      </masterKey>
+    </descriptor>
+  </descriptor>
+</key>

ZR.Admin.WebApi/DataProtection/key-90545f18-6f4a-4b52-912a-17781da30c06.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<key id="90545f18-6f4a-4b52-912a-17781da30c06" version="1">
+  <creationDate>2024-11-12T02:16:22.2451319Z</creationDate>
+  <activationDate>2024-11-12T02:16:22.1621758Z</activationDate>
+  <expirationDate>2025-02-10T02:16:22.1621758Z</expirationDate>
+  <descriptor deserializerType="Microsoft.AspNetCore.DataProtection.AuthenticatedEncryption.ConfigurationModel.AuthenticatedEncryptorDescriptorDeserializer, Microsoft.AspNetCore.DataProtection, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
+    <descriptor>
+      <encryption algorithm="AES_256_CBC" />
+      <validation algorithm="HMACSHA256" />
+      <masterKey p4:requiresEncryption="true" xmlns:p4="http://schemas.asp.net/2015/03/dataProtection">
+        <!-- Warning: the key below is in an unencrypted form. -->
+        <value>VaWhCZngpvaP+f4rC/Frx9iWzkwKprbP2lroeRhzxm93DrG1VPOcCm/vydAVGv82u4C42bNUdrxflkZyf3fySQ==</value>
+      </masterKey>
+    </descriptor>
+  </descriptor>
+</key>

ZR.Service/mes/qc/CommonFQCService.cs

@@ -1415,7 +1415,7 @@ namespace ZR.Service.mes.qc
                         Context
                             .Queryable<WmPolishInventory>()
                             .Where(it => it.Partnumber == partNumber)
-                            .Select(it => it.UpdatedTime)
+                            .Select(it => it.CreatedTime)
                             .First() ?? startTime;
                     // 盘点数
                     int polishWarehouseTotal =
@@ -1488,7 +1488,7 @@ namespace ZR.Service.mes.qc
                         Context
                             .Queryable<WmOneTimeInventory>()
                             .Where(it => it.Partnumber == partNumber)
-                            .Select(it => it.UpdatedTime)
+                            .Select(it => it.CreatedTime)
                             .First() ?? startTime;
                     // 基本值
                     int oneTimeWarehouseTotal =

ZR.Service/mes/wms/WmOneTimeInventoryService.cs

@@ -579,7 +579,7 @@ namespace ZR.Service.mes.wms
                         .Queryable<WmOneTimeInventory>()
                         .Where(it => it.Status == 1)
                         .Select(it => it.CreatedTime)
-                        .First() ?? new DateTime(2024, 10, 19, 0, 0, 0);
+                        .First() ?? new DateTime(2024, 11, 16, 12, 0, 0);
                 // DateTime
                 CommonFQCService commonFQCService = new();
                 // 获取报表数据

ZR.Service/mes/wms/WmPolishInventoryService.cs

@@ -659,7 +659,7 @@ namespace ZR.Service.mes.wms
                         .Queryable<WmPolishInventory>()
                         .Where(it => it.Status == 1)
                         .Select(it => it.CreatedTime)
-                        .First() ?? new DateTime(2024, 10, 19, 0, 0, 0);
+                        .First() ?? new DateTime(2024, 11, 16, 12, 0, 0);
                 CommonFQCService commonFQCService = new();
                 // 获取报表数据
                 // 抛光计算后库存 = 盘点库存 + 产线抛光 + 后道反抛 + GP12反抛 - 抛光投入