Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -492,7 +492,7 @@ namespace Myshipping.Application
                 {
                     itconfig.RemoveAll(x => x.ConfigId == ii.ConfigId);
                 }
-                item.IsVGM=itgoods.Where(x => x.SystemCode == "YFVGM").FirstOrDefault()==null?null: itgoods.Where(x => x.SystemCode == "YFVGM").Select(x=>x.FinishTime).FirstOrDefault();
+                item.IsVGM = itgoods.Where(x => x.SystemCode == "YFVGM").FirstOrDefault() == null ? null : itgoods.Where(x => x.SystemCode == "YFVGM").Select(x => x.FinishTime).FirstOrDefault();
                 item.IsCanDan = itgoods.Where(x => x.SystemCode == "YFCD").FirstOrDefault() == null ? null : itgoods.Where(x => x.SystemCode == "YFCD").Select(x => x.FinishTime).FirstOrDefault();
                 item.IsZZFX = itgoods.Where(x => x.SystemCode == "ZZFX").FirstOrDefault() == null ? null : itgoods.Where(x => x.SystemCode == "ZZFX").Select(x => x.FinishTime).FirstOrDefault();
                 item.GoodsStatusList = itgoods.Union<GoodsStatusList>(itconfig).OrderBy(x => x.Sort).ToList();
@@ -593,7 +593,7 @@ namespace Myshipping.Application
             var query = _rep.AsQueryable().Filter(null, true).Where(x => x.TenantId == UserManager.TENANT_ID)
                  .WhereIF(!input.ISDel, x => x.IsDeleted == false)
                  .WhereIF(input.ISDel, x => x.IsDeleted == true)
-                 .WhereIF(input.firstFlag, x => x.ETD <= etoday && x.ETD >= ftoday || x.ETD == null)
+                 .WhereIF(input.firstFlag, x => (x.ETD <= etoday && x.ETD >= ftoday || x.ETD == null) && x.CreatedUserId == UserManager.UserId) //首次加载数据：ETD前后15天，且创建人是当前人
                  .Where(x => x.ParentId == 0 || x.ParentId == null) //台账只查询主单！！
                  .WhereIF(pidlist != null && pidlist.Count > 0, x => pidlist.Contains(x.Id))
                  .WhereIF(!string.IsNullOrWhiteSpace(input.BSNO), u => u.BSNO.Contains(input.BSNO))
@@ -6364,12 +6364,12 @@ namespace Myshipping.Application
                 }
 
                 //截单
-                if(model.sendType.Equals("E", StringComparison.OrdinalIgnoreCase))
+                if (model.sendType.Equals("E", StringComparison.OrdinalIgnoreCase))
                 {
                     //如果是截单需最后推送货物状态
                     await SetGoodsStatus("JD", model.Id);
                 }
-                
+
             }
 
 

Myshipping.Application/Service/DataSync/DataSyncService.cs

@@ -2290,7 +2290,7 @@ namespace Myshipping.Application
         public async Task<dynamic> GetSyncVesselDate()
         {
 
-            var list = await _vesselinfo.AsQueryable().Filter(null, true).Where(x => x.ATD == null && x.TenantId == UserManager.TENANT_ID && (x.Voyno != null && x.Voyno != "")).Select(x => new
+            var list = await _vesselinfo.AsQueryable().Filter(null, true).Where(x =>x.Sign==false&&x.ATD == null && x.TenantId == UserManager.TENANT_ID && (x.Voyno != null && x.Voyno != "")).Select(x => new
             {
                 Vessel = x.Vessel,
                 Voyno = x.Voyno,

Myshipping.Core/Entity/DJY/DjyVesselInfo.cs

@@ -94,8 +94,11 @@ namespace Myshipping.Application.Entity
         /// </summary>
         public string BSNO { get; set; }
 
+        /// <summary>
+        /// 是否调用接口标志
+        /// </summary>
+        public bool Sign { get; set; }
 
-     
     }