修改提单管理

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

@@ -19,7 +19,7 @@ namespace DS.WMS.Core.Op.Interface
         /// <param name="querySearch">查询条件</param>
         /// <param name="isExport">是否导出</param>
         /// <returns>返回回执</returns>
-        Task<DataResult<List<BLIssueManageBaseDto>>> GetPageAsync(PageRequest<BLIssueMangeQueryExtDto> querySearch, bool isExport = false);
+        Task<DataResult<List<BLIssueManageBaseDto>>> GetPageAsync(PageRequest querySearch, bool isExport = false);
 
         /// <summary>
         /// 打印

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

@@ -104,7 +104,7 @@ namespace DS.WMS.Core.Op.Method
         /// <param name="querySearch">查询条件</param>
         /// <param name="isExport">是否导出</param>
         /// <returns>返回回执</returns>
-        public async Task<DataResult<List<BLIssueManageBaseDto>>> GetPageAsync(PageRequest<BLIssueMangeQueryExtDto> querySearch,bool isExport = false)
+        public async Task<DataResult<List<BLIssueManageBaseDto>>> GetPageAsync(PageRequest querySearch,bool isExport = false)
         {
             /*
              1、海运出口的订单数据跟提单管理表的数据关联，有提单记录的以提单记录为准。
@@ -113,8 +113,8 @@ namespace DS.WMS.Core.Op.Method
             var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
 
             List<IConditionalModel> whereList = null;
-            BLIssueMangeQueryExtDto otherQueryCondition = querySearch.OtherQueryCondition;
 
+            BLIssueMangeQueryExtDto otherQueryCondition = new BLIssueMangeQueryExtDto();
 
             whereList = GetPageCondition(querySearch,out otherQueryCondition);
 
@@ -379,11 +379,16 @@ namespace DS.WMS.Core.Op.Method
         /// <param name="querySearch">原始查询条件</param>
         /// <param name="queryExt">其他查询条件</param>
         /// <returns></returns>
-        private List<IConditionalModel> GetPageCondition(PageRequest<BLIssueMangeQueryExtDto> querySearch,out BLIssueMangeQueryExtDto queryExt)
+        private List<IConditionalModel> GetPageCondition(PageRequest querySearch,out BLIssueMangeQueryExtDto queryExt)
         {
             List<IConditionalModel> whereList = null;
 
-            queryExt = querySearch.OtherQueryCondition;
+            queryExt = new BLIssueMangeQueryExtDto();
+
+            if (!string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition))
+            {
+                queryExt = JsonConvert.DeserializeObject<BLIssueMangeQueryExtDto>(querySearch.OtherQueryCondition);
+            }
 
             if (!querySearch.QueryCondition.IsNullOrEmpty())
             {
@@ -477,7 +482,7 @@ namespace DS.WMS.Core.Op.Method
                             DateTime currDate = DateTime.MinValue;
                             if (DateTime.TryParse(b.FieldValue, out currDate))
                             {
-                                querySearch.OtherQueryCondition.ETDStart = currDate;
+                                queryExt.ETDStart = currDate;
                             }
                         }
                         else if (b.ConditionalType == ConditionalType.LessThanOrEqual)
@@ -485,7 +490,7 @@ namespace DS.WMS.Core.Op.Method
                             DateTime currDate = DateTime.MinValue;
                             if (DateTime.TryParse(b.FieldValue, out currDate))
                             {
-                                querySearch.OtherQueryCondition.ETDEnd = currDate.AddDays(1);
+                                queryExt.ETDEnd = currDate.AddDays(1);
                             }
                         }
 
@@ -504,7 +509,7 @@ namespace DS.WMS.Core.Op.Method
                             DateTime currDate = DateTime.MinValue;
                             if (DateTime.TryParse(b.FieldValue, out currDate))
                             {
-                                querySearch.OtherQueryCondition.CheckInDateStart = currDate;
+                                queryExt.CheckInDateStart = currDate;
                             }
                         }
                         else if (b.ConditionalType == ConditionalType.LessThanOrEqual)
@@ -512,7 +517,7 @@ namespace DS.WMS.Core.Op.Method
                             DateTime currDate = DateTime.MinValue;
                             if (DateTime.TryParse(b.FieldValue, out currDate))
                             {
-                                querySearch.OtherQueryCondition.CheckInDateEnd = currDate.AddDays(1);
+                                queryExt.CheckInDateEnd = currDate.AddDays(1);
                             }
                         }
 
@@ -531,7 +536,7 @@ namespace DS.WMS.Core.Op.Method
                             DateTime currDate = DateTime.MinValue;
                             if (DateTime.TryParse(b.FieldValue, out currDate))
                             {
-                                querySearch.OtherQueryCondition.CheckOutDateStart = currDate;
+                                queryExt.CheckOutDateStart = currDate;
                             }
                         }
                         else if (b.ConditionalType == ConditionalType.LessThanOrEqual)
@@ -539,7 +544,7 @@ namespace DS.WMS.Core.Op.Method
                             DateTime currDate = DateTime.MinValue;
                             if (DateTime.TryParse(b.FieldValue, out currDate))
                             {
-                                querySearch.OtherQueryCondition.CheckOutDateEnd = currDate.AddDays(1);
+                                queryExt.CheckOutDateEnd = currDate.AddDays(1);
                             }
                         }
 

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<BLIssueMangeQueryExtDto> querySearch)
+        public async Task<DataResult<List<BLIssueManageBaseDto>>> GetPageAsync([FromBody] PageRequest 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<BLIssueMangeQueryExtDto> querySearch)
+        public async Task<DataResult<List<BLIssueManageBaseDto>>> GetExportList(PageRequest querySearch)
         {
             return await _BLIssueManageService.GetPageAsync(querySearch,true);
         }