修改约号管理

Myshipping.Application/Entity/Para/ParaContractNoInfo.cs

@@ -36,6 +36,11 @@ namespace Myshipping.Application
         /// </summary>
         public string LANE_CODE { get; set; }
 
+        /// <summary>
+        /// 航线中文
+        /// </summary>
+        public string LANE_CNAME { get; set; }
+
         /// <summary>
         /// 目的港代码
         /// </summary>

Myshipping.Application/Service/Para/Dto/ParaContractNoDto.cs

@@ -38,6 +38,12 @@ namespace Myshipping.Application
         ///  <example>测试1</example>
         public string LaneCode { get; set; }
 
+        /// <summary>
+        /// 航线中文
+        /// </summary>
+        ///  <example>测试1</example>
+        public string LaneCName { get; set; }
+
         /// <summary>
         /// 目的港代码
         /// </summary>

Myshipping.Application/Service/Para/Dto/ParaDtoMapper.cs

@@ -77,6 +77,7 @@ namespace Myshipping.Application
                 .Map(dest => dest.ContractName, src => src.CONTRACT_NAME)
                 .Map(dest => dest.ContractNote, src => src.CONTRACT_NOTE)
                 .Map(dest => dest.LaneCode, src => src.LANE_CODE)
+                .Map(dest => dest.LaneCName, src => src.LANE_CNAME)
                 .Map(dest => dest.PODCode, src => src.POD_CODE)
                 .Map(dest => dest.CarrierCode, src => src.CARRIER_CODE);
 
@@ -92,6 +93,7 @@ namespace Myshipping.Application
                 .Map(dest => dest.UpdateUserName, src => src.UpdatedUserName)
                 .Map(dest => dest.UpdateTime, src => src.UpdatedTime.HasValue ? src.UpdatedTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")
                 .Map(dest => dest.LaneCode, src => src.LANE_CODE)
+                .Map(dest => dest.LaneCName, src => src.LANE_CNAME)
                 .Map(dest => dest.PODCode, src => src.POD_CODE)
                 .Map(dest => dest.CarrierCode, src => src.CARRIER_CODE);
 
@@ -102,6 +104,7 @@ namespace Myshipping.Application
                .Map(dest => dest.CONTRACT_NAME, src => src.ContractName)
                .Map(dest => dest.CONTRACT_NOTE, src => src.ContractNote)
                .Map(dest => dest.LANE_CODE, src => src.LaneCode)
+               .Map(dest => dest.LANE_CNAME, src => src.LaneCName)
                .Map(dest => dest.POD_CODE, src => src.PODCode)
                .Map(dest => dest.CARRIER_CODE, src => src.CarrierCode);
         }

Myshipping.Application/Service/Para/Interface/IParaService.cs

@@ -103,10 +103,11 @@ namespace Myshipping.Application
         /// <param name="top">默认最大行数</param>
         /// <param name="carrier">船公司代码</param>
         /// <param name="lane">航线代码</param>
+        /// <param name="lanecname">航线中文</param>
         /// <param name="pod">目的港代码</param>
         /// <returns>返回回执</returns>
         Task<List<ParaContractNoShowDto>> QuerytParaContractNoInfo(string queryItem, int top = 10,
-            string carrier = "", string lane = "",string pod = "");
+            string carrier = "", string lane = "", string lanecname = "", string pod = "");
 
         /// <summary>
         /// 作废约号参数

Myshipping.Application/Service/Para/ParaService.cs

@@ -610,6 +610,7 @@ namespace Myshipping.Application
                     info.CONTRACT_NAME = model.ContractName?.Trim();
                     info.CONTRACT_NOTE = model.ContractNote?.Trim();
                     info.LANE_CODE = model.LaneCode?.Trim();
+                    info.LANE_CNAME = model.LaneCName?.Trim();
                     info.POD_CODE = model.PODCode?.Trim();
 
                     await _paraContractNoInfoRepository.AsUpdateable(info).IgnoreColumns(it => new
@@ -675,11 +676,12 @@ namespace Myshipping.Application
         /// <param name="top">默认最大行数</param>
         /// <param name="carrier">船公司代码</param>
         /// <param name="lane">航线代码</param>
+        /// <param name="lanecname">航线中文</param>
         /// <param name="pod">目的港代码</param>
         /// <returns>返回回执</returns>
         [HttpGet("/Para/QuerytParaContractNoInfo")]
         public async Task<List<ParaContractNoShowDto>> QuerytParaContractNoInfo([FromQuery] string queryItem, [FromQuery] int top = 10,
-            [FromQuery] string carrier = "", [FromQuery] string lane = "", [FromQuery] string pod = "")
+            [FromQuery] string carrier = "", [FromQuery] string lane = "", [FromQuery] string lanecname = "", [FromQuery] string pod = "")
         {
             List<ParaContractNoShowDto> list = new List<ParaContractNoShowDto>();
 
@@ -701,16 +703,21 @@ namespace Myshipping.Application
                 {
                     query = query.Where(t => t.CARRIER_CODE.Equals(carrier));
                 }
-                else
-                {
-                    throw Oops.Bah($"检索约号失败，船公司不能为空");
-                }
+                //else
+                //{
+                //    throw Oops.Bah($"检索约号失败，船公司不能为空");
+                //}
 
                 if (!string.IsNullOrWhiteSpace(lane))
                 {
                     query = query.Where(t => t.LANE_CODE.Contains(lane));
                 }
 
+                if (!string.IsNullOrWhiteSpace(lanecname))
+                {
+                    query = query.Where(t => t.LANE_CNAME.Contains(lanecname));
+                }
+
                 if (!string.IsNullOrWhiteSpace(pod))
                 {
                     query = query.Where(t => t.POD_CODE.Contains(pod));