修改提单管理

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

@@ -406,5 +406,15 @@ namespace DS.WMS.Core.Op.Dtos
         /// 单证人员
         /// </summary>
         public string DocName { get; set; }
+
+        /// <summary>
+        /// 是否改签
+        /// </summary>
+        public bool IsBLModify { get; set; }
+
+        /// <summary>
+        /// 是否扣单
+        /// </summary>
+        public bool IsBLSeize { get; set; }
     }
 }

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

@@ -369,5 +369,17 @@ namespace DS.WMS.Core.Op.Entity
         /// </summary>
         [SqlSugar.SugarColumn(ColumnDescription = "是否换签（背书）", IsNullable = true)]
         public bool IsChangeEndorse { get; set; }
+
+        /// <summary>
+        /// 是否改签
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "是否改签", IsNullable = true)]
+        public bool IsBLModify { get; set; }
+
+        /// <summary>
+        /// 是否扣单
+        /// </summary>
+        [SqlSugar.SugarColumn(ColumnDescription = "是否扣单", IsNullable = true)]
+        public bool IsBLSeize { get; set; }
     }
 }

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

@@ -105,15 +105,26 @@ namespace DS.WMS.Core.Op.Method
         {
             /*
              1、海运出口的订单数据跟提单管理表的数据关联，有提单记录的以提单记录为准。
+
              */
             var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
 
             var query = tenantDb.Queryable<SeaExport>().ClearFilter(typeof(IOrgId))
                 .LeftJoin<BLIssueManageBase>((l, r) => l.Id == r.BookingId)
                 .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode) 
-                    && querySearch.OtherQueryCondition.QueryTabCode.Equals("CheckInQuery",StringComparison.OrdinalIgnoreCase),(l,r)=> r.IsCheckIn == false)
+                    && querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.CheckInQuery.ToString(), StringComparison.OrdinalIgnoreCase),(l,r)=> r.IsCheckIn == false)
+                .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode)
+                    && querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.CheckOutQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsCheckIn == true)
+                .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode)
+                    && querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.HasCheckOutQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsCheckOut == true)
                 .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode)
-                    && querySearch.OtherQueryCondition.QueryTabCode.Equals("CheckOutQuery", StringComparison.OrdinalIgnoreCase), (l, r) => r.IsCheckIn == true)
+                    && querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.BLModifyQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsBLModify == true)
+                .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode)
+                    && querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.BLSeizeQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsBLSeize == true)
+                .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.MHouseFlag)
+                    && querySearch.OtherQueryCondition.QueryTabCode.Equals("M", StringComparison.OrdinalIgnoreCase), (l, r) => l.ParentId == 0)
+                .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.MHouseFlag)
+                    && querySearch.OtherQueryCondition.QueryTabCode.Equals("H", StringComparison.OrdinalIgnoreCase), (l, r) => l.ParentId > 0)
                 .Select((l, r) => new { order = l, bl = r });
 
             BLIssueMangeQueryExtDto otherQuery = null;
@@ -206,6 +217,20 @@ namespace DS.WMS.Core.Op.Method
 
             var query = tenantDb.Queryable<SeaExport>().ClearFilter(typeof(IOrgId))
                 .LeftJoin<BLIssueManageBase>((l, r) => l.Id == r.BookingId)
+                .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode)
+                    && querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.CheckInQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsCheckIn == false)
+                .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode)
+                    && querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.CheckOutQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsCheckIn == true)
+                .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode)
+                    && querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.HasCheckOutQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsCheckOut == true)
+                .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode)
+                    && querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.BLModifyQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsBLModify == true)
+                .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode)
+                    && querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.BLSeizeQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsBLSeize == true)
+                .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.MHouseFlag)
+                    && querySearch.OtherQueryCondition.QueryTabCode.Equals("M", StringComparison.OrdinalIgnoreCase), (l, r) => l.ParentId == 0)
+                .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.MHouseFlag)
+                    && querySearch.OtherQueryCondition.QueryTabCode.Equals("H", StringComparison.OrdinalIgnoreCase), (l, r) => l.ParentId > 0)
                 .Select((l, r) => new { order = l, bl = r });
 
             if (!querySearch.QueryCondition.IsNullOrEmpty())