From e278e7b3eae1bb7b570d10c0ddf49f5ca0864aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E6=97=AD=E4=B9=8B?= <12930972+jiang-xuzhi@user.noreply.gitee.com> Date: Tue, 25 Jul 2023 15:22:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/models/bbac-edi-se-compare.js | 128 ++++++++++++++++++ .../wwwroot/models/bom.js | 26 ++-- .../wwwroot/models/hbpo-edi-se-compare.js | 128 ++++++++++++++++++ .../wwwroot/models/invoice/invoice_grp.js | 101 ++++++++++++++ .../models/jis-bbac/input/bbac_sa_service.js | 12 +- .../wwwroot/models/pub_ba_detail_service.js | 1 - 6 files changed, 377 insertions(+), 19 deletions(-) create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac-edi-se-compare.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/hbpo-edi-se-compare.js create mode 100644 code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_grp.js diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac-edi-se-compare.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac-edi-se-compare.js new file mode 100644 index 00000000..a1428cf3 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bbac-edi-se-compare.js @@ -0,0 +1,128 @@ +import version from "./version.js"; + +const stateName = { + title: "状态", + type: "string", + input: "select", + options: [ + { label: "执行完成(任务成功)", value: "Succeeded" }, + { label: "执行完成(任务失败)", value: "Failed" }, + { label: "执行中", value: "Processing" }, + { label: "等待执行", value: "Enqueued" }, + ], +}; + +const schema = { + title: "数据对比", + type: "object", + properties: { + type: { + title: "版本号", + type: "string", + }, + taskId: { + title: "单据流水号", + type: "string", + }, + email: { + title: "创建人", + type: "string", + }, + createdAt: { + title: "创建时间", + type: "DateTime", + }, + remark: { + title: "说明", + type: "string", + }, + stateName, + }, +}; + +const queryUrl = "settleaccount/Job/list"; +const deleteUrl = "settleaccount/Job/delete"; +const exportUrl = "settleaccount/pub_sa_detail_service/export"; +const compareUrl = "settleaccount/edi-se-compare/bbacedi-se-compare"; +const queryMethod = "POST"; +const deleteMethod = "POST"; +const exportMethod = "POST"; +const compareMethod = "POST"; + +export default function () { + return { + query: { + url: queryUrl, + method: queryMethod, + + autoSubmit: true, + disableQueryOnLoad: true, + schema: { + title: "数据对比", + type: "object", + properties: { + type: Object.assign({ defaultSelected: true }, version), + name: { + type: "string", + default: null, + hidden: true, + }, + stateName, + filters: { + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + // { + // logic: "and", + // column: "year", + // action: "like", + // value: null, + // readOnly: true, + // }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + deleteUrl, + exportUrl, + compareUrl, + deleteMethod, + exportMethod, + compareMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bom.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bom.js index f50f824b..f447fa27 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bom.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bom.js @@ -18,23 +18,33 @@ const schema = { title: "组件描述", type: "string", }, + childItemUom: { + title: "组件计量单位", + type: "string", + }, qty: { - title: "用量", - type: "number", + title: "组件数量", + type: "decimal", }, bomType: { title: "结构类型", type: "string", }, - effectiveTime: { - title: "生效时间", + operateProcess: { + title: "工序", + type: "int", + }, + scrapPercent: { + title: "废品率", type: "string", - input: "date", }, - effectiveTime: { - title: "失效时间", + issuePosition: { + title: "子物品消耗位置", type: "string", - input: "date", + }, + bomLevel: { + title: "结构层级", + type: "int", }, }, }; diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/hbpo-edi-se-compare.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/hbpo-edi-se-compare.js new file mode 100644 index 00000000..66f792e1 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/hbpo-edi-se-compare.js @@ -0,0 +1,128 @@ +import version from "./version.js"; + +const stateName = { + title: "状态", + type: "string", + input: "select", + options: [ + { label: "执行完成(任务成功)", value: "Succeeded" }, + { label: "执行完成(任务失败)", value: "Failed" }, + { label: "执行中", value: "Processing" }, + { label: "等待执行", value: "Enqueued" }, + ], +}; + +const schema = { + title: "数据对比", + type: "object", + properties: { + type: { + title: "版本号", + type: "string", + }, + taskId: { + title: "单据流水号", + type: "string", + }, + email: { + title: "创建人", + type: "string", + }, + createdAt: { + title: "创建时间", + type: "DateTime", + }, + remark: { + title: "说明", + type: "string", + }, + stateName, + }, +}; + +const queryUrl = "settleaccount/Job/list"; +const deleteUrl = "settleaccount/Job/delete"; +const exportUrl = "settleaccount/pub_sa_detail_service/export"; +const compareUrl = "settleaccount/edi-se-compare/hbpoedi-se-compare"; +const queryMethod = "POST"; +const deleteMethod = "POST"; +const exportMethod = "POST"; +const compareMethod = "POST"; + +export default function () { + return { + query: { + url: queryUrl, + method: queryMethod, + + autoSubmit: true, + disableQueryOnLoad: true, + schema: { + title: "数据对比", + type: "object", + properties: { + type: Object.assign({ defaultSelected: true }, version), + name: { + type: "string", + default: null, + hidden: true, + }, + stateName, + filters: { + type: "array", + hidden: true, + items: { + type: "object", + properties: { + logic: { + type: "int", + }, + column: { + type: "string", + }, + action: { + type: "int", + }, + value: { + type: "string", + }, + }, + }, + default: [ + // { + // logic: "and", + // column: "year", + // action: "like", + // value: null, + // readOnly: true, + // }, + ], + }, + skipCount: { + hidden: true, + default: 0, + }, + maxResultCount: { + hidden: true, + default: 10, + }, + sorting: { + hidden: true, + }, + }, + }, + }, + table: { + schema: schema, + }, + edit: { + deleteUrl, + exportUrl, + compareUrl, + deleteMethod, + exportMethod, + compareMethod, + schema: schema, + }, + }; +} diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_grp.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_grp.js new file mode 100644 index 00000000..416dc202 --- /dev/null +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_grp.js @@ -0,0 +1,101 @@ +import version from "../version"; +import { state2, state3 } from "../state"; +const schema = { + title: "财务审核", + type: "object", + properties: { + version, + realnvBillNum: { + title: "实际纸质发票号", + type: "string", + }, + invbillNum: { + title: "系统生成发票号", + type: "string", + }, + amt: { + title: "未税金额", + type: "decimal", + }, + taxAmt: { + title: "税后金额", + type: "decimal", + }, + fileName: { + title: "开票Excel文件", + type: "string", + }, + businessType: { + title: "业务类别", + type: "EnumBusinessType", + }, + state2, + }, +}; + +const queryUrl = "settleaccount/invoice_service/detail_queryUrl"; +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: { + 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 1aa64573..d66111b1 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 @@ -43,17 +43,13 @@ const schema = { }; const baseUrl = "settleaccount/bbac_sa_service"; -const queryUrl = `${baseUrl}/get-list`; -const detailsUrl = `${baseUrl}/get/%s`; -const createUrl = `${baseUrl}/create`; -const updateUrl = `${baseUrl}/update/%s`; +const queryUrl = "settleaccount/bbac_sa_service/get-list"; +const createUrl = "settleaccount/bbac_sa_service/create"; 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"; @@ -117,15 +113,11 @@ export default function () { schema: schema, }, edit: { - detailsUrl, createUrl, - updateUrl, deleteUrl, importUrl, exportUrl, - detailsMethod, createMethod, - updateMethod, deleteMethod, importMethod, exportMethod, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_ba_detail_service.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_ba_detail_service.js index 0e232dc4..19a018ea 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_ba_detail_service.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/pub_ba_detail_service.js @@ -71,7 +71,6 @@ const schema = { }; const queryUrl = "settleaccount/p-uB_BA_SERVICE/detail-query"; - const queryMethod = "POST"; export default function () {