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 }; + }, +}; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/EdiSeCompareService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/EdiSeCompareService.cs new file mode 100644 index 00000000..80e82e32 --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/EdiSeCompareService.cs @@ -0,0 +1,88 @@ +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.OpenApi.Extensions; +using SettleAccount.Job.Services.Report; +using TaskJob.EventArgs; +using Volo.Abp.Application.Services; +using Win.Sfs.SettleAccount.Entities.BQ.Dtos; +using Win.Sfs.SettleAccount.Entities.TaskJobs; + +namespace Win.Sfs.SettleAccount.Entities.BQ; + +/// +/// Edi与发运对比服务 +/// +[AllowAnonymous] +[Route("api/settleaccount/[controller]/[action]")] +public class EdiSeCompareService : ApplicationService +{ + /// + /// 任务服务 + /// + private readonly TaskJobService _taskJobService; + + public EdiSeCompareService(TaskJobService taskJobService) + { + _taskJobService = taskJobService; + } + + #region 对比 + /// + /// BBACEdi与发运比对 + /// + [HttpPost] + public async Task BBACEdiSeCompare(PubSaSeCompareRequestDto pubSaSeCompareRequestDto) + { + var businessTypeDisplayName = pubSaSeCompareRequestDto.BusinessType.ToString(); + DisplayAttribute attributeOfType = pubSaSeCompareRequestDto.BusinessType.GetAttributeOfType(); + if (attributeOfType != null) + { + businessTypeDisplayName = attributeOfType.Name; + } + var projectName = $"{businessTypeDisplayName}结算与发运数据对比"; + + List customConditionList = new List(); + customConditionList.Add(new CustomCondition() { Name = "Version", Value = pubSaSeCompareRequestDto.Version }); + customConditionList.Add(new CustomCondition() { Name = "BusinessType", Value = ((int)pubSaSeCompareRequestDto.BusinessType).ToString() }); + customConditionList.Add(new CustomCondition() { Name = "LU", Value = pubSaSeCompareRequestDto.LU }); + customConditionList.Add(new CustomCondition() { Name = "PN", Value = pubSaSeCompareRequestDto.PN }); + customConditionList.Add(new CustomCondition() { Name = "ProjectName", Value = projectName }); + + var _taskid = await _taskJobService.ExportEnqueueAsync(projectName, ExportExtentsion.Excel, pubSaSeCompareRequestDto.Version, string.Empty, CurrentUser, typeof(BBACEdiSeCompareExportService), customConditionList, (rs) => + { + }); + return _taskid; + } + + /// + /// HBPOEdi与发运比对 + /// + [HttpPost] + public async Task HBPOEdiSeCompare(PubSaSeCompareRequestDto pubSaSeCompareRequestDto) + { + var businessTypeDisplayName = pubSaSeCompareRequestDto.BusinessType.ToString(); + DisplayAttribute attributeOfType = pubSaSeCompareRequestDto.BusinessType.GetAttributeOfType(); + if (attributeOfType != null) + { + businessTypeDisplayName = attributeOfType.Name; + } + var projectName = $"{businessTypeDisplayName}结算与发运数据对比"; + + List customConditionList = new List(); + customConditionList.Add(new CustomCondition() { Name = "Version", Value = pubSaSeCompareRequestDto.Version }); + customConditionList.Add(new CustomCondition() { Name = "BusinessType", Value = ((int)pubSaSeCompareRequestDto.BusinessType).ToString() }); + customConditionList.Add(new CustomCondition() { Name = "LU", Value = pubSaSeCompareRequestDto.LU }); + customConditionList.Add(new CustomCondition() { Name = "PN", Value = pubSaSeCompareRequestDto.PN }); + customConditionList.Add(new CustomCondition() { Name = "ProjectName", Value = projectName }); + + var _taskid = await _taskJobService.ExportEnqueueAsync(projectName, ExportExtentsion.Excel, pubSaSeCompareRequestDto.Version, string.Empty, CurrentUser, typeof(HBPOEdiSeCompareExportService), customConditionList, (rs) => + { + }); + return _taskid; + } + #endregion + +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/PubSaSeCompareDiff.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/PubSaSeCompareDiff.cs index d0ec83ee..51850420 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/PubSaSeCompareDiff.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/PubSaSeCompareDiff.cs @@ -68,9 +68,12 @@ public class PubSaSeCompareDiff /// /// 差异数量 /// - [ExporterHeader(DisplayName = "差异数量")] - public decimal DiffQty { set; get; } + [Display(Name = "差异数量")] + public decimal DiffQty => SAQty - SEQty; + /// + /// 匹配类型 + /// [Display(Name = "匹配类型")] public string MateType { get; set; } @@ -98,12 +101,6 @@ public class PubSaSeCompareDiff [Display(Name = "零件号")] public string SeLU { set; get; } - /// - /// 生产号 - /// - [Display(Name = "生产号")] - public string SePN { set; get; } - /// /// 零件号 /// @@ -114,7 +111,7 @@ public class PubSaSeCompareDiff /// 生产号 /// [Display(Name = "生产号")] - public string SaPN { set; get; } + public string PN { set; get; } /// /// 类型 diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/PubSaSeCompareDapperRepository.cs b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/PubSaSeCompareDapperRepository.cs index 4f344b02..7491316f 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/PubSaSeCompareDapperRepository.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/PubSaSeCompareDapperRepository.cs @@ -38,9 +38,8 @@ public class PubSaSeCompareDapperRepository : DapperRepository + /// BBACEdi与发运对比导出服务 + /// + public class BBACEdiSeCompareExportService : ITransientDependency, IExportJob + { + /// + /// 文件容器 + /// + private readonly IBlobContainer _fileContainer; + + /// + /// AutoMapper + /// + private readonly IObjectMapper _objectMapper; + + /// + /// 构造 + /// + public BBACEdiSeCompareExportService( + IBlobContainer fileContainer, + IObjectMapper objectMapper) + { + _fileContainer = fileContainer; + _objectMapper = objectMapper; + } + + /// + /// 导出 + /// + public string ExportFile(Guid id, List exportName, List property) + { + return ""; + } + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HBPOEdiSeCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HBPOEdiSeCompareExportService.cs new file mode 100644 index 00000000..56bfd61d --- /dev/null +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HBPOEdiSeCompareExportService.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using TaskJob.EventArgs; +using TaskJob.Interfaces; +using Volo.Abp.BlobStoring; +using Volo.Abp.DependencyInjection; +using Volo.Abp.ObjectMapping; +using Win.Sfs.BaseData.ImportExcelCommon; + +namespace SettleAccount.Job.Services.Report +{ + /// + /// HBPOEdi与发运对比导出服务 + /// + public class HBPOEdiSeCompareExportService : ITransientDependency, IExportJob + { + /// + /// 文件容器 + /// + private readonly IBlobContainer _fileContainer; + + /// + /// AutoMapper + /// + private readonly IObjectMapper _objectMapper; + + /// + /// 构造 + /// + public HBPOEdiSeCompareExportService( + IBlobContainer fileContainer, + IObjectMapper objectMapper) + { + _fileContainer = fileContainer; + _objectMapper = objectMapper; + } + + /// + /// 导出 + /// + public string ExportFile(Guid id, List exportName, List property) + { + return ""; + } + } +} diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs index e81438cd..8bca57d3 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; using EmptyFiles; +using Magicodes.ExporterAndImporter.Core; using Magicodes.ExporterAndImporter.Excel; using Microsoft.OpenApi.Extensions; using NetTopologySuite.Operation.Buffer; @@ -31,38 +32,34 @@ namespace SettleAccount.Job.Services.Report public class PubSaSeCompareExportService : ITransientDependency, IExportJob { /// - /// Pub结算明细仓储 + /// 替换件关系仓储 /// - private readonly INormalEfCoreRepository _pubSaDetailRepository; + private readonly INormalEfCoreRepository _tbRePartsRelationshipRepository; /// - /// Pub发运数据仓储 + /// Pub结算发运对比Dapper /// - private readonly INormalEfCoreRepository _pubSeDetailRepository; + private readonly PubSaSeCompareDapperRepository _pubSaSeCompareDapperRepository; /// - /// 替换件关系仓储 + /// 文件容器 /// - private readonly INormalEfCoreRepository _tbRePartsRelationshipRepository; - - private readonly PubSaSeCompareDapperRepository _pubSaSeCompareDapperRepository; - private readonly IBlobContainer _fileContainer; + /// + /// AutoMapper + /// private readonly IObjectMapper _objectMapper; /// /// 构造 /// - public PubSaSeCompareExportService(INormalEfCoreRepository pubSaDetailRepository, - INormalEfCoreRepository pubSeDetailRepository, + public PubSaSeCompareExportService( INormalEfCoreRepository tbRePartsRelationshipRepository, PubSaSeCompareDapperRepository pubSaSeCompareDapperRepository, IBlobContainer fileContainer, IObjectMapper objectMapper) { - _pubSaDetailRepository = pubSaDetailRepository; - _pubSeDetailRepository = pubSeDetailRepository; _tbRePartsRelationshipRepository = tbRePartsRelationshipRepository; _pubSaSeCompareDapperRepository = pubSaSeCompareDapperRepository; _fileContainer = fileContainer; @@ -107,39 +104,64 @@ namespace SettleAccount.Job.Services.Report }); //有结算有发运 - var haveSaHaveSe = pubSaSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.HaveSaHaveSe); + var haveSaHaveSes = pubSaSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.HaveSaHaveSe); //有结算无发运 - var haveSaNotHaveSe = pubSaSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.HaveSaNotHaveSe); + var haveSaNotHaveSes = pubSaSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.HaveSaNotHaveSe); //无结算有发运 - var notHaveSaHaveSe = pubSaSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.NotHaveSaHaveSe); + var notHaveSaHaveSes = pubSaSeCompareDiffs.FindAll(t => t.Category == EnumPubSaSeCompareCategory.NotHaveSaHaveSe); - haveSaHaveSe.ForEach(t => t.PrimitiveLU = t.ReplaceLU = t.SaLU); - haveSaNotHaveSe.ForEach(t => t.PrimitiveLU = t.ReplaceLU = t.SaLU); - notHaveSaHaveSe.ForEach(t => t.PrimitiveLU = t.ReplaceLU = t.SaLU); + haveSaHaveSes.ForEach(t => t.PrimitiveLU = t.ReplaceLU = t.SaLU); + haveSaNotHaveSes.ForEach(t => t.PrimitiveLU = t.ReplaceLU = t.SaLU); + notHaveSaHaveSes.ForEach(t => t.PrimitiveLU = t.ReplaceLU = t.SeLU); #region 二次对比 //二次对比（替换零件号） - var repLUs = notHaveSaHaveSe.Select(t => t.SeLU).Distinct().ToList(); + var repLUs = notHaveSaHaveSes.Select(t => t.SeLU).Distinct().ToList(); var tbRePartsRelationships = _tbRePartsRelationshipRepository.GetListAsync(t => repLUs.Contains(t.RepLU) && ((int)t.BusinessType).ToString() == businessType).Result; tbRePartsRelationships.ForEach(tbRePartsRelationship => { - notHaveSaHaveSe.FindAll(t => t.SeLU == tbRePartsRelationship.RepLU).ForEach(t => + notHaveSaHaveSes.FindAll(t => t.SeLU == tbRePartsRelationship.RepLU).ForEach(t => { t.ReplaceLU = tbRePartsRelationship.LU; }); }); + var haveSaNotHaveSeLUPNs = haveSaNotHaveSes.Select(t => new { t.ReplaceLU, t.PN }); + var notHaveSaHaveSeLUPNs = notHaveSaHaveSes.Select(t => new { t.ReplaceLU, t.PN }); + //二次匹配 匹配上的零件号 + var secondMatchLUPNs = haveSaNotHaveSeLUPNs.Intersect(notHaveSaHaveSeLUPNs); + if (secondMatchLUPNs.Any() == true) + { + pubSaSeCompareDiffs.RemoveAll(t => secondMatchLUPNs.Contains(new { t.ReplaceLU, t.PN })); - var haveSaNotHaveSeReplaceLU = haveSaNotHaveSe.Select(t => t.ReplaceLU); - var notHaveSaHaveSeReplaceLU = notHaveSaHaveSe.Select(t => t.ReplaceLU); - //此次匹配上的零件号 - var secondMatchReplaceLU = notHaveSaHaveSeReplaceLU.Intersect(notHaveSaHaveSeReplaceLU); - //if (secondMatchReplaceLU) - //{ - - //} - + foreach (var secondMatchLUPN in secondMatchLUPNs) + { + var haveSaNotHaveSe = haveSaNotHaveSes.FirstOrDefault(t => t.ReplaceLU == secondMatchLUPN.ReplaceLU && t.PN == secondMatchLUPN.PN); + var notHaveSaHaveSe = notHaveSaHaveSes.FirstOrDefault(t => t.ReplaceLU == secondMatchLUPN.ReplaceLU && t.PN == secondMatchLUPN.PN); + pubSaSeCompareDiffs.Add(new PubSaSeCompareDiff() + { + WmsBillNum = notHaveSaHaveSe.WmsBillNum, + ShippingDate = notHaveSaHaveSe.ShippingDate, + SeqNumber = notHaveSaHaveSe.SeqNumber, + PJISSeqNumber = notHaveSaHaveSe.PJISSeqNumber, + MaterialNumber = haveSaNotHaveSe.MaterialNumber, + MaterialDes = haveSaNotHaveSe.MaterialDes, + CustomerOfflineTime = haveSaNotHaveSe.CustomerOfflineTime, + SAQty = haveSaNotHaveSe.SAQty, + SEQty = notHaveSaHaveSe.SEQty, + MateType = haveSaNotHaveSe.MateType, + FixPrice = haveSaNotHaveSe.FixPrice, + PrimitiveLU = haveSaNotHaveSe.PrimitiveLU, + ReplaceLU = haveSaNotHaveSe.ReplaceLU, + SeLU = notHaveSaHaveSe.SeLU, + SaLU = haveSaNotHaveSe.SaLU, + PN = haveSaNotHaveSe.PN, + Category = EnumPubSaSeCompareCategory.HaveSaHaveSe, + IsRemove = false + }); + } + } #endregion @@ -149,7 +171,7 @@ namespace SettleAccount.Job.Services.Report } if (string.IsNullOrEmpty(pn) == false) { - pubSaSeCompareDiffs = pubSaSeCompareDiffs.FindAll(p => p.SaPN == pn || p.SePN == pn); + pubSaSeCompareDiffs = pubSaSeCompareDiffs.FindAll(p => p.PN == pn); } //结算核对明细 diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs index 14bdd971..f7c77c44 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs @@ -40,6 +40,9 @@ namespace Win.Sfs.SettleAccount GlobalJobFilters.Filters.Add(new AutomaticRetryAttribute{ Attempts = 0}); context.Services.AddTransient(); + context.Services.AddTransient(); + context.Services.AddTransient(); + context.Services.AddTransient(); context.Services.AddTransient(); @@ -86,6 +89,15 @@ namespace Win.Sfs.SettleAccount { return implementationFactory.GetService(); } + if (key.Equals(typeof(BBACEdiSeCompareExportService).FullName)) + { + return implementationFactory.GetService(); + } + if (key.Equals(typeof(HBPOEdiSeCompareExportService).FullName)) + { + return implementationFactory.GetService(); + } + if (key.Equals(typeof(InvoiceSettledDiffExportService).FullName)) {