Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportBillManageReq.cs

@@ -453,5 +453,9 @@ namespace DS.WMS.Core.Op.Dtos
         /// </summary>
         [Description("通知人")]
         public string NotifyParty { get; set; }
+        /// <summary>
+        /// 集装箱
+        /// </summary>
+        public string CntrTotal { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportBillManageRes.cs

@@ -459,5 +459,9 @@ namespace DS.WMS.Core.Op.Dtos
         /// </summary>
         [Description("通知人")]
         public string NotifyParty { get; set; }
+        /// <summary>
+        /// 集装箱
+        /// </summary>
+        public string CntrTotal { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Entity/SeaExportBillManage.cs

@@ -530,4 +530,10 @@ public class SeaExportBillManage : BaseOrgModel<long>
     [Description("通知人")]
     [SqlSugar.SugarColumn(ColumnDescription = "通知人", IsNullable = true, Length = 100)]
     public string NotifyParty { get; set; }
+    /// <summary>
+    /// 集装箱
+    /// </summary>
+    [Description("集装箱")]
+    [SugarColumn(ColumnDescription = "集装箱", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
+    public string CntrTotal { get; set; }
 }

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.BusinessStatus = string.Empty;
-                info.BusinessStatusName = "";
+                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<SeaExport>();
                 entity.IsChangeETD = true;

ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs

@@ -353,7 +353,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("执行完订单比对");
 
@@ -486,6 +492,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