From 6f41be67bb4cc55db35a6b092c9ed4e7be337165 Mon Sep 17 00:00:00 2001 From: cjy Date: Mon, 28 Oct 2024 09:31:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=86=E5=8D=95=E6=B7=BB=E5=8A=A0CntrTot?= =?UTF-8?q?al=EF=BC=9B=E4=B8=BB=E5=8D=95=E6=9B=B4=E6=96=B0=E5=BF=BD?= =?UTF-8?q?=E7=95=A5=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.WMS.Core/Op/Dtos/SeaExportBillManageReq.cs | 4 ++++ .../DS.WMS.Core/Op/Dtos/SeaExportBillManageRes.cs | 4 ++++ .../DS.WMS.Core/Op/Entity/SeaExportBillManage.cs | 6 ++++++ ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs | 9 ++++++++- 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportBillManageReq.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportBillManageReq.cs index 45b3c732..a5372069 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportBillManageReq.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportBillManageReq.cs @@ -453,5 +453,9 @@ namespace DS.WMS.Core.Op.Dtos /// [Description("通知人")] public string NotifyParty { get; set; } + /// + /// 集装箱 + /// + public string CntrTotal { get; set; } } } diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportBillManageRes.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportBillManageRes.cs index 92e35e3f..0f4571e2 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportBillManageRes.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportBillManageRes.cs @@ -459,5 +459,9 @@ namespace DS.WMS.Core.Op.Dtos /// [Description("通知人")] public string NotifyParty { get; set; } + /// + /// 集装箱 + /// + public string CntrTotal { get; set; } } } diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExportBillManage.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExportBillManage.cs index 23185df6..074f5969 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExportBillManage.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExportBillManage.cs @@ -530,4 +530,10 @@ public class SeaExportBillManage : BaseOrgModel [Description("通知人")] [SqlSugar.SugarColumn(ColumnDescription = "通知人", IsNullable = true, Length = 100)] public string NotifyParty { get; set; } + /// + /// 集装箱 + /// + [Description("集装箱")] + [SugarColumn(ColumnDescription = "集装箱", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)] + public string CntrTotal { get; set; } } \ No newline at end of file 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 c128d7f8..2152faf6 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs @@ -350,7 +350,13 @@ public partial class SeaExportService : ISeaExportService //开启事务 await tenantDb.Ado.BeginTranAsync(); info.Note = "正常编辑"; - await tenantDb.Updateable(info).EnableDiffLogEvent().ExecuteCommandAsync();//.IgnoreColumns(ignoreAllNullColumns: true) + await tenantDb.Updateable(info).IgnoreColumns(it => new + { + it.BusinessStatus, + it.BusinessStatusName, + it.IsVGM,it.IsBooking,it.IsLand,it.IsCustoms, + it.IsChangeETD,it.IsRefund + }).EnableDiffLogEvent().ExecuteCommandAsync();//.IgnoreColumns(ignoreAllNullColumns: true) _logger.Info("执行完订单比对"); @@ -483,6 +489,7 @@ public partial class SeaExportService : ISeaExportService part.CBM = info.CBM; part.TotalNo = info.TotalNo; part.CntrNo = info.CntrNo; + //part.CntrTotal = info.CntrTotal; await tenantDb.Updateable(part).ExecuteCommandAsync(); } #endregion From f8c592bbe907f5992ee9c5a46507856b586e5ec8 Mon Sep 17 00:00:00 2001 From: cjy Date: Mon, 28 Oct 2024 10:24:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=94=B9=E9=85=8D?= =?UTF-8?q?=E9=80=80=E8=88=B1=E6=9C=AA=E5=8F=98=E6=9B=B4=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DS.WMS.Core/Op/Method/SeaExportRefundService.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportRefundService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportRefundService.cs index 5e84009c..0a9930c4 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportRefundService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportRefundService.cs @@ -339,11 +339,15 @@ namespace DS.WMS.Core.Op.Method info.IsCustoms = false; info.IsLand = false; info.IsVGM = false; - info.BusinessStatus = ""; - info.BusinessStatusName = ""; + info.BusinessStatus = string.Empty; + info.BusinessStatusName = string.Empty; info.OrderProgress = "0"; - await tenantDb.Updateable(info).UpdateColumns(x => new { x.CustomerNo,x.IsBooking,x.IsCustoms,x.IsLand,x.IsVGM,x.OrderProgress }).ExecuteCommandAsync(); + await tenantDb.Updateable(info).UpdateColumns(x => new { + x.CustomerNo, + x.IsBooking,x.IsCustoms,x.IsLand,x.IsVGM,x.OrderProgress, + x.BusinessStatus, x.BusinessStatusName + }).ExecuteCommandAsync(); var oldOrder = entity.Adapt(); entity.IsChangeETD = true;