From 5c74b7e68309791b1ad608a6882dff2f032f1528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B5=87=E6=96=87=E9=BE=99?= Date: Mon, 14 Oct 2024 17:52:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=93=B6=E8=A1=8C=E7=9A=84=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=80=A7=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ds-wms-service/DS.WMS.Core/Info/Method/ClientBankService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Info/Method/ClientBankService.cs b/ds-wms-service/DS.WMS.Core/Info/Method/ClientBankService.cs index b94e63f7..f6e531f5 100644 --- a/ds-wms-service/DS.WMS.Core/Info/Method/ClientBankService.cs +++ b/ds-wms-service/DS.WMS.Core/Info/Method/ClientBankService.cs @@ -58,8 +58,8 @@ public class ClientBankService : ServiceBase, IClientBankService { if (req.Id == 0) { - if (await TenantDb.Queryable().Where(x => x.CodeName == req.CodeName).AnyAsync()) - return DataResult.Failed("客户银行信息已存在!", MultiLanguageConst.ClientBankExist); + //if (await TenantDb.Queryable().Where(x => x.CodeName == req.CodeName).AnyAsync()) + // return DataResult.Failed("客户银行信息已存在!", MultiLanguageConst.ClientBankExist); var data = req.Adapt(); var entity = await TenantDb.InsertNav(data).Include(x => x.InvoiceHeaders).ExecuteReturnEntityAsync(); From 696bbb6d94da6d8028ab993c533fe51a7220254e Mon Sep 17 00:00:00 2001 From: cjy Date: Mon, 14 Oct 2024 18:16:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=95=E7=A5=A8=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=E6=B5=B7=E8=BF=90=E5=87=BA=E5=BA=93=E5=8D=95=E7=A5=A8=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.WMS.Core/Op/Method/SeaExportService.cs | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs index cc683996..2f3600a0 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs @@ -926,7 +926,9 @@ public partial class SeaExportService : ISeaExportService //{ // return DataResult.Failed(sequence.Message, MultiLanguageConst.SequenceSetNotExist); //} + var edi = tenantDb.Queryable().First(x => x.BusinessId == long.Parse(id)); + var data = new SeaExport(); if (template.IsNullOrEmpty()) { @@ -939,7 +941,13 @@ public partial class SeaExportService : ISeaExportService data.BusinessStatusName = ""; data.CustomerNo = ""; var entity = tenantDb.Insertable(data).ExecuteReturnEntity(); - + if (edi.IsNotNull()) + { + var ediEntity = edi.Adapt(); + ediEntity.Id = 0; + ediEntity.BusinessId = entity.Id; + tenantDb.Insertable(ediEntity).ExecuteReturnEntity(); + } #region 初始化费用状态表 var feeStatus = BusinessFeeStatus.Init(entity.Id); @@ -971,6 +979,14 @@ public partial class SeaExportService : ISeaExportService var insertColumns = list1.ToArray(); //insertColumns.AddRange(["Id", "ParentId", "IsBusinessLocking", "IsFeeLocking", "CustomerNo"]); var entity = tenantDb.Insertable(data).InsertColumns(insertColumns).ExecuteReturnEntity(); + + if (edi.IsNotNull()) + { + var ediEntity = edi.Adapt(); + ediEntity.Id = 0; + ediEntity.BusinessId = entity.Id; + tenantDb.Insertable(ediEntity).ExecuteReturnEntity(); + } #region 初始化费用状态表 var feeStatus = BusinessFeeStatus.Init(entity.Id); tenantDb.Insertable(feeStatus).ExecuteCommand();