diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index ecc777da..3315d887 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -637,7 +637,7 @@ namespace Myshipping.Application var currStus = currStatusList.FirstOrDefault(a => a.StatusSKUCode.Equals("YFVGM", StringComparison.OrdinalIgnoreCase) && a.IsYield); - if(currStus != null) + if (currStus != null) item.IsVGM = currStus?.ActDate.Value; } if (currStatusList.Any(a => a.StatusSKUCode.Equals("YFCD", StringComparison.OrdinalIgnoreCase) && a.IsYield)) @@ -826,15 +826,27 @@ namespace Myshipping.Application throw Oops.Bah("当前主提单号已存在,请勿重复录入!"); } } + //if (!string.IsNullOrWhiteSpace(input.HBLNO) && !string.IsNullOrWhiteSpace(input.MBLNO) && input.ParentId != 0) + //{ + // var et = await _rep.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && x.MBLNO == input.MBLNO && x.HBLNO == input.HBLNO && x.TenantId == UserManager.TENANT_ID && x.ParentId == input.ParentId && x.Id != input.Id).FirstAsync(); + // if (et != null) + // { + // throw Oops.Bah("当前分提单号已存在,请勿重复录入!"); + // } + //} + + //input.HBLNO请求参数的分单号,主提单号,都不为空时 if (!string.IsNullOrWhiteSpace(input.HBLNO) && !string.IsNullOrWhiteSpace(input.MBLNO) && input.ParentId != 0) { - var et = await _rep.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && x.MBLNO == input.MBLNO && x.HBLNO == input.HBLNO && x.TenantId == UserManager.TENANT_ID && x.ParentId == input.ParentId && x.Id != input.Id).FirstAsync(); + //查询表中是否有当前输入的分单号 + var et = await _rep.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && x.HBLNO == input.HBLNO && x.TenantId == UserManager.TENANT_ID && x.ParentId == input.ParentId && x.Id != input.Id).FirstAsync(); if (et != null) { throw Oops.Bah("当前分提单号已存在,请勿重复录入!"); } } + //陈冠宇提订舱编号不允许重复 if (!string.IsNullOrWhiteSpace(input.CUSTNO)) { @@ -7474,14 +7486,14 @@ namespace Myshipping.Application //如果合同协议号不为空需要判断是否字符前、后有空格,不允许字符前后有空格,需要提示修改 if (!string.IsNullOrWhiteSpace(order.CONTRACTNO)) { - if(order.CONTRACTNO.StartsWith(" ")) + if (order.CONTRACTNO.StartsWith(" ")) throw Oops.Bah("运费协议号前含有空格,请修改"); if (order.CONTRACTNO.EndsWith(" ")) throw Oops.Bah("运费协议号后含有空格,请修改"); } - //增加件、重、尺比对 + //增加件、重、尺比对 if (ctnList != null && ctnList.Count > 0) { if (ctnList.Sum(a => a.PKGS.HasValue ? a.PKGS.Value : 0) != (order.PKGS.HasValue ? order.PKGS.Value : 0)) @@ -8559,7 +8571,7 @@ HLCUTA12307DPXJ3 以这票为例 6个柜 ExtData = t.ExtData }).Distinct().ToListAsync(); } - + var childrens = await _rep.AsQueryable().Filter(null, true).Where(x => x.ParentId == item.Id && x.TenantId == UserManager.TENANT_ID && x.IsDeleted == false).ToListAsync(); dto.childrens = childrens.Adapt>();