From 613413efac566d6d7b15146dfbeb32fc38d25b9e Mon Sep 17 00:00:00 2001
From: zhangxiaofeng <1939543722@qq.com>
Date: Fri, 10 May 2024 17:38:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=BB=9F=E8=AE=A1=E3=80=81?=
 =?UTF-8?q?=E8=AE=A1=E8=B4=B9=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Event/BookingSlotStockSubscriber.cs        | 18 ++++++++++++++----
 .../BookingOrder/BookingOrderService.cs        |  8 +++++---
 .../Service/BookingSlot/BookingSlotService.cs  | 15 ++++++++++-----
 .../BookingSlot/Dto/BookingSlotBaseDto.cs      | 12 ++++++++++++
 4 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/Myshipping.Application/Event/BookingSlotStockSubscriber.cs b/Myshipping.Application/Event/BookingSlotStockSubscriber.cs
index a345ecc7..ba70cf76 100644
--- a/Myshipping.Application/Event/BookingSlotStockSubscriber.cs
+++ b/Myshipping.Application/Event/BookingSlotStockSubscriber.cs
@@ -64,10 +64,6 @@ namespace Myshipping.Application.Event
                    && x.PLACERECEIPT == paraObj.PLACERECEIPT)
                   .OrderByDescending(x => x.UpdatedTime)
                   .ToListAsync();
-            if (!baseList.Any())
-            {
-                return;
-            }
 
             var stockObj = await _repStock.AsQueryable()
                  .Filter(null, true)
@@ -79,6 +75,15 @@ namespace Myshipping.Application.Event
                  && x.CARRIERID == paraObj.CARRIERID
                  && x.PLACEDELIVERY == paraObj.PLACEDELIVERY
                  && x.PLACERECEIPT == paraObj.PLACERECEIPT);
+
+            if (!baseList.Any())
+            {
+                // 从库存表删除这7项维度的库存数据
+
+                return;
+            }
+
+            
             if (stockObj == null)
             {
                 stockObj = new BookingSlotStock();
@@ -222,5 +227,10 @@ namespace Myshipping.Application.Event
         /// 交货地
         /// </summary>
         public string PLACEDELIVERY { get; set; }
+
+        /// <summary>
+        /// 租户Id
+        /// </summary>
+        public long? TenantId { get; set; }
     }
 }
diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index 5285779d..220cb580 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -1588,7 +1588,7 @@ namespace Myshipping.Application
                         throw Oops.Bah("当前真提单号已存在，请勿重复录入!");
                     }
                 }
-                
+
             }
 
             //版本号避免多人同时操作数据错乱
@@ -11925,7 +11925,8 @@ namespace Myshipping.Application
                 x.VESSEL,
                 x.VOYNO,
                 x.PLACERECEIPT,
-                x.PLACEDELIVERY
+                x.PLACEDELIVERY,
+                x.TenantId
             }).ToListAsync();
 
             if (slotList.Count > 0)
@@ -11958,7 +11959,8 @@ namespace Myshipping.Application
                         VESSEL = item.VESSEL,
                         VOYNO = item.VOYNO,
                         PLACERECEIPT = item.PLACERECEIPT,
-                        PLACEDELIVERY = item.PLACEDELIVERY
+                        PLACEDELIVERY = item.PLACEDELIVERY,
+                        TenantId = item.TenantId
                     }));
                 }
             }
diff --git a/Myshipping.Application/Service/BookingSlot/BookingSlotService.cs b/Myshipping.Application/Service/BookingSlot/BookingSlotService.cs
index 0b9b048a..69b064a1 100644
--- a/Myshipping.Application/Service/BookingSlot/BookingSlotService.cs
+++ b/Myshipping.Application/Service/BookingSlot/BookingSlotService.cs
@@ -170,7 +170,8 @@ namespace Myshipping.Application
                         VESSEL = oldObj.VESSEL,
                         VOYNO = oldObj.VOYNO,
                         PLACERECEIPT = oldObj.PLACERECEIPT,
-                        PLACEDELIVERY = oldObj.PLACEDELIVERY
+                        PLACEDELIVERY = oldObj.PLACEDELIVERY,
+                        TenantId = model.TenantId
                     }));
                 }
                 await _repCtn.DeleteAsync(x => x.SLOT_ID == model.Id);
@@ -212,7 +213,8 @@ namespace Myshipping.Application
                 VESSEL = model.VESSEL,
                 VOYNO = model.VOYNO,
                 PLACERECEIPT = model.PLACERECEIPT,
-                PLACEDELIVERY = model.PLACEDELIVERY
+                PLACEDELIVERY = model.PLACEDELIVERY,
+                TenantId = model.TenantId
             }));
 
             return await Detail(model.Id);
@@ -537,7 +539,8 @@ namespace Myshipping.Application
                             VESSEL = oldObj.VESSEL,
                             VOYNO = oldObj.VOYNO,
                             PLACERECEIPT = oldObj.PLACERECEIPT,
-                            PLACEDELIVERY = oldObj.PLACEDELIVERY
+                            PLACEDELIVERY = oldObj.PLACEDELIVERY,
+                            TenantId = model.TenantId
                         }));
                     }
 
@@ -659,7 +662,8 @@ namespace Myshipping.Application
                     VESSEL = model.VESSEL,
                     VOYNO = model.VOYNO,
                     PLACERECEIPT = model.PLACERECEIPT,
-                    PLACEDELIVERY = model.PLACEDELIVERY
+                    PLACEDELIVERY = model.PLACEDELIVERY,
+                    TenantId = model.TenantId
                 }));
             }
             else
@@ -1044,7 +1048,8 @@ namespace Myshipping.Application
                         VESSEL = latestSlot.VESSEL,
                         VOYNO = latestSlot.VOYNO,
                         PLACERECEIPT = latestSlot.PLACERECEIPT,
-                        PLACEDELIVERY = latestSlot.PLACEDELIVERY
+                        PLACEDELIVERY = latestSlot.PLACEDELIVERY,
+                        TenantId = latestSlot.TenantId,
                     }));
                 }
             }
diff --git a/Myshipping.Application/Service/BookingSlot/Dto/BookingSlotBaseDto.cs b/Myshipping.Application/Service/BookingSlot/Dto/BookingSlotBaseDto.cs
index bbe76320..89090911 100644
--- a/Myshipping.Application/Service/BookingSlot/Dto/BookingSlotBaseDto.cs
+++ b/Myshipping.Application/Service/BookingSlot/Dto/BookingSlotBaseDto.cs
@@ -328,6 +328,18 @@ namespace Myshipping.Application.Service.BookingSlot.Dto
         /// </summary>
         [Description("客户样单截止日期")]
         public Nullable<DateTime> CUSTOM_SI_CUT_DATE { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Description("备注")]
+        public string REMARK { get; set; }
+
+        /// <summary>
+        /// 计费日期
+        /// </summary>
+        [Description("计费日期")]
+        public DateTime? PRICE_CALCULATION_DATE { get; set; }
     }
 
     /// <summary>