From a4b4ae50045698897eb97b812db9cc5272d56214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E6=97=AD=E4=B9=8B?=
<12930972+jiang-xuzhi@user.noreply.gitee.com>
Date: Sat, 22 Jul 2023 09:12:23 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0role?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../models/bj/input/bj_pub_sa_service.js | 7 +-
.../bj/input/bj_pub_se_detail_service.js | 9 +-
.../bj/settlement/bj_pub_ba_detail_service.js | 38 +--
.../settlement/bj_pub_can_detail_service.js | 126 ++++++++++
.../bj/settlement/bj_pub_pd_detail_service.js | 103 +++++++++
.../models/in/input/in_pub_sa_service.js | 7 +-
.../in/input/in_pub_se_detail_service.js | 9 +-
.../in/settlement/in_pub_ba_detail_service.js | 128 +++++++++++
.../in/settlement/in_pub_pd_detail_service.js | 103 +++++++++
.../models/invoice/invoice_not_settle.js | 13 --
.../wwwroot/models/invoice/invoice_service.js | 33 ++-
.../models/jis-bbac/input/bbac_sa_service.js | 7 +-
.../jis-bbac/input/bbac_se_detail_service.js | 17 +-
.../jis-bbac/input/bbac_se_edi_service.js | 29 +--
.../settlement/bbac_ba_detail_service.js | 121 ++++++++++
.../jis-bbac/settlement/bbac_ba_service.js | 21 +-
.../settlement/bbac_can_sa_service.js | 14 +-
.../settlement/bbac_not_sa_service.js | 8 +-
.../settlement/bbac_pd_detail_service.js | 103 +++++++++
.../jis-bbac/settlement/bbac_pd_service.js | 17 +-
.../models/jis-hbpo/input/hbpo_sa_service.js | 7 +-
.../jis-hbpo/input/hbpo_se_detail_service.js | 16 +-
.../jis-hbpo/input/hbpo_se_edi_service.js | 29 +--
.../settlement/hbpo_ba_detail_service.js | 128 +++++++++++
.../jis-hbpo/settlement/hbpo_ba_service.js | 10 +-
.../settlement/hbpo_can_sa_service.js | 9 +-
.../settlement/hbpo_not_sa_service.js | 8 +-
.../settlement/hbpo_pd_detail_service.js | 107 +++++++++
.../jis-hbpo/settlement/hbpo_pd_service.js | 21 +-
.../jit/input/jit_jit_pub_sa_service.js | 7 +-
.../jit/input/jit_pub_se_detail_service.js | 9 +-
.../settlement/jit_pub_ba_detail_service.js | 38 +--
.../jit_pub_can_sa_detail_service.js | 126 ++++++++++
.../settlement/jit_pub_pd_detail_service.js | 103 +++++++++
.../wwwroot/models/job-service.js | 4 +-
.../wwwroot/models/purchase_price_service.js | 6 +-
.../wwwroot/models/role.js | 20 ++
.../wwwroot/models/user.js | 24 +-
.../router/{base-date.js => base-data.js} | 84 +++----
.../wwwroot/router/business.js | 216 +++++++++++++++++-
.../wwwroot/router/routes.js | 4 +-
.../bj/settlement/bj_pub_ba_detail_service.js | 15 ++
.../bj_pub_can_sa_detail_service.js | 2 +-
.../bj/settlement/bj_pub_pd_detail_service.js | 15 ++
.../in/settlement/in_pub_ba_detail_service.js | 15 ++
.../in/settlement/in_pub_pd_detail_service.js | 15 ++
.../settlement/bbac_ba_detail_service.js | 15 ++
.../settlement/bbac_pd_detail_service.js | 15 ++
.../settlement/hbpo_ba_detail_service.js | 15 ++
.../settlement/hbpo_pd_detail_service.js | 15 ++
.../settlement/jit_pub_ba_detail_service.js | 15 ++
.../jit_pub_can_sa_detail_service.js | 2 +-
.../settlement/jit_pub_pd_detail_service.js | 15 ++
53 files changed, 1762 insertions(+), 281 deletions(-)
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/settlement/bj_pub_can_detail_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/settlement/bj_pub_pd_detail_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/settlement/in_pub_ba_detail_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/settlement/in_pub_pd_detail_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_detail_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_detail_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_detail_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_detail_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/settlement/jit_pub_can_sa_detail_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/settlement/jit_pub_pd_detail_service.js
rename code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/{base-date.js => base-data.js} (89%)
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_ba_detail_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_pd_detail_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/settlement/in_pub_ba_detail_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/settlement/in_pub_pd_detail_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_ba_detail_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_pd_detail_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_ba_detail_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_pd_detail_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_ba_detail_service.js
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_pd_detail_service.js
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/input/bj_pub_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/input/bj_pub_sa_service.js
index 79c2422d..1aa64573 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/input/bj_pub_sa_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/input/bj_pub_sa_service.js
@@ -1,7 +1,10 @@
+import version from "../../version.js";
+
const schema = {
title: "JIS结算数据",
type: "object",
properties: {
+ version,
project: {
title: "项目",
type: "string",
@@ -89,8 +92,8 @@ export default function () {
default: [
{
logic: "and",
- column: "project",
- action: "like",
+ column: "version",
+ action: "equal",
value: null,
readOnly: true,
},
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/input/bj_pub_se_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/input/bj_pub_se_detail_service.js
index bd9b82c6..6c5a7ffa 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/input/bj_pub_se_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/input/bj_pub_se_detail_service.js
@@ -1,11 +1,10 @@
+import version from "../../version.js";
+
const schema = {
title: "JIS发运数据",
type: "object",
properties: {
- version: {
- title: "版本",
- type: "string",
- },
+ version,
shippingDate: {
title: "发货时间",
type: "string",
@@ -96,7 +95,7 @@ export default function () {
{
logic: "and",
column: "version",
- action: "like",
+ action: "equal",
value: null,
readOnly: true,
},
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/settlement/bj_pub_ba_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/settlement/bj_pub_ba_detail_service.js
index ffb30b0b..122cf94b 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/settlement/bj_pub_ba_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/settlement/bj_pub_ba_detail_service.js
@@ -1,19 +1,20 @@
+import version from "../../version.js";
+import { state2, state3 } from "../../state.js";
+
const schema = {
- title: "可结算单明细",
+ title: "商务审批",
type: "object",
properties: {
settleBillNum: {
title: "关联结算单号",
- type: "int",
+ type: "string",
},
site: {
title: "工厂地点",
type: "string",
},
- version: {
- title: "版本",
- type: "int",
- },
+ version,
+ state2,
price: {
title: "单价",
type: "decimal",
@@ -22,22 +23,19 @@ const schema = {
title: "结算单号",
type: "string",
},
+
settleDate: {
title: "结算日期",
type: "DateTime",
},
- settleInvGroupNumDate: {
- title: "发票组号",
+ invGroupNum: {
+ title: "发票分组号",
type: "string",
},
lu: {
title: "零件号",
type: "string",
},
- materialDesc: {
- title: "物料描述",
- type: "string",
- },
pn: {
title: "生产号",
type: "string",
@@ -46,18 +44,20 @@ const schema = {
title: "结算数量",
type: "decimal",
},
- groupNumy: {
+ groupNum: {
title: "结算分组号",
type: "string",
},
},
};
-const baseUrl = "settleaccount/hbpo_can_sa_detail_service";
-const queryUrl = `${baseUrl}/get-list`;
+const baseUrl = "settleaccount/bbac_ba_service";
+const queryUrl = `${baseUrl}/main-query`;
const detailsUrl = `${baseUrl}/get/%s`;
+const exportUrl = `${baseUrl}/export`;
const queryMethod = "POST";
const detailsMethod = "POST";
+const exportMethod = "POST";
export default function () {
return {
@@ -66,7 +66,7 @@ export default function () {
method: queryMethod,
hasFilter: true,
schema: {
- title: "发票分组号明细",
+ title: "商务审批",
type: "object",
properties: {
filters: {
@@ -93,8 +93,8 @@ export default function () {
default: [
{
logic: "and",
- column: "billNum",
- action: "like",
+ column: "version",
+ action: "equal",
value: null,
readOnly: true,
},
@@ -119,7 +119,9 @@ export default function () {
},
edit: {
detailsUrl,
+ exportUrl,
detailsMethod,
+ exportMethod,
schema: schema,
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/settlement/bj_pub_can_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/settlement/bj_pub_can_detail_service.js
new file mode 100644
index 00000000..ffb30b0b
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/settlement/bj_pub_can_detail_service.js
@@ -0,0 +1,126 @@
+const schema = {
+ title: "可结算单明细",
+ type: "object",
+ properties: {
+ settleBillNum: {
+ title: "关联结算单号",
+ type: "int",
+ },
+ site: {
+ title: "工厂地点",
+ type: "string",
+ },
+ version: {
+ title: "版本",
+ type: "int",
+ },
+ price: {
+ title: "单价",
+ type: "decimal",
+ },
+ billNum: {
+ title: "结算单号",
+ type: "string",
+ },
+ settleDate: {
+ title: "结算日期",
+ type: "DateTime",
+ },
+ settleInvGroupNumDate: {
+ title: "发票组号",
+ type: "string",
+ },
+ lu: {
+ title: "零件号",
+ type: "string",
+ },
+ materialDesc: {
+ title: "物料描述",
+ type: "string",
+ },
+ pn: {
+ title: "生产号",
+ type: "string",
+ },
+ qty: {
+ title: "结算数量",
+ type: "decimal",
+ },
+ groupNumy: {
+ title: "结算分组号",
+ type: "string",
+ },
+ },
+};
+
+const baseUrl = "settleaccount/hbpo_can_sa_detail_service";
+const queryUrl = `${baseUrl}/get-list`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+
+export default function () {
+ return {
+ query: {
+ url: queryUrl,
+ method: queryMethod,
+ hasFilter: true,
+ schema: {
+ title: "发票分组号明细",
+ type: "object",
+ properties: {
+ filters: {
+ title: "项目",
+ type: "array",
+ hidden: true,
+ items: {
+ type: "object",
+ properties: {
+ logic: {
+ type: "int",
+ },
+ column: {
+ type: "string",
+ },
+ action: {
+ type: "int",
+ },
+ value: {
+ type: "string",
+ },
+ },
+ },
+ default: [
+ {
+ logic: "and",
+ column: "billNum",
+ action: "like",
+ value: null,
+ readOnly: true,
+ },
+ ],
+ },
+ skipCount: {
+ hidden: true,
+ default: 0,
+ },
+ maxResultCount: {
+ hidden: true,
+ default: 10,
+ },
+ sorting: {
+ hidden: true,
+ },
+ },
+ },
+ },
+ table: {
+ schema: schema,
+ },
+ edit: {
+ detailsUrl,
+ detailsMethod,
+ schema: schema,
+ },
+ };
+}
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/settlement/bj_pub_pd_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/settlement/bj_pub_pd_detail_service.js
new file mode 100644
index 00000000..cc8a6143
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/settlement/bj_pub_pd_detail_service.js
@@ -0,0 +1,103 @@
+import version from "../../version.js";
+import { state2, state3 } from "../../state.js";
+
+const schema = {
+ title: "寄售库库存扣减审批",
+ type: "object",
+ properties: {
+ version,
+ state3,
+ 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}/main-query`;
+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: "version",
+ action: "equal",
+ value: null,
+ readOnly: true,
+ },
+ ],
+ },
+ skipCount: {
+ hidden: true,
+ default: 0,
+ },
+ maxResultCount: {
+ hidden: true,
+ default: 10,
+ },
+ sorting: {
+ hidden: true,
+ },
+ },
+ },
+ },
+ table: {
+ schema: schema,
+ },
+ edit: {
+ detailsUrl,
+ exportUrl,
+ detailsMethod,
+ exportMethod,
+ schema: schema,
+ },
+ };
+}
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/input/in_pub_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/input/in_pub_sa_service.js
index 79c2422d..64e06625 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/input/in_pub_sa_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/input/in_pub_sa_service.js
@@ -1,7 +1,10 @@
+import version from "../../version";
+
const schema = {
title: "JIS结算数据",
type: "object",
properties: {
+ version,
project: {
title: "项目",
type: "string",
@@ -89,8 +92,8 @@ export default function () {
default: [
{
logic: "and",
- column: "project",
- action: "like",
+ column: "version",
+ action: "equal",
value: null,
readOnly: true,
},
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/input/in_pub_se_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/input/in_pub_se_detail_service.js
index bd9b82c6..6c5a7ffa 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/input/in_pub_se_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/input/in_pub_se_detail_service.js
@@ -1,11 +1,10 @@
+import version from "../../version.js";
+
const schema = {
title: "JIS发运数据",
type: "object",
properties: {
- version: {
- title: "版本",
- type: "string",
- },
+ version,
shippingDate: {
title: "发货时间",
type: "string",
@@ -96,7 +95,7 @@ export default function () {
{
logic: "and",
column: "version",
- action: "like",
+ action: "equal",
value: null,
readOnly: true,
},
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/settlement/in_pub_ba_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/settlement/in_pub_ba_detail_service.js
new file mode 100644
index 00000000..122cf94b
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/settlement/in_pub_ba_detail_service.js
@@ -0,0 +1,128 @@
+import version from "../../version.js";
+import { state2, state3 } from "../../state.js";
+
+const schema = {
+ title: "商务审批",
+ type: "object",
+ properties: {
+ settleBillNum: {
+ title: "关联结算单号",
+ type: "string",
+ },
+ site: {
+ title: "工厂地点",
+ type: "string",
+ },
+ version,
+ state2,
+ 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}/main-query`;
+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: "version",
+ action: "equal",
+ value: null,
+ readOnly: true,
+ },
+ ],
+ },
+ skipCount: {
+ hidden: true,
+ default: 0,
+ },
+ maxResultCount: {
+ hidden: true,
+ default: 10,
+ },
+ sorting: {
+ hidden: true,
+ },
+ },
+ },
+ },
+ table: {
+ schema: schema,
+ },
+ edit: {
+ detailsUrl,
+ exportUrl,
+ detailsMethod,
+ exportMethod,
+ schema: schema,
+ },
+ };
+}
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/settlement/in_pub_pd_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/settlement/in_pub_pd_detail_service.js
new file mode 100644
index 00000000..cc8a6143
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/settlement/in_pub_pd_detail_service.js
@@ -0,0 +1,103 @@
+import version from "../../version.js";
+import { state2, state3 } from "../../state.js";
+
+const schema = {
+ title: "寄售库库存扣减审批",
+ type: "object",
+ properties: {
+ version,
+ state3,
+ 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}/main-query`;
+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: "version",
+ action: "equal",
+ value: null,
+ readOnly: true,
+ },
+ ],
+ },
+ skipCount: {
+ hidden: true,
+ default: 0,
+ },
+ maxResultCount: {
+ hidden: true,
+ default: 10,
+ },
+ sorting: {
+ hidden: true,
+ },
+ },
+ },
+ },
+ table: {
+ schema: schema,
+ },
+ edit: {
+ detailsUrl,
+ exportUrl,
+ detailsMethod,
+ exportMethod,
+ schema: schema,
+ },
+ };
+}
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_not_settle.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_not_settle.js
index a6375733..2ff73dd0 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_not_settle.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_not_settle.js
@@ -39,21 +39,8 @@ const schema = {
},
};
-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 {
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_service.js
index b02e3578..d3bccdaf 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_service.js
@@ -33,19 +33,16 @@ const schema = {
},
};
-const baseUrl = "settleaccount/invoice_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 exportUrl = `${baseUrl}/export`;
+const queryUrl = "settleaccount/invoice_service/main-query";
+const exportUrl = "settleaccount/invoice_service/export";
+const rejectUrl = "settleaccount/invoice_service/reject";
+const passedUrl = "settleaccount/invoice_service/approval-passed";
+const sync_qadUrl = "settleaccount/invoice_service/sync_qad";
const queryMethod = "POST";
-const detailsMethod = "POST";
-const createMethod = "POST";
-const updateMethod = "POST";
-const deleteMethod = "POST";
const exportMethod = "POST";
+const rejectMethod = "POST";
+const passedMethod = "POST";
+const sync_qadMethod = "POST";
export default function () {
return {
@@ -106,16 +103,14 @@ export default function () {
schema: schema,
},
edit: {
- detailsUrl,
- createUrl,
- updateUrl,
- deleteUrl,
exportUrl,
- detailsMethod,
- createMethod,
- updateMethod,
- deleteMethod,
+ rejectUrl,
+ passedUrl,
+ sync_qadUrl,
exportMethod,
+ rejectMethod,
+ passedMethod,
+ sync_qadMethod,
schema: schema,
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_service.js
index 79c2422d..1aa64573 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_service.js
@@ -1,7 +1,10 @@
+import version from "../../version.js";
+
const schema = {
title: "JIS结算数据",
type: "object",
properties: {
+ version,
project: {
title: "项目",
type: "string",
@@ -89,8 +92,8 @@ export default function () {
default: [
{
logic: "and",
- column: "project",
- action: "like",
+ column: "version",
+ action: "equal",
value: null,
readOnly: true,
},
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_detail_service.js
index bd9b82c6..bbf49107 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_detail_service.js
@@ -1,11 +1,10 @@
+import version from "../../version.js";
+
const schema = {
title: "JIS发运数据",
type: "object",
properties: {
- version: {
- title: "版本",
- type: "string",
- },
+ version,
shippingDate: {
title: "发货时间",
type: "string",
@@ -54,11 +53,11 @@ const schema = {
const baseUrl = "settleaccount/bbac_se_detail_service";
const queryUrl = `${baseUrl}/get-list`;
// const deleteUrl = `${baseUrl}/delete-list`;
-const importUrl = `${baseUrl}/import`;
+// const importUrl = `${baseUrl}/import`;
const exportUrl = `${baseUrl}/export`;
const queryMethod = "POST";
// const deleteMethod = "POST";
-const importMethod = "POST";
+// const importMethod = "POST";
const exportMethod = "POST";
export default function () {
@@ -96,7 +95,7 @@ export default function () {
{
logic: "and",
column: "version",
- action: "like",
+ action: "equal",
value: null,
readOnly: true,
},
@@ -121,10 +120,10 @@ export default function () {
},
edit: {
// deleteUrl,
- importUrl,
+ // importUrl,
exportUrl,
// deleteMethod,
- importMethod,
+ // importMethod,
exportMethod,
schema: schema,
},
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_edi_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_edi_service.js
index 0397c726..6704a25c 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_edi_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_edi_service.js
@@ -1,3 +1,5 @@
+import version from "../../version.js";
+
const schema = {
title: "EDI数据",
type: "object",
@@ -6,10 +8,7 @@ const schema = {
title: "LU+生产码",
type: "string",
},
- version: {
- title: "期间",
- type: "string",
- },
+ version,
lu: {
title: "零件号",
type: "string",
@@ -49,18 +48,8 @@ const schema = {
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 () {
@@ -98,7 +87,7 @@ export default function () {
{
logic: "and",
column: "version",
- action: "like",
+ action: "equal",
value: null,
readOnly: true,
},
@@ -122,17 +111,7 @@ export default function () {
schema: schema,
},
edit: {
- detailsUrl,
- createUrl,
- updateUrl,
- deleteUrl,
- importUrl,
exportUrl,
- detailsMethod,
- createMethod,
- updateMethod,
- deleteMethod,
- importMethod,
exportMethod,
schema: schema,
},
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_detail_service.js
new file mode 100644
index 00000000..93e86844
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_detail_service.js
@@ -0,0 +1,121 @@
+import version from "../../version.js";
+import { state2, state3 } from "../../state.js";
+
+const schema = {
+ title: "商务审批",
+ type: "object",
+ properties: {
+ settleBillNum: {
+ title: "关联结算单号",
+ type: "string",
+ },
+ site: {
+ title: "工厂地点",
+ type: "string",
+ },
+ version,
+ state2,
+ 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 queryUrl = "settleaccount/b-bAC_BA_SERVICE/detail-query";
+const queryMethod = "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: "version",
+ action: "equal",
+ value: null,
+ readOnly: true,
+ },
+ ],
+ },
+ skipCount: {
+ hidden: true,
+ default: 0,
+ },
+ maxResultCount: {
+ hidden: true,
+ default: 10,
+ },
+ sorting: {
+ hidden: true,
+ },
+ },
+ },
+ },
+ table: {
+ schema: schema,
+ },
+ edit: {
+ queryUrl,
+ queryMethod,
+ schema: schema,
+ },
+ };
+}
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_service.js
index 122cf94b..a7921488 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_service.js
@@ -51,13 +51,16 @@ const schema = {
},
};
-const baseUrl = "settleaccount/bbac_ba_service";
-const queryUrl = `${baseUrl}/main-query`;
-const detailsUrl = `${baseUrl}/get/%s`;
-const exportUrl = `${baseUrl}/export`;
+const queryUrl = "settleaccount/b-bAC_BA_SERVICE/main-query";
+const exportUrl = "settleaccount/b-bAC_BA_SERVICE/export";
+const invoiceUrl = "settleaccount/b-bAC_BA_SERVICE/generate-invoice";
+const rejectUrl = "settleaccount/b-bAC_BA_SERVICE/reject";
+const receivedUrl = "/api/settleaccount/h-bPO_BA_SERVICE/received";
const queryMethod = "POST";
-const detailsMethod = "POST";
const exportMethod = "POST";
+const invoiceMethod = "POST";
+const rejectMethod = "POST";
+const receivedMethod = "POST";
export default function () {
return {
@@ -118,10 +121,14 @@ export default function () {
schema: schema,
},
edit: {
- detailsUrl,
exportUrl,
- detailsMethod,
+ invoiceUrl,
+ rejectUrl,
+ receivedUrl,
exportMethod,
+ invoiceMethod,
+ rejectMethod,
+ receivedMethod,
schema: schema,
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_service.js
index ae1fd61e..b2ef7804 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_service.js
@@ -22,13 +22,12 @@ const schema = {
},
};
-const baseUrl = "settleaccount/bbac_can_sa_service";
-const queryUrl = `${baseUrl}/main-query`;
-const detailsUrl = `${baseUrl}/get/%s`;
-const exportUrl = `${baseUrl}/export`;
+const queryUrl = "settleaccount/bbac_can_sa_service/main-query";
+const exportUrl = "settleaccount/bbac_can_sa_service/export";
+const invoiceUrl = "settleaccount/bbac_can_sa_service/generate-invoice";
const queryMethod = "POST";
-const detailsMethod = "POST";
const exportMethod = "POST";
+const invoiceMethod = "POST";
export default function () {
return {
@@ -89,11 +88,10 @@ export default function () {
schema: schema,
},
edit: {
- detailsUrl,
exportUrl,
- detailsMethod,
+ invoiceUrl,
exportMethod,
-
+ invoiceMethod,
schema: schema,
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_not_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_not_sa_service.js
index 40ca61a5..3c7a882b 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_not_sa_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_not_sa_service.js
@@ -51,11 +51,11 @@ const schema = {
const baseUrl = "settleaccount/bbac_not_sa_service";
const queryUrl = `${baseUrl}/detail-query`;
-const detailsUrl = `${baseUrl}/get/%s`;
const exportUrl = `${baseUrl}/export`;
+const settlementUrl="settleaccount/bbac_not_sa_service/generate-settlement-order";
const queryMethod = "POST";
-const detailsMethod = "POST";
const exportMethod = "POST";
+const settlementMethod = "POST";
export default function () {
return {
@@ -116,10 +116,10 @@ export default function () {
schema: schema,
},
edit: {
- detailsUrl,
exportUrl,
- detailsMethod,
+ settlementUrl,
exportMethod,
+ settlementMethod,
schema: schema,
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_detail_service.js
new file mode 100644
index 00000000..cc8a6143
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_detail_service.js
@@ -0,0 +1,103 @@
+import version from "../../version.js";
+import { state2, state3 } from "../../state.js";
+
+const schema = {
+ title: "寄售库库存扣减审批",
+ type: "object",
+ properties: {
+ version,
+ state3,
+ 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}/main-query`;
+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: "version",
+ action: "equal",
+ value: null,
+ readOnly: true,
+ },
+ ],
+ },
+ skipCount: {
+ hidden: true,
+ default: 0,
+ },
+ maxResultCount: {
+ hidden: true,
+ default: 10,
+ },
+ sorting: {
+ hidden: true,
+ },
+ },
+ },
+ },
+ table: {
+ schema: schema,
+ },
+ edit: {
+ detailsUrl,
+ exportUrl,
+ detailsMethod,
+ exportMethod,
+ schema: schema,
+ },
+ };
+}
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_service.js
index 9169500b..2eb92152 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_service.js
@@ -26,13 +26,14 @@ const schema = {
},
};
-const baseUrl = "settleaccount/bbac_pd_service";
-const queryUrl = `${baseUrl}/main-query`;
-const detailsUrl = `${baseUrl}/get/%s`;
-const exportUrl = `${baseUrl}/export`;
+const queryUrl = "settleaccount/b-bAC_PD_SERVICE/main-query";
+const exportUrl = "settleaccount/b-bAC_PD_SERVICE/export";
+const rejectUrl = "settleaccount/b-bAC_PD_SERVICE/reject";
+const passedUrl = "settleaccount/b-bAC_PD_SERVICE/approval-passed"
const queryMethod = "POST";
-const detailsMethod = "POST";
const exportMethod = "POST";
+const rejectMethod = "POST";
+const passedMethod = "POST";
export default function () {
return {
@@ -93,10 +94,12 @@ export default function () {
schema: schema,
},
edit: {
- detailsUrl,
exportUrl,
- detailsMethod,
+ rejectUrl,
+ passedUrl,
exportMethod,
+ rejectMethod,
+ passedMethod,
schema: schema,
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_service.js
index 0ebd39a2..89b4f191 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_service.js
@@ -1,7 +1,10 @@
+import version from "../../version.js";
+
const schema = {
title: "JIS结算数据",
type: "object",
properties: {
+ version,
project: {
title: "项目",
type: "string",
@@ -89,8 +92,8 @@ export default function () {
default: [
{
logic: "and",
- column: "project",
- action: "like",
+ column: "version",
+ action: "equal",
value: null,
readOnly: true,
},
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js
index 4be68061..b4fb0856 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js
@@ -1,11 +1,10 @@
+import version from "../../version.js";
+
const schema = {
title: "JIS发运数据",
type: "object",
properties: {
- version: {
- title: "版本",
- type: "string",
- },
+ version,
shippingDate: {
title: "发货时间",
type: "string",
@@ -53,12 +52,8 @@ const schema = {
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 () {
@@ -96,7 +91,7 @@ export default function () {
{
logic: "and",
column: "version",
- action: "like",
+ action: "equal",
value: null,
readOnly: true,
},
@@ -120,11 +115,8 @@ export default function () {
schema: schema,
},
edit: {
- // deleteUrl,
importUrl,
exportUrl,
- // deleteMethod,
- importMethod,
exportMethod,
schema: schema,
},
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_edi_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_edi_service.js
index 4226e69e..c86609a5 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_edi_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_edi_service.js
@@ -1,3 +1,5 @@
+import version from "../../version.js";
+
const schema = {
title: "EDI数据",
type: "object",
@@ -6,10 +8,7 @@ const schema = {
title: "LU+生产码",
type: "string",
},
- version: {
- title: "期间",
- type: "string",
- },
+ version,
lu: {
title: "零件号",
type: "string",
@@ -49,18 +48,8 @@ const schema = {
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 () {
@@ -98,7 +87,7 @@ export default function () {
{
logic: "and",
column: "version",
- action: "like",
+ action: "equal",
value: null,
readOnly: true,
},
@@ -122,17 +111,7 @@ export default function () {
schema: schema,
},
edit: {
- detailsUrl,
- createUrl,
- updateUrl,
- deleteUrl,
- importUrl,
exportUrl,
- detailsMethod,
- createMethod,
- updateMethod,
- deleteMethod,
- importMethod,
exportMethod,
schema: schema,
},
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_detail_service.js
new file mode 100644
index 00000000..39b28e44
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_detail_service.js
@@ -0,0 +1,128 @@
+import version from "../../version.js";
+import { state2, state3 } from "../../state.js";
+
+const schema = {
+ title: "不可结算单",
+ type: "object",
+ properties: {
+ state2,
+ settleBillNum: {
+ title: "关联结算单号",
+ type: "string",
+ },
+ site: {
+ title: "工厂地点",
+ type: "string",
+ },
+ version,
+ 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}/main-query`;
+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: "version",
+ action: "equal",
+ value: null,
+ readOnly: true,
+ },
+ ],
+ },
+ skipCount: {
+ hidden: true,
+ default: 0,
+ },
+ maxResultCount: {
+ hidden: true,
+ default: 10,
+ },
+ sorting: {
+ hidden: true,
+ },
+ },
+ },
+ },
+ table: {
+ schema: schema,
+ },
+ edit: {
+ detailsUrl,
+ exportUrl,
+ detailsMethod,
+ exportMethod,
+ schema: schema,
+ },
+ };
+}
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_service.js
index 39b28e44..eb4fe7a7 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_service.js
@@ -51,13 +51,17 @@ const schema = {
},
};
-const baseUrl = "settleaccount/hbpo_ba_service";
+const baseUrl = "settleaccount/h-bPO_BA_SERVICE";
const queryUrl = `${baseUrl}/main-query`;
const detailsUrl = `${baseUrl}/get/%s`;
const exportUrl = `${baseUrl}/export`;
+const invoiceUrl = "settleaccount/h-bPO_BA_SERVICE/generate-invoice";
+const receivedUrl = "settleaccount/h-bPO_BA_SERVICE/received";
const queryMethod = "POST";
const detailsMethod = "POST";
const exportMethod = "POST";
+const invoiceMethod = "POST";
+const receivedMethod = "POST";
export default function () {
return {
@@ -120,8 +124,12 @@ export default function () {
edit: {
detailsUrl,
exportUrl,
+ invoiceUrl,
+ receivedUrl,
detailsMethod,
exportMethod,
+ invoiceMethod,
+ receivedMethod,
schema: schema,
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_service.js
index e22d081a..0f05c2af 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_service.js
@@ -24,11 +24,12 @@ const schema = {
const baseUrl = "settleaccount/hbpo_can_sa_service";
const queryUrl = `${baseUrl}/main-query`;
-const detailsUrl = `${baseUrl}/get/%s`;
const exportUrl = `${baseUrl}/export`;
+const invoiceUrl="settleaccount/hbpo_can_sa_service/generate-invoice";
+
const queryMethod = "POST";
-const detailsMethod = "POST";
const exportMethod = "POST";
+const invoiceMethod="POST";
export default function () {
return {
@@ -89,10 +90,10 @@ export default function () {
schema: schema,
},
edit: {
- detailsUrl,
exportUrl,
- detailsMethod,
+ invoiceUrl,
exportMethod,
+ invoiceMethod,
schema: schema,
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_not_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_not_sa_service.js
index eb2e743e..bf569f16 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_not_sa_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_not_sa_service.js
@@ -51,11 +51,11 @@ const schema = {
const baseUrl = "settleaccount/bbac_not_sa_service";
const queryUrl = `${baseUrl}/main-query`;
-const detailsUrl = `${baseUrl}/get/%s`;
const exportUrl = `${baseUrl}/export`;
+const settlementUrl = "settleaccount/hbpo_not_sa_service/generate-settlement-order";
const queryMethod = "POST";
-const detailsMethod = "POST";
const exportMethod = "POST";
+const settlementMethod = "POST";
export default function () {
return {
@@ -116,10 +116,10 @@ export default function () {
schema: schema,
},
edit: {
- detailsUrl,
exportUrl,
- detailsMethod,
+ settlementUrl,
exportMethod,
+ settlementMethod,
schema: schema,
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_detail_service.js
new file mode 100644
index 00000000..0fc79ca2
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_detail_service.js
@@ -0,0 +1,107 @@
+import version from "../../version.js";
+import { state2, state3 } from "../../state.js";
+
+const schema = {
+ title: "寄售库库存扣减审批",
+ type: "object",
+ properties: {
+ version,
+ state3,
+ 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: "version",
+ action: "equal",
+ value: null,
+ readOnly: true,
+ },
+ ],
+ },
+ skipCount: {
+ hidden: true,
+ default: 0,
+ },
+ maxResultCount: {
+ hidden: true,
+ default: 10,
+ },
+ sorting: {
+ hidden: true,
+ },
+ },
+ },
+ },
+ table: {
+ schema: schema,
+ },
+ edit: {
+ detailsUrl,
+ exportUrl,
+ detailsMethod,
+ exportMethod,
+ schema: schema,
+ },
+ };
+}
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_service.js
index 0fc79ca2..f23feb31 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_service.js
@@ -26,17 +26,14 @@ const schema = {
},
};
-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 queryUrl = "settleaccount/h-bPO_PD_SERVICE/get-list";
+const exportUrl = "settleaccount/h-bPO_PD_SERVICE/export";
+const passedUrl = "settleaccount/h-bPO_PD_SERVICE/approval-passed";
+const rejectUrl = "settleaccount/h-bPO_PD_SERVICE/reject";
const queryMethod = "POST";
-const detailsMethod = "POST";
const exportMethod = "POST";
+const passedMethod = "POST";
+const rejectMethod="POST";
export default function () {
return {
@@ -97,10 +94,12 @@ export default function () {
schema: schema,
},
edit: {
- detailsUrl,
exportUrl,
- detailsMethod,
+ passedUrl,
+ rejectUrl,
exportMethod,
+ passedMethod,
+ rejectMethod,
schema: schema,
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/input/jit_jit_pub_sa_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/input/jit_jit_pub_sa_service.js
index 79c2422d..1aa64573 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/input/jit_jit_pub_sa_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/input/jit_jit_pub_sa_service.js
@@ -1,7 +1,10 @@
+import version from "../../version.js";
+
const schema = {
title: "JIS结算数据",
type: "object",
properties: {
+ version,
project: {
title: "项目",
type: "string",
@@ -89,8 +92,8 @@ export default function () {
default: [
{
logic: "and",
- column: "project",
- action: "like",
+ column: "version",
+ action: "equal",
value: null,
readOnly: true,
},
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/input/jit_pub_se_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/input/jit_pub_se_detail_service.js
index bd9b82c6..6c5a7ffa 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/input/jit_pub_se_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/input/jit_pub_se_detail_service.js
@@ -1,11 +1,10 @@
+import version from "../../version.js";
+
const schema = {
title: "JIS发运数据",
type: "object",
properties: {
- version: {
- title: "版本",
- type: "string",
- },
+ version,
shippingDate: {
title: "发货时间",
type: "string",
@@ -96,7 +95,7 @@ export default function () {
{
logic: "and",
column: "version",
- action: "like",
+ action: "equal",
value: null,
readOnly: true,
},
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/settlement/jit_pub_ba_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/settlement/jit_pub_ba_detail_service.js
index ffb30b0b..122cf94b 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/settlement/jit_pub_ba_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/settlement/jit_pub_ba_detail_service.js
@@ -1,19 +1,20 @@
+import version from "../../version.js";
+import { state2, state3 } from "../../state.js";
+
const schema = {
- title: "可结算单明细",
+ title: "商务审批",
type: "object",
properties: {
settleBillNum: {
title: "关联结算单号",
- type: "int",
+ type: "string",
},
site: {
title: "工厂地点",
type: "string",
},
- version: {
- title: "版本",
- type: "int",
- },
+ version,
+ state2,
price: {
title: "单价",
type: "decimal",
@@ -22,22 +23,19 @@ const schema = {
title: "结算单号",
type: "string",
},
+
settleDate: {
title: "结算日期",
type: "DateTime",
},
- settleInvGroupNumDate: {
- title: "发票组号",
+ invGroupNum: {
+ title: "发票分组号",
type: "string",
},
lu: {
title: "零件号",
type: "string",
},
- materialDesc: {
- title: "物料描述",
- type: "string",
- },
pn: {
title: "生产号",
type: "string",
@@ -46,18 +44,20 @@ const schema = {
title: "结算数量",
type: "decimal",
},
- groupNumy: {
+ groupNum: {
title: "结算分组号",
type: "string",
},
},
};
-const baseUrl = "settleaccount/hbpo_can_sa_detail_service";
-const queryUrl = `${baseUrl}/get-list`;
+const baseUrl = "settleaccount/bbac_ba_service";
+const queryUrl = `${baseUrl}/main-query`;
const detailsUrl = `${baseUrl}/get/%s`;
+const exportUrl = `${baseUrl}/export`;
const queryMethod = "POST";
const detailsMethod = "POST";
+const exportMethod = "POST";
export default function () {
return {
@@ -66,7 +66,7 @@ export default function () {
method: queryMethod,
hasFilter: true,
schema: {
- title: "发票分组号明细",
+ title: "商务审批",
type: "object",
properties: {
filters: {
@@ -93,8 +93,8 @@ export default function () {
default: [
{
logic: "and",
- column: "billNum",
- action: "like",
+ column: "version",
+ action: "equal",
value: null,
readOnly: true,
},
@@ -119,7 +119,9 @@ export default function () {
},
edit: {
detailsUrl,
+ exportUrl,
detailsMethod,
+ exportMethod,
schema: schema,
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/settlement/jit_pub_can_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/settlement/jit_pub_can_sa_detail_service.js
new file mode 100644
index 00000000..ffb30b0b
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/settlement/jit_pub_can_sa_detail_service.js
@@ -0,0 +1,126 @@
+const schema = {
+ title: "可结算单明细",
+ type: "object",
+ properties: {
+ settleBillNum: {
+ title: "关联结算单号",
+ type: "int",
+ },
+ site: {
+ title: "工厂地点",
+ type: "string",
+ },
+ version: {
+ title: "版本",
+ type: "int",
+ },
+ price: {
+ title: "单价",
+ type: "decimal",
+ },
+ billNum: {
+ title: "结算单号",
+ type: "string",
+ },
+ settleDate: {
+ title: "结算日期",
+ type: "DateTime",
+ },
+ settleInvGroupNumDate: {
+ title: "发票组号",
+ type: "string",
+ },
+ lu: {
+ title: "零件号",
+ type: "string",
+ },
+ materialDesc: {
+ title: "物料描述",
+ type: "string",
+ },
+ pn: {
+ title: "生产号",
+ type: "string",
+ },
+ qty: {
+ title: "结算数量",
+ type: "decimal",
+ },
+ groupNumy: {
+ title: "结算分组号",
+ type: "string",
+ },
+ },
+};
+
+const baseUrl = "settleaccount/hbpo_can_sa_detail_service";
+const queryUrl = `${baseUrl}/get-list`;
+const detailsUrl = `${baseUrl}/get/%s`;
+const queryMethod = "POST";
+const detailsMethod = "POST";
+
+export default function () {
+ return {
+ query: {
+ url: queryUrl,
+ method: queryMethod,
+ hasFilter: true,
+ schema: {
+ title: "发票分组号明细",
+ type: "object",
+ properties: {
+ filters: {
+ title: "项目",
+ type: "array",
+ hidden: true,
+ items: {
+ type: "object",
+ properties: {
+ logic: {
+ type: "int",
+ },
+ column: {
+ type: "string",
+ },
+ action: {
+ type: "int",
+ },
+ value: {
+ type: "string",
+ },
+ },
+ },
+ default: [
+ {
+ logic: "and",
+ column: "billNum",
+ action: "like",
+ value: null,
+ readOnly: true,
+ },
+ ],
+ },
+ skipCount: {
+ hidden: true,
+ default: 0,
+ },
+ maxResultCount: {
+ hidden: true,
+ default: 10,
+ },
+ sorting: {
+ hidden: true,
+ },
+ },
+ },
+ },
+ table: {
+ schema: schema,
+ },
+ edit: {
+ detailsUrl,
+ detailsMethod,
+ schema: schema,
+ },
+ };
+}
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/settlement/jit_pub_pd_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/settlement/jit_pub_pd_detail_service.js
new file mode 100644
index 00000000..cc8a6143
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/settlement/jit_pub_pd_detail_service.js
@@ -0,0 +1,103 @@
+import version from "../../version.js";
+import { state2, state3 } from "../../state.js";
+
+const schema = {
+ title: "寄售库库存扣减审批",
+ type: "object",
+ properties: {
+ version,
+ state3,
+ 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}/main-query`;
+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: "version",
+ action: "equal",
+ value: null,
+ readOnly: true,
+ },
+ ],
+ },
+ skipCount: {
+ hidden: true,
+ default: 0,
+ },
+ maxResultCount: {
+ hidden: true,
+ default: 10,
+ },
+ sorting: {
+ hidden: true,
+ },
+ },
+ },
+ },
+ table: {
+ schema: schema,
+ },
+ edit: {
+ detailsUrl,
+ exportUrl,
+ detailsMethod,
+ exportMethod,
+ schema: schema,
+ },
+ };
+}
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js
index 1b13d9be..d1615950 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js
@@ -13,7 +13,7 @@ const stateName = {
};
const schema = {
- title: "期间设置",
+ title: "数据对比",
type: "object",
properties: {
type: {
@@ -58,7 +58,7 @@ export default function () {
autoSubmit: true,
disableQueryOnLoad: true,
schema: {
- title: "期间设置",
+ title: "数据对比",
type: "object",
properties: {
type: Object.assign({ defaultSelected: true }, version),
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/purchase_price_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/purchase_price_service.js
index 89046f11..d4db01c9 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/purchase_price_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/purchase_price_service.js
@@ -14,9 +14,9 @@ const schema = {
};
const baseUrl = "settleaccount/purchase_price_service";
-const queryUrl = `${baseUrl}/get-list`;
-const importUrl = `${baseUrl}/import`;
-const exportUrl = `${baseUrl}/export`;
+const queryUrl = "settleaccount/purchase_price_service/get-list";
+const importUrl = "settleaccount/purchase_price_service/import";
+const exportUrl = "settleaccount/purchase_price_service/export";
const queryMethod = "POST";
const importMethod = "POST";
const exportMethod = "POST";
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/role.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/role.js
index e65832bb..5cc19d7c 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/role.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/role.js
@@ -19,6 +19,15 @@ const schema = {
},
};
+const queryUrl = "identity/roles";
+const deletetUrl = "identity/roles/{id}";
+const updateUrl = "identity/roles/{id}";
+const createUrl = "identity/roles/{id}";
+const queryMethod = "GET";
+const deletetMethod = "DELETE";
+const updateMethod = "PUT";
+const createMethod = "GET";
+
export default function () {
return {
query: {
@@ -46,5 +55,16 @@ export default function () {
table: {
schema: schema,
},
+ edit: {
+ queryUrl,
+ deletetUrl,
+ updateUrl,
+ createUrl,
+ queryMethod,
+ deletetMethod,
+ updateMethod,
+ createMethod,
+ schema: schema,
+ },
};
}
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/user.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/user.js
index 38e10fb0..600b21cf 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/user.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/user.js
@@ -64,18 +64,18 @@ const schema = {
{ pattern: "^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+.[a-zA-Z0-9_-]+$", message: "%s必须是正确的格式" },
],
},
- // roleNames: {
- // title: "角色",
- // type: "array",
- // input: "select",
- // multiple: true,
- // url: "identity/roles/all",
- // value: "name",
- // label: "name",
- // items: {
- // type: "string",
- // },
- // },
+ roleNames: {
+ title: "角色",
+ type: "array",
+ input: "select",
+ multiple: true,
+ url: "identity/roles/all",
+ value: "name",
+ label: "name",
+ items: {
+ type: "string",
+ },
+ },
},
};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-date.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js
similarity index 89%
rename from code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-date.js
rename to code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js
index 5ab67712..6c28eba4 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-date.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js
@@ -67,48 +67,48 @@ export default [
},
],
},
- // {
- // path: "role",
- // meta: {
- // type: "page",
- // title: "角色管理",
- // icon: "file",
- // permission: "AbpIdentity.Users",
- // },
- // children: [
- // {
- // path: "create",
- // meta: {
- // type: "button",
- // title: "新建",
- // icon: "file",
- // permission: "AbpIdentity.Users.Create",
- // isTop: true,
- // },
- // },
- // {
- // path: "update",
- // meta: {
- // type: "button",
- // title: "编辑",
- // icon: "file",
- // htmlClass: "el-button--primary",
- // permission: "AbpIdentity.Users.Update",
- // disabled: `(o) => o.isStatic`,
- // },
- // },
- // {
- // path: "delete",
- // meta: {
- // type: "button",
- // title: "删除",
- // icon: "file",
- // permission: "AbpIdentity.Users.Delete",
- // disabled: `(o) => o.isStatic`,
- // },
- // },
- // ],
- // },
+ {
+ path: "role",
+ meta: {
+ type: "page",
+ title: "角色管理",
+ icon: "file",
+ permission: "AbpIdentity.Users",
+ },
+ children: [
+ {
+ path: "create",
+ meta: {
+ type: "button",
+ title: "新建",
+ icon: "file",
+ permission: "AbpIdentity.Users.Create",
+ isTop: true,
+ },
+ },
+ {
+ path: "update",
+ meta: {
+ type: "button",
+ title: "编辑",
+ icon: "file",
+ htmlClass: "el-button--primary",
+ permission: "AbpIdentity.Users.Update",
+ disabled: `(o) => o.isStatic`,
+ },
+ },
+ {
+ path: "delete",
+ meta: {
+ type: "button",
+ title: "删除",
+ icon: "file",
+ permission: "AbpIdentity.Users.Delete",
+ disabled: `(o) => o.isStatic`,
+ },
+ },
+ ],
+ },
{
path: "material",
meta: {
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
index 8283ae50..201bb4c9 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
@@ -399,7 +399,7 @@ export default [
},
},
{
- path: "generateInvoice",
+ path: "invoice",
meta: {
type: "button",
title: "生成发票数据",
@@ -458,7 +458,7 @@ export default [
},
},
{
- path: "generateSettlementOrder",
+ path: "settlement",
meta: {
type: "button",
title: "生成可结算单",
@@ -517,6 +517,26 @@ export default [
},
],
},
+ {
+ path: "bbac_ba_detail_service",
+ meta: {
+ type: "page",
+ title: "商务审核明细",
+ icon: "file",
+ isHidden: true,
+ },
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ ],
+ },
{
path: "bbac_pd_service",
meta: {
@@ -554,7 +574,7 @@ export default [
},
},
{
- path: "approvalPassed ",
+ path: "passed ",
meta: {
type: "button",
title: "审核通过",
@@ -565,6 +585,26 @@ export default [
},
],
},
+ {
+ path: "bbac_pd_detail_service",
+ meta: {
+ type: "page",
+ title: "寄售库库存扣减审批明细",
+ icon: "file",
+ isHidden: true,
+ },
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ ],
+ },
],
},
],
@@ -938,7 +978,7 @@ export default [
path: "hbpo_can_sa_detail_service",
meta: {
type: "page",
- title: "HBPO发票分组号明细",
+ title: "HBPO可结算单明细",
icon: "file",
isHidden: true,
},
@@ -982,7 +1022,7 @@ export default [
},
},
{
- path: "generateSettlementOrder",
+ path: "settlement",
meta: {
type: "button",
title: "生成可结算单",
@@ -1041,6 +1081,26 @@ export default [
},
],
},
+ {
+ path: "hbpo_ba_detail_service",
+ meta: {
+ type: "page",
+ title: "商务审批明细",
+ icon: "file",
+ isHidden: true,
+ },
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ ],
+ },
{
path: "hbpo_pd_service",
meta: {
@@ -1078,7 +1138,7 @@ export default [
},
},
{
- path: "approvalPassed ",
+ path: "passed ",
meta: {
type: "button",
title: "审核通过",
@@ -1089,6 +1149,26 @@ export default [
},
],
},
+ {
+ path: "hbpo_pd_detail_service",
+ meta: {
+ type: "page",
+ title: "寄售库库存扣减审批明细",
+ icon: "file",
+ isHidden: true,
+ },
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ ],
+ },
],
},
],
@@ -1471,6 +1551,26 @@ export default [
},
],
},
+ {
+ path: "jit_pub_ba_detail_service",
+ meta: {
+ type: "page",
+ title: "商务审批明细",
+ icon: "file",
+ isHidden: true,
+ },
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ ],
+ },
{
path: "jit_pub_pd_service",
meta: {
@@ -1519,6 +1619,26 @@ export default [
},
],
},
+ {
+ path: "jit_pub_pd_detail_service",
+ meta: {
+ type: "page",
+ title: "寄售库库存扣减审批明细",
+ icon: "file",
+ isHidden: true,
+ },
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ ],
+ },
],
},
],
@@ -1901,6 +2021,26 @@ export default [
},
],
},
+ {
+ path: "bj_pub_ba_detail_service",
+ meta: {
+ type: "page",
+ title: "商务审批明细",
+ icon: "file",
+ isHidden: true,
+ },
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ ],
+ },
{
path: "bj_pub_pd_service",
meta: {
@@ -1949,6 +2089,26 @@ export default [
},
],
},
+ {
+ path: "bj_pub_pd_detail_service",
+ meta: {
+ type: "page",
+ title: "寄售库库存扣减审批明细",
+ icon: "file",
+ isHidden: true,
+ },
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ ],
+ },
],
},
],
@@ -2331,6 +2491,26 @@ export default [
},
],
},
+ {
+ path: "in_pub_ba_detail_service",
+ meta: {
+ type: "page",
+ title: "商务审批明细",
+ icon: "file",
+ isHidden: true,
+ },
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ ],
+ },
{
path: "in_pub_pd_service",
meta: {
@@ -2379,6 +2559,26 @@ export default [
},
],
},
+ {
+ path: "in_pub_pd_detail_service",
+ meta: {
+ type: "page",
+ title: "寄售库库存扣减审批明细",
+ icon: "file",
+ isHidden: true,
+ },
+ children: [
+ {
+ path: "query",
+ meta: {
+ type: "button",
+ title: "查询",
+ icon: "file",
+ isTop: true,
+ },
+ },
+ ],
+ },
],
},
],
@@ -2429,7 +2629,7 @@ export default [
},
},
{
- path: "approvalPassed ",
+ path: "passed ",
meta: {
type: "button",
title: "审核通过",
@@ -2439,7 +2639,7 @@ export default [
},
},
{
- path: "sync_QAD ",
+ path: "sync_qad ",
meta: {
type: "button",
title: "同步寄售库至QAD",
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/routes.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/routes.js
index 0b7b43cb..991fd6e7 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/routes.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/routes.js
@@ -1,4 +1,4 @@
-import baseDate from "./base-date.js";
+import baseData from "./base-data.js";
import business from "./business.js";
export default [
@@ -11,6 +11,6 @@ export default [
public: true,
},
},
- ...baseDate,
+ ...baseData,
...business,
];
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_ba_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_ba_detail_service.js
new file mode 100644
index 00000000..7d04bb09
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_ba_detail_service.js
@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/bj/settlement/bj_pub_ba_detail_service.js";
+
+export default {
+ components: { AppList },
+ template: html``,
+ setup() {
+ const config = useConfig();
+ const onCommand = async (item, rows) => {
+ console.log(item.path, item, rows);
+ };
+ return { config, onCommand };
+ },
+};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_can_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_can_sa_detail_service.js
index 7d04bb09..abf4dd9e 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_can_sa_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_can_sa_detail_service.js
@@ -1,6 +1,6 @@
import AppList from "../../../components/list/index.js";
import html from "html";
-import useConfig from "../../../models/bj/settlement/bj_pub_ba_detail_service.js";
+import useConfig from "../../../models/bj/settlement/bj_pub_can_detail_service.js";
export default {
components: { AppList },
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_pd_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_pd_detail_service.js
new file mode 100644
index 00000000..0e6ae867
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_pd_detail_service.js
@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/bj/settlement/bj_pub_pd_detail_service.js";
+
+export default {
+ components: { AppList },
+ template: html``,
+ setup() {
+ const config = useConfig();
+ const onCommand = async (item, rows) => {
+ console.log(item.path, item, rows);
+ };
+ return { config, onCommand };
+ },
+};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/settlement/in_pub_ba_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/settlement/in_pub_ba_detail_service.js
new file mode 100644
index 00000000..12c571fc
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/settlement/in_pub_ba_detail_service.js
@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/in/settlement/in_pub_ba_detail_service.js";
+
+export default {
+ components: { AppList },
+ template: html``,
+ setup() {
+ const config = useConfig();
+ const onCommand = async (item, rows) => {
+ console.log(item.path, item, rows);
+ };
+ return { config, onCommand };
+ },
+};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/settlement/in_pub_pd_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/settlement/in_pub_pd_detail_service.js
new file mode 100644
index 00000000..62515ada
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/settlement/in_pub_pd_detail_service.js
@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/in/settlement/in_pub_pd_detail_service.js";
+
+export default {
+ components: { AppList },
+ template: html``,
+ setup() {
+ const config = useConfig();
+ const onCommand = async (item, rows) => {
+ console.log(item.path, item, rows);
+ };
+ return { config, onCommand };
+ },
+};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_ba_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_ba_detail_service.js
new file mode 100644
index 00000000..cc418a00
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_ba_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_ba_detail_service.js";
+
+export default {
+ components: { AppList },
+ template: html``,
+ setup() {
+ const config = useConfig();
+ const onCommand = async (item, rows) => {
+ console.log(item.path, item, rows);
+ };
+ return { config, onCommand };
+ },
+};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_pd_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_pd_detail_service.js
new file mode 100644
index 00000000..d2d37e06
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_pd_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_pd_detail_service.js";
+
+export default {
+ components: { AppList },
+ template: html``,
+ setup() {
+ const config = useConfig();
+ const onCommand = async (item, rows) => {
+ console.log(item.path, item, rows);
+ };
+ return { config, onCommand };
+ },
+};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_ba_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_ba_detail_service.js
new file mode 100644
index 00000000..d44638b7
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_ba_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_ba_detail_service.js";
+
+export default {
+ components: { AppList },
+ template: html``,
+ setup() {
+ const config = useConfig();
+ const onCommand = async (item, rows) => {
+ console.log(item.path, item, rows);
+ };
+ return { config, onCommand };
+ },
+};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_pd_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_pd_detail_service.js
new file mode 100644
index 00000000..8b95a341
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_pd_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_pd_detail_service.js";
+
+export default {
+ components: { AppList },
+ template: html``,
+ setup() {
+ const config = useConfig();
+ const onCommand = async (item, rows) => {
+ console.log(item.path, item, rows);
+ };
+ return { config, onCommand };
+ },
+};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_ba_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_ba_detail_service.js
new file mode 100644
index 00000000..85a7c6a7
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_ba_detail_service.js
@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/jit/settlement/jit_pub_ba_detail_service";
+
+export default {
+ components: { AppList },
+ template: html``,
+ setup() {
+ const config = useConfig();
+ const onCommand = async (item, rows) => {
+ console.log(item.path, item, rows);
+ };
+ return { config, onCommand };
+ },
+};
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_can_sa_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_can_sa_detail_service.js
index c3d9b615..575e5916 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_can_sa_detail_service.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_can_sa_detail_service.js
@@ -1,6 +1,6 @@
import AppList from "../../../components/list/index.js";
import html from "html";
-import useConfig from "../../../models/jit/settlement/jit_pub_ba_detail_service.js";
+import useConfig from "../../../models/jit/settlement/jit_pub_can_sa_detail_service";
export default {
components: { AppList },
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_pd_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_pd_detail_service.js
new file mode 100644
index 00000000..5bb56929
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_pd_detail_service.js
@@ -0,0 +1,15 @@
+import AppList from "../../../components/list/index.js";
+import html from "html";
+import useConfig from "../../../models/jit/settlement/jit_pub_pd_detail_service.js";
+
+export default {
+ components: { AppList },
+ template: html``,
+ setup() {
+ const config = useConfig();
+ const onCommand = async (item, rows) => {
+ console.log(item.path, item, rows);
+ };
+ return { config, onCommand };
+ },
+};
From d96c02c1c90ec17c35e03d5d5300e7f70adfdc5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com>
Date: Sat, 22 Jul 2023 09:57:36 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E5=90=88bin=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../20230721063310_20230721.Designer.cs | 1055 ++++
.../Migrations/20230721063310_20230721.cs | 621 +++
.../AuthServerDbContextModelSnapshot.cs | 1053 ++++
.../Entities/BQ/BBAC_CAN_SA_SERVICE.cs | 30 +-
.../Entities/BQ/HBPO_CAN_SA_SERVICE.cs | 97 +-
.../Entities/BQ/INVOICE_SERVICE.cs | 6 -
.../Entities/BQ/BBAC_SEC_DETAIL.cs | 155 +
.../Entities/BQ/HBPO_SEC_DETAIL.cs | 156 +
.../Entities/BQ/Managers/INV_MNG.cs | 2 +-
.../Entities/BQ/PUB_SEC_DETAIL.cs | 155 +
...AccountDbContextModelCreatingExtensions.cs | 78 +-
.../20230721063549_20230721.Designer.cs | 4442 ++++++++++++++++
.../Migrations/20230721063549_20230721.cs | 217 +
.../20230722013448_20230722.Designer.cs | 4442 ++++++++++++++++
.../Migrations/20230722013448_20230722.cs | 34 +
.../20230722015432_202307220002.Designer.cs | 4550 +++++++++++++++++
.../Migrations/20230722015432_202307220002.cs | 73 +
.../SettleAccountDbContextModelSnapshot.cs | 157 +-
18 files changed, 17281 insertions(+), 42 deletions(-)
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20230721063310_20230721.Designer.cs
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20230721063310_20230721.cs
create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/AuthServerDbContextModelSnapshot.cs
create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SEC_DETAIL.cs
create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SEC_DETAIL.cs
create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SEC_DETAIL.cs
create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230721063549_20230721.Designer.cs
create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230721063549_20230721.cs
create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230722013448_20230722.Designer.cs
create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230722013448_20230722.cs
create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230722015432_202307220002.Designer.cs
create mode 100644 code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230722015432_202307220002.cs
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20230721063310_20230721.Designer.cs b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20230721063310_20230721.Designer.cs
new file mode 100644
index 00000000..92d6de57
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20230721063310_20230721.Designer.cs
@@ -0,0 +1,1055 @@
+//
+using System;
+using AuthServer.Host.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Volo.Abp.EntityFrameworkCore;
+
+namespace Win.Sfs.SettleAccount.Migrations
+{
+ [DbContext(typeof(AuthServerDbContext))]
+ [Migration("20230721063310_20230721")]
+ partial class _20230721
+ {
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.SqlServer)
+ .HasAnnotation("Relational:MaxIdentifierLength", 128)
+ .HasAnnotation("ProductVersion", "5.0.8")
+ .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResource", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("AllowedAccessTokenSigningAlgorithms")
+ .HasMaxLength(100)
+ .HasColumnType("nvarchar(100)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("nvarchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("Description")
+ .HasMaxLength(1000)
+ .HasColumnType("nvarchar(1000)");
+
+ b.Property("DisplayName")
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.Property("Enabled")
+ .HasColumnType("bit");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.Property("ShowInDiscoveryDocument")
+ .HasColumnType("bit");
+
+ b.HasKey("Id");
+
+ b.ToTable("IdentityServerApiResources");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceClaim", b =>
+ {
+ b.Property("ApiResourceId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Type")
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.HasKey("ApiResourceId", "Type");
+
+ b.ToTable("IdentityServerApiResourceClaims");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceProperty", b =>
+ {
+ b.Property("ApiResourceId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Key")
+ .HasMaxLength(250)
+ .HasColumnType("nvarchar(250)");
+
+ b.Property("Value")
+ .HasMaxLength(2000)
+ .HasColumnType("nvarchar(2000)");
+
+ b.HasKey("ApiResourceId", "Key", "Value");
+
+ b.ToTable("IdentityServerApiResourceProperties");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceScope", b =>
+ {
+ b.Property("ApiResourceId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Scope")
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.HasKey("ApiResourceId", "Scope");
+
+ b.ToTable("IdentityServerApiResourceScopes");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceSecret", b =>
+ {
+ b.Property("ApiResourceId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Type")
+ .HasMaxLength(250)
+ .HasColumnType("nvarchar(250)");
+
+ b.Property("Value")
+ .HasMaxLength(4000)
+ .HasColumnType("nvarchar(4000)");
+
+ b.Property("Description")
+ .HasMaxLength(1000)
+ .HasColumnType("nvarchar(1000)");
+
+ b.Property("Expiration")
+ .HasColumnType("datetime2");
+
+ b.HasKey("ApiResourceId", "Type", "Value");
+
+ b.ToTable("IdentityServerApiResourceSecrets");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.ApiScopes.ApiScope", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("nvarchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("Description")
+ .HasMaxLength(1000)
+ .HasColumnType("nvarchar(1000)");
+
+ b.Property("DisplayName")
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.Property("Emphasize")
+ .HasColumnType("bit");
+
+ b.Property("Enabled")
+ .HasColumnType("bit");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.Property("Required")
+ .HasColumnType("bit");
+
+ b.Property("ShowInDiscoveryDocument")
+ .HasColumnType("bit");
+
+ b.HasKey("Id");
+
+ b.ToTable("IdentityServerApiScopes");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.ApiScopes.ApiScopeClaim", b =>
+ {
+ b.Property("ApiScopeId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Type")
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.HasKey("ApiScopeId", "Type");
+
+ b.ToTable("IdentityServerApiScopeClaims");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.ApiScopes.ApiScopeProperty", b =>
+ {
+ b.Property("ApiScopeId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Key")
+ .HasMaxLength(250)
+ .HasColumnType("nvarchar(250)");
+
+ b.Property("Value")
+ .HasMaxLength(2000)
+ .HasColumnType("nvarchar(2000)");
+
+ b.HasKey("ApiScopeId", "Key", "Value");
+
+ b.ToTable("IdentityServerApiScopeProperties");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.Client", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("AbsoluteRefreshTokenLifetime")
+ .HasColumnType("int");
+
+ b.Property("AccessTokenLifetime")
+ .HasColumnType("int");
+
+ b.Property("AccessTokenType")
+ .HasColumnType("int");
+
+ b.Property("AllowAccessTokensViaBrowser")
+ .HasColumnType("bit");
+
+ b.Property("AllowOfflineAccess")
+ .HasColumnType("bit");
+
+ b.Property("AllowPlainTextPkce")
+ .HasColumnType("bit");
+
+ b.Property("AllowRememberConsent")
+ .HasColumnType("bit");
+
+ b.Property("AllowedIdentityTokenSigningAlgorithms")
+ .HasMaxLength(100)
+ .HasColumnType("nvarchar(100)");
+
+ b.Property("AlwaysIncludeUserClaimsInIdToken")
+ .HasColumnType("bit");
+
+ b.Property("AlwaysSendClientClaims")
+ .HasColumnType("bit");
+
+ b.Property("AuthorizationCodeLifetime")
+ .HasColumnType("int");
+
+ b.Property("BackChannelLogoutSessionRequired")
+ .HasColumnType("bit");
+
+ b.Property("BackChannelLogoutUri")
+ .HasMaxLength(2000)
+ .HasColumnType("nvarchar(2000)");
+
+ b.Property("ClientClaimsPrefix")
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.Property("ClientId")
+ .IsRequired()
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.Property("ClientName")
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.Property("ClientUri")
+ .HasMaxLength(2000)
+ .HasColumnType("nvarchar(2000)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("nvarchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("ConsentLifetime")
+ .HasColumnType("int");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("Description")
+ .HasMaxLength(1000)
+ .HasColumnType("nvarchar(1000)");
+
+ b.Property("DeviceCodeLifetime")
+ .HasColumnType("int");
+
+ b.Property("EnableLocalLogin")
+ .HasColumnType("bit");
+
+ b.Property("Enabled")
+ .HasColumnType("bit");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("FrontChannelLogoutSessionRequired")
+ .HasColumnType("bit");
+
+ b.Property("FrontChannelLogoutUri")
+ .HasMaxLength(2000)
+ .HasColumnType("nvarchar(2000)");
+
+ b.Property("IdentityTokenLifetime")
+ .HasColumnType("int");
+
+ b.Property("IncludeJwtId")
+ .HasColumnType("bit");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("LogoUri")
+ .HasMaxLength(2000)
+ .HasColumnType("nvarchar(2000)");
+
+ b.Property("PairWiseSubjectSalt")
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.Property("ProtocolType")
+ .IsRequired()
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.Property("RefreshTokenExpiration")
+ .HasColumnType("int");
+
+ b.Property("RefreshTokenUsage")
+ .HasColumnType("int");
+
+ b.Property("RequireClientSecret")
+ .HasColumnType("bit");
+
+ b.Property("RequireConsent")
+ .HasColumnType("bit");
+
+ b.Property("RequirePkce")
+ .HasColumnType("bit");
+
+ b.Property("RequireRequestObject")
+ .HasColumnType("bit");
+
+ b.Property("SlidingRefreshTokenLifetime")
+ .HasColumnType("int");
+
+ b.Property("UpdateAccessTokenClaimsOnRefresh")
+ .HasColumnType("bit");
+
+ b.Property("UserCodeType")
+ .HasMaxLength(100)
+ .HasColumnType("nvarchar(100)");
+
+ b.Property("UserSsoLifetime")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ClientId");
+
+ b.ToTable("IdentityServerClients");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientClaim", b =>
+ {
+ b.Property("ClientId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Type")
+ .HasMaxLength(250)
+ .HasColumnType("nvarchar(250)");
+
+ b.Property("Value")
+ .HasMaxLength(250)
+ .HasColumnType("nvarchar(250)");
+
+ b.HasKey("ClientId", "Type", "Value");
+
+ b.ToTable("IdentityServerClientClaims");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientCorsOrigin", b =>
+ {
+ b.Property("ClientId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Origin")
+ .HasMaxLength(150)
+ .HasColumnType("nvarchar(150)");
+
+ b.HasKey("ClientId", "Origin");
+
+ b.ToTable("IdentityServerClientCorsOrigins");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientGrantType", b =>
+ {
+ b.Property("ClientId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("GrantType")
+ .HasMaxLength(250)
+ .HasColumnType("nvarchar(250)");
+
+ b.HasKey("ClientId", "GrantType");
+
+ b.ToTable("IdentityServerClientGrantTypes");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientIdPRestriction", b =>
+ {
+ b.Property("ClientId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Provider")
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.HasKey("ClientId", "Provider");
+
+ b.ToTable("IdentityServerClientIdPRestrictions");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientPostLogoutRedirectUri", b =>
+ {
+ b.Property("ClientId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("PostLogoutRedirectUri")
+ .HasMaxLength(2000)
+ .HasColumnType("nvarchar(2000)");
+
+ b.HasKey("ClientId", "PostLogoutRedirectUri");
+
+ b.ToTable("IdentityServerClientPostLogoutRedirectUris");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientProperty", b =>
+ {
+ b.Property("ClientId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Key")
+ .HasMaxLength(250)
+ .HasColumnType("nvarchar(250)");
+
+ b.Property("Value")
+ .HasMaxLength(2000)
+ .HasColumnType("nvarchar(2000)");
+
+ b.HasKey("ClientId", "Key", "Value");
+
+ b.ToTable("IdentityServerClientProperties");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientRedirectUri", b =>
+ {
+ b.Property("ClientId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("RedirectUri")
+ .HasMaxLength(2000)
+ .HasColumnType("nvarchar(2000)");
+
+ b.HasKey("ClientId", "RedirectUri");
+
+ b.ToTable("IdentityServerClientRedirectUris");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientScope", b =>
+ {
+ b.Property("ClientId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Scope")
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.HasKey("ClientId", "Scope");
+
+ b.ToTable("IdentityServerClientScopes");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientSecret", b =>
+ {
+ b.Property("ClientId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Type")
+ .HasMaxLength(250)
+ .HasColumnType("nvarchar(250)");
+
+ b.Property("Value")
+ .HasMaxLength(4000)
+ .HasColumnType("nvarchar(4000)");
+
+ b.Property("Description")
+ .HasMaxLength(2000)
+ .HasColumnType("nvarchar(2000)");
+
+ b.Property("Expiration")
+ .HasColumnType("datetime2");
+
+ b.HasKey("ClientId", "Type", "Value");
+
+ b.ToTable("IdentityServerClientSecrets");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.Devices.DeviceFlowCodes", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("ClientId")
+ .IsRequired()
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("nvarchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("Data")
+ .IsRequired()
+ .HasMaxLength(50000)
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Description")
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.Property("DeviceCode")
+ .IsRequired()
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.Property("Expiration")
+ .IsRequired()
+ .HasColumnType("datetime2");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("SessionId")
+ .HasMaxLength(100)
+ .HasColumnType("nvarchar(100)");
+
+ b.Property("SubjectId")
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.Property("UserCode")
+ .IsRequired()
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.HasKey("Id");
+
+ b.HasIndex("DeviceCode")
+ .IsUnique();
+
+ b.HasIndex("Expiration");
+
+ b.HasIndex("UserCode");
+
+ b.ToTable("IdentityServerDeviceFlowCodes");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.Grants.PersistedGrant", b =>
+ {
+ b.Property("Key")
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.Property("ClientId")
+ .IsRequired()
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("nvarchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("ConsumedTime")
+ .HasColumnType("datetime2");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2");
+
+ b.Property("Data")
+ .IsRequired()
+ .HasMaxLength(50000)
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Description")
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.Property("Expiration")
+ .HasColumnType("datetime2");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("Id")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("SessionId")
+ .HasMaxLength(100)
+ .HasColumnType("nvarchar(100)");
+
+ b.Property("SubjectId")
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.Property("Type")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.HasKey("Key");
+
+ b.HasIndex("Expiration");
+
+ b.HasIndex("SubjectId", "ClientId", "Type");
+
+ b.HasIndex("SubjectId", "SessionId", "Type");
+
+ b.ToTable("IdentityServerPersistedGrants");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityResource", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("nvarchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property("CreationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("CreationTime");
+
+ b.Property("CreatorId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("CreatorId");
+
+ b.Property("DeleterId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("DeleterId");
+
+ b.Property("DeletionTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("DeletionTime");
+
+ b.Property("Description")
+ .HasMaxLength(1000)
+ .HasColumnType("nvarchar(1000)");
+
+ b.Property("DisplayName")
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.Property("Emphasize")
+ .HasColumnType("bit");
+
+ b.Property("Enabled")
+ .HasColumnType("bit");
+
+ b.Property("ExtraProperties")
+ .HasColumnType("nvarchar(max)")
+ .HasColumnName("ExtraProperties");
+
+ b.Property("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bit")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property("LastModificationTime")
+ .HasColumnType("datetime2")
+ .HasColumnName("LastModificationTime");
+
+ b.Property("LastModifierId")
+ .HasColumnType("uniqueidentifier")
+ .HasColumnName("LastModifierId");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.Property("Required")
+ .HasColumnType("bit");
+
+ b.Property("ShowInDiscoveryDocument")
+ .HasColumnType("bit");
+
+ b.HasKey("Id");
+
+ b.ToTable("IdentityServerIdentityResources");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityResourceClaim", b =>
+ {
+ b.Property("IdentityResourceId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Type")
+ .HasMaxLength(200)
+ .HasColumnType("nvarchar(200)");
+
+ b.HasKey("IdentityResourceId", "Type");
+
+ b.ToTable("IdentityServerIdentityResourceClaims");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityResourceProperty", b =>
+ {
+ b.Property("IdentityResourceId")
+ .HasColumnType("uniqueidentifier");
+
+ b.Property("Key")
+ .HasMaxLength(250)
+ .HasColumnType("nvarchar(250)");
+
+ b.Property("Value")
+ .HasMaxLength(2000)
+ .HasColumnType("nvarchar(2000)");
+
+ b.HasKey("IdentityResourceId", "Key", "Value");
+
+ b.ToTable("IdentityServerIdentityResourceProperties");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceClaim", b =>
+ {
+ b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource", null)
+ .WithMany("UserClaims")
+ .HasForeignKey("ApiResourceId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceProperty", b =>
+ {
+ b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource", null)
+ .WithMany("Properties")
+ .HasForeignKey("ApiResourceId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceScope", b =>
+ {
+ b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource", null)
+ .WithMany("Scopes")
+ .HasForeignKey("ApiResourceId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResourceSecret", b =>
+ {
+ b.HasOne("Volo.Abp.IdentityServer.ApiResources.ApiResource", null)
+ .WithMany("Secrets")
+ .HasForeignKey("ApiResourceId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.ApiScopes.ApiScopeClaim", b =>
+ {
+ b.HasOne("Volo.Abp.IdentityServer.ApiScopes.ApiScope", null)
+ .WithMany("UserClaims")
+ .HasForeignKey("ApiScopeId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.ApiScopes.ApiScopeProperty", b =>
+ {
+ b.HasOne("Volo.Abp.IdentityServer.ApiScopes.ApiScope", null)
+ .WithMany("Properties")
+ .HasForeignKey("ApiScopeId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientClaim", b =>
+ {
+ b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null)
+ .WithMany("Claims")
+ .HasForeignKey("ClientId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientCorsOrigin", b =>
+ {
+ b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null)
+ .WithMany("AllowedCorsOrigins")
+ .HasForeignKey("ClientId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientGrantType", b =>
+ {
+ b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null)
+ .WithMany("AllowedGrantTypes")
+ .HasForeignKey("ClientId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientIdPRestriction", b =>
+ {
+ b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null)
+ .WithMany("IdentityProviderRestrictions")
+ .HasForeignKey("ClientId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientPostLogoutRedirectUri", b =>
+ {
+ b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null)
+ .WithMany("PostLogoutRedirectUris")
+ .HasForeignKey("ClientId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientProperty", b =>
+ {
+ b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null)
+ .WithMany("Properties")
+ .HasForeignKey("ClientId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientRedirectUri", b =>
+ {
+ b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null)
+ .WithMany("RedirectUris")
+ .HasForeignKey("ClientId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientScope", b =>
+ {
+ b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null)
+ .WithMany("AllowedScopes")
+ .HasForeignKey("ClientId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.ClientSecret", b =>
+ {
+ b.HasOne("Volo.Abp.IdentityServer.Clients.Client", null)
+ .WithMany("ClientSecrets")
+ .HasForeignKey("ClientId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityResourceClaim", b =>
+ {
+ b.HasOne("Volo.Abp.IdentityServer.IdentityResources.IdentityResource", null)
+ .WithMany("UserClaims")
+ .HasForeignKey("IdentityResourceId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityResourceProperty", b =>
+ {
+ b.HasOne("Volo.Abp.IdentityServer.IdentityResources.IdentityResource", null)
+ .WithMany("Properties")
+ .HasForeignKey("IdentityResourceId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.ApiResources.ApiResource", b =>
+ {
+ b.Navigation("Properties");
+
+ b.Navigation("Scopes");
+
+ b.Navigation("Secrets");
+
+ b.Navigation("UserClaims");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.ApiScopes.ApiScope", b =>
+ {
+ b.Navigation("Properties");
+
+ b.Navigation("UserClaims");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.Clients.Client", b =>
+ {
+ b.Navigation("AllowedCorsOrigins");
+
+ b.Navigation("AllowedGrantTypes");
+
+ b.Navigation("AllowedScopes");
+
+ b.Navigation("Claims");
+
+ b.Navigation("ClientSecrets");
+
+ b.Navigation("IdentityProviderRestrictions");
+
+ b.Navigation("PostLogoutRedirectUris");
+
+ b.Navigation("Properties");
+
+ b.Navigation("RedirectUris");
+ });
+
+ modelBuilder.Entity("Volo.Abp.IdentityServer.IdentityResources.IdentityResource", b =>
+ {
+ b.Navigation("Properties");
+
+ b.Navigation("UserClaims");
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20230721063310_20230721.cs b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20230721063310_20230721.cs
new file mode 100644
index 00000000..47ac9d25
--- /dev/null
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20230721063310_20230721.cs
@@ -0,0 +1,621 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Win.Sfs.SettleAccount.Migrations
+{
+ public partial class _20230721 : Migration
+ {
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.CreateTable(
+ name: "IdentityServerApiResources",
+ columns: table => new
+ {
+ Id = table.Column(type: "uniqueidentifier", nullable: false),
+ Name = table.Column(type: "nvarchar(200)", maxLength: 200, nullable: false),
+ DisplayName = table.Column(type: "nvarchar(200)", maxLength: 200, nullable: true),
+ Description = table.Column(type: "nvarchar(1000)", maxLength: 1000, nullable: true),
+ Enabled = table.Column(type: "bit", nullable: false),
+ AllowedAccessTokenSigningAlgorithms = table.Column(type: "nvarchar(100)", maxLength: 100, nullable: true),
+ ShowInDiscoveryDocument = table.Column(type: "bit", nullable: false),
+ ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true),
+ ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true),
+ CreationTime = table.Column(type: "datetime2", nullable: false),
+ CreatorId = table.Column(type: "uniqueidentifier", nullable: true),
+ LastModificationTime = table.Column(type: "datetime2", nullable: true),
+ LastModifierId = table.Column(type: "uniqueidentifier", nullable: true),
+ IsDeleted = table.Column(type: "bit", nullable: false, defaultValue: false),
+ DeleterId = table.Column(type: "uniqueidentifier", nullable: true),
+ DeletionTime = table.Column(type: "datetime2", nullable: true)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_IdentityServerApiResources", x => x.Id);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "IdentityServerApiScopes",
+ columns: table => new
+ {
+ Id = table.Column(type: "uniqueidentifier", nullable: false),
+ Enabled = table.Column(type: "bit", nullable: false),
+ Name = table.Column(type: "nvarchar(200)", maxLength: 200, nullable: false),
+ DisplayName = table.Column(type: "nvarchar(200)", maxLength: 200, nullable: true),
+ Description = table.Column(type: "nvarchar(1000)", maxLength: 1000, nullable: true),
+ Required = table.Column(type: "bit", nullable: false),
+ Emphasize = table.Column(type: "bit", nullable: false),
+ ShowInDiscoveryDocument = table.Column(type: "bit", nullable: false),
+ ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true),
+ ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true),
+ CreationTime = table.Column(type: "datetime2", nullable: false),
+ CreatorId = table.Column(type: "uniqueidentifier", nullable: true),
+ LastModificationTime = table.Column(type: "datetime2", nullable: true),
+ LastModifierId = table.Column(type: "uniqueidentifier", nullable: true),
+ IsDeleted = table.Column(type: "bit", nullable: false, defaultValue: false),
+ DeleterId = table.Column(type: "uniqueidentifier", nullable: true),
+ DeletionTime = table.Column(type: "datetime2", nullable: true)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_IdentityServerApiScopes", x => x.Id);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "IdentityServerClients",
+ columns: table => new
+ {
+ Id = table.Column(type: "uniqueidentifier", nullable: false),
+ ClientId = table.Column(type: "nvarchar(200)", maxLength: 200, nullable: false),
+ ClientName = table.Column(type: "nvarchar(200)", maxLength: 200, nullable: true),
+ Description = table.Column(type: "nvarchar(1000)", maxLength: 1000, nullable: true),
+ ClientUri = table.Column(type: "nvarchar(2000)", maxLength: 2000, nullable: true),
+ LogoUri = table.Column(type: "nvarchar(2000)", maxLength: 2000, nullable: true),
+ Enabled = table.Column(type: "bit", nullable: false),
+ ProtocolType = table.Column(type: "nvarchar(200)", maxLength: 200, nullable: false),
+ RequireClientSecret = table.Column(type: "bit", nullable: false),
+ RequireConsent = table.Column(type: "bit", nullable: false),
+ AllowRememberConsent = table.Column(type: "bit", nullable: false),
+ AlwaysIncludeUserClaimsInIdToken = table.Column(type: "bit", nullable: false),
+ RequirePkce = table.Column(type: "bit", nullable: false),
+ AllowPlainTextPkce = table.Column(type: "bit", nullable: false),
+ RequireRequestObject = table.Column(type: "bit", nullable: false),
+ AllowAccessTokensViaBrowser = table.Column(type: "bit", nullable: false),
+ FrontChannelLogoutUri = table.Column(type: "nvarchar(2000)", maxLength: 2000, nullable: true),
+ FrontChannelLogoutSessionRequired = table.Column(type: "bit", nullable: false),
+ BackChannelLogoutUri = table.Column(type: "nvarchar(2000)", maxLength: 2000, nullable: true),
+ BackChannelLogoutSessionRequired = table.Column(type: "bit", nullable: false),
+ AllowOfflineAccess = table.Column(type: "bit", nullable: false),
+ IdentityTokenLifetime = table.Column(type: "int", nullable: false),
+ AllowedIdentityTokenSigningAlgorithms = table.Column(type: "nvarchar(100)", maxLength: 100, nullable: true),
+ AccessTokenLifetime = table.Column(type: "int", nullable: false),
+ AuthorizationCodeLifetime = table.Column(type: "int", nullable: false),
+ ConsentLifetime = table.Column(type: "int", nullable: true),
+ AbsoluteRefreshTokenLifetime = table.Column(type: "int", nullable: false),
+ SlidingRefreshTokenLifetime = table.Column(type: "int", nullable: false),
+ RefreshTokenUsage = table.Column(type: "int", nullable: false),
+ UpdateAccessTokenClaimsOnRefresh = table.Column(type: "bit", nullable: false),
+ RefreshTokenExpiration = table.Column(type: "int", nullable: false),
+ AccessTokenType = table.Column(type: "int", nullable: false),
+ EnableLocalLogin = table.Column(type: "bit", nullable: false),
+ IncludeJwtId = table.Column(type: "bit", nullable: false),
+ AlwaysSendClientClaims = table.Column(type: "bit", nullable: false),
+ ClientClaimsPrefix = table.Column(type: "nvarchar(200)", maxLength: 200, nullable: true),
+ PairWiseSubjectSalt = table.Column(type: "nvarchar(200)", maxLength: 200, nullable: true),
+ UserSsoLifetime = table.Column(type: "int", nullable: true),
+ UserCodeType = table.Column(type: "nvarchar(100)", maxLength: 100, nullable: true),
+ DeviceCodeLifetime = table.Column(type: "int", nullable: false),
+ ExtraProperties = table.Column(type: "nvarchar(max)", nullable: true),
+ ConcurrencyStamp = table.Column(type: "nvarchar(40)", maxLength: 40, nullable: true),
+ CreationTime = table.Column(type: "datetime2", nullable: false),
+ CreatorId = table.Column(type: "uniqueidentifier", nullable: true),
+ LastModificationTime = table.Column(type: "datetime2", nullable: true),
+ LastModifierId = table.Column(type: "uniqueidentifier", nullable: true),
+ IsDeleted = table.Column(type: "bit", nullable: false, defaultValue: false),
+ DeleterId = table.Column(type: "uniqueidentifier", nullable: true),
+ DeletionTime = table.Column(type: "datetime2", nullable: true)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_IdentityServerClients", x => x.Id);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "IdentityServerDeviceFlowCodes",
+ columns: table => new
+ {
+ Id = table.Column(type: "uniqueidentifier", nullable: false),
+ DeviceCode = table.Column(type: "nvarchar(200)", maxLength: 200, nullable: false),
+ UserCode = table.Column