Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

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

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,
+    },
+  };
+}

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: {

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,
+    },
+  };
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/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/bbac_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,
+    },
+  };
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/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: "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,
+    },
+  };
+}

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,
+    },
+  };
+}

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,
+    },
+  };
+}

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,
+    },
+  };
+}

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,
+    },
+  };
+}

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,
+    },
+  };
+}

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,
+    },
+  };
+}

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,
+    },
+  };
+}

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,
+    },
+  };
+}

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,
+    },
+  };
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_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/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: "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,
+    },
+  };
+}

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,
+    },
+  };
+}

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,
+    },
+  };
+}

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,
+    },
+  };
+}

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,
+    },
+  };
+}

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,
+    },
+  };
+}

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,
+    },
+  };
+}

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,
+    },
+  };
+}

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,
+    },
+  };
+}

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/routes.js

@@ -1,5 +1,6 @@
 import baseDate from "./base-date.js";
 import business from "./business.js";
+
 export default [
   {
     path: "home",

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`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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/jis-bbac/input/bbac_sa_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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/jis-bbac/input/bbac_se_detail_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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/jis-bbac/input/bbac_se_edi_service.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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`<app-list :config="config" @command="onCommand" />`,
+  setup() {
+    const config = useConfig();
+    const onCommand = async (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { config, onCommand };
+  },
+};

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;
+           
+        }
+
+
+        /// <summary>
+        /// 输出报错信息
+        /// </summary>
+        /// <param name="errorList"></param>
+        /// <param name="fileName"></param>
+        /// <returns></returns>
+        protected async Task<string> ExportErrorReportAsync(List<ErrorExportDto> 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;
+        }
+
+
+
+
+    }
+
+
+
+}

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<INVOICE_GRP, Guid> _repository;
         private readonly INormalEfCoreRepository<INVOICE_WAIT_DETAIL, Guid> _wRepository;
@@ -31,28 +34,41 @@ namespace Win.Sfs.SettleAccount.Bases
         //private readonly INormalEfCoreRepository<TEntityDetail, Guid> _detailRepository;
         private readonly IExcelImportAppService _excelImportService;
   
+
         protected BA_SERVICE(
             INormalEfCoreRepository<INVOICE_GRP, Guid> repository,
             INormalEfCoreRepository<INVOICE_WAIT_DETAIL, Guid> wRepository,
             INormalEfCoreRepository<INVOICE_NOT_SETTLE, Guid> sRepository,
             INormalEfCoreRepository<INVOICE_MAP_GROUP, Guid> mRepository,
             IExcelImportAppService excelImportService
+       
             //INormalEfCoreRepository<TEntityDetail, Guid> detailRepository
 
             )
         {
+           
             _excelImportService = excelImportService;
             _repository = repository;
             _wRepository = wRepository;
             _mRepository = mRepository;
             _sRepository = sRepository; 
         }
+
+        /// <summary>
+        /// 审核发票通过
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
         public virtual async Task<string> GenerateInvoice(INVOICE_GRP_REQ_DTO input)
         {
             return ApplicationConsts.SuccessStr;
 
         }
-
+        /// <summary>
+        /// 主表查询
+        /// </summary>
+        /// <param name="input">主表查询条件</param>
+        /// <returns></returns>
         [HttpPost]
         //[Route("mainquery")]
         public virtual async Task<PagedResultDto<INVOICE_GRP_DTO>> MainQueryAsync(INVOICE_GRP_REQ_DTO input)
@@ -62,24 +78,34 @@ namespace Win.Sfs.SettleAccount.Bases
             var dtos = ObjectMapper.Map<List<INVOICE_GRP>, List<INVOICE_GRP_DTO>>(entitys);
             return new PagedResultDto<INVOICE_GRP_DTO>(totalCount, dtos);
         }
+        /// <summary>
+        /// 查询明细明细
+        /// </summary>
+        /// <param name="input">明细查询条件</param>
+        /// <returns></returns>
         [HttpPost]
         public virtual async Task<INVOICE_GRP_DETAIL_DTO> 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<INVOICE_MAP_GROUP>, List<INVOICE_MAP_GROUP_DTO>>(m);
            var w=await _wRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount);
            var wdtos = ObjectMapper.Map<List<INVOICE_WAIT_DETAIL>, List<INVOICE_WAIT_DETAIL_DTO>>(w);
            var s=await _sRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount);
            var sdtos = ObjectMapper.Map<List<INVOICE_NOT_SETTLE>, List<INVOICE_NOT_SETTLE_DTO>>(s);
-            _entity.INVOICE_NOT_SETTLE = sdtos;
+            entity.INVOICE_NOT_SETTLE = sdtos;
-            _entity.INVOICE_WAIT_DETAIL = wdtos;
+            entity.INVOICE_WAIT_DETAIL = wdtos;
-            _entity.INVOICE_MAP_GROUP = mdtos;
+            entity.INVOICE_MAP_GROUP = mdtos;
-            return _entity;
+            return entity;
 
 
         }
+        /// <summary>
+        /// 导出文件
+        /// </summary>
+        /// <param name="input">主表查询条件</param>
+        /// <returns></returns>
         [HttpPost]
         public virtual async Task<string> ExportAsync(INVOICE_GRP_REQ_DTO input)
         {
@@ -112,9 +138,27 @@ namespace Win.Sfs.SettleAccount.Bases
                  );
             return _fileName;
         }
+        /// <summary>
+        /// 退回
+        /// </summary>
+        /// <param name="input">主表查询条件</param>
+        /// <returns></returns>
         [HttpPost]
         public virtual async Task<string> RejectAsync(INVOICE_GRP_REQ_DTO input)
         {
+
+
+
+           return ApplicationConsts.SuccessStr; 
+
+        }
+
+
+     
+
+
+        protected virtual async Task<string> RuleAsync(INVOICE_GRP_REQ_DTO input)
+        {
             return ApplicationConsts.SuccessStr;
 
         }

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<TEntity, TEntityDto, TEntityDetail, TEntityDetailDto, TRequestMainInput, TRequestDetailInput, TEntityDetailExportDto> :ApplicationService
+    public abstract class CAN_SA_SERVICE<TEntity, TEntityDto, TEntityDetail, TEntityDetailDto, TRequestMainInput, TRequestDetailInput, TEntityDetailExportDto> : BASE_SERVICE
         where TEntity : class, IEntity<Guid>
         where TEntityDetail:SA_CAN_BASE
         where TEntityDto : class, IEntityDto<Guid>, new()
@@ -39,6 +42,7 @@ namespace Win.Sfs.SettleAccount.Bases
         private readonly INormalEfCoreRepository<TEntityDetail, Guid> _detailRepository;
         private readonly IExcelImportAppService _excelImportService;
     
+
         protected CAN_SA_SERVICE(
             INormalEfCoreRepository<TEntity, Guid> repository,
             IExcelImportAppService excelImportService,
@@ -52,7 +56,11 @@ namespace Win.Sfs.SettleAccount.Bases
 
 
         }
-
+        /// <summary>
+        ///查询明细 
+        /// </summary>
+        /// <param name="input">明细查询条件</param>
+        /// <returns></returns>
         [HttpPost]
         //[Route("detailquery")]
         public virtual async Task<PagedResultDto<TEntityDetailDto>> DetailQueryAsync(TRequestDetailInput input)
@@ -64,6 +72,11 @@ namespace Win.Sfs.SettleAccount.Bases
             return new PagedResultDto<TEntityDetailDto>(totalCount, dtos);
 
         }
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="input">明细查询条件</param>
+        /// <returns></returns>
         [HttpPost]
         //[Route("export")]
         public virtual async Task<string> ExportAsync(TRequestDetailInput input)
@@ -99,12 +112,22 @@ namespace Win.Sfs.SettleAccount.Bases
                  );
             return _fileName;
         }
+        /// <summary>
+        /// 生成发票
+        /// </summary>
+        /// <param name="input">主表查询条件</param>
+        /// <returns></returns>
         [HttpPost]
         //[Route("generateinvoice")]
         public virtual async Task<string> GenerateInvoice(TRequestMainInput input)
         {
             return ApplicationConsts.SuccessStr;
         }
+        /// <summary>
+        /// 查询主表
+        /// </summary>
+        /// <param name="input">主表查询条件</param>
+        /// <returns></returns>
         [HttpPost]
         //[Route("mainquery")]
         public virtual async Task<PagedResultDto<TEntityDto>> MainQueryAsync(TRequestMainInput input)
@@ -118,9 +141,5 @@ namespace Win.Sfs.SettleAccount.Bases
        
 
 
-
-
-
-
     }
 }

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<TEntityDetail, TEntityDetailDto, TRequestDetailInput, TEntityDetailExportDto> : ApplicationService
+    public abstract class NOT_SA_SERVICE<TEntityDetail, TEntityDetailDto, TRequestDetailInput, TEntityDetailExportDto> : BASE_SERVICE
 
         where TEntityDetail : SA_NOT_BASE
 
@@ -33,8 +36,9 @@ namespace Win.Sfs.SettleAccount.Bases
     {
 
 
-        private readonly INormalEfCoreRepository<TEntityDetail, Guid> _detailRepository;
+        protected readonly INormalEfCoreRepository<TEntityDetail, Guid> _detailRepository;
-        private readonly IExcelImportAppService _excelImportService;
+        protected readonly IExcelImportAppService _excelImportService;
+     
 
         protected NOT_SA_SERVICE(
 
@@ -46,7 +50,11 @@ namespace Win.Sfs.SettleAccount.Bases
             _excelImportService = excelImportService;
             _detailRepository = detailRepository;
         }
-
+        /// <summary>
+        /// 查询明细
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
         [HttpPost]
         //[Route("detailquery")]
         public virtual async Task<PagedResultDto<TEntityDetailDto>> DetailQueryAsync(TRequestDetailInput input)
@@ -58,6 +66,11 @@ namespace Win.Sfs.SettleAccount.Bases
             return new PagedResultDto<TEntityDetailDto>(totalCount, dtos);
 
         }
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
         [HttpPost]
         //[Route("export")]
         public virtual async Task<string> ExportAsync(TRequestDetailInput input)
@@ -93,8 +106,13 @@ namespace Win.Sfs.SettleAccount.Bases
                  );
             return _fileName;
         }
+        /// <summary>
+        /// 生成可计算单
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
         [HttpPost]
-        public virtual async Task<string> GenerateSettlementOrder(HBPO_NOT_SA_DETAIL_REQ_DTO input)
+        public virtual async Task<string> GenerateSettlementOrder(TRequestDetailInput input)
         {
             return  ApplicationConsts.SuccessStr;
         }

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<TEntity, TEntityDto, TEntityDetail, TEntityDetailDto, TRequestMainInput, TRequestDetailInput, TEntityDetailExportDto> : ApplicationService
+    public class PD_SERVICE<TEntity, TEntityDto, TEntityDetail, TEntityDetailDto, TRequestMainInput, TRequestDetailInput, TEntityDetailExportDto> : BASE_SERVICE
         where TEntity : PD_BASE_MAIN
         where TEntityDetail : PD_BASE
         where TEntityDto : class, IEntityDto<Guid>, new()
@@ -36,6 +39,7 @@ namespace Win.Sfs.SettleAccount.Bases
         private readonly INormalEfCoreRepository<TEntityDetail, Guid> _detailRepository;
         private readonly IExcelImportAppService _excelImportService;
        
+
         protected PD_SERVICE(
             INormalEfCoreRepository<TEntity, Guid> repository,
             IExcelImportAppService excelImportService,
@@ -50,6 +54,11 @@ namespace Win.Sfs.SettleAccount.Bases
 
         }
 
+        /// <summary>
+        /// 查询明细
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
         [HttpPost]
         //[Route("detailquery")]
         public virtual async Task<PagedResultDto<TEntityDetailDto>> DetailQueryAsync(TRequestDetailInput input)
@@ -61,6 +70,11 @@ namespace Win.Sfs.SettleAccount.Bases
             return new PagedResultDto<TEntityDetailDto>(totalCount, dtos);
 
         }
+        /// <summary>
+        /// 导出
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
         [HttpPost]
         //[Route("export")]
         public virtual async Task<string> ExportAsync(TRequestDetailInput input)
@@ -102,6 +116,11 @@ namespace Win.Sfs.SettleAccount.Bases
         {
             return ApplicationConsts.SuccessStr;
         }
+        /// <summary>
+        /// 查询主表
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
         [HttpPost]
         //[Route("mainquery")]
         public virtual async Task<PagedResultDto<TEntityDto>> MainQueryAsync(TRequestMainInput input)
@@ -111,7 +130,11 @@ namespace Win.Sfs.SettleAccount.Bases
             var dtos = ObjectMapper.Map<List<TEntity>, List<TEntityDto>>(entitys);
             return new PagedResultDto<TEntityDto>(totalCount, dtos);
         }
-
+        /// <summary>
+        /// 退回
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
         [HttpPost]
         public virtual async Task<string> RejectAsync(TRequestMainInput input)
         {
@@ -129,9 +152,5 @@ namespace Win.Sfs.SettleAccount.Bases
 
 
 
-
-
-
-
     }
 }

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
 {
     /// <summary>
-    /// 
+    /// BBAC业务商务审核
     /// </summary>
     [AllowAnonymous]
     [Route("api/settleaccount/bbac_ba_service")]
     public class BBAC_BA_SERVICE : BA_SERVICE
     {
-        public BBAC_BA_SERVICE(INormalEfCoreRepository<INVOICE_GRP, Guid> repository, INormalEfCoreRepository<INVOICE_WAIT_DETAIL, Guid> wRepository, INormalEfCoreRepository<INVOICE_NOT_SETTLE, Guid> sRepository, INormalEfCoreRepository<INVOICE_MAP_GROUP, Guid> mRepository, IExcelImportAppService excelImportService) : base(repository, wRepository, sRepository, mRepository, excelImportService)
+        public BBAC_BA_SERVICE(INormalEfCoreRepository<INVOICE_GRP, Guid> repository, INormalEfCoreRepository<INVOICE_WAIT_DETAIL, Guid> wRepository,
+            INormalEfCoreRepository<INVOICE_NOT_SETTLE, Guid> sRepository, INormalEfCoreRepository<INVOICE_MAP_GROUP, Guid> mRepository, IExcelImportAppService excelImportService)
+            : base(repository, wRepository, sRepository, mRepository, excelImportService)
         {
         }
     }

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
 {
 
-
+    /// <summary>
+    /// BBAC-JIS可结算单
+    /// </summary>
     [AllowAnonymous]
     [Route("api/settleaccount/[controller]/[action]")]
     public class BBAC_CAN_SA_SERVICE : CAN_SA_SERVICE

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
 {
+
+    /// <summary>
+    /// BBAC-JIS不可结算单
+    /// </summary>
     [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<BBAC_NOT_SA_DETAIL, Guid> detailRepository) : base(excelImportService, detailRepository)
+        public BBAC_NOT_SA_SERVICE(
+            IExcelImportAppService excelImportService,
+            INormalEfCoreRepository<BBAC_NOT_SA_DETAIL, Guid> detailRepository) : base(excelImportService, detailRepository)
+        {
+        }
+        [HttpPost]
+        public override async Task<string> 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<BBAC_CAN_SA_DETAIL> ls = new List<BBAC_CAN_SA_DETAIL>();
+            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_CAN_SA>() { bbac});
+            return ApplicationConsts.SuccessStr;
         }
+
+
     }
 }

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
 {
+    /// <summary>
+    /// BBAC寄售库库存扣减审批
+    /// </summary>
     [AllowAnonymous]
     [Route("api/settleaccount/bbac_pd_service")]
     public class BBAC_PD_SERVICE : PD_SERVICE<BBAC_PD, BBAC_PD_DTO,

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/HBPO_CAN_SA_SERVICE.cs

@@ -16,6 +16,10 @@ using Win.Sfs.Shared.RepositoryBase;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
+
+    /// <summary>
+    /// HBPO-JIS可结算单
+    /// </summary>
     [AllowAnonymous]
     [Route("api/settleaccount/[controller]/[action]")]
     public class HBPO_CAN_SA_SERVICE : CAN_SA_SERVICE

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
 {
+    ///<summary>
+    /// HBPO-JIS不可结算单
+    /// </summary>
     [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<HBPO_NOT_SA_DETAIL, Guid> detailRepository) : base(excelImportService, detailRepository)
         {
+        }
+        public override async Task<string> 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<HBPO_CAN_SA_DETAIL> ls = new List<HBPO_CAN_SA_DETAIL>();
+            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_CAN_SA>() { hbpo});
+            return ApplicationConsts.SuccessStr;
+        
+           
         }
     }
 }

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<string> ApprovalPassed(INVOICE_GRP_REQ_DTO input)
         {
-            return string.Empty;
 
+            return string.Empty;
         }
 
         [HttpPost]

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
 {
+
+    /// <summary>
+    /// 通用业务可结算单
+    /// </summary>
     [AllowAnonymous]
     [Route("api/settleaccount/[controller]/[action]")]
     public class PUB_CAN_SA_SERVICE : CAN_SA_SERVICE

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<PUB_NOT_SA_DETAIL, Guid> detailRepository) : base(excelImportService, detailRepository)
         {
         }
+        public override async Task<string> 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<PUB_CAN_SA_DETAIL> ls = new List<PUB_CAN_SA_DETAIL>();
+            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<PUB_CAN_SA>() { hbpo });
+            return ApplicationConsts.SuccessStr;
+           
+        }
+
+
     }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs

@@ -300,8 +300,6 @@ namespace SettleAccount.Bases
         public bool IsPriceList { set; get; }
 
 
-
-
         public BASE_CONF(bool isRelationShip, bool isMaterial, bool isBom)
         {
             IsRelationShip = isRelationShip;

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;
@@ -109,15 +110,15 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
 
         public virtual async Task<bool> SetNewState(TEntity p_entiy)
         {
-            p_entiy.State = SettleBillState.未结状态;
+            await SetNewState(p_entiy.BillNum);
-            await _repository.UpdateAsync(p_entiy);
+
-            return true;
+            return await SetNewState(p_entiy.BillNum);
         }
 
-        public virtual async Task<bool> SetNewState(string billNUm)
+        public virtual async Task<bool> 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.未结状态;
@@ -127,8 +128,18 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Managers
             return true;
         }
 
+        public virtual async Task<List<TEntityDetail>> GetAllList(string billNum)
+        {
+           return await _detailRepository.Where(p=>p.InvGroupNum==billNum).ToListAsync();
         }
            
+
+
+      
+
+    }
+
+
 }
 
 

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;