From 81d4c5e0548b9bfda4775aa3ed31f288a846d022 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Mon, 25 Sep 2023 09:48:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=89=8D=E7=AB=AF=EF=BC=9A=20=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E9=97=AE=E9=A2=98166=E3=80=81167;=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=8A=B6=E6=80=817=E5=92=8C8=EF=BC=9B?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=B7=B2=E4=BD=9C=E5=BA=9F=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=AF=BC=E5=87=BA=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E5=88=86=E7=BB=84=E6=8C=89=E9=92=AE=EF=BC=9B=E5=AF=84=E5=94=AE?= =?UTF-8?q?=E5=BA=93=E6=89=A3=E5=87=8F=E5=AE=A1=E6=89=B9=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=80=80=E5=9B=9E=E6=8C=89=E9=92=AE=EF=BC=8C=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=9C=B0=E5=9D=80=E5=92=8C=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SettleAccount.HttpApi.Host/wwwroot/models/_options.js | 2 ++ .../wwwroot/models/base-data/material-relationship.js | 5 +---- .../SettleAccount.HttpApi.Host/wwwroot/router/base-data.js | 2 +- .../SettleAccount.HttpApi.Host/wwwroot/router/business.js | 5 +++-- .../wwwroot/views/settle/inventory.js | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js index 63c578ca..59606ee2 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/_options.js @@ -16,6 +16,8 @@ const stateOptions = [ { value: 4, label: "客户已收票" }, { value: 5, label: "已扣减" }, { value: 6, label: "已提交扣减" }, + { value: 7, label: "已提交撤销扣减" }, + { value: 8, label: "已提交QAD" }, ]; const state = { title: "状态", type: "number", input: "select", options: stateOptions }; const state2 = Object.assign(Object.assign({}, state), { options: stateOptions.filter((a) => parseInt(a.value) > 0) }); diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/material-relationship.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/material-relationship.js index feb60c17..37bfe55b 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/material-relationship.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/base-data/material-relationship.js @@ -88,10 +88,7 @@ export default function () { import: { schema: { properties: { - isBj: { - title: "是否为备件", - type: "boolean", - }, + businessType }, }, }, diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js index 937125ee..fa221e97 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/router/base-data.js @@ -37,7 +37,7 @@ export default [ children: [createButton("query", "title=查询&isTop=true"), createButton("import", "title=导入&isTop=true"), createButton("export", "title=导出&isTop=true&pattern=paged")], }, { - ...createPage("parts-relationship", "title=厂内替换件关系"), + ...createPage("parts-relationship", "title=变更新旧LU关系"), children: [createButton("query", "title=查询&isTop=true"), createButton("import", "title=导入&isTop=true"), createButton("export", "title=导出&isTop=true&pattern=paged")], }, { 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 756e0271..b2bba542 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 @@ -101,7 +101,7 @@ function createCommerceCheckList(path, business, client, title = "商务审批") "title=退回", (_, q) => q.filters.some((o) => o.column === "state" && o.value === 1) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1) ), - createButton("export-group", "title=导出发票分组&pattern=paged"), + createButton("export-group", "title=导出发票分组&pattern=paged", (r, _) => r.invoiceState !== 2), createButton( "receive", "title=客户已收票&isTop=true", @@ -122,6 +122,7 @@ function createVmiOutCheckList(path, business, client, title = "寄售库库存 children: [ createButton("query", "title=查询&isTop=true"), createButton("approval", "title=扣减审核通过&isTop=true"), + createButton("reject", "title=退回&isTop=true"), createButton("export", "title=导出&isTop=true&pattern=paged"), ], }; @@ -372,7 +373,7 @@ export default [ "title=财务审核通过&isTop=true", (_, q) => q.filters.some((o) => o.column === "state" && o.value === 2) && q.filters.some((o) => o.column === "invoiceState" && o.value === 1) ), - createButton("export-group", "title=导出发票分组&pattern=paged"), + createButton("export-group", "title=导出发票分组&pattern=paged", (r, _) => r.invoiceState !== 2), //createButton("approval", "title=发票重开"), createButton( "reject", diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/inventory.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/inventory.js index ad8cdf2a..ecbec75e 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/inventory.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/inventory.js @@ -26,8 +26,8 @@ export default { : item.path === "reject" ? `确认退回选中的${rows.length}行数据吗?` : `确认选中的${rows.length}行数据客户已收票吗?`; - const data = item.path === "approval" ? rows.map((o) => o.billNum) : item.path === "reject" ? rows[0]["invGroupNum"] : rows.map((o) => o.invbillNum); - const url = item.path === "approval" ? config.edit.approvalUrl : item.path === "reject" ? config.edit.rejectUrl : config.edit.receivedUrl; + const data = rows.map((o) => o.invbillNum); + const url = config.edit.approvalUrl; await appListRef.value.onClick(async () => await request(url, data, { method: "POST" }), message, true); } } else if (item.path === "export-group") { From f032bb62e643a9ba73057bc364fca6eb127e95f9 Mon Sep 17 00:00:00 2001 From: mahao Date: Mon, 25 Sep 2023 11:25:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/BQ/INVOICE_SERVICE.cs | 1 + .../Entities/BQ/Syncs/TM_BJBMPT_JIS_RECORD.cs | 9 ++++----- .../Entities/BQ/Syncs/TM_BJBMPT_JIT_RECORD.cs | 9 ++++----- .../Entities/BQ/Syncs/TM_BJBMPT_OTHER_RECORD.cs | 9 ++++----- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs index 789518c7..e384fef0 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/INVOICE_SERVICE.cs @@ -118,6 +118,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ /// /// /// 已扣减发票提交到QAD + /// 成功提交后修改状态为已提交QAD /// [HttpPost] public virtual async Task SubmitToQad(List invbillNums) diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIS_RECORD.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIS_RECORD.cs index a5f9eddf..b320708e 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIS_RECORD.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIS_RECORD.cs @@ -5,12 +5,11 @@ using System.ComponentModel.DataAnnotations.Schema; namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs { - //#if DEBUG - // [Table("TM_BJBMPT_JIS_RECORD")] - //#else - // [Table("EX_BJBMPT_JIS_RECORD")] - //#endif +#if DEBUG [Table("TM_BJBMPT_JIS_RECORD")] +#else + [Table("EX_BJBMPT_JIS_RECORD")] +#endif public class TM_BJBMPT_JIS_RECORD { [Key] diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIT_RECORD.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIT_RECORD.cs index 87e2aad5..a32a6a93 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIT_RECORD.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_JIT_RECORD.cs @@ -8,12 +8,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs /// /// Jis小件 /// - //#if DEBUG - // [Table("TM_BJBMPT_JIT_RECORD")] - //#else - // [Table("EX_BJBMPT_JIT_RECORD")] - //#endif +#if DEBUG [Table("TM_BJBMPT_JIT_RECORD")] +#else + [Table("EX_BJBMPT_JIT_RECORD")] +#endif public class TM_BJBMPT_JIT_RECORD { [Key] diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_OTHER_RECORD.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_OTHER_RECORD.cs index d2785a80..22c7245f 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_OTHER_RECORD.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Syncs/TM_BJBMPT_OTHER_RECORD.cs @@ -8,12 +8,11 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs /// /// Jit(非Jis) /// -//#if DEBUG -// [Table("TM_BJBMPT_OTHER_RECORD")] -//#else -// [Table("EX_BJBMPT_OTHER_RECORD")] -//#endif +#if DEBUG [Table("TM_BJBMPT_OTHER_RECORD")] +#else + [Table("EX_BJBMPT_OTHER_RECORD")] +#endif public class TM_BJBMPT_OTHER_RECORD { [Key]