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

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

@@ -396,5 +396,15 @@ namespace DS.WMS.Core.Op.Dtos
         /// 是否换签（背书）
         /// </summary>
         public bool IsChangeEndorse { get; set; }
+
+        /// <summary>
+        /// Desc:单证
+        /// </summary>
+        public long Doc { get; set; }
+
+        /// <summary>
+        /// 单证人员
+        /// </summary>
+        public string DocName { get; set; }
     }
 }

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

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace DS.WMS.Core.Op.Dtos.BLIssueManage
+namespace DS.WMS.Core.Op.Dtos
 {
     /// <summary>
     /// 
@@ -15,5 +15,15 @@ namespace DS.WMS.Core.Op.Dtos.BLIssueManage
         /// 台账状态标签代码
         /// </summary>
         public string QueryTabCode { get; set; }
+
+        /// <summary>
+        /// 主分单（M-主单，H-分单）
+        /// </summary>
+        public string MHouseFlag { get; set; }
+
+        /// <summary>
+        /// 收费状态（ALL-全部，NORECV-仅未收，RECV-仅已收）
+        /// </summary>
+        public string ChargeFeeStaus { get; set; }
     }
 }

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

@@ -13,9 +13,9 @@ namespace DS.WMS.Core.Op.Dtos
     public enum BLQueryStatusEnum
     {
         /// <summary>
-        /// 未签入
+        /// 提单查询
         /// </summary>
-        [Description("未签入")]
+        [Description("提单查询")]
         BLQuery,
         /// <summary>
         /// 可签入
@@ -28,6 +28,11 @@ namespace DS.WMS.Core.Op.Dtos
         [Description("可签出")]
         CheckOutQuery,
         /// <summary>
+        /// 已签出
+        /// </summary>
+        [Description("已签出")]
+        HasCheckOutQuery,
+        /// <summary>
         /// 改签
         /// </summary>
         [Description("改签")]

ds-wms-service/DS.WMS.Core/Op/Interface/BLIssueManage/IBLIssueManageService.cs

@@ -18,14 +18,14 @@ namespace DS.WMS.Core.Op.Interface
         /// </summary>
         /// <param name="querySearch">查询条件</param>
         /// <returns>返回回执</returns>
-        Task<DataResult<List<BLIssueManageBaseDto>>> GetPageAsync(PageRequest querySearch);
+        Task<DataResult<List<BLIssueManageBaseDto>>> GetPageAsync(PageRequest<BLIssueMangeQueryExtDto> querySearch);
 
         /// <summary>
         /// 获取导出数据列表
         /// </summary>
         /// <param name="querySearch">查询条件</param>
         /// <returns>返回回执</returns>
-        Task<DataResult<List<BLIssueManageBaseDto>>> GetExportList(PageRequest querySearch);
+        Task<DataResult<List<BLIssueManageBaseDto>>> GetExportList(PageRequest<BLIssueMangeQueryExtDto> querySearch);
 
         /// <summary>
         /// 打印

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

@@ -101,7 +101,7 @@ namespace DS.WMS.Core.Op.Method
         /// </summary>
         /// <param name="querySearch">查询条件</param>
         /// <returns>返回回执</returns>
-        public async Task<DataResult<List<BLIssueManageBaseDto>>> GetPageAsync(PageRequest querySearch)
+        public async Task<DataResult<List<BLIssueManageBaseDto>>> GetPageAsync(PageRequest<BLIssueMangeQueryExtDto> querySearch)
         {
             /*
              1、海运出口的订单数据跟提单管理表的数据关联，有提单记录的以提单记录为准。
@@ -110,8 +110,14 @@ 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("CheckInQuery",StringComparison.OrdinalIgnoreCase),(l,r)=> r.IsCheckIn == false)
+                .WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode)
+                    && querySearch.OtherQueryCondition.QueryTabCode.Equals("CheckOutQuery", StringComparison.OrdinalIgnoreCase), (l, r) => r.IsCheckIn == true)
                 .Select((l, r) => new { order = l, bl = r });
 
+            BLIssueMangeQueryExtDto otherQuery = null;
+
             if (!querySearch.QueryCondition.IsNullOrEmpty())
             {
                 var whereList = querySearch.GetConditionalModels(db);
@@ -176,6 +182,8 @@ namespace DS.WMS.Core.Op.Method
                         BusiTypeName = BLIssueBusiTypeEnum.SeaExport.GetDescription(),
                         BLType = BLTypeEnum.BL.ToString(),
                         BLTypeName = BLTypeEnum.BL.GetDescription(),
+                        StlDate = data.order.StlDate,
+
                     });
 
                     start++;
@@ -192,7 +200,7 @@ namespace DS.WMS.Core.Op.Method
         /// </summary>
         /// <param name="querySearch">查询条件</param>
         /// <returns>返回回执</returns>
-        public async Task<DataResult<List<BLIssueManageBaseDto>>> GetExportList(PageRequest querySearch)
+        public async Task<DataResult<List<BLIssueManageBaseDto>>> GetExportList(PageRequest<BLIssueMangeQueryExtDto> querySearch)
         {
             var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
 

ds-wms-service/DS.WMS.OpApi/Controllers/BLIssueManageController.cs

@@ -34,7 +34,7 @@ namespace DS.WMS.OpApi.Controllers
         /// <returns>返回回执</returns>
         [HttpPost]
         [Route("GetPage")]
-        public async Task<DataResult<List<BLIssueManageBaseDto>>> GetPageAsync([FromBody] PageRequest querySearch)
+        public async Task<DataResult<List<BLIssueManageBaseDto>>> GetPageAsync([FromBody] PageRequest<BLIssueMangeQueryExtDto> querySearch)
         {
             return await _BLIssueManageService.GetPageAsync(querySearch);
         }
@@ -48,7 +48,7 @@ namespace DS.WMS.OpApi.Controllers
         /// <returns>返回回执</returns>
         [HttpPost]
         [Route("GetExportList")]
-        public async Task<DataResult<List<BLIssueManageBaseDto>>> GetExportList(PageRequest querySearch)
+        public async Task<DataResult<List<BLIssueManageBaseDto>>> GetExportList(PageRequest<BLIssueMangeQueryExtDto> querySearch)
         {
             return await _BLIssueManageService.GetExportList(querySearch);
         }