学 赵 1 year ago
parent
commit
ff329ff797
  1. 7
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/input/bj_pub_sa_service.js
  2. 9
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/input/bj_pub_se_detail_service.js
  3. 38
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/settlement/bj_pub_ba_detail_service.js
  4. 126
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/settlement/bj_pub_can_detail_service.js
  5. 103
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/bj/settlement/bj_pub_pd_detail_service.js
  6. 7
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/input/in_pub_sa_service.js
  7. 9
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/input/in_pub_se_detail_service.js
  8. 128
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/settlement/in_pub_ba_detail_service.js
  9. 103
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/in/settlement/in_pub_pd_detail_service.js
  10. 13
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_not_settle.js
  11. 33
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/invoice/invoice_service.js
  12. 7
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_sa_service.js
  13. 17
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_detail_service.js
  14. 29
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/input/bbac_se_edi_service.js
  15. 121
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_detail_service.js
  16. 21
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_ba_service.js
  17. 14
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_can_sa_service.js
  18. 8
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_not_sa_service.js
  19. 103
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_detail_service.js
  20. 17
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-bbac/settlement/bbac_pd_service.js
  21. 7
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_sa_service.js
  22. 16
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_detail_service.js
  23. 29
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/input/hbpo_se_edi_service.js
  24. 128
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_detail_service.js
  25. 10
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_ba_service.js
  26. 9
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_can_sa_service.js
  27. 8
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_not_sa_service.js
  28. 107
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_detail_service.js
  29. 21
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jis-hbpo/settlement/hbpo_pd_service.js
  30. 7
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/input/jit_jit_pub_sa_service.js
  31. 9
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/input/jit_pub_se_detail_service.js
  32. 38
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/settlement/jit_pub_ba_detail_service.js
  33. 126
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/settlement/jit_pub_can_sa_detail_service.js
  34. 103
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/jit/settlement/jit_pub_pd_detail_service.js
  35. 4
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/job-service.js
  36. 6
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/purchase_price_service.js
  37. 20
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/role.js
  38. 24
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/user.js
  39. 84
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js
  40. 216
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/business.js
  41. 4
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/routes.js
  42. 15
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_ba_detail_service.js
  43. 2
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_can_sa_detail_service.js
  44. 15
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/bj/settlement/bj_pub_pd_detail_service.js
  45. 15
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/settlement/in_pub_ba_detail_service.js
  46. 15
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/in/settlement/in_pub_pd_detail_service.js
  47. 15
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_ba_detail_service.js
  48. 15
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-bbac/settlement/bbac_pd_detail_service.js
  49. 15
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_ba_detail_service.js
  50. 15
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jis-hbpo/settlement/hbpo_pd_detail_service.js
  51. 15
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_ba_detail_service.js
  52. 2
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_can_sa_detail_service.js
  53. 15
      code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/jit/settlement/jit_pub_pd_detail_service.js
  54. 88
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/EdiSeCompareService.cs
  55. 15
      code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/PubSaSeCompareDiff.cs
  56. 3
      code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/PubSaSeCompareDapperRepository.cs
  57. 46
      code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/BBACEdiSeCompareExportService.cs
  58. 46
      code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HBPOEdiSeCompareExportService.cs
  59. 84
      code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/PubSaSeCompareExportService.cs
  60. 12
      code/src/Modules/SettleAccount/src/SettleAccount.Job/SettleAccountJobModule.cs

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

9
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,
},

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

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

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

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

9
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,
},

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

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

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

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

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

17
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,
},

29
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,
},

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

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

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

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

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

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

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

16
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,
},

29
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,
},

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

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

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

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

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

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

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

9
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,
},

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

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

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

4
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),

6
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";

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

24
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",
},
},
},
};

84
code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-date.js → 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: {

216
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",

4
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,
];

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

2
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 },

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

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

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

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

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

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

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

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

2
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 },

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

88
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;
/// <summary>
/// Edi与发运对比服务
/// </summary>
[AllowAnonymous]
[Route("api/settleaccount/[controller]/[action]")]
public class EdiSeCompareService : ApplicationService
{
/// <summary>
/// 任务服务
/// </summary>
private readonly TaskJobService _taskJobService;
public EdiSeCompareService(TaskJobService taskJobService)
{
_taskJobService = taskJobService;
}
#region 对比
/// <summary>
/// BBACEdi与发运比对
/// </summary>
[HttpPost]
public async Task<string> BBACEdiSeCompare(PubSaSeCompareRequestDto pubSaSeCompareRequestDto)
{
var businessTypeDisplayName = pubSaSeCompareRequestDto.BusinessType.ToString();
DisplayAttribute attributeOfType = pubSaSeCompareRequestDto.BusinessType.GetAttributeOfType<DisplayAttribute>();
if (attributeOfType != null)
{
businessTypeDisplayName = attributeOfType.Name;
}
var projectName = $"{businessTypeDisplayName}结算与发运数据对比";
List<CustomCondition> customConditionList = new List<CustomCondition>();
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;
}
/// <summary>
/// HBPOEdi与发运比对
/// </summary>
[HttpPost]
public async Task<string> HBPOEdiSeCompare(PubSaSeCompareRequestDto pubSaSeCompareRequestDto)
{
var businessTypeDisplayName = pubSaSeCompareRequestDto.BusinessType.ToString();
DisplayAttribute attributeOfType = pubSaSeCompareRequestDto.BusinessType.GetAttributeOfType<DisplayAttribute>();
if (attributeOfType != null)
{
businessTypeDisplayName = attributeOfType.Name;
}
var projectName = $"{businessTypeDisplayName}结算与发运数据对比";
List<CustomCondition> customConditionList = new List<CustomCondition>();
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
}

15
code/src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/PubSaSeCompareDiff.cs

@ -68,9 +68,12 @@ public class PubSaSeCompareDiff
/// <summary>
/// 差异数量
/// </summary>
[ExporterHeader(DisplayName = "差异数量")]
public decimal DiffQty { set; get; }
[Display(Name = "差异数量")]
public decimal DiffQty => SAQty - SEQty;
/// <summary>
/// 匹配类型
/// </summary>
[Display(Name = "匹配类型")]
public string MateType { get; set; }
@ -98,12 +101,6 @@ public class PubSaSeCompareDiff
[Display(Name = "零件号")]
public string SeLU { set; get; }
/// <summary>
/// 生产号
/// </summary>
[Display(Name = "生产号")]
public string SePN { set; get; }
/// <summary>
/// 零件号
/// </summary>
@ -114,7 +111,7 @@ public class PubSaSeCompareDiff
/// 生产号
/// </summary>
[Display(Name = "生产号")]
public string SaPN { set; get; }
public string PN { set; get; }
/// <summary>
/// 类型

3
code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/PubSaSeCompareDapperRepository.cs

@ -38,9 +38,8 @@ public class PubSaSeCompareDapperRepository : DapperRepository<SettleAccountDbCo
'' AssemblyCode,
'' InjectionCode,
A.LU SeLU,
A.PN SePN,
B.LU SaLU,
B.PN SaPN,
ISNULL(A.PN,B.PN) PN,
A.SEQty,
B.SAQty,
(B.SAQty-A.SEQty) DiffQty,

46
code/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/BBACEdiSeCompareExportService.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
{
/// <summary>
/// BBACEdi与发运对比导出服务
/// </summary>
public class BBACEdiSeCompareExportService : ITransientDependency, IExportJob
{
/// <summary>
/// 文件容器
/// </summary>
private readonly IBlobContainer<MyFileContainer> _fileContainer;
/// <summary>
/// AutoMapper
/// </summary>
private readonly IObjectMapper _objectMapper;
/// <summary>
/// 构造
/// </summary>
public BBACEdiSeCompareExportService(
IBlobContainer<MyFileContainer> fileContainer,
IObjectMapper objectMapper)
{
_fileContainer = fileContainer;
_objectMapper = objectMapper;
}
/// <summary>
/// 导出
/// </summary>
public string ExportFile(Guid id, List<string> exportName, List<CustomCondition> property)
{
return "";
}
}
}

46
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
{
/// <summary>
/// HBPOEdi与发运对比导出服务
/// </summary>
public class HBPOEdiSeCompareExportService : ITransientDependency, IExportJob
{
/// <summary>
/// 文件容器
/// </summary>
private readonly IBlobContainer<MyFileContainer> _fileContainer;
/// <summary>
/// AutoMapper
/// </summary>
private readonly IObjectMapper _objectMapper;
/// <summary>
/// 构造
/// </summary>
public HBPOEdiSeCompareExportService(
IBlobContainer<MyFileContainer> fileContainer,
IObjectMapper objectMapper)
{
_fileContainer = fileContainer;
_objectMapper = objectMapper;
}
/// <summary>
/// 导出
/// </summary>
public string ExportFile(Guid id, List<string> exportName, List<CustomCondition> property)
{
return "";
}
}
}

84
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
{
/// <summary>
/// Pub结算明细仓储
/// 替换件关系仓储
/// </summary>
private readonly INormalEfCoreRepository<PUB_SA_DETAIL, Guid> _pubSaDetailRepository;
private readonly INormalEfCoreRepository<TB_RePartsRelationship, Guid> _tbRePartsRelationshipRepository;
/// <summary>
/// Pub发运数据仓储
/// Pub结算发运对比Dapper
/// </summary>
private readonly INormalEfCoreRepository<PUB_SE_DETAIL, Guid> _pubSeDetailRepository;
private readonly PubSaSeCompareDapperRepository _pubSaSeCompareDapperRepository;
/// <summary>
/// 替换件关系仓储
/// 文件容器
/// </summary>
private readonly INormalEfCoreRepository<TB_RePartsRelationship, Guid> _tbRePartsRelationshipRepository;
private readonly PubSaSeCompareDapperRepository _pubSaSeCompareDapperRepository;
private readonly IBlobContainer<MyFileContainer> _fileContainer;
/// <summary>
/// AutoMapper
/// </summary>
private readonly IObjectMapper _objectMapper;
/// <summary>
/// 构造
/// </summary>
public PubSaSeCompareExportService(INormalEfCoreRepository<PUB_SA_DETAIL, Guid> pubSaDetailRepository,
INormalEfCoreRepository<PUB_SE_DETAIL, Guid> pubSeDetailRepository,
public PubSaSeCompareExportService(
INormalEfCoreRepository<TB_RePartsRelationship, Guid> tbRePartsRelationshipRepository,
PubSaSeCompareDapperRepository pubSaSeCompareDapperRepository,
IBlobContainer<MyFileContainer> 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<PubSaSeCompareDiff>(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);
}
//结算核对明细

12
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<PubSaSeCompareExportService>();
context.Services.AddTransient<BBACEdiSeCompareExportService>();
context.Services.AddTransient<HBPOEdiSeCompareExportService>();
context.Services.AddTransient<SettleAccountImportService>();
context.Services.AddTransient<InvoiceImportService>();
@ -86,6 +89,15 @@ namespace Win.Sfs.SettleAccount
{
return implementationFactory.GetService<PubSaSeCompareExportService>();
}
if (key.Equals(typeof(BBACEdiSeCompareExportService).FullName))
{
return implementationFactory.GetService<BBACEdiSeCompareExportService>();
}
if (key.Equals(typeof(HBPOEdiSeCompareExportService).FullName))
{
return implementationFactory.GetService<HBPOEdiSeCompareExportService>();
}
if (key.Equals(typeof(InvoiceSettledDiffExportService).FullName))
{

Loading…
Cancel
Save