diff --git a/.csharpier.yml b/.csharpier.yml
new file mode 100644
index 00000000..675029f0
--- /dev/null
+++ b/.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
\ No newline at end of file
diff --git a/ZR.Admin.WebApi/DataProtection/key-20d11d9e-dab5-4f77-b346-e1148913f446.xml b/ZR.Admin.WebApi/DataProtection/key-20d11d9e-dab5-4f77-b346-e1148913f446.xml
new file mode 100644
index 00000000..4ce17218
--- /dev/null
+++ b/ZR.Admin.WebApi/DataProtection/key-20d11d9e-dab5-4f77-b346-e1148913f446.xml
@@ -0,0 +1,16 @@
+
+
+ 2024-08-09T01:02:31.521163Z
+ 2024-08-11T00:40:18.575418Z
+ 2024-11-07T01:02:31.4752931Z
+
+
+
+
+
+
+ yYcrERkCYq9mbtWIP8yZUEQT52Il3bbmkh6w2edZmkT5jNpfV2MwMD+TiA1C522bipCpgYquERwYq8eICROX7Q==
+
+
+
+
\ No newline at end of file
diff --git a/ZR.Admin.WebApi/DataProtection/key-90545f18-6f4a-4b52-912a-17781da30c06.xml b/ZR.Admin.WebApi/DataProtection/key-90545f18-6f4a-4b52-912a-17781da30c06.xml
new file mode 100644
index 00000000..f363ff62
--- /dev/null
+++ b/ZR.Admin.WebApi/DataProtection/key-90545f18-6f4a-4b52-912a-17781da30c06.xml
@@ -0,0 +1,16 @@
+
+
+ 2024-11-12T02:16:22.2451319Z
+ 2024-11-12T02:16:22.1621758Z
+ 2025-02-10T02:16:22.1621758Z
+
+
+
+
+
+
+ VaWhCZngpvaP+f4rC/Frx9iWzkwKprbP2lroeRhzxm93DrG1VPOcCm/vydAVGv82u4C42bNUdrxflkZyf3fySQ==
+
+
+
+
\ No newline at end of file
diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-GP12质检记录表-0808154939.zip b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-GP12质检记录表-0808154939.zip
deleted file mode 100644
index dc6b842a..00000000
Binary files a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-GP12质检记录表-0808154939.zip and /dev/null differ
diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-一次合格品仓库-0808154936.zip b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-一次合格品仓库-0808154936.zip
deleted file mode 100644
index f1ba3379..00000000
Binary files a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-一次合格品仓库-0808154936.zip and /dev/null differ
diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-一次合格品仓库记录表-0808154933.zip b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-一次合格品仓库记录表-0808154933.zip
deleted file mode 100644
index e3d6e7b3..00000000
Binary files a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-一次合格品仓库记录表-0808154933.zip and /dev/null differ
diff --git a/ZR.Admin.WebApi/wwwroot/ImportTemplate/一次合格仓库盘点模板.xlsx b/ZR.Admin.WebApi/wwwroot/ImportTemplate/一次合格仓库盘点模板.xlsx
new file mode 100644
index 00000000..64505a26
Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/ImportTemplate/一次合格仓库盘点模板.xlsx differ
diff --git a/ZR.Admin.WebApi/wwwroot/export/2024年3周1日计划-01-20-142515.xlsx b/ZR.Admin.WebApi/wwwroot/export/2024年3周1日计划-01-20-142515.xlsx
deleted file mode 100644
index e69de29b..00000000
diff --git a/ZR.Admin.WebApi/wwwroot/export/2024年3周1日计划-01-20-142552.xlsx b/ZR.Admin.WebApi/wwwroot/export/2024年3周1日计划-01-20-142552.xlsx
deleted file mode 100644
index 76cd3f72..00000000
Binary files a/ZR.Admin.WebApi/wwwroot/export/2024年3周1日计划-01-20-142552.xlsx and /dev/null differ
diff --git a/ZR.Admin.WebApi/wwwroot/export/2024年3周1日计划-01-20-142652.xlsx b/ZR.Admin.WebApi/wwwroot/export/2024年3周1日计划-01-20-142652.xlsx
deleted file mode 100644
index e6a341ff..00000000
Binary files a/ZR.Admin.WebApi/wwwroot/export/2024年3周1日计划-01-20-142652.xlsx and /dev/null differ
diff --git a/ZR.Admin.WebApi/wwwroot/export/2024年3周1日计划-01-20-143429.xlsx b/ZR.Admin.WebApi/wwwroot/export/2024年3周1日计划-01-20-143429.xlsx
deleted file mode 100644
index 43357bee..00000000
Binary files a/ZR.Admin.WebApi/wwwroot/export/2024年3周1日计划-01-20-143429.xlsx and /dev/null differ
diff --git a/ZR.Admin.WebApi/wwwroot/export/2024年3周计划-01-20-143630.xlsx b/ZR.Admin.WebApi/wwwroot/export/2024年3周计划-01-20-143630.xlsx
deleted file mode 100644
index 627bd0c7..00000000
Binary files a/ZR.Admin.WebApi/wwwroot/export/2024年3周计划-01-20-143630.xlsx and /dev/null differ
diff --git a/ZR.Admin.WebApi/wwwroot/export/2024年3周计划-02-04-140700.xlsx b/ZR.Admin.WebApi/wwwroot/export/2024年3周计划-02-04-140700.xlsx
deleted file mode 100644
index 5906a062..00000000
Binary files a/ZR.Admin.WebApi/wwwroot/export/2024年3周计划-02-04-140700.xlsx and /dev/null differ
diff --git a/ZR.Admin.WebApi/wwwroot/export/2024年4周2日计划-02-02-151006.xlsx b/ZR.Admin.WebApi/wwwroot/export/2024年4周2日计划-02-02-151006.xlsx
deleted file mode 100644
index 65226062..00000000
Binary files a/ZR.Admin.WebApi/wwwroot/export/2024年4周2日计划-02-02-151006.xlsx and /dev/null differ
diff --git a/ZR.Admin.WebApi/wwwroot/export/2024年6周7日计划-02-04-110534.xlsx b/ZR.Admin.WebApi/wwwroot/export/2024年6周7日计划-02-04-110534.xlsx
deleted file mode 100644
index ef9260a6..00000000
Binary files a/ZR.Admin.WebApi/wwwroot/export/2024年6周7日计划-02-04-110534.xlsx and /dev/null differ
diff --git a/ZR.Admin.WebApi/wwwroot/export/2024年6周7日计划-02-04-111434.xlsx b/ZR.Admin.WebApi/wwwroot/export/2024年6周7日计划-02-04-111434.xlsx
deleted file mode 100644
index c3db50d8..00000000
Binary files a/ZR.Admin.WebApi/wwwroot/export/2024年6周7日计划-02-04-111434.xlsx and /dev/null differ
diff --git a/ZR.Service/mes/qc/CommonFQCService.cs b/ZR.Service/mes/qc/CommonFQCService.cs
index 90ddbe1c..a5351d05 100644
--- a/ZR.Service/mes/qc/CommonFQCService.cs
+++ b/ZR.Service/mes/qc/CommonFQCService.cs
@@ -1415,7 +1415,7 @@ namespace ZR.Service.mes.qc
Context
.Queryable()
.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()
.Where(it => it.Partnumber == partNumber)
- .Select(it => it.UpdatedTime)
+ .Select(it => it.CreatedTime)
.First() ?? startTime;
// 基本值
int oneTimeWarehouseTotal =
diff --git a/ZR.Service/mes/wms/WmOneTimeInventoryService.cs b/ZR.Service/mes/wms/WmOneTimeInventoryService.cs
index 422209a1..8b6ff8c4 100644
--- a/ZR.Service/mes/wms/WmOneTimeInventoryService.cs
+++ b/ZR.Service/mes/wms/WmOneTimeInventoryService.cs
@@ -579,7 +579,7 @@ namespace ZR.Service.mes.wms
.Queryable()
.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();
// 获取报表数据
diff --git a/ZR.Service/mes/wms/WmPolishInventoryService.cs b/ZR.Service/mes/wms/WmPolishInventoryService.cs
index 70e1a75c..703bd943 100644
--- a/ZR.Service/mes/wms/WmPolishInventoryService.cs
+++ b/ZR.Service/mes/wms/WmPolishInventoryService.cs
@@ -659,7 +659,7 @@ namespace ZR.Service.mes.wms
.Queryable()
.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反抛 - 抛光投入