修改SI截单回执更新订单功能，如果是合票的主票，则不合并推送东胜

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -11020,8 +11020,18 @@ namespace Myshipping.Application
                             //如果当前是主票
                             if (dto.CUSTNO.Equals(dto.HBLNO, StringComparison.OrdinalIgnoreCase))
                             {
-                                var allOrderList = await _rep.AsQueryable().Filter(null, true).Where(x => dto.HBLNO == x.HBLNO && (x.SPLIT_OR_MERGE_FLAG != null && x.SPLIT_OR_MERGE_FLAG == 2)
+                                List<BookingOrder> allOrderList = new List<BookingOrder>();
+
+                                if(!string.IsNullOrWhiteSpace(oddCode) &&  oddCode.Equals("SIReceipt",StringComparison.OrdinalIgnoreCase))
+                                {
+                                    allOrderList = await _rep.AsQueryable().Filter(null, true).Where(x => x.Id == item.Id
                                     && x.TenantId == UserManager.TENANT_ID && x.IsDeleted == false).ToListAsync();
+                                }
+                                else
+                                {
+                                    allOrderList = await _rep.AsQueryable().Filter(null, true).Where(x => dto.HBLNO == x.HBLNO && (x.SPLIT_OR_MERGE_FLAG != null && x.SPLIT_OR_MERGE_FLAG == 2)
+                                    && x.TenantId == UserManager.TENANT_ID && x.IsDeleted == false).ToListAsync();
+                                }
 
                                 if (allOrderList.Count > 0)
                                 {

Myshipping.Application/Service/TaskManagePlat/TaskManageSISubmittedService.cs

@@ -381,7 +381,8 @@ namespace Myshipping.Application
                                 Id = orderInfo.Id,
                                 MBLNO = orderInfo.MBLNO,
                                 ctnInputs = new List<BookingCtnDto>(),
-                                ChangedFields = new List<string>()
+                                ChangedFields = new List<string>(),
+                                OddCode = "SIReceipt"
                             };
 
                             if (!string.IsNullOrEmpty(siSubmitted.ISSUETYPE))