From 0458654c9435f08705188598c4b55b124431a611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Tue, 18 Jul 2023 09:31:55 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/BQ/INVOICE_SERVICE.cs | 2 +- .../Entities/BQ/Managers/CAN_SA_MNG.cs | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs index 9e3ef810..37157b6d 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs @@ -64,8 +64,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ [HttpPost] public virtual async Task ApprovalPassed(INVOICE_GRP_REQ_DTO input) { - return string.Empty; + return string.Empty; } [HttpPost] diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/CAN_SA_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/CAN_SA_MNG.cs index 72e4e8b0..4378dc89 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/CAN_SA_MNG.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/CAN_SA_MNG.cs @@ -109,9 +109,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers public virtual async Task SetNewState(TEntity p_entiy) { - p_entiy.State = SettleBillState.未结状态; - await _repository.UpdateAsync(p_entiy); - return true; + await SetNewState(p_entiy.BillNum); + + return await SetNewState(p_entiy.BillNum); } public virtual async Task SetNewState(string billNUm) @@ -126,6 +126,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers await _repository.DbContext.BulkReadAsync(ls); return true; } + public virtual } From 7cde71fa785ed8066b4c6ff88da9e74e90b9ffba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Tue, 18 Jul 2023 09:32:03 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/BQ/Managers/CAN_SA_MNG.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/CAN_SA_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/CAN_SA_MNG.cs index 4378dc89..891e8607 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/CAN_SA_MNG.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/CAN_SA_MNG.cs @@ -51,8 +51,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers { var ls = _repository.Where(p => p.InvGroupNum == p_billNum).ToList(); - - foreach(TEntity p_entiy in ls) + + foreach (TEntity p_entiy in ls) { switch (p_entiy.State) @@ -102,7 +102,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers } - + return true; } @@ -117,19 +117,20 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers public virtual async Task SetNewState(string billNUm) { - var ls=_repository.Where(p => p.InvGroupNum == billNUm).ToList(); + var ls = _repository.Where(p => p.InvGroupNum == billNUm).ToList(); foreach (var l in ls) { l.State = SettleBillState.未结状态; } - + await _repository.DbContext.BulkReadAsync(ls); return true; } - public virtual + } + } From f7c58df6e3332e46573d006553a92bda776b6e74 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 18 Jul 2023 10:09:54 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/src/.editorconfig | 376 ++++++++++++++++++ .../wwwroot/models/.js | 132 ++++++ .../wwwroot/models/bbac_sa_service.js | 132 ++++++ .../wwwroot/models/bbac_se_detail_service.js | 132 ++++++ .../wwwroot/models/bbac_se_edi_service.js | 132 ++++++ .../wwwroot/router/business.js | 39 ++ .../views/jis-bbac/input/bbac_sa_service.js | 15 + .../jis-bbac/input/bbac_se_detail_service.js | 15 + .../jis-bbac/input/bbac_se_edi_service.js | 15 + 9 files changed, 988 insertions(+) create mode 100644 code/src/.editorconfig create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_se_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_se_edi_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_se_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_se_edi_service.js diff --git a/code/src/.editorconfig b/code/src/.editorconfig new file mode 100644 index 00000000..fe767f48 --- /dev/null +++ b/code/src/.editorconfig @@ -0,0 +1,376 @@ +root = true + +[*] +indent_style = space +indent_size = 2 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.md] +trim_trailing_whitespace = false + +[*.cs] +indent_size = 4 +dotnet_sort_system_directives_first = true + +# Don't use this. qualifier +dotnet_style_qualification_for_field = false:suggestion +dotnet_style_qualification_for_property = false:suggestion + +# use int x = .. over Int32 +dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion + +# use int.MaxValue over Int32.MaxValue +dotnet_style_predefined_type_for_member_access = true:suggestion + +# Require var all the time. +csharp_style_var_for_built_in_types = true:suggestion +csharp_style_var_when_type_is_apparent = true:suggestion +csharp_style_var_elsewhere = true:suggestion + +# Disallow throw expressions. +csharp_style_throw_expression = false:suggestion + +# Newline settings +csharp_new_line_before_open_brace = all +csharp_new_line_before_else = true +csharp_new_line_before_catch = true +csharp_new_line_before_finally = true +csharp_new_line_before_members_in_object_initializers = true +csharp_new_line_before_members_in_anonymous_types = true + +# Namespace settings +csharp_style_namespace_declarations = file_scoped + +# Brace settings +csharp_prefer_braces = true # Prefer curly braces even for one line of code + +[*.{xml,config,*proj,nuspec,props,resx,targets,yml,tasks}] +indent_size = 2 + +# Xml config files +[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}] +indent_size = 2 + +[*.json] +indent_size = 2 + +[*.{ps1,psm1}] +indent_size = 4 + +[*.sh] +indent_size = 4 +end_of_line = lf + +[*.{razor,cshtml}] +charset = utf-8-bom + +[*.{cs,vb}] + +# SYSLIB1054: Use 'LibraryImportAttribute' instead of 'DllImportAttribute' to generate P/Invoke marshalling code at compile time +dotnet_diagnostic.SYSLIB1054.severity = warning + +# CA1018: Mark attributes with AttributeUsageAttribute +dotnet_diagnostic.CA1018.severity = warning + +# CA1047: Do not declare protected member in sealed type +dotnet_diagnostic.CA1047.severity = warning + +# CA1305: Specify IFormatProvider +dotnet_diagnostic.CA1305.severity = suggestion + +# CA1416: Validate platform compatibility +dotnet_diagnostic.CA1416.severity = warning + +# CA1507: Use nameof to express symbol names +dotnet_diagnostic.CA1507.severity = warning + +# CA1725: Parameter names should match base declaration +dotnet_diagnostic.CA1725.severity = suggestion + +# CA1802: Use literals where appropriate +dotnet_diagnostic.CA1802.severity = warning + +# CA1805: Do not initialize unnecessarily +dotnet_diagnostic.CA1805.severity = warning + +# CA1810: Do not initialize unnecessarily +dotnet_diagnostic.CA1810.severity = warning + +# CA1821: Remove empty Finalizers +dotnet_diagnostic.CA1821.severity = warning + +# CA1822: Make member static +dotnet_diagnostic.CA1822.severity = suggestion +dotnet_code_quality.CA1822.api_surface = private, internal + +# CA1823: Avoid unused private fields +dotnet_diagnostic.CA1823.severity = warning + +# CA1825: Avoid zero-length array allocations +dotnet_diagnostic.CA1825.severity = warning + +# CA1826: Do not use Enumerable methods on indexable collections. Instead use the collection directly +dotnet_diagnostic.CA1826.severity = warning + +# CA1827: Do not use Count() or LongCount() when Any() can be used +dotnet_diagnostic.CA1827.severity = warning + +# CA1828: Do not use CountAsync() or LongCountAsync() when AnyAsync() can be used +dotnet_diagnostic.CA1828.severity = warning + +# CA1829: Use Length/Count property instead of Count() when available +dotnet_diagnostic.CA1829.severity = warning + +# CA1830: Prefer strongly-typed Append and Insert method overloads on StringBuilder +dotnet_diagnostic.CA1830.severity = warning + +# CA1831: Use AsSpan or AsMemory instead of Range-based indexers when appropriate +# CA1832: Use AsSpan or AsMemory instead of Range-based indexers when appropriate +# CA1833: Use AsSpan or AsMemory instead of Range-based indexers when appropriate +dotnet_diagnostic.CA1831.severity = warning +dotnet_diagnostic.CA1832.severity = warning +dotnet_diagnostic.CA1833.severity = warning + +# CA1834: Consider using 'StringBuilder.Append(char)' when applicable +dotnet_diagnostic.CA1834.severity = warning + +# CA1835: Prefer the 'Memory'-based overloads for 'ReadAsync' and 'WriteAsync' +dotnet_diagnostic.CA1835.severity = warning + +# CA1836: Prefer IsEmpty over Count +dotnet_diagnostic.CA1836.severity = warning + +# CA1837: Use 'Environment.ProcessId' +dotnet_diagnostic.CA1837.severity = warning + +# CA1838: Avoid 'StringBuilder' parameters for P/Invokes +dotnet_diagnostic.CA1838.severity = warning + +# CA1839: Use 'Environment.ProcessPath' +dotnet_diagnostic.CA1839.severity = warning + +# CA1840: Use 'Environment.CurrentManagedThreadId' +dotnet_diagnostic.CA1840.severity = warning + +# CA1841: Prefer Dictionary.Contains methods +dotnet_diagnostic.CA1841.severity = warning + +# CA1842: Do not use 'WhenAll' with a single task +dotnet_diagnostic.CA1842.severity = warning + +# CA1843: Do not use 'WaitAll' with a single task +dotnet_diagnostic.CA1843.severity = warning + +# CA1844: Provide memory-based overrides of async methods when subclassing 'Stream' +dotnet_diagnostic.CA1844.severity = warning + +# CA1845: Use span-based 'string.Concat' +dotnet_diagnostic.CA1845.severity = warning + +# CA1846: Prefer AsSpan over Substring +dotnet_diagnostic.CA1846.severity = warning + +# CA1847: Use string.Contains(char) instead of string.Contains(string) with single characters +dotnet_diagnostic.CA1847.severity = warning + +# CA1854: Prefer the IDictionary.TryGetValue(TKey, out TValue) method +dotnet_diagnostic.CA1854.severity = warning + +# CA2007: Consider calling ConfigureAwait on the awaited task +dotnet_diagnostic.CA2007.severity = warning + +# CA2008: Do not create tasks without passing a TaskScheduler +dotnet_diagnostic.CA2008.severity = warning + +# CA2009: Do not call ToImmutableCollection on an ImmutableCollection value +dotnet_diagnostic.CA2009.severity = warning + +# CA2011: Avoid infinite recursion +dotnet_diagnostic.CA2011.severity = warning + +# CA2012: Use ValueTask correctly +dotnet_diagnostic.CA2012.severity = warning + +# CA2013: Do not use ReferenceEquals with value types +dotnet_diagnostic.CA2013.severity = warning + +# CA2014: Do not use stackalloc in loops. +dotnet_diagnostic.CA2014.severity = warning + +# CA2016: Forward the 'CancellationToken' parameter to methods that take one +dotnet_diagnostic.CA2016.severity = warning + +# CA2200: Rethrow to preserve stack details +dotnet_diagnostic.CA2200.severity = warning + +# CA2208: Instantiate argument exceptions correctly +dotnet_diagnostic.CA2208.severity = warning + +# CA2245: Do not assign a property to itself +dotnet_diagnostic.CA2245.severity = warning + +# CA2246: Assigning symbol and its member in the same statement +dotnet_diagnostic.CA2246.severity = warning + +# CA2249: Use string.Contains instead of string.IndexOf to improve readability. +dotnet_diagnostic.CA2249.severity = warning + +# IDE0005: Remove unnecessary usings +dotnet_diagnostic.IDE0005.severity = warning + +# IDE0011: Curly braces to surround blocks of code +dotnet_diagnostic.IDE0011.severity = warning + +# IDE0020: Use pattern matching to avoid is check followed by a cast (with variable) +dotnet_diagnostic.IDE0020.severity = warning + +# IDE0029: Use coalesce expression (non-nullable types) +dotnet_diagnostic.IDE0029.severity = warning + +# IDE0030: Use coalesce expression (nullable types) +dotnet_diagnostic.IDE0030.severity = warning + +# IDE0031: Use null propagation +dotnet_diagnostic.IDE0031.severity = warning + +# IDE0035: Remove unreachable code +dotnet_diagnostic.IDE0035.severity = warning + +# IDE0036: Order modifiers +csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion +dotnet_diagnostic.IDE0036.severity = warning + +# IDE0038: Use pattern matching to avoid is check followed by a cast (without variable) +dotnet_diagnostic.IDE0038.severity = warning + +# IDE0043: Format string contains invalid placeholder +dotnet_diagnostic.IDE0043.severity = warning + +# IDE0044: Make field readonly +dotnet_diagnostic.IDE0044.severity = warning + +# IDE0051: Remove unused private members +dotnet_diagnostic.IDE0051.severity = warning + +# IDE0055: All formatting rules +dotnet_diagnostic.IDE0055.severity = suggestion + +# IDE0059: Unnecessary assignment to a value +dotnet_diagnostic.IDE0059.severity = warning + +# IDE0060: Remove unused parameter +dotnet_code_quality_unused_parameters = non_public +dotnet_diagnostic.IDE0060.severity = warning + +# IDE0062: Make local function static +dotnet_diagnostic.IDE0062.severity = warning + +# IDE0161: Convert to file-scoped namespace +dotnet_diagnostic.IDE0161.severity = warning + +# IDE0200: Lambda expression can be removed +dotnet_diagnostic.IDE0200.severity = warning + +# IDE2000: Disallow multiple blank lines +dotnet_style_allow_multiple_blank_lines_experimental = false +dotnet_diagnostic.IDE2000.severity = warning + +[{eng/tools/**.cs,**/{test,testassets,samples,Samples,perf,scripts,stress}/**.cs}] +# CA1018: Mark attributes with AttributeUsageAttribute +dotnet_diagnostic.CA1018.severity = suggestion +# CA1507: Use nameof to express symbol names +dotnet_diagnostic.CA1507.severity = suggestion +# CA1802: Use literals where appropriate +dotnet_diagnostic.CA1802.severity = suggestion +# CA1805: Do not initialize unnecessarily +dotnet_diagnostic.CA1805.severity = suggestion +# CA1810: Do not initialize unnecessarily +dotnet_diagnostic.CA1810.severity = suggestion +# CA1822: Make member static +dotnet_diagnostic.CA1822.severity = suggestion +# CA1823: Avoid zero-length array allocations +dotnet_diagnostic.CA1825.severity = suggestion +# CA1826: Do not use Enumerable methods on indexable collections. Instead use the collection directly +dotnet_diagnostic.CA1826.severity = suggestion +# CA1827: Do not use Count() or LongCount() when Any() can be used +dotnet_diagnostic.CA1827.severity = suggestion +# CA1829: Use Length/Count property instead of Count() when available +dotnet_diagnostic.CA1829.severity = suggestion +# CA1834: Consider using 'StringBuilder.Append(char)' when applicable +dotnet_diagnostic.CA1834.severity = suggestion +# CA1835: Prefer the 'Memory'-based overloads for 'ReadAsync' and 'WriteAsync' +dotnet_diagnostic.CA1835.severity = suggestion +# CA1837: Use 'Environment.ProcessId' +dotnet_diagnostic.CA1837.severity = suggestion +# CA1838: Avoid 'StringBuilder' parameters for P/Invokes +dotnet_diagnostic.CA1838.severity = suggestion +# CA1841: Prefer Dictionary.Contains methods +dotnet_diagnostic.CA1841.severity = suggestion +# CA1844: Provide memory-based overrides of async methods when subclassing 'Stream' +dotnet_diagnostic.CA1844.severity = suggestion +# CA1845: Use span-based 'string.Concat' +dotnet_diagnostic.CA1845.severity = suggestion +# CA1846: Prefer AsSpan over Substring +dotnet_diagnostic.CA1846.severity = suggestion +# CA1847: Use string.Contains(char) instead of string.Contains(string) with single characters +dotnet_diagnostic.CA1847.severity = suggestion +# CA1854: Prefer the IDictionary.TryGetValue(TKey, out TValue) method +dotnet_diagnostic.CA1854.severity = suggestion +# CA2007: Consider calling ConfigureAwait on the awaited task +dotnet_diagnostic.CA2007.severity = suggestion +# CA2008: Do not create tasks without passing a TaskScheduler +dotnet_diagnostic.CA2008.severity = suggestion +# CA2012: Use ValueTask correctly +dotnet_diagnostic.CA2012.severity = suggestion +# CA2249: Use string.Contains instead of string.IndexOf to improve readability. +dotnet_diagnostic.CA2249.severity = suggestion +# IDE0005: Remove unnecessary usings +dotnet_diagnostic.IDE0005.severity = suggestion +# IDE0020: Use pattern matching to avoid is check followed by a cast (with variable) +dotnet_diagnostic.IDE0020.severity = suggestion +# IDE0029: Use coalesce expression (non-nullable types) +dotnet_diagnostic.IDE0029.severity = suggestion +# IDE0030: Use coalesce expression (nullable types) +dotnet_diagnostic.IDE0030.severity = suggestion +# IDE0031: Use null propagation +dotnet_diagnostic.IDE0031.severity = suggestion +# IDE0038: Use pattern matching to avoid is check followed by a cast (without variable) +dotnet_diagnostic.IDE0038.severity = suggestion +# IDE0044: Make field readonly +dotnet_diagnostic.IDE0044.severity = suggestion +# IDE0051: Remove unused private members +dotnet_diagnostic.IDE0051.severity = suggestion +# IDE0059: Unnecessary assignment to a value +dotnet_diagnostic.IDE0059.severity = suggestion +# IDE0060: Remove unused parameters +dotnet_diagnostic.IDE0060.severity = suggestion +# IDE0062: Make local function static +dotnet_diagnostic.IDE0062.severity = suggestion +# IDE0200: Lambda expression can be removed +dotnet_diagnostic.IDE0200.severity = suggestion + +# CA2016: Forward the 'CancellationToken' parameter to methods that take one +dotnet_diagnostic.CA2016.severity = suggestion + +# Defaults for content in the shared src/ and shared runtime dir + +[{**/Shared/runtime/**.{cs,vb},src/Shared/test/Shared.Tests/runtime/**.{cs,vb},**/microsoft.extensions.hostfactoryresolver.sources/**.{cs,vb}}] +# CA1822: Make member static +dotnet_diagnostic.CA1822.severity = silent +# IDE0011: Use braces +dotnet_diagnostic.IDE0011.severity = silent +# IDE0055: Fix formatting +dotnet_diagnostic.IDE0055.severity = silent +# IDE0060: Remove unused parameters +dotnet_diagnostic.IDE0060.severity = silent +# IDE0062: Make local function static +dotnet_diagnostic.IDE0062.severity = silent +# IDE0161: Convert to file-scoped namespace +dotnet_diagnostic.IDE0161.severity = silent + +[{**/Shared/**.cs,**/microsoft.extensions.hostfactoryresolver.sources/**.{cs,vb}}] +# IDE0005: Remove unused usings. Ignore for shared src files since imports for those depend on the projects in which they are included. +dotnet_diagnostic.IDE0005.severity = silent diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/.js new file mode 100644 index 00000000..a6375733 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/.js @@ -0,0 +1,132 @@ +const schema = { + title: "通用代码", + type: "object", + properties: { + project: { + title: "项目", + type: "string", + readOnly: true, + showForList: true, + rules: [ + { + required: true, + }, + ], + }, + value: { + title: "值", + type: "string", + readOnly: true, + showForList: true, + rules: [ + { + required: true, + }, + ], + }, + description: { + title: "描述", + type: "string", + input: "textarea", + showForList: true, + rules: [ + { + required: true, + }, + { max: 60 }, + ], + }, + }, +}; + +const baseUrl = "settleaccount/code-setting"; +const queryUrl = `${baseUrl}/get-list`; +const detailsUrl = `${baseUrl}/get/%s`; +const createUrl = `${baseUrl}/create`; +const updateUrl = `${baseUrl}/update/%s`; +const deleteUrl = `${baseUrl}/delete-list`; +const importUrl = `${baseUrl}/code-setting-upload-excel-import`; +const exportUrl = `${baseUrl}/export`; +const queryMethod = "POST"; +const detailsMethod = "POST"; +const createMethod = "POST"; +const updateMethod = "POST"; +const deleteMethod = "POST"; +const importMethod = "POST"; +const exportMethod = "POST"; + +export default function () { + return { + query: { + url: queryUrl, + method: queryMethod, + hasFilter: true, + schema: { + title: "通用代码", + type: "object", + properties: { + filters: { + title: "项目", + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "project", + action: "like", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + detailsUrl, + createUrl, + updateUrl, + deleteUrl, + importUrl, + exportUrl, + detailsMethod, + createMethod, + updateMethod, + deleteMethod, + importMethod, + exportMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_sa_service.js new file mode 100644 index 00000000..6aa5363b --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_sa_service.js @@ -0,0 +1,132 @@ +const schema = { + title: "JIS结算数据", + type: "object", + properties: { + project: { + title: "项目", + type: "string", + readOnly: true, + showForList: true, + rules: [ + { + required: true, + }, + ], + }, + value: { + title: "值", + type: "string", + readOnly: true, + showForList: true, + rules: [ + { + required: true, + }, + ], + }, + description: { + title: "描述", + type: "string", + input: "textarea", + showForList: true, + rules: [ + { + required: true, + }, + { max: 60 }, + ], + }, + }, +}; + +const baseUrl = "settleaccount/code-setting"; +const queryUrl = `${baseUrl}/get-list`; +const detailsUrl = `${baseUrl}/get/%s`; +const createUrl = `${baseUrl}/create`; +const updateUrl = `${baseUrl}/update/%s`; +const deleteUrl = `${baseUrl}/delete-list`; +const importUrl = `${baseUrl}/code-setting-upload-excel-import`; +const exportUrl = `${baseUrl}/export`; +const queryMethod = "POST"; +const detailsMethod = "POST"; +const createMethod = "POST"; +const updateMethod = "POST"; +const deleteMethod = "POST"; +const importMethod = "POST"; +const exportMethod = "POST"; + +export default function () { + return { + query: { + url: queryUrl, + method: queryMethod, + hasFilter: true, + schema: { + title: "JIS结算数据", + type: "object", + properties: { + filters: { + title: "项目", + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "project", + action: "like", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + detailsUrl, + createUrl, + updateUrl, + deleteUrl, + importUrl, + exportUrl, + detailsMethod, + createMethod, + updateMethod, + deleteMethod, + importMethod, + exportMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_se_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_se_detail_service.js new file mode 100644 index 00000000..252b8f16 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_se_detail_service.js @@ -0,0 +1,132 @@ +const schema = { + title: "JIS发运数据", + type: "object", + properties: { + version: { + title: "版本", + type: "string", + }, + shippingDate: { + title: "发货时间", + type: "string", + input: "datetime", + }, + wmsBillNum: { + title: "发运单号", + type: "string", + }, + lu: { + title: "零件号", + type: "string", + }, + pn: { + title: "生产号", + type: "string", + }, + keyCode: { + title: "组合键值(LU+PN)", + type: "string", + }, + qty: { + title: "数量", + type: "number", + }, + seqNumber: { + title: "日顺序号", + type: "string", + }, + assemblyCode: { + title: "小总成号", + type: "string", + }, + injectionCode: { + title: "注塑码", + type: "string", + }, + beginDate: { + title: "订单时间", + type: "string", + input: "datetime", + }, + }, +}; + +const baseUrl = "settleaccount/bbac_se_detail_service"; +const queryUrl = `${baseUrl}/get-list`; +const deleteUrl = `${baseUrl}/delete-list`; +const importUrl = `${baseUrl}/import`; +const exportUrl = `${baseUrl}/export`; +const queryMethod = "POST"; +const deleteMethod = "POST"; +const importMethod = "POST"; +const exportMethod = "POST"; + +export default function () { + return { + query: { + url: queryUrl, + method: queryMethod, + hasFilter: true, + schema: { + title: "JIS发运数据", + type: "object", + properties: { + filters: { + title: "项目", + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "project", + action: "like", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + deleteUrl, + importUrl, + exportUrl, + deleteMethod, + importMethod, + exportMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_se_edi_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_se_edi_service.js new file mode 100644 index 00000000..ead0f08b --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_se_edi_service.js @@ -0,0 +1,132 @@ +const schema = { + title: "EDI数据", + type: "object", + properties: { + project: { + title: "项目", + type: "string", + readOnly: true, + showForList: true, + rules: [ + { + required: true, + }, + ], + }, + value: { + title: "值", + type: "string", + readOnly: true, + showForList: true, + rules: [ + { + required: true, + }, + ], + }, + description: { + title: "描述", + type: "string", + input: "textarea", + showForList: true, + rules: [ + { + required: true, + }, + { max: 60 }, + ], + }, + }, +}; + +const baseUrl = "settleaccount/code-setting"; +const queryUrl = `${baseUrl}/get-list`; +const detailsUrl = `${baseUrl}/get/%s`; +const createUrl = `${baseUrl}/create`; +const updateUrl = `${baseUrl}/update/%s`; +const deleteUrl = `${baseUrl}/delete-list`; +const importUrl = `${baseUrl}/code-setting-upload-excel-import`; +const exportUrl = `${baseUrl}/export`; +const queryMethod = "POST"; +const detailsMethod = "POST"; +const createMethod = "POST"; +const updateMethod = "POST"; +const deleteMethod = "POST"; +const importMethod = "POST"; +const exportMethod = "POST"; + +export default function () { + return { + query: { + url: queryUrl, + method: queryMethod, + hasFilter: true, + schema: { + title: "EDI数据", + type: "object", + properties: { + filters: { + title: "项目", + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "project", + action: "like", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + detailsUrl, + createUrl, + updateUrl, + deleteUrl, + importUrl, + exportUrl, + detailsMethod, + createMethod, + updateMethod, + deleteMethod, + importMethod, + exportMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js index 2552006c..7b60ca6f 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js @@ -30,6 +30,45 @@ export default [ title: "JIS发运数据", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "import", + meta: { + type: "button", + title: "导入", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], }, { path: "bbac_se_edi_service", diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_sa_service.js new file mode 100644 index 00000000..0fdffdb1 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_sa_service.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/bbac_sa_service.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_se_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_se_detail_service.js new file mode 100644 index 00000000..5745f56c --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_se_detail_service.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/bbac_se_detail_service.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_se_edi_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_se_edi_service.js new file mode 100644 index 00000000..0fdffdb1 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_se_edi_service.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/bbac_sa_service.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; From d77ee270d0842ad5bac34ab37a4f39be4696f804 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 18 Jul 2023 10:51:00 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/models/bbac_se_edi_service.js | 64 +++++++++++-------- .../jis-bbac/input/bbac_se_edi_service.js | 2 +- 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_se_edi_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_se_edi_service.js index ead0f08b..6cabc85b 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_se_edi_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_se_edi_service.js @@ -2,39 +2,47 @@ const schema = { title: "EDI数据", type: "object", properties: { - project: { - title: "项目", + keyCode: { + title: "LU+生产码", type: "string", - readOnly: true, - showForList: true, - rules: [ - { - required: true, - }, - ], }, - value: { - title: "值", + version: { + title: "期间", type: "string", - readOnly: true, - showForList: true, - rules: [ - { - required: true, - }, - ], }, - description: { - title: "描述", + lu: { + title: "零件号", type: "string", - input: "textarea", - showForList: true, - rules: [ - { - required: true, - }, - { max: 60 }, - ], + }, + pn: { + title: "生产码", + type: "string", + }, + seqNumber: { + title: "日顺序号", + type: "string", + }, + assemblyCode: { + title: "小总成号", + type: "string", + }, + injectionCode: { + title: "注塑码", + type: "string", + }, + qty: { + title: "EDI数量", + type: "number", + }, + beginDate: { + title: "订货时间", + type: "string", + input: "datetime", + }, + id: { + type: "string", + hidden: true, + showForList: false, }, }, }; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_se_edi_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_se_edi_service.js index 0fdffdb1..ee6c45bd 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_se_edi_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_se_edi_service.js @@ -1,6 +1,6 @@ import AppList from "../../../components/list/index.js"; import html from "html"; -import useConfig from "../../../models/bbac_sa_service.js"; +import useConfig from "../../../models/bbac_se_edi_service.js"; export default { components: { AppList }, From 52474a2e719c9bf6b7d90e513aef0cda01f8bd7f Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Tue, 18 Jul 2023 11:30:26 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../host/SettleAccount.HttpApi.Host/wwwroot/router/routes.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/routes.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/routes.js index 146ad045..e9efa452 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/routes.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/routes.js @@ -1,5 +1,7 @@ import baseDate from "./base-date.js"; import business from "./business.js"; +import inventory from "./inventory.js"; + export default [ { path: "home", @@ -12,4 +14,5 @@ export default [ }, ...baseDate, ...business, + ...inventory, ]; From 4f0485e5a865a8143185b0489b7633e8fa2c54ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E6=97=AD=E4=B9=8B?= <12930972+jiang-xuzhi@user.noreply.gitee.com> Date: Tue, 18 Jul 2023 11:46:06 +0800 Subject: [PATCH 6/8] update --- .../models/price-list-app-service-bj.js | 99 + .../wwwroot/models/price-list.js | 111 + .../wwwroot/models/purchase_price_service.js | 91 + .../wwwroot/router/business.js | 2244 ++++++++++++++++- .../wwwroot/router/routes.js | 2 - .../base-data/price-list-app-service-bj.js | 15 + .../wwwroot/views/base-data/price-list.js | 15 + .../views/base-data/purchase_price_service.js | 15 + 8 files changed, 2456 insertions(+), 136 deletions(-) create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list-app-service-bj.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/purchase_price_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/price-list-app-service-bj.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/price-list.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/purchase_price_service.js diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list-app-service-bj.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list-app-service-bj.js new file mode 100644 index 00000000..508070f3 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list-app-service-bj.js @@ -0,0 +1,99 @@ +const schema = { + title: "备件价格单", + type: "object", + properties: { + lu: { + title: "零件号", + type: "string", + }, + price: { + title: "价格", + type: "decimal", + }, + beginDate: { + title: "开始时间", + type: "DateTime", + }, + endDate: { + title: "结算时间", + type: "DateTime", + }, + }, +}; + +const baseUrl = "settleaccount/price-list-app-service-bj"; +const queryUrl = `${baseUrl}/get-list`; +const importUrl = `${baseUrl}/import`; +const exportUrl = `${baseUrl}/export`; +const queryMethod = "POST"; +const importMethod = "POST"; +const exportMethod = "POST"; + +export default function () { + return { + baseUrl, + query: { + url: queryUrl, + method: queryMethod, + schema: { + title: "备件价格单", + type: "object", + properties: { + filters: { + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "lu", + action: "like", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + queryUrl, + importUrl, + exportUrl, + queryMethod, + importMethod, + exportMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js new file mode 100644 index 00000000..04726d1c --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js @@ -0,0 +1,111 @@ +const schema = { + title: "销售价格单", + type: "object", + properties: { + version: { + title: "版本", + type: "string", + }, + beginDate: { + title: "开始时间", + type: "DateTime", + }, + endDate: { + title: "结算时间", + type: "DateTime", + }, + price: { + title: "价格", + type: "decimal", + }, + materialCode: { + title: "物料编号", + type: "string", + }, + type: { + title: "价格类型", + type: "int", + }, + customerCode: { + title: "客户", + type: "string", + }, + }, +}; + +const baseUrl = "settleaccount/price-list"; +const queryUrl = `${baseUrl}/get-list`; +const importUrl = `${baseUrl}/import`; +const exportUrl = `${baseUrl}/export`; +const queryMethod = "POST"; +const importMethod = "POST"; +const exportMethod = "POST"; + +export default function () { + return { + baseUrl, + query: { + url: queryUrl, + method: queryMethod, + schema: { + title: "销售价格单", + type: "object", + properties: { + filters: { + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "version", + action: "like", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + queryUrl, + importUrl, + exportUrl, + queryMethod, + importMethod, + exportMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/purchase_price_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/purchase_price_service.js new file mode 100644 index 00000000..89046f11 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/purchase_price_service.js @@ -0,0 +1,91 @@ +const schema = { + title: "采购价格单", + type: "object", + properties: { + lu: { + title: "零件号", + type: "string", + }, + price: { + title: "价格", + type: "decimal", + }, + }, +}; + +const baseUrl = "settleaccount/purchase_price_service"; +const queryUrl = `${baseUrl}/get-list`; +const importUrl = `${baseUrl}/import`; +const exportUrl = `${baseUrl}/export`; +const queryMethod = "POST"; +const importMethod = "POST"; +const exportMethod = "POST"; + +export default function () { + return { + baseUrl, + query: { + url: queryUrl, + method: queryMethod, + schema: { + title: "采购价格单", + type: "object", + properties: { + filters: { + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "lu", + action: "like", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + queryUrl, + importUrl, + exportUrl, + queryMethod, + importMethod, + exportMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js index 7b60ca6f..1205f8fc 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js @@ -22,6 +22,74 @@ export default [ title: "JIS结算数据", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + ], + }, + { + path: "bbac_sa_service", + meta: { + type: "page", + title: "JIS结算数据明细", + icon: "file", + isHidden: true, + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "import", + meta: { + type: "button", + title: "导入", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], }, { path: "bbac_se_detail_service", @@ -77,6 +145,27 @@ export default [ title: "EDI数据", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], }, ], }, @@ -95,6 +184,43 @@ export default [ title: "EDI与发运数据对比", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "exportEDIJob", + meta: { + type: "button", + title: "生成对比", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "download", + meta: { + type: "button", + title: "下载", + icon: "file", + }, + }, + ], }, { path: "bbac_sa_detail_jobservice", @@ -103,6 +229,43 @@ export default [ title: "EDI、发运与结算比对", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "exportEDIJob", + meta: { + type: "button", + title: "生成对比", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "download", + meta: { + type: "button", + title: "下载", + icon: "file", + }, + }, + ], }, { path: "bbac_sa_detail_jobservice", @@ -111,6 +274,43 @@ export default [ title: "发运与结算数据二次比对", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "exportEDIJob", + meta: { + type: "button", + title: "生成对比", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "download", + meta: { + type: "button", + title: "下载", + icon: "file", + }, + }, + ], }, { path: "bbac_sa_detail_jobservice", @@ -119,6 +319,43 @@ export default [ title: "买单件发运与结算数据三次比对", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "exportEDIJob", + meta: { + type: "button", + title: "生成对比", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "download", + meta: { + type: "button", + title: "下载", + icon: "file", + }, + }, + ], }, ], }, @@ -134,25 +371,147 @@ export default [ path: "bbac_can_sa_service", meta: { type: "page", - title: "BBAC可结算单", + title: "BBAC发票分组号", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + { + path: "generateInvoice", + meta: { + type: "button", + title: "生成发票数据", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], }, { - path: "bbac_not_sa_service", + path: "bbac_can_sa_detail_service", meta: { type: "page", - title: "不可结算单", + title: "BBAC发票分组号明细", icon: "file", + isHidden: true, }, - }, - { - path: "bbac_ba_service", - meta: { - type: "page", - title: "商务审批", + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + ], + }, + { + path: "bbac_not_sa_service", + meta: { + type: "page", + title: "不可结算单", + icon: "file", + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + { + path: "generateSettlementOrder", + meta: { + type: "button", + title: "生成可结算单", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], + }, + { + path: "bbac_ba_service", + meta: { + type: "page", + title: "商务审批", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "reject", + meta: { + type: "button", + title: "退回", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + { + path: "generateInvoice ", + meta: { + type: "button", + title: "生成发票数据", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], }, { path: "bbac_pd_service", @@ -161,6 +520,46 @@ export default [ title: "寄售库库存扣减审批", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "reject", + meta: { + type: "button", + title: "退回", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + { + path: "approvalPassed ", + meta: { + type: "button", + title: "审核通过", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], }, ], }, @@ -189,6 +588,74 @@ export default [ title: "JIS结算数据", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + ], + }, + { + path: "hbpo_sa_detail_service", + meta: { + type: "page", + title: "JIS结算数据明细", + icon: "file", + isHidden: true, + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "import", + meta: { + type: "button", + title: "导入", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], }, { path: "hbpo_se_detail_service", @@ -197,6 +664,45 @@ export default [ title: "JIS发运数据", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "import", + meta: { + type: "button", + title: "导入", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], }, { path: "hbpo_se_edi_service", @@ -205,6 +711,27 @@ export default [ title: "EDI数据", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], }, ], }, @@ -223,14 +750,88 @@ export default [ title: "EDI与发运数据对比", icon: "file", }, - }, - { - path: "hbpo_sa_detail_jobservice", - meta: { - type: "page", + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "exportEDIJob", + meta: { + type: "button", + title: "生成对比", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "download", + meta: { + type: "button", + title: "下载", + icon: "file", + }, + }, + ], + }, + { + path: "hbpo_sa_detail_jobservice", + meta: { + type: "page", title: "EDI、发运与结算比对", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "exportEDIJob", + meta: { + type: "button", + title: "生成对比", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "download", + meta: { + type: "button", + title: "下载", + icon: "file", + }, + }, + ], }, { path: "hbpo_sa_detail_jobservice", @@ -239,6 +840,43 @@ export default [ title: "发运与结算数据二次比对", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "exportEDIJob", + meta: { + type: "button", + title: "生成对比", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "download", + meta: { + type: "button", + title: "下载", + icon: "file", + }, + }, + ], }, ], }, @@ -257,6 +895,57 @@ export default [ title: "可结算单", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + { + path: "generateInvoice", + meta: { + type: "button", + title: "生成发票数据", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], + }, + { + path: "hbpo_can_sa_detail_service", + meta: { + type: "page", + title: "HBPO发票分组号明细", + icon: "file", + isHidden: true, + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + ], }, { path: "hbpo_not_sa_service", @@ -265,6 +954,37 @@ export default [ title: "不可结算单", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + { + path: "generateSettlementOrder", + meta: { + type: "button", + title: "生成可结算单", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], }, { path: "hbpo_ba_service", @@ -273,14 +993,950 @@ export default [ title: "商务审批", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "reject", + meta: { + type: "button", + title: "退回", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + { + path: "generateInvoice ", + meta: { + type: "button", + title: "生成发票数据", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], + }, + { + path: "hbpo_pd_service", + meta: { + type: "page", + title: "寄售库库存扣减审批", + icon: "file", + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "reject", + meta: { + type: "button", + title: "退回", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + { + path: "approvalPassed ", + meta: { + type: "button", + title: "审核通过", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], + }, + ], + }, + ], + }, + + { + path: "jit", + meta: { + type: "group", + title: "直供件", + icon: "folder", + }, + children: [ + { + path: "input", + meta: { + type: "group", + title: "数据输入", + icon: "folder", + }, + children: [ + { + path: "pub_sa_service", + meta: { + type: "page", + title: "结算数据", + icon: "file", + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + ], + }, + { + path: "pub_sa_detail_service", + meta: { + type: "page", + title: "结算数据明细", + icon: "file", + isHidden: true, + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "import", + meta: { + type: "button", + title: "导入", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], + }, + { + path: "pub_se_detail_service", + meta: { + type: "page", + title: "发运数据", + icon: "file", + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "import", + meta: { + type: "button", + title: "导入", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], + }, + ], + }, + { + path: "contrast", + meta: { + type: "group", + title: "数据对比", + icon: "folder", + }, + children: [ + { + path: "pub_sa_detail_jobservice", + meta: { + type: "page", + title: "发运与结算比对", + icon: "file", + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "exportEDIJob", + meta: { + type: "button", + title: "生成对比", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "download", + meta: { + type: "button", + title: "下载", + icon: "file", + }, + }, + ], + }, + { + path: "pub_sa_detail_jobservice", + meta: { + type: "page", + title: "发运与结算二次比对", + icon: "file", + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "exportEDIJob", + meta: { + type: "button", + title: "生成对比", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "download", + meta: { + type: "button", + title: "下载", + icon: "file", + }, + }, + ], + }, + ], + }, + { + path: "settlement", + meta: { + type: "group", + title: "结算开票", + icon: "folder", + }, + children: [ + { + path: "pub_can_sa_service", + meta: { + type: "page", + title: "可结算单", + icon: "file", + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + { + path: "generateInvoice", + meta: { + type: "button", + title: "生成发票数据", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], + }, + { + path: "pub_not_sa_service", + meta: { + type: "page", + title: "不可结算单", + icon: "file", + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + { + path: "generateSettlementOrder", + meta: { + type: "button", + title: "生成可结算单", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], + }, + { + path: "pub_ba_service", + meta: { + type: "page", + title: "商务审批", + icon: "file", + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "reject", + meta: { + type: "button", + title: "退回", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + { + path: "generateInvoice ", + meta: { + type: "button", + title: "生成发票数据", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], + }, + { + path: "pub_pd_service", + meta: { + type: "page", + title: "寄售库库存扣减审批", + icon: "file", + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "reject", + meta: { + type: "button", + title: "退回", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + { + path: "approvalPassed ", + meta: { + type: "button", + title: "审核通过", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], + }, + ], + }, + ], + }, + + { + path: "bj", + meta: { + type: "group", + title: "备件", + icon: "folder", + }, + children: [ + { + path: "input", + meta: { + type: "group", + title: "数据输入", + icon: "folder", + }, + children: [ + { + path: "pub_sa_service", + meta: { + type: "page", + title: "结算数据", + icon: "file", + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + ], + }, + { + path: "pub_sa_detail_service", + meta: { + type: "page", + title: "结算数据明细", + icon: "file", + isHidden: true, + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "import", + meta: { + type: "button", + title: "导入", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], + }, + { + path: "pub_se_detail_service", + meta: { + type: "page", + title: "发运数据", + icon: "file", + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "import", + meta: { + type: "button", + title: "导入", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], + }, + ], + }, + { + path: "contrast", + meta: { + type: "group", + title: "数据对比", + icon: "folder", + }, + children: [ + { + path: "pub_sa_detail_jobservice", + meta: { + type: "page", + title: "发运与结算比对", + icon: "file", + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "exportEDIJob", + meta: { + type: "button", + title: "生成对比", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "download", + meta: { + type: "button", + title: "下载", + icon: "file", + }, + }, + ], + }, + { + path: "pub_sa_detail_jobservice", + meta: { + type: "page", + title: "发运与结算二次比对", + icon: "file", + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "exportEDIJob", + meta: { + type: "button", + title: "生成对比", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "download", + meta: { + type: "button", + title: "下载", + icon: "file", + }, + }, + ], + }, + ], + }, + { + path: "settlement", + meta: { + type: "group", + title: "结算开票", + icon: "folder", + }, + children: [ + { + path: "pub_can_sa_service", + meta: { + type: "page", + title: "可结算单", + icon: "file", + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + { + path: "generateInvoice", + meta: { + type: "button", + title: "生成发票数据", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], + }, + { + path: "pub_not_sa_service", + meta: { + type: "page", + title: "不可结算单", + icon: "file", + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + { + path: "generateSettlementOrder", + meta: { + type: "button", + title: "生成可结算单", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], + }, + { + path: "pub_ba_service", + meta: { + type: "page", + title: "商务审批", + icon: "file", + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "reject", + meta: { + type: "button", + title: "退回", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + { + path: "generateInvoice ", + meta: { + type: "button", + title: "生成发票数据", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], }, { - path: "hbpo_pd_service", + path: "pub_pd_service", meta: { type: "page", title: "寄售库库存扣减审批", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "reject", + meta: { + type: "button", + title: "退回", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + { + path: "approvalPassed ", + meta: { + type: "button", + title: "审核通过", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], }, ], }, @@ -288,10 +1944,10 @@ export default [ }, { - path: "jit", + path: "in", meta: { type: "group", - title: "直供件", + title: "印度件", icon: "folder", }, children: [ @@ -310,6 +1966,74 @@ export default [ title: "结算数据", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + ], + }, + { + path: "pub_sa_detail_service", + meta: { + type: "page", + title: "结算数据明细", + icon: "file", + isHidden: true, + }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "import", + meta: { + type: "button", + title: "导入", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], }, { path: "pub_se_detail_service", @@ -318,6 +2042,45 @@ export default [ title: "发运数据", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "import", + meta: { + type: "button", + title: "导入", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], }, ], }, @@ -336,6 +2099,43 @@ export default [ title: "发运与结算比对", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "exportEDIJob", + meta: { + type: "button", + title: "生成对比", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "download", + meta: { + type: "button", + title: "下载", + icon: "file", + }, + }, + ], }, { path: "pub_sa_detail_jobservice", @@ -344,6 +2144,43 @@ export default [ title: "发运与结算二次比对", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "exportEDIJob", + meta: { + type: "button", + title: "生成对比", + icon: "file", + isTop: true, + }, + }, + { + path: "delete", + meta: { + type: "button", + title: "删除", + icon: "file", + isTop: true, + }, + }, + { + path: "download", + meta: { + type: "button", + title: "下载", + icon: "file", + }, + }, + ], }, ], }, @@ -362,6 +2199,37 @@ export default [ title: "可结算单", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + { + path: "generateInvoice", + meta: { + type: "button", + title: "生成发票数据", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], }, { path: "pub_not_sa_service", @@ -370,6 +2238,37 @@ export default [ title: "不可结算单", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + { + path: "generateSettlementOrder", + meta: { + type: "button", + title: "生成可结算单", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], }, { path: "pub_ba_service", @@ -378,6 +2277,46 @@ export default [ title: "商务审批", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "reject", + meta: { + type: "button", + title: "退回", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + { + path: "generateInvoice ", + meta: { + type: "button", + title: "生成发票数据", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], }, { path: "pub_pd_service", @@ -386,6 +2325,46 @@ export default [ title: "寄售库库存扣减审批", icon: "file", }, + children: [ + { + path: "query", + meta: { + type: "button", + title: "查询", + icon: "file", + isTop: true, + }, + }, + { + path: "reject", + meta: { + type: "button", + title: "退回", + icon: "file", + isTop: true, + }, + }, + { + path: "export", + meta: { + type: "button", + title: "导出", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + { + path: "approvalPassed ", + meta: { + type: "button", + title: "审核通过", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + ], }, ], }, @@ -393,231 +2372,228 @@ export default [ }, { - path: "bj", + path: "inspect", meta: { type: "group", - title: "备件", + title: "商务审核", icon: "folder", }, children: [ { - path: "input", + path: "invoice_grp_dto", meta: { - type: "group", - title: "数据输入", - icon: "folder", + type: "page", + title: "财务管理审核", + icon: "file", }, children: [ { - path: "pub_sa_service", + path: "query", meta: { - type: "page", - title: "结算数据", + type: "button", + title: "查询", icon: "file", + isTop: true, }, }, { - path: "pub_se_detail_service", + path: "reject", meta: { - type: "page", - title: "发运数据", + type: "button", + title: "退回", icon: "file", + isTop: true, }, }, - ], - }, - { - path: "contrast", - meta: { - type: "group", - title: "数据对比", - icon: "folder", - }, - children: [ { - path: "pub_sa_detail_jobservice", + path: "importInvocie", meta: { - type: "page", - title: "发运与结算比对", + type: "button", + title: "导入发票号", icon: "file", + isTop: true, + pattern: "paged", }, }, { - path: "pub_sa_detail_jobservice", + path: "approvalPassed ", meta: { - type: "page", - title: "发运与结算二次比对", + type: "button", + title: "审核通过", + icon: "file", + isTop: true, + pattern: "paged", + }, + }, + { + path: "sync_QAD ", + meta: { + type: "button", + title: "同步寄售库至QAD", icon: "file", + isTop: true, + pattern: "paged", }, }, ], }, + ], + }, + //实际采购成本，不知道起什么名 + { + path: "cost", + meta: { + type: "group", + title: "实际采购成本", + icon: "folder", + }, + children: [ { - path: "settlement", + path: "cost", meta: { - type: "group", - title: "结算开票", - icon: "folder", + type: "page", + title: "实际采购成本", + icon: "file", }, children: [ { - path: "pub_can_sa_service", - meta: { - type: "page", - title: "可结算单", - icon: "file", - }, - }, - { - path: "pub_not_sa_service", + path: "query", meta: { - type: "page", - title: "不可结算单", + type: "button", + title: "查询", icon: "file", + isTop: true, }, }, { - path: "pub_ba_service", + path: "export", meta: { - type: "page", - title: "商务审批", + type: "button", + title: "导出", icon: "file", + isTop: true, + pattern: "paged", }, }, { - path: "pub_pd_service", + path: "generate", meta: { - type: "page", - title: "寄售库库存扣减审批", + type: "button", + title: "生成", icon: "file", + isTop: true, + pattern: "paged", }, }, ], }, ], }, - { - path: "in", + path: "inventory", meta: { type: "group", - title: "印度件", + title: "寄售库", icon: "folder", }, children: [ { - path: "input", + path: "balance", meta: { - type: "group", - title: "数据输入", - icon: "folder", + type: "page", + title: "库存余额查询", + icon: "file", }, children: [ { - path: "pub_sa_service", + path: "query", meta: { - type: "page", - title: "结算数据", + type: "button", + title: "查询", icon: "file", + isTop: true, }, }, { - path: "pub_se_detail_service", + path: "export", meta: { - type: "page", - title: "发运数据", + type: "button", + title: "导出", icon: "file", + isTop: true, + pattern: "paged", + }, + }, + { + path: "balance", + meta: { + type: "button", + title: "余额调整", + icon: "file", + isTop: true, + pattern: "paged", }, }, ], }, { - path: "contrast", + path: "record", meta: { - type: "group", - title: "数据对比", - icon: "folder", + type: "page", + title: "库存事务查询", + icon: "file", }, children: [ { - path: "pub_sa_detail_jobservice", + path: "query", meta: { - type: "page", - title: "发运与结算比对", + type: "button", + title: "查询", icon: "file", + isTop: true, }, }, { - path: "pub_sa_detail_jobservice", + path: "export", meta: { - type: "page", - title: "发运与结算二次比对", + type: "button", + title: "导出", icon: "file", + isTop: true, + pattern: "paged", }, }, ], }, { - path: "settlement", + path: "backup", meta: { - type: "group", - title: "结算开票", - icon: "folder", + type: "page", + title: "时点库存余额查询", + icon: "file", }, children: [ { - path: "pub_can_sa_service", - meta: { - type: "page", - title: "可结算单", - icon: "file", - }, - }, - { - path: "pub_not_sa_service", - meta: { - type: "page", - title: "不可结算单", - icon: "file", - }, - }, - { - path: "pub_ba_service", + path: "query", meta: { - type: "page", - title: "商务审批", + type: "button", + title: "查询", icon: "file", + isTop: true, }, }, { - path: "pub_pd_service", + path: "export", meta: { - type: "page", - title: "寄售库库存扣减审批", + type: "button", + title: "导出", icon: "file", + isTop: true, + pattern: "paged", }, }, ], }, ], }, - - { - path: "inspect", - meta: { - type: "group", - title: "商务审核", - icon: "folder", - }, - children: [ - { - path: "invoice_grp_dto", - meta: { - type: "page", - title: "财务管理审核", - icon: "file", - }, - }, - ], - }, ]; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/routes.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/routes.js index e9efa452..0b7b43cb 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/routes.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/routes.js @@ -1,6 +1,5 @@ import baseDate from "./base-date.js"; import business from "./business.js"; -import inventory from "./inventory.js"; export default [ { @@ -14,5 +13,4 @@ export default [ }, ...baseDate, ...business, - ...inventory, ]; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/price-list-app-service-bj.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/price-list-app-service-bj.js new file mode 100644 index 00000000..f58a3e48 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/price-list-app-service-bj.js @@ -0,0 +1,15 @@ +import AppList from "../../components/list/index.js"; +import html from "html"; +import useConfig from "../../models/price-list-app-service-bj.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/price-list.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/price-list.js new file mode 100644 index 00000000..66a67ea5 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/price-list.js @@ -0,0 +1,15 @@ +import AppList from "../../components/list/index.js"; +import html from "html"; +import useConfig from "../../models/price-list.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/purchase_price_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/purchase_price_service.js new file mode 100644 index 00000000..8799ac9c --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/purchase_price_service.js @@ -0,0 +1,15 @@ +import AppList from "../../components/list/index.js"; +import html from "html"; +import useConfig from "../../models/purchase_price_service.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; From f821d52f71a0afd76919de300f2507ebfbba41fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E6=97=AD=E4=B9=8B?= <12930972+jiang-xuzhi@user.noreply.gitee.com> Date: Tue, 18 Jul 2023 16:15:20 +0800 Subject: [PATCH 7/8] update --- .../wwwroot/models/centralized-control.js | 2 +- .../jis-bbac/input/bbac_sa_detail_service.js | 132 +++++++++++++++++ .../{ => jis-bbac/input}/bbac_sa_service.js | 2 +- .../input}/bbac_se_detail_service.js | 2 +- .../jis-bbac/input/bbac_se_edi_service.js | 140 ++++++++++++++++++ .../jis-bbac/settlement/bbac_ba_service.js | 131 ++++++++++++++++ .../settlement/bbac_can_sa_detail_service.js | 126 ++++++++++++++++ .../settlement/bbac_can_sa_service.js | 106 +++++++++++++ .../settlement/bbac_not_sa_service.js | 127 ++++++++++++++++ .../jis-bbac/settlement/bbac_pd_service.js | 106 +++++++++++++ .../jis-hbpo/input/hbpo_sa_detail_service.js | 132 +++++++++++++++++ .../models/jis-hbpo/input/hbpo_sa_service.js | 132 +++++++++++++++++ .../jis-hbpo/input/hbpo_se_detail_service.js | 132 +++++++++++++++++ .../input/hbpo_se_edi_service.js} | 2 +- .../jis-hbpo/settlement/hbpo_ba_service.js | 131 ++++++++++++++++ .../settlement/hbpo_can_sa_detail_service.js | 126 ++++++++++++++++ .../settlement/hbpo_can_sa_service.js | 106 +++++++++++++ .../settlement/hbpo_not_sa_service.js | 127 ++++++++++++++++ .../jis-hbpo/settlement/hbpo_pd_service.js | 106 +++++++++++++ .../wwwroot/router/business.js | 4 +- .../contrast/bbac_sa_detail_jobservice.js | 15 ++ .../jis-bbac/input/bbac_sa_detail_service.js | 15 ++ .../views/jis-bbac/input/bbac_sa_service.js | 2 +- .../jis-bbac/input/bbac_se_detail_service.js | 2 +- .../jis-bbac/input/bbac_se_edi_service.js | 2 +- .../jis-bbac/settlement/bbac_ba_service.js | 15 ++ .../settlement/bbac_can_sa_detail_service.js | 15 ++ .../settlement/bbac_can_sa_service.js | 15 ++ .../settlement/bbac_not_sa_service.js | 15 ++ .../jis-bbac/settlement/bbac_pd_service.js | 15 ++ .../jis-hbpo/input/hbpo_sa_detail_service.js | 15 ++ .../views/jis-hbpo/input/hbpo_sa_service.js | 15 ++ .../jis-hbpo/input/hbpo_se_detail_service.js | 15 ++ .../jis-hbpo/input/hbpo_se_edi_service.js | 15 ++ .../jis-hbpo/settlement/hbpo_ba_service.js | 15 ++ .../settlement/hbpo_can_sa_detail_service.js | 15 ++ .../settlement/hbpo_can_sa_service.js | 15 ++ .../settlement/hbpo_not_sa_service.js | 15 ++ .../jis-hbpo/settlement/hbpo_pd_service.js | 15 ++ 39 files changed, 2109 insertions(+), 9 deletions(-) create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_detail_service.js rename code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/{ => jis-bbac/input}/bbac_sa_service.js (98%) rename code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/{ => jis-bbac/input}/bbac_se_detail_service.js (98%) create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_edi_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_not_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js rename code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/{bbac_se_edi_service.js => jis-hbpo/input/hbpo_se_edi_service.js} (98%) create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_not_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/bbac_sa_detail_jobservice.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_sa_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_ba_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_can_sa_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_can_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_not_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_pd_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/input/hbpo_sa_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/input/hbpo_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/input/hbpo_se_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/input/hbpo_se_edi_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_ba_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_can_sa_detail_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_can_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_not_sa_service.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_pd_service.js diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/centralized-control.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/centralized-control.js index 5e6a6dd2..b8c925af 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/centralized-control.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/centralized-control.js @@ -72,7 +72,7 @@ export default function () { method: queryMethod, hasFilter: true, schema: { - title: "通用代码", + title: "期间设置", type: "object", properties: { filters: { diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_detail_service.js new file mode 100644 index 00000000..58a4a599 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_detail_service.js @@ -0,0 +1,132 @@ +const schema = { + title: "JIS结算数据", + type: "object", + properties: { + project: { + title: "项目", + type: "string", + readOnly: true, + showForList: true, + rules: [ + { + required: true, + }, + ], + }, + value: { + title: "值", + type: "string", + readOnly: true, + showForList: true, + rules: [ + { + required: true, + }, + ], + }, + description: { + title: "描述", + type: "string", + input: "textarea", + showForList: true, + rules: [ + { + required: true, + }, + { max: 60 }, + ], + }, + }, +}; + +const baseUrl = "settleaccount/bbac_sa_detail_service"; +const queryUrl = `${baseUrl}/get-list`; +const detailsUrl = `${baseUrl}/get/%s`; +const createUrl = `${baseUrl}/create`; +const updateUrl = `${baseUrl}/update/%s`; +const deleteUrl = `${baseUrl}/delete-list`; +const importUrl = `${baseUrl}/code-setting-upload-excel-import`; +const exportUrl = `${baseUrl}/export`; +const queryMethod = "POST"; +const detailsMethod = "POST"; +const createMethod = "POST"; +const updateMethod = "POST"; +const deleteMethod = "POST"; +const importMethod = "POST"; +const exportMethod = "POST"; + +export default function () { + return { + query: { + url: queryUrl, + method: queryMethod, + hasFilter: true, + schema: { + title: "JIS结算数据", + type: "object", + properties: { + filters: { + title: "项目", + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "project", + action: "like", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + detailsUrl, + createUrl, + updateUrl, + deleteUrl, + importUrl, + exportUrl, + detailsMethod, + createMethod, + updateMethod, + deleteMethod, + importMethod, + exportMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_service.js similarity index 98% rename from code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_sa_service.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_service.js index 6aa5363b..79c2422d 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_sa_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_service.js @@ -39,7 +39,7 @@ const schema = { }, }; -const baseUrl = "settleaccount/code-setting"; +const baseUrl = "settleaccount/bbac_sa_service"; const queryUrl = `${baseUrl}/get-list`; const detailsUrl = `${baseUrl}/get/%s`; const createUrl = `${baseUrl}/create`; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_se_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_detail_service.js similarity index 98% rename from code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_se_detail_service.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_detail_service.js index 252b8f16..b416d87a 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_se_detail_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_detail_service.js @@ -95,7 +95,7 @@ export default function () { default: [ { logic: "and", - column: "project", + column: "version", action: "like", value: null, readOnly: true, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_edi_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_edi_service.js new file mode 100644 index 00000000..0397c726 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_edi_service.js @@ -0,0 +1,140 @@ +const schema = { + title: "EDI数据", + type: "object", + properties: { + keyCode: { + title: "LU+生产码", + type: "string", + }, + version: { + title: "期间", + type: "string", + }, + lu: { + title: "零件号", + type: "string", + }, + pn: { + title: "生产码", + type: "string", + }, + seqNumber: { + title: "日顺序号", + type: "string", + }, + assemblyCode: { + title: "小总成号", + type: "string", + }, + injectionCode: { + title: "注塑码", + type: "string", + }, + qty: { + title: "EDI数量", + type: "number", + }, + beginDate: { + title: "订货时间", + type: "string", + input: "datetime", + }, + id: { + type: "string", + hidden: true, + showForList: false, + }, + }, +}; + +const baseUrl = "settleaccount/bbac_se_edi_service"; +const queryUrl = `${baseUrl}/get-list`; +const detailsUrl = `${baseUrl}/get/%s`; +const createUrl = `${baseUrl}/create`; +const updateUrl = `${baseUrl}/update/%s`; +const deleteUrl = `${baseUrl}/delete-list`; +const importUrl = `${baseUrl}/code-setting-upload-excel-import`; +const exportUrl = `${baseUrl}/export`; +const queryMethod = "POST"; +const detailsMethod = "POST"; +const createMethod = "POST"; +const updateMethod = "POST"; +const deleteMethod = "POST"; +const importMethod = "POST"; +const exportMethod = "POST"; + +export default function () { + return { + query: { + url: queryUrl, + method: queryMethod, + hasFilter: true, + schema: { + title: "EDI数据", + type: "object", + properties: { + filters: { + title: "项目", + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "version", + action: "like", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + detailsUrl, + createUrl, + updateUrl, + deleteUrl, + importUrl, + exportUrl, + detailsMethod, + createMethod, + updateMethod, + deleteMethod, + importMethod, + exportMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_service.js new file mode 100644 index 00000000..51771cc1 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_service.js @@ -0,0 +1,131 @@ +const schema = { + title: "不可结算单", + type: "object", + properties: { + settleBillNum: { + title: "关联结算单号", + type: "string", + }, + site: { + title: "工厂地点", + type: "string", + }, + version: { + title: "版本", + type: "int", + }, + price: { + title: "单价", + type: "decimal", + }, + billNum: { + title: "结算单号", + type: "string", + }, + + settleDate: { + title: "结算日期", + type: "DateTime", + }, + invGroupNum: { + title: "发票分组号", + type: "string", + }, + lu: { + title: "零件号", + type: "string", + }, + pn: { + title: "生产号", + type: "string", + }, + qty: { + title: "结算数量", + type: "decimal", + }, + groupNum: { + title: "结算分组号", + type: "string", + }, + }, +}; + +const baseUrl = "settleaccount/bbac_ba_service"; +const queryUrl = `${baseUrl}/get-list`; +const detailsUrl = `${baseUrl}/get/%s`; +const createUrl = `${baseUrl}/create`; +const updateUrl = `${baseUrl}/update/%s`; +const deleteUrl = `${baseUrl}/delete-list`; +const importUrl = `${baseUrl}/code-setting-upload-excel-import`; +const exportUrl = `${baseUrl}/export`; +const queryMethod = "POST"; +const detailsMethod = "POST"; +const exportMethod = "POST"; + +export default function () { + return { + query: { + url: queryUrl, + method: queryMethod, + hasFilter: true, + schema: { + title: "不可结算单", + type: "object", + properties: { + filters: { + title: "项目", + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "billNum", + action: "like", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + detailsUrl, + exportUrl, + detailsMethod, + exportMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_detail_service.js new file mode 100644 index 00000000..136711b5 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_detail_service.js @@ -0,0 +1,126 @@ +const schema = { + title: "发票分组号明细", + type: "object", + properties: { + settleBillNum: { + title: "关联结算单号", + type: "int", + }, + site: { + title: "工厂地点", + type: "string", + }, + version: { + title: "版本", + type: "int", + }, + price: { + title: "单价", + type: "decimal", + }, + billNum: { + title: "结算单号", + type: "string", + }, + settleDate: { + title: "结算日期", + type: "DateTime", + }, + settleInvGroupNumDate: { + title: "发票组号", + type: "string", + }, + lu: { + title: "零件号", + type: "string", + }, + materialDesc: { + title: "物料描述", + type: "string", + }, + pn: { + title: "生产号", + type: "string", + }, + qty: { + title: "结算数量", + type: "decimal", + }, + groupNumy: { + title: "结算分组号", + type: "string", + }, + }, +}; + +const baseUrl = "settleaccount/bbac_can_sa_detail_service"; +const queryUrl = `${baseUrl}/get-list`; +const detailsUrl = `${baseUrl}/get/%s`; +const queryMethod = "POST"; +const detailsMethod = "POST"; + +export default function () { + return { + query: { + url: queryUrl, + method: queryMethod, + hasFilter: true, + schema: { + title: "发票分组号明细", + type: "object", + properties: { + filters: { + title: "项目", + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "billNum", + action: "like", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + detailsUrl, + detailsMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_service.js new file mode 100644 index 00000000..72052f47 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_service.js @@ -0,0 +1,106 @@ +const schema = { + title: "发票分组号", + type: "object", + properties: { + version: { + title: "期间", + type: "int", + }, + billNum: { + title: "结算单据", + type: "string", + }, + settleBillNum: { + title: "关联结算单号", + type: "string", + }, + state: { + title: "状态", + type: "string", + }, + invGroupNum: { + title: "发票分组号", + type: "string", + }, + }, +}; + +const baseUrl = "settleaccount/bbac_can_sa_service"; +const queryUrl = `${baseUrl}/get-list`; +const detailsUrl = `${baseUrl}/get/%s`; +const createUrl = `${baseUrl}/create`; +const updateUrl = `${baseUrl}/update/%s`; +const deleteUrl = `${baseUrl}/delete-list`; +const importUrl = `${baseUrl}/code-setting-upload-excel-import`; +const exportUrl = `${baseUrl}/export`; +const queryMethod = "POST"; +const detailsMethod = "POST"; +const exportMethod = "POST"; + +export default function () { + return { + query: { + url: queryUrl, + method: queryMethod, + hasFilter: true, + schema: { + title: "发票分组号", + type: "object", + properties: { + filters: { + title: "项目", + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "billNum", + action: "like", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + detailsUrl, + exportUrl, + detailsMethod, + exportMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_not_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_not_sa_service.js new file mode 100644 index 00000000..ae8c1a3b --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_not_sa_service.js @@ -0,0 +1,127 @@ +const schema = { + title: "不可结算单", + type: "object", + properties: { + settleBillNum: { + title: "关联结算单号", + type: "string", + }, + site: { + title: "工厂地点", + type: "string", + }, + version: { + title: "版本", + type: "int", + }, + price: { + title: "单价", + type: "decimal", + }, + billNum: { + title: "结算单号", + type: "string", + }, + + settleDate: { + title: "结算日期", + type: "DateTime", + }, + invGroupNum: { + title: "发票分组号", + type: "string", + }, + lu: { + title: "零件号", + type: "string", + }, + pn: { + title: "生产号", + type: "string", + }, + qty: { + title: "结算数量", + type: "decimal", + }, + groupNum: { + title: "结算分组号", + type: "string", + }, + }, +}; + +const baseUrl = "settleaccount/bbac_not_sa_service"; +const queryUrl = `${baseUrl}/get-list`; +const detailsUrl = `${baseUrl}/get/%s`; +const exportUrl = `${baseUrl}/export`; +const queryMethod = "POST"; +const detailsMethod = "POST"; +const exportMethod = "POST"; + +export default function () { + return { + query: { + url: queryUrl, + method: queryMethod, + hasFilter: true, + schema: { + title: "不可结算单", + type: "object", + properties: { + filters: { + title: "项目", + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "billNum", + action: "like", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + detailsUrl, + exportUrl, + detailsMethod, + exportMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_service.js new file mode 100644 index 00000000..8356d93b --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_service.js @@ -0,0 +1,106 @@ +const schema = { + title: "寄售库库存扣减审批", + type: "object", + properties: { + version: { + title: "期间", + type: "int", + }, + billNum: { + title: "结算单号", + type: "string", + }, + settleBillNum: { + title: "关联结算单号", + type: "string", + }, + invGroupNum: { + title: "发票分组号", + type: "string", + }, + site: { + title: "地点", + type: "string", + }, + }, +}; + +const baseUrl = "settleaccount/bbac_pd_service"; +const queryUrl = `${baseUrl}/get-list`; +const detailsUrl = `${baseUrl}/get/%s`; +const createUrl = `${baseUrl}/create`; +const updateUrl = `${baseUrl}/update/%s`; +const deleteUrl = `${baseUrl}/delete-list`; +const importUrl = `${baseUrl}/code-setting-upload-excel-import`; +const exportUrl = `${baseUrl}/export`; +const queryMethod = "POST"; +const detailsMethod = "POST"; +const exportMethod = "POST"; + +export default function () { + return { + query: { + url: queryUrl, + method: queryMethod, + hasFilter: true, + schema: { + title: "不可结算单", + type: "object", + properties: { + filters: { + title: "项目", + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "billNum", + action: "like", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + detailsUrl, + exportUrl, + detailsMethod, + exportMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_detail_service.js new file mode 100644 index 00000000..49e92ea1 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_detail_service.js @@ -0,0 +1,132 @@ +const schema = { + title: "JIS结算数据", + type: "object", + properties: { + project: { + title: "项目", + type: "string", + readOnly: true, + showForList: true, + rules: [ + { + required: true, + }, + ], + }, + value: { + title: "值", + type: "string", + readOnly: true, + showForList: true, + rules: [ + { + required: true, + }, + ], + }, + description: { + title: "描述", + type: "string", + input: "textarea", + showForList: true, + rules: [ + { + required: true, + }, + { max: 60 }, + ], + }, + }, +}; + +const baseUrl = "settleaccount/hbpo_sa_detail_service"; +const queryUrl = `${baseUrl}/get-list`; +const detailsUrl = `${baseUrl}/get/%s`; +const createUrl = `${baseUrl}/create`; +const updateUrl = `${baseUrl}/update/%s`; +const deleteUrl = `${baseUrl}/delete-list`; +const importUrl = `${baseUrl}/code-setting-upload-excel-import`; +const exportUrl = `${baseUrl}/export`; +const queryMethod = "POST"; +const detailsMethod = "POST"; +const createMethod = "POST"; +const updateMethod = "POST"; +const deleteMethod = "POST"; +const importMethod = "POST"; +const exportMethod = "POST"; + +export default function () { + return { + query: { + url: queryUrl, + method: queryMethod, + hasFilter: true, + schema: { + title: "JIS结算数据", + type: "object", + properties: { + filters: { + title: "项目", + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "project", + action: "like", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + detailsUrl, + createUrl, + updateUrl, + deleteUrl, + importUrl, + exportUrl, + detailsMethod, + createMethod, + updateMethod, + deleteMethod, + importMethod, + exportMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_service.js new file mode 100644 index 00000000..0ebd39a2 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_service.js @@ -0,0 +1,132 @@ +const schema = { + title: "JIS结算数据", + type: "object", + properties: { + project: { + title: "项目", + type: "string", + readOnly: true, + showForList: true, + rules: [ + { + required: true, + }, + ], + }, + value: { + title: "值", + type: "string", + readOnly: true, + showForList: true, + rules: [ + { + required: true, + }, + ], + }, + description: { + title: "描述", + type: "string", + input: "textarea", + showForList: true, + rules: [ + { + required: true, + }, + { max: 60 }, + ], + }, + }, +}; + +const baseUrl = "settleaccount/hbpo_sa_service"; +const queryUrl = `${baseUrl}/get-list`; +const detailsUrl = `${baseUrl}/get/%s`; +const createUrl = `${baseUrl}/create`; +const updateUrl = `${baseUrl}/update/%s`; +const deleteUrl = `${baseUrl}/delete-list`; +const importUrl = `${baseUrl}/code-setting-upload-excel-import`; +const exportUrl = `${baseUrl}/export`; +const queryMethod = "POST"; +const detailsMethod = "POST"; +const createMethod = "POST"; +const updateMethod = "POST"; +const deleteMethod = "POST"; +const importMethod = "POST"; +const exportMethod = "POST"; + +export default function () { + return { + query: { + url: queryUrl, + method: queryMethod, + hasFilter: true, + schema: { + title: "JIS结算数据", + type: "object", + properties: { + filters: { + title: "项目", + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "project", + action: "like", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + detailsUrl, + createUrl, + updateUrl, + deleteUrl, + importUrl, + exportUrl, + detailsMethod, + createMethod, + updateMethod, + deleteMethod, + importMethod, + exportMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js new file mode 100644 index 00000000..c1f75dfe --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js @@ -0,0 +1,132 @@ +const schema = { + title: "JIS发运数据", + type: "object", + properties: { + version: { + title: "版本", + type: "string", + }, + shippingDate: { + title: "发货时间", + type: "string", + input: "datetime", + }, + wmsBillNum: { + title: "发运单号", + type: "string", + }, + lu: { + title: "零件号", + type: "string", + }, + pn: { + title: "生产号", + type: "string", + }, + keyCode: { + title: "组合键值(LU+PN)", + type: "string", + }, + qty: { + title: "数量", + type: "number", + }, + seqNumber: { + title: "日顺序号", + type: "string", + }, + assemblyCode: { + title: "小总成号", + type: "string", + }, + injectionCode: { + title: "注塑码", + type: "string", + }, + beginDate: { + title: "订单时间", + type: "string", + input: "datetime", + }, + }, +}; + +const baseUrl = "settleaccount/hbpo_se_detail_service"; +const queryUrl = `${baseUrl}/get-list`; +const deleteUrl = `${baseUrl}/delete-list`; +const importUrl = `${baseUrl}/import`; +const exportUrl = `${baseUrl}/export`; +const queryMethod = "POST"; +const deleteMethod = "POST"; +const importMethod = "POST"; +const exportMethod = "POST"; + +export default function () { + return { + query: { + url: queryUrl, + method: queryMethod, + hasFilter: true, + schema: { + title: "JIS发运数据", + type: "object", + properties: { + filters: { + title: "项目", + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "version", + action: "like", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + deleteUrl, + importUrl, + exportUrl, + deleteMethod, + importMethod, + exportMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_se_edi_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_edi_service.js similarity index 98% rename from code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_se_edi_service.js rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_edi_service.js index 6cabc85b..4226e69e 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac_se_edi_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_edi_service.js @@ -97,7 +97,7 @@ export default function () { default: [ { logic: "and", - column: "project", + column: "version", action: "like", value: null, readOnly: true, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_service.js new file mode 100644 index 00000000..72d58e0a --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_service.js @@ -0,0 +1,131 @@ +const schema = { + title: "不可结算单", + type: "object", + properties: { + settleBillNum: { + title: "关联结算单号", + type: "string", + }, + site: { + title: "工厂地点", + type: "string", + }, + version: { + title: "版本", + type: "int", + }, + price: { + title: "单价", + type: "decimal", + }, + billNum: { + title: "结算单号", + type: "string", + }, + + settleDate: { + title: "结算日期", + type: "DateTime", + }, + invGroupNum: { + title: "发票分组号", + type: "string", + }, + lu: { + title: "零件号", + type: "string", + }, + pn: { + title: "生产号", + type: "string", + }, + qty: { + title: "结算数量", + type: "decimal", + }, + groupNum: { + title: "结算分组号", + type: "string", + }, + }, +}; + +const baseUrl = "settleaccount/hbpo_ba_service"; +const queryUrl = `${baseUrl}/get-list`; +const detailsUrl = `${baseUrl}/get/%s`; +const createUrl = `${baseUrl}/create`; +const updateUrl = `${baseUrl}/update/%s`; +const deleteUrl = `${baseUrl}/delete-list`; +const importUrl = `${baseUrl}/code-setting-upload-excel-import`; +const exportUrl = `${baseUrl}/export`; +const queryMethod = "POST"; +const detailsMethod = "POST"; +const exportMethod = "POST"; + +export default function () { + return { + query: { + url: queryUrl, + method: queryMethod, + hasFilter: true, + schema: { + title: "不可结算单", + type: "object", + properties: { + filters: { + title: "项目", + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "billNum", + action: "like", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + detailsUrl, + exportUrl, + detailsMethod, + exportMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_detail_service.js new file mode 100644 index 00000000..ffb30b0b --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_detail_service.js @@ -0,0 +1,126 @@ +const schema = { + title: "可结算单明细", + type: "object", + properties: { + settleBillNum: { + title: "关联结算单号", + type: "int", + }, + site: { + title: "工厂地点", + type: "string", + }, + version: { + title: "版本", + type: "int", + }, + price: { + title: "单价", + type: "decimal", + }, + billNum: { + title: "结算单号", + type: "string", + }, + settleDate: { + title: "结算日期", + type: "DateTime", + }, + settleInvGroupNumDate: { + title: "发票组号", + type: "string", + }, + lu: { + title: "零件号", + type: "string", + }, + materialDesc: { + title: "物料描述", + type: "string", + }, + pn: { + title: "生产号", + type: "string", + }, + qty: { + title: "结算数量", + type: "decimal", + }, + groupNumy: { + title: "结算分组号", + type: "string", + }, + }, +}; + +const baseUrl = "settleaccount/hbpo_can_sa_detail_service"; +const queryUrl = `${baseUrl}/get-list`; +const detailsUrl = `${baseUrl}/get/%s`; +const queryMethod = "POST"; +const detailsMethod = "POST"; + +export default function () { + return { + query: { + url: queryUrl, + method: queryMethod, + hasFilter: true, + schema: { + title: "发票分组号明细", + type: "object", + properties: { + filters: { + title: "项目", + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "billNum", + action: "like", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + detailsUrl, + detailsMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_service.js new file mode 100644 index 00000000..936824cf --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_service.js @@ -0,0 +1,106 @@ +const schema = { + title: "可结算单", + type: "object", + properties: { + version: { + title: "期间", + type: "int", + }, + billNum: { + title: "结算单据", + type: "string", + }, + settleBillNum: { + title: "关联结算单号", + type: "string", + }, + state: { + title: "状态", + type: "string", + }, + invGroupNum: { + title: "发票分组号", + type: "string", + }, + }, +}; + +const baseUrl = "settleaccount/hbpo_can_sa_service"; +const queryUrl = `${baseUrl}/get-list`; +const detailsUrl = `${baseUrl}/get/%s`; +const createUrl = `${baseUrl}/create`; +const updateUrl = `${baseUrl}/update/%s`; +const deleteUrl = `${baseUrl}/delete-list`; +const importUrl = `${baseUrl}/code-setting-upload-excel-import`; +const exportUrl = `${baseUrl}/export`; +const queryMethod = "POST"; +const detailsMethod = "POST"; +const exportMethod = "POST"; + +export default function () { + return { + query: { + url: queryUrl, + method: queryMethod, + hasFilter: true, + schema: { + title: "发票分组号", + type: "object", + properties: { + filters: { + title: "项目", + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "billNum", + action: "like", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + detailsUrl, + exportUrl, + detailsMethod, + exportMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_not_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_not_sa_service.js new file mode 100644 index 00000000..ae8c1a3b --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_not_sa_service.js @@ -0,0 +1,127 @@ +const schema = { + title: "不可结算单", + type: "object", + properties: { + settleBillNum: { + title: "关联结算单号", + type: "string", + }, + site: { + title: "工厂地点", + type: "string", + }, + version: { + title: "版本", + type: "int", + }, + price: { + title: "单价", + type: "decimal", + }, + billNum: { + title: "结算单号", + type: "string", + }, + + settleDate: { + title: "结算日期", + type: "DateTime", + }, + invGroupNum: { + title: "发票分组号", + type: "string", + }, + lu: { + title: "零件号", + type: "string", + }, + pn: { + title: "生产号", + type: "string", + }, + qty: { + title: "结算数量", + type: "decimal", + }, + groupNum: { + title: "结算分组号", + type: "string", + }, + }, +}; + +const baseUrl = "settleaccount/bbac_not_sa_service"; +const queryUrl = `${baseUrl}/get-list`; +const detailsUrl = `${baseUrl}/get/%s`; +const exportUrl = `${baseUrl}/export`; +const queryMethod = "POST"; +const detailsMethod = "POST"; +const exportMethod = "POST"; + +export default function () { + return { + query: { + url: queryUrl, + method: queryMethod, + hasFilter: true, + schema: { + title: "不可结算单", + type: "object", + properties: { + filters: { + title: "项目", + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "billNum", + action: "like", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + detailsUrl, + exportUrl, + detailsMethod, + exportMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_service.js new file mode 100644 index 00000000..559b53bb --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_service.js @@ -0,0 +1,106 @@ +const schema = { + title: "寄售库库存扣减审批", + type: "object", + properties: { + version: { + title: "期间", + type: "int", + }, + billNum: { + title: "结算单号", + type: "string", + }, + settleBillNum: { + title: "关联结算单号", + type: "string", + }, + invGroupNum: { + title: "发票分组号", + type: "string", + }, + site: { + title: "地点", + type: "string", + }, + }, +}; + +const baseUrl = "settleaccount/hbpo_pd_service"; +const queryUrl = `${baseUrl}/get-list`; +const detailsUrl = `${baseUrl}/get/%s`; +const createUrl = `${baseUrl}/create`; +const updateUrl = `${baseUrl}/update/%s`; +const deleteUrl = `${baseUrl}/delete-list`; +const importUrl = `${baseUrl}/code-setting-upload-excel-import`; +const exportUrl = `${baseUrl}/export`; +const queryMethod = "POST"; +const detailsMethod = "POST"; +const exportMethod = "POST"; + +export default function () { + return { + query: { + url: queryUrl, + method: queryMethod, + hasFilter: true, + schema: { + title: "不可结算单", + type: "object", + properties: { + filters: { + title: "项目", + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + { + logic: "and", + column: "billNum", + action: "like", + value: null, + readOnly: true, + }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + detailsUrl, + exportUrl, + detailsMethod, + exportMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js index 1205f8fc..2907dc4b 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js @@ -44,7 +44,7 @@ export default [ ], }, { - path: "bbac_sa_service", + path: "bbac_sa_detail_service", meta: { type: "page", title: "JIS结算数据明细", @@ -1104,7 +1104,7 @@ export default [ }, children: [ { - path: "pub_sa_service", + path: "jit_pub_sa_service", meta: { type: "page", title: "结算数据", diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/bbac_sa_detail_jobservice.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/bbac_sa_detail_jobservice.js new file mode 100644 index 00000000..2e3946c3 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/contrast/bbac_sa_detail_jobservice.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/bbac_sa_detail_jobservice.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_sa_detail_service.js new file mode 100644 index 00000000..b105d154 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_sa_detail_service.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/jis-bbac/input/bbac_sa_detail_service.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_sa_service.js index 0fdffdb1..b107161e 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_sa_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_sa_service.js @@ -1,6 +1,6 @@ import AppList from "../../../components/list/index.js"; import html from "html"; -import useConfig from "../../../models/bbac_sa_service.js"; +import useConfig from "../../../models/jis-bbac/input/bbac_sa_service.js"; export default { components: { AppList }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_se_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_se_detail_service.js index 5745f56c..4f3509cf 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_se_detail_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_se_detail_service.js @@ -1,6 +1,6 @@ import AppList from "../../../components/list/index.js"; import html from "html"; -import useConfig from "../../../models/bbac_se_detail_service.js"; +import useConfig from "../../../models/jis-bbac/input/bbac_se_detail_service.js"; export default { components: { AppList }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_se_edi_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_se_edi_service.js index ee6c45bd..c016ce76 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_se_edi_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/input/bbac_se_edi_service.js @@ -1,6 +1,6 @@ import AppList from "../../../components/list/index.js"; import html from "html"; -import useConfig from "../../../models/bbac_se_edi_service.js"; +import useConfig from "../../../models/jis-bbac/input/bbac_se_edi_service.js"; export default { components: { AppList }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_ba_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_ba_service.js new file mode 100644 index 00000000..1036ce6a --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_ba_service.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/jis-bbac/settlement/bbac_ba_service.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_can_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_can_sa_detail_service.js new file mode 100644 index 00000000..fa6105de --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_can_sa_detail_service.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/jis-bbac/settlement/bbac_can_sa_detail_service.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_can_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_can_sa_service.js new file mode 100644 index 00000000..66964828 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_can_sa_service.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/jis-bbac/settlement/bbac_can_sa_service.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_not_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_not_sa_service.js new file mode 100644 index 00000000..05a7b3ab --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_not_sa_service.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/jis-bbac/settlement/bbac_not_sa_service.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_pd_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_pd_service.js new file mode 100644 index 00000000..1dfd3f52 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_pd_service.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/jis-bbac/settlement/bbac_pd_service.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/input/hbpo_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/input/hbpo_sa_detail_service.js new file mode 100644 index 00000000..2c199f88 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/input/hbpo_sa_detail_service.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/jis-hbpo/input/hbpo_sa_detail_service.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/input/hbpo_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/input/hbpo_sa_service.js new file mode 100644 index 00000000..257acc24 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/input/hbpo_sa_service.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/jis-hbpo/input/hbpo_sa_service.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/input/hbpo_se_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/input/hbpo_se_detail_service.js new file mode 100644 index 00000000..7d9aacf5 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/input/hbpo_se_detail_service.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/jis-hbpo/input/hbpo_se_detail_service.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/input/hbpo_se_edi_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/input/hbpo_se_edi_service.js new file mode 100644 index 00000000..1e765b3c --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/input/hbpo_se_edi_service.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/jis-hbpo/input/hbpo_se_edi_service.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_ba_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_ba_service.js new file mode 100644 index 00000000..32a39c08 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_ba_service.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/jis-hbpo/settlement/hbpo_ba_service.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_can_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_can_sa_detail_service.js new file mode 100644 index 00000000..53b69b73 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_can_sa_detail_service.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/jis-hbpo/settlement/hbpo_can_sa_detail_service.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_can_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_can_sa_service.js new file mode 100644 index 00000000..fb873877 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_can_sa_service.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/jis-hbpo/settlement/hbpo_can_sa_service.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_not_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_not_sa_service.js new file mode 100644 index 00000000..3af10051 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_not_sa_service.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/jis-hbpo/settlement/hbpo_not_sa_service.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_pd_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_pd_service.js new file mode 100644 index 00000000..ffc87ca6 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_pd_service.js @@ -0,0 +1,15 @@ +import AppList from "../../../components/list/index.js"; +import html from "html"; +import useConfig from "../../../models/jis-hbpo/settlement/hbpo_pd_service.js"; + +export default { + components: { AppList }, + template: html``, + setup() { + const config = useConfig(); + const onCommand = async (item, rows) => { + console.log(item.path, item, rows); + }; + return { config, onCommand }; + }, +}; From ff14c760f749e119981be443b58737f6238a70c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Tue, 18 Jul 2023 17:24:02 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9F=BA=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Bases/BASE_SERVICE.cs | 94 +++++++++++++++++++ .../Bases/BA_SERVICE.cs | 58 ++++++++++-- .../Bases/CAN_SA_SERVICE.cs | 33 +++++-- .../Bases/NOT_SA_SERVICE.cs | 30 ++++-- .../Bases/PD_SERVICE.cs | 33 +++++-- .../Entities/BQ/BBAC_BA_SERVICE.cs | 6 +- .../Entities/BQ/BBAC_CAN_SA_SERVICE.cs | 4 +- .../Entities/BQ/BBAC_NOT_SA_SERVICE.cs | 55 ++++++++++- .../Entities/BQ/BBAC_PD_SERVICE.cs | 3 + .../Entities/BQ/HBPO_CAN_SA_SERVICE.cs | 4 + .../Entities/BQ/HBPO_NOT_SA_SERVICE.cs | 48 +++++++++- .../Entities/BQ/PUB_CAN_SA_SERVICE.cs | 4 + .../Entities/BQ/PUB_NOT_SA_SERVICE.cs | 49 +++++++++- .../SettleAccount.Domain/Bases/EntityBase.cs | 2 - .../Entities/BQ/Managers/CAN_SA_MNG.cs | 13 ++- .../Entities/BQ/PUB_CAN_SA.cs | 6 +- 16 files changed, 402 insertions(+), 40 deletions(-) create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BASE_SERVICE.cs diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BASE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BASE_SERVICE.cs new file mode 100644 index 00000000..7b37206c --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BASE_SERVICE.cs @@ -0,0 +1,94 @@ +using Shouldly; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Application.Services; +using Volo.Abp.Caching; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Domain.Entities; +using Win.Abp.Snowflakes; +using Win.Sfs.BaseData.ImportExcelCommon; +using Win.Sfs.SettleAccount.CommonManagers; +using Win.Sfs.SettleAccount.Constant; +using Win.Sfs.SettleAccount.ExcelImporter; +using Win.Sfs.SettleAccount.ExportReports; + +namespace Win.Sfs.SettleAccount.Bases +{ + + + public abstract class BASE_SERVICE: ApplicationService, ITransientDependency + { + + + protected readonly IExcelImportAppService _excelImportService; + + protected readonly ISnowflakeIdGenerator _snowflakeIdGenerator; + + protected readonly ICommonManager _commonManager; + + protected BASE_SERVICE() { } + + protected BASE_SERVICE( + + IExcelImportAppService excelImportService, + ISnowflakeIdGenerator snowflakeIdGenerator, + ICommonManager commonManager) + { + _excelImportService = excelImportService; + _snowflakeIdGenerator = snowflakeIdGenerator; + _commonManager = commonManager; + + } + + + /// + /// 输出报错信息 + /// + /// + /// + /// + protected async Task ExportErrorReportAsync(List errorList, string fileName = "") + { + //没有信息返回成功 + if (errorList == null || errorList.Count == 0) + { + return ApplicationConsts.SuccessStr; + } + + if (string.IsNullOrEmpty(fileName)) + { + //导出文件名称 + fileName = CommonMethod.GetExcelFileNameByUserID(ApplicationConsts.CheckErroFileName, _snowflakeIdGenerator.Create().ToString(), ApplicationConsts.FileExtension); + } + + errorList = errorList.Distinct().OrderBy(p => p.Type).ThenBy(p => p.Model).ThenBy(p => p.ItemCode).ToList(); + + //声明导出容器 + ExportImporter _exportImporter = new ExportImporter(); + + var result = await _exportImporter.ExcelExporter(errorList); + + result.ShouldNotBeNull(); + + //保存导出文件到服务器存成二进制 + await _excelImportService.SaveBlobAsync( + new SaveExcelImportInputDto + { + Name = fileName, + Content = result + } + ); + return fileName; + } + + + + + } + + + +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs index fd2b86dc..4252da2d 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/BA_SERVICE.cs @@ -15,14 +15,17 @@ using System.Threading.Tasks; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Entities; +using Win.Abp.Snowflakes; using Win.Sfs.BaseData.ImportExcelCommon; using Win.Sfs.SettleAccount.Constant; using Win.Sfs.SettleAccount.Entities.BQ.Dtos; +using Win.Sfs.SettleAccount.ExcelImporter; +using Win.Sfs.SettleAccount.ExportReports; using Win.Sfs.Shared.RepositoryBase; namespace Win.Sfs.SettleAccount.Bases { - public abstract class BA_SERVICE:ApplicationService + public abstract class BA_SERVICE: BASE_SERVICE { private readonly INormalEfCoreRepository _repository; private readonly INormalEfCoreRepository _wRepository; @@ -30,6 +33,7 @@ namespace Win.Sfs.SettleAccount.Bases private readonly INormalEfCoreRepository _mRepository; //private readonly INormalEfCoreRepository _detailRepository; private readonly IExcelImportAppService _excelImportService; + protected BA_SERVICE( INormalEfCoreRepository repository, @@ -37,22 +41,34 @@ namespace Win.Sfs.SettleAccount.Bases INormalEfCoreRepository sRepository, INormalEfCoreRepository mRepository, IExcelImportAppService excelImportService + //INormalEfCoreRepository detailRepository ) { + _excelImportService = excelImportService; _repository = repository; _wRepository = wRepository; _mRepository = mRepository; _sRepository = sRepository; } + + /// + /// 审核发票通过 + /// + /// + /// public virtual async Task GenerateInvoice(INVOICE_GRP_REQ_DTO input) { return ApplicationConsts.SuccessStr; } - + /// + /// 主表查询 + /// + /// 主表查询条件 + /// [HttpPost] //[Route("mainquery")] public virtual async Task> MainQueryAsync(INVOICE_GRP_REQ_DTO input) @@ -62,24 +78,34 @@ namespace Win.Sfs.SettleAccount.Bases var dtos = ObjectMapper.Map, List>(entitys); return new PagedResultDto(totalCount, dtos); } + /// + /// 查询明细明细 + /// + /// 明细查询条件 + /// [HttpPost] public virtual async Task DetailQueryAsync(INVOICE_GRP_REQ_DTO input) { - INVOICE_GRP_DETAIL_DTO _entity=new INVOICE_GRP_DETAIL_DTO(); + INVOICE_GRP_DETAIL_DTO entity=new INVOICE_GRP_DETAIL_DTO(); var m= await _mRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount); var mdtos = ObjectMapper.Map, List>(m); var w=await _wRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount); var wdtos = ObjectMapper.Map, List>(w); var s=await _sRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount); var sdtos = ObjectMapper.Map, List>(s); - _entity.INVOICE_NOT_SETTLE = sdtos; - _entity.INVOICE_WAIT_DETAIL = wdtos; - _entity.INVOICE_MAP_GROUP = mdtos; - return _entity; + entity.INVOICE_NOT_SETTLE = sdtos; + entity.INVOICE_WAIT_DETAIL = wdtos; + entity.INVOICE_MAP_GROUP = mdtos; + return entity; } + /// + /// 导出文件 + /// + /// 主表查询条件 + /// [HttpPost] public virtual async Task ExportAsync(INVOICE_GRP_REQ_DTO input) { @@ -112,11 +138,29 @@ namespace Win.Sfs.SettleAccount.Bases ); return _fileName; } + /// + /// 退回 + /// + /// 主表查询条件 + /// [HttpPost] public virtual async Task RejectAsync(INVOICE_GRP_REQ_DTO input) { + + + return ApplicationConsts.SuccessStr; } + + + + + + protected virtual async Task RuleAsync(INVOICE_GRP_REQ_DTO input) + { + return ApplicationConsts.SuccessStr; + + } } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs index e7ed0eca..d73c2735 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs @@ -17,15 +17,18 @@ using Volo.Abp.Application.Services; using Volo.Abp.Domain.Entities; using Volo.Abp.ObjectMapping; using Volo.Abp.TenantManagement.EntityFrameworkCore; +using Win.Abp.Snowflakes; using Win.Sfs.BaseData.ImportExcelCommon; using Win.Sfs.SettleAccount.Constant; using Win.Sfs.SettleAccount.Entities.BQ; using Win.Sfs.SettleAccount.Entities.BQ.Dtos; +using Win.Sfs.SettleAccount.ExcelImporter; +using Win.Sfs.SettleAccount.ExportReports; using Win.Sfs.Shared.RepositoryBase; namespace Win.Sfs.SettleAccount.Bases { - public abstract class CAN_SA_SERVICE :ApplicationService + public abstract class CAN_SA_SERVICE : BASE_SERVICE where TEntity : class, IEntity where TEntityDetail:SA_CAN_BASE where TEntityDto : class, IEntityDto, new() @@ -38,6 +41,7 @@ namespace Win.Sfs.SettleAccount.Bases private readonly INormalEfCoreRepository _repository; private readonly INormalEfCoreRepository _detailRepository; private readonly IExcelImportAppService _excelImportService; + protected CAN_SA_SERVICE( INormalEfCoreRepository repository, @@ -52,7 +56,11 @@ namespace Win.Sfs.SettleAccount.Bases } - + /// + ///查询明细 + /// + /// 明细查询条件 + /// [HttpPost] //[Route("detailquery")] public virtual async Task> DetailQueryAsync(TRequestDetailInput input) @@ -64,6 +72,11 @@ namespace Win.Sfs.SettleAccount.Bases return new PagedResultDto(totalCount, dtos); } + /// + /// 导出 + /// + /// 明细查询条件 + /// [HttpPost] //[Route("export")] public virtual async Task ExportAsync(TRequestDetailInput input) @@ -99,12 +112,22 @@ namespace Win.Sfs.SettleAccount.Bases ); return _fileName; } + /// + /// 生成发票 + /// + /// 主表查询条件 + /// [HttpPost] //[Route("generateinvoice")] public virtual async Task GenerateInvoice(TRequestMainInput input) { return ApplicationConsts.SuccessStr; } + /// + /// 查询主表 + /// + /// 主表查询条件 + /// [HttpPost] //[Route("mainquery")] public virtual async Task> MainQueryAsync(TRequestMainInput input) @@ -115,11 +138,7 @@ namespace Win.Sfs.SettleAccount.Bases return new PagedResultDto(totalCount, dtos); } - - - - - + } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/NOT_SA_SERVICE.cs index 9a7a4271..f21c0f78 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/NOT_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/NOT_SA_SERVICE.cs @@ -15,14 +15,17 @@ using System.Threading.Tasks; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Entities; +using Win.Abp.Snowflakes; using Win.Sfs.BaseData.ImportExcelCommon; using Win.Sfs.SettleAccount.Constant; using Win.Sfs.SettleAccount.Entities.BQ.Dtos; +using Win.Sfs.SettleAccount.ExcelImporter; +using Win.Sfs.SettleAccount.ExportReports; using Win.Sfs.Shared.RepositoryBase; namespace Win.Sfs.SettleAccount.Bases { - public abstract class NOT_SA_SERVICE : ApplicationService + public abstract class NOT_SA_SERVICE : BASE_SERVICE where TEntityDetail : SA_NOT_BASE @@ -33,8 +36,9 @@ namespace Win.Sfs.SettleAccount.Bases { - private readonly INormalEfCoreRepository _detailRepository; - private readonly IExcelImportAppService _excelImportService; + protected readonly INormalEfCoreRepository _detailRepository; + protected readonly IExcelImportAppService _excelImportService; + protected NOT_SA_SERVICE( @@ -46,7 +50,11 @@ namespace Win.Sfs.SettleAccount.Bases _excelImportService = excelImportService; _detailRepository = detailRepository; } - + /// + /// 查询明细 + /// + /// + /// [HttpPost] //[Route("detailquery")] public virtual async Task> DetailQueryAsync(TRequestDetailInput input) @@ -58,6 +66,11 @@ namespace Win.Sfs.SettleAccount.Bases return new PagedResultDto(totalCount, dtos); } + /// + /// 导出 + /// + /// + /// [HttpPost] //[Route("export")] public virtual async Task ExportAsync(TRequestDetailInput input) @@ -93,12 +106,17 @@ namespace Win.Sfs.SettleAccount.Bases ); return _fileName; } + /// + /// 生成可计算单 + /// + /// + /// [HttpPost] - public virtual async Task GenerateSettlementOrder(HBPO_NOT_SA_DETAIL_REQ_DTO input) + public virtual async Task GenerateSettlementOrder(TRequestDetailInput input) { return ApplicationConsts.SuccessStr; } - + } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs index aaf8b1d7..64b5dc31 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/PD_SERVICE.cs @@ -15,14 +15,17 @@ using System.Threading.Tasks; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Volo.Abp.Domain.Entities; +using Win.Abp.Snowflakes; using Win.Sfs.BaseData.ImportExcelCommon; using Win.Sfs.SettleAccount.Constant; using Win.Sfs.SettleAccount.Entities.BQ.Dtos; +using Win.Sfs.SettleAccount.ExcelImporter; +using Win.Sfs.SettleAccount.ExportReports; using Win.Sfs.Shared.RepositoryBase; namespace Win.Sfs.SettleAccount.Bases { - public class PD_SERVICE : ApplicationService + public class PD_SERVICE : BASE_SERVICE where TEntity : PD_BASE_MAIN where TEntityDetail : PD_BASE where TEntityDto : class, IEntityDto, new() @@ -35,6 +38,7 @@ namespace Win.Sfs.SettleAccount.Bases private readonly INormalEfCoreRepository _repository; private readonly INormalEfCoreRepository _detailRepository; private readonly IExcelImportAppService _excelImportService; + protected PD_SERVICE( INormalEfCoreRepository repository, @@ -50,6 +54,11 @@ namespace Win.Sfs.SettleAccount.Bases } + /// + /// 查询明细 + /// + /// + /// [HttpPost] //[Route("detailquery")] public virtual async Task> DetailQueryAsync(TRequestDetailInput input) @@ -61,6 +70,11 @@ namespace Win.Sfs.SettleAccount.Bases return new PagedResultDto(totalCount, dtos); } + /// + /// 导出 + /// + /// + /// [HttpPost] //[Route("export")] public virtual async Task ExportAsync(TRequestDetailInput input) @@ -102,6 +116,11 @@ namespace Win.Sfs.SettleAccount.Bases { return ApplicationConsts.SuccessStr; } + /// + /// 查询主表 + /// + /// + /// [HttpPost] //[Route("mainquery")] public virtual async Task> MainQueryAsync(TRequestMainInput input) @@ -111,7 +130,11 @@ namespace Win.Sfs.SettleAccount.Bases var dtos = ObjectMapper.Map, List>(entitys); return new PagedResultDto(totalCount, dtos); } - + /// + /// 退回 + /// + /// + /// [HttpPost] public virtual async Task RejectAsync(TRequestMainInput input) { @@ -120,11 +143,7 @@ namespace Win.Sfs.SettleAccount.Bases } - - - - - + diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs index 0845be4e..f875d691 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_BA_SERVICE.cs @@ -14,13 +14,15 @@ using Win.Sfs.Shared.RepositoryBase; namespace Win.Sfs.SettleAccount.Entities.BQ { /// - /// + /// BBAC业务商务审核 /// [AllowAnonymous] [Route("api/settleaccount/bbac_ba_service")] public class BBAC_BA_SERVICE : BA_SERVICE { - public BBAC_BA_SERVICE(INormalEfCoreRepository repository, INormalEfCoreRepository wRepository, INormalEfCoreRepository sRepository, INormalEfCoreRepository mRepository, IExcelImportAppService excelImportService) : base(repository, wRepository, sRepository, mRepository, excelImportService) + public BBAC_BA_SERVICE(INormalEfCoreRepository repository, INormalEfCoreRepository wRepository, + INormalEfCoreRepository sRepository, INormalEfCoreRepository mRepository, IExcelImportAppService excelImportService) + : base(repository, wRepository, sRepository, mRepository, excelImportService) { } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs index 26f082fe..a4a839fa 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_CAN_SA_SERVICE.cs @@ -19,7 +19,9 @@ using Win.Sfs.Shared.RepositoryBase; namespace Win.Sfs.SettleAccount.Entities.BQ { - + /// + /// BBAC-JIS可结算单 + /// [AllowAnonymous] [Route("api/settleaccount/[controller]/[action]")] public class BBAC_CAN_SA_SERVICE : CAN_SA_SERVICE diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs index f01a105e..d2fdfdf4 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_NOT_SA_SERVICE.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Authorization; +using EFCore.BulkExtensions; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using SettleAccount.Domain.BQ; using System; @@ -8,13 +9,19 @@ using System.Text; using System.Threading.Tasks; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; +using Volo.Abp.Domain.Repositories; using Win.Sfs.BaseData.ImportExcelCommon; using Win.Sfs.SettleAccount.Bases; +using Win.Sfs.SettleAccount.Constant; using Win.Sfs.SettleAccount.Entities.BQ.Dtos; using Win.Sfs.Shared.RepositoryBase; namespace Win.Sfs.SettleAccount.Entities.BQ { + + /// + /// BBAC-JIS不可结算单 + /// [AllowAnonymous] [Route("api/settleaccount/[controller]/[action]")] public class BBAC_NOT_SA_SERVICE : NOT_SA_SERVICE @@ -23,8 +30,52 @@ namespace Win.Sfs.SettleAccount.Entities.BQ BBAC_NOT_SA_DETAIL_REQ_DTO, BBAC_NOT_SA_DETAIL_EXP_DTO> { - public BBAC_NOT_SA_SERVICE(IExcelImportAppService excelImportService, INormalEfCoreRepository detailRepository) : base(excelImportService, detailRepository) + public BBAC_NOT_SA_SERVICE( + IExcelImportAppService excelImportService, + INormalEfCoreRepository detailRepository) : base(excelImportService, detailRepository) + { + } + [HttpPost] + public override async Task GenerateSettlementOrder(BBAC_NOT_SA_DETAIL_REQ_DTO input) { + var entitys = await _detailRepository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, input.SkipCount); + + var billNum=OrderNumberGenerator.GenerateOrderNumber("C"); + var bbac = new BBAC_CAN_SA(guid: GuidGenerator.Create(), + version: input.Version, + billNum: billNum, + settleBillNum: string.Empty, + state: SettleBillState.未结状态, + invGroupNum: billNum + ); + + List ls = new List(); + foreach (var entity in entitys) { + + new BBAC_CAN_SA_DETAIL(guid:entity.Id + , keyCode: entity.KeyCode + , version: entity.Version + , billNum: billNum + , settleBillNum: entity.SettleBillNum + , lU: entity.LU + , pN: entity.PN + , site: entity.Site + , qty: entity.Qty + , price: entity.Price + , category: entity.Category + , isReturn: entity.IsReturn + , settleDate: entity.SettleDate + , groupNum: entity.GroupNum + , invGroupNum: entity.InvGroupNum + + ); + } + await _detailRepository.DbContext.BulkInsertAsync(ls); + await _detailRepository.DbContext.BulkDeleteAsync(entitys); + await _detailRepository.DbContext.BulkInsertAsync(new List() { bbac}); + return ApplicationConsts.SuccessStr; } + + } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs index 85c8058b..3e794532 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_PD_SERVICE.cs @@ -14,6 +14,9 @@ using Win.Sfs.Shared.RepositoryBase; namespace Win.Sfs.SettleAccount.Entities.BQ { + /// + /// BBAC寄售库库存扣减审批 + /// [AllowAnonymous] [Route("api/settleaccount/bbac_pd_service")] public class BBAC_PD_SERVICE : PD_SERVICE + /// HBPO-JIS可结算单 + /// [AllowAnonymous] [Route("api/settleaccount/[controller]/[action]")] public class HBPO_CAN_SA_SERVICE : CAN_SA_SERVICE diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_NOT_SA_SERVICE.cs index f00a159e..79901c79 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_NOT_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_NOT_SA_SERVICE.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Authorization; +using EFCore.BulkExtensions; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using SettleAccount.Domain.BQ; @@ -11,11 +12,15 @@ using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Win.Sfs.BaseData.ImportExcelCommon; using Win.Sfs.SettleAccount.Bases; +using Win.Sfs.SettleAccount.Constant; using Win.Sfs.SettleAccount.Entities.BQ.Dtos; using Win.Sfs.Shared.RepositoryBase; namespace Win.Sfs.SettleAccount.Entities.BQ { + /// + /// HBPO-JIS不可结算单 + /// [AllowAnonymous] [Route("api/settleaccount/[controller]/[action]")] public class HBPO_NOT_SA_SERVICE : NOT_SA_SERVICE @@ -26,6 +31,47 @@ namespace Win.Sfs.SettleAccount.Entities.BQ { public HBPO_NOT_SA_SERVICE(IExcelImportAppService excelImportService, INormalEfCoreRepository detailRepository) : base(excelImportService, detailRepository) { + } + public override async Task GenerateSettlementOrder(HBPO_NOT_SA_DETAIL_REQ_DTO input) + { + var entitys = await _detailRepository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, input.SkipCount); + + var billNum = OrderNumberGenerator.GenerateOrderNumber("C"); + var hbpo= new HBPO_CAN_SA(guid: GuidGenerator.Create(), + version: input.Version, + billNum: billNum, + settleBillNum: string.Empty, + state: SettleBillState.未结状态, + invGroupNum: billNum + ); + + List ls = new List(); + foreach (var entity in entitys) + { + + new HBPO_CAN_SA_DETAIL(guid: entity.Id + , keyCode: entity.KeyCode + , version: entity.Version + , billNum: billNum + , settleBillNum: entity.SettleBillNum + , lU: entity.LU + , pN: entity.PN + , site: entity.Site + , qty: entity.Qty + , price: entity.Price + + , settleDate: entity.SettleDate + , groupNum: entity.GroupNum + , invGroupNum: entity.InvGroupNum + + ); + } + await _detailRepository.DbContext.BulkInsertAsync(ls); + await _detailRepository.DbContext.BulkDeleteAsync(entitys); + await _detailRepository.DbContext.BulkInsertAsync(new List() { hbpo}); + return ApplicationConsts.SuccessStr; + + } } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs index d64b7c6a..8fd4eca0 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_CAN_SA_SERVICE.cs @@ -16,6 +16,10 @@ using Win.Sfs.Shared.RepositoryBase; namespace Win.Sfs.SettleAccount.Entities.BQ { + + /// + /// 通用业务可结算单 + /// [AllowAnonymous] [Route("api/settleaccount/[controller]/[action]")] public class PUB_CAN_SA_SERVICE : CAN_SA_SERVICE diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_NOT_SA_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_NOT_SA_SERVICE.cs index b32f22fd..5b486b6f 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_NOT_SA_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_NOT_SA_SERVICE.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Authorization; +using EFCore.BulkExtensions; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using SettleAccount.Domain.BQ; @@ -11,6 +12,7 @@ using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; using Win.Sfs.BaseData.ImportExcelCommon; using Win.Sfs.SettleAccount.Bases; +using Win.Sfs.SettleAccount.Constant; using Win.Sfs.SettleAccount.Entities.BQ.Dtos; using Win.Sfs.Shared.RepositoryBase; @@ -27,5 +29,50 @@ namespace Win.Sfs.SettleAccount.Entities.BQ public PUB_NOT_SA_SERVICE(IExcelImportAppService excelImportService, INormalEfCoreRepository detailRepository) : base(excelImportService, detailRepository) { } + public override async Task GenerateSettlementOrder(PUB_NOT_SA_DETAIL_REQ_DTO input) + { + var entitys = await _detailRepository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, input.SkipCount); + + var billNum = OrderNumberGenerator.GenerateOrderNumber("C"); + var hbpo = new PUB_CAN_SA(guid: GuidGenerator.Create(), + version: input.Version, + billNum: billNum, + settleBillNum: string.Empty, + state: SettleBillState.未结状态, + invGroupNum: billNum, + businessType:entitys.FirstOrDefault().BusinessType + ); + + List ls = new List(); + foreach (var entity in entitys) + { + + new PUB_CAN_SA_DETAIL( + guid: entity.Id + , keyCode: entity.KeyCode + , version: entity.Version + , billNum: billNum + , settleBillNum: entity.SettleBillNum + , lU: entity.LU + , pN: entity.PN + , site: entity.Site + , qty: entity.Qty + , price: entity.Price + ,businessType:entity.BusinessType + + , settleDate: entity.SettleDate + , groupNum: entity.GroupNum + , invGroupNum: entity.InvGroupNum + + ); + } + await _detailRepository.DbContext.BulkInsertAsync(ls); + await _detailRepository.DbContext.BulkDeleteAsync(entitys); + await _detailRepository.DbContext.BulkInsertAsync(new List() { hbpo }); + return ApplicationConsts.SuccessStr; + + } + + } } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs index 37c2c1c5..f1875c55 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs @@ -299,8 +299,6 @@ namespace SettleAccount.Bases public bool IsPriceList { set; get; } - - public BASE_CONF(bool isRelationShip, bool isMaterial, bool isBom) { diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/CAN_SA_MNG.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/CAN_SA_MNG.cs index 891e8607..7d3c514d 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/CAN_SA_MNG.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Managers/CAN_SA_MNG.cs @@ -1,5 +1,6 @@ using EFCore.BulkExtensions; using Hangfire.Annotations; +using Microsoft.EntityFrameworkCore; using SettleAccount.Bases; using System; using System.Collections.Generic; @@ -114,10 +115,10 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers return await SetNewState(p_entiy.BillNum); } - public virtual async Task SetNewState(string billNUm) + public virtual async Task SetNewState(string billNum) { - var ls = _repository.Where(p => p.InvGroupNum == billNUm).ToList(); + var ls = _repository.Where(p => p.InvGroupNum == billNum).ToList(); foreach (var l in ls) { l.State = SettleBillState.未结状态; @@ -126,6 +127,14 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers await _repository.DbContext.BulkReadAsync(ls); return true; } + + public virtual async Task> GetAllList(string billNum) + { + return await _detailRepository.Where(p=>p.InvGroupNum==billNum).ToListAsync(); + } + + + } diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_CAN_SA.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_CAN_SA.cs index e6f27e44..c4543567 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_CAN_SA.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_CAN_SA.cs @@ -31,8 +31,9 @@ public class PUB_CAN_SA : SA_CAN_BASE_MAIN //[Display(Name = "明细记录行数")] //public string InvGroupNum { get; set; } = null!; - public PUB_CAN_SA(int version, string settleBillNum, string billNum, SettleBillState state, EnumBusinessType businessType, string invGroupNum) + public PUB_CAN_SA(Guid guid, int version, string settleBillNum, string billNum, SettleBillState state, EnumBusinessType businessType, string invGroupNum) { + Id = guid; Version = version; SettleBillNum = settleBillNum; BillNum = billNum; @@ -117,8 +118,9 @@ public class PUB_CAN_SA_DETAIL : SA_CAN_BASE //[Display(Name = "结算分组")] //public string GroupNum { get; set; } = null!; - public PUB_CAN_SA_DETAIL(string keyCode, int version, string billNum, string settleBillNum, string lU, string pN, string site, decimal qty, decimal price, string invGroupNum, DateTime settleDate, EnumBusinessType businessType, string groupNum) + public PUB_CAN_SA_DETAIL(Guid guid, string keyCode, int version, string billNum, string settleBillNum, string lU, string pN, string site, decimal qty, decimal price, string invGroupNum, DateTime settleDate, EnumBusinessType businessType, string groupNum) { + Id = guid; KeyCode = keyCode; Version = version; BillNum = billNum;