chenjingyong
/
ds8-solution-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

海运出口编辑提单号重复判断排除改配和退单情形；改配退舱修改

Browse Source
dev
cjy 2 months ago
parent ee9f528486
commit 7048b7736d
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

16
ds-wms-service/DS.WMS.Core/Op/Method/SeaExportRefundService.cs
Unescape Escape View File

@ -588,10 +588,10 @@ namespace DS.WMS.Core.Op.Method
var info = await tenantDb.Queryable<SeaExport>().Where(x => x.Id == long.Parse(req.Id)).FirstAsync(); var info = await tenantDb.Queryable<SeaExport>().Where(x => x.Id == long.Parse(req.Id)).FirstAsync();
if (info.IsNull()) if (info.IsNull())
return await Task.FromResult(DataResult.Failed("不存在的海运出口信息!", MultiLanguageConst.SeaExportExist)); return await Task.FromResult(DataResult.Failed("不存在的海运出口信息!", MultiLanguageConst.SeaExportExist));
if (info.IsRefund == false) //if (info.IsRefund == false)
{ //{
return await Task.FromResult(DataResult.Failed("订单状态必须为退舱标识!")); // return await Task.FromResult(DataResult.Failed("订单状态必须为退舱标识!"));
} //}
var task = await tenantDb.Queryable<BusinessTask>().Where(x => x.BusinessId == long.Parse(req.Id) && x.TaskType == TaskBaseTypeEnum.RETURN_CABIN_POOL).FirstAsync(); var task = await tenantDb.Queryable<BusinessTask>().Where(x => x.BusinessId == long.Parse(req.Id) && x.TaskType == TaskBaseTypeEnum.RETURN_CABIN_POOL).FirstAsync();
if (task.IsNotNull() && task.TaskStatus == TaskStatusEnum.Complete) if (task.IsNotNull() && task.TaskStatus == TaskStatusEnum.Complete)
@ -639,10 +639,10 @@ namespace DS.WMS.Core.Op.Method
var info = await tenantDb.Queryable<SeaExport>().Where(x => x.Id == long.Parse(req.Id)).FirstAsync(); var info = await tenantDb.Queryable<SeaExport>().Where(x => x.Id == long.Parse(req.Id)).FirstAsync();
if (info.IsNull()) if (info.IsNull())
return await Task.FromResult(DataResult.Failed("不存在的海运出口信息!", MultiLanguageConst.SeaExportExist)); return await Task.FromResult(DataResult.Failed("不存在的海运出口信息!", MultiLanguageConst.SeaExportExist));
if (info.IsRefund == false) //if (info.IsRefund == false)
{ //{
return await Task.FromResult(DataResult.Failed("订单状态必须为退舱标识!")); // return await Task.FromResult(DataResult.Failed("订单状态必须为退舱标识!"));
} //}
var task = await tenantDb.Queryable<BusinessTask>().Where(x => x.BusinessId == long.Parse(req.Id) && x.TaskType == TaskBaseTypeEnum.RETURN_CABIN).FirstAsync(); var task = await tenantDb.Queryable<BusinessTask>().Where(x => x.BusinessId == long.Parse(req.Id) && x.TaskType == TaskBaseTypeEnum.RETURN_CABIN).FirstAsync();

2
ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs
Unescape Escape View File

@ -219,7 +219,7 @@ public partial class SeaExportService : ISeaExportService
} }
else else
{ {
if (req.BLType != "拼箱分票" && !string.IsNullOrEmpty(req.MBLNO) && tenantDb.Queryable<SeaExport>().Where(x => x.Id != req.Id && x.MBLNO == req.MBLNO.Trim()).Any()) if (req.BLType != "拼箱分票" && !string.IsNullOrEmpty(req.MBLNO) && tenantDb.Queryable<SeaExport>().Where(x => x.Id != req.Id && x.MBLNO == req.MBLNO.Trim() && !(x.IsChangeETD == true || x.IsRefund == true)).Any())
{ {
return await Task.FromResult(DataResult.Failed("海运出口信息主提单号已存在!", MultiLanguageConst.SeaExportMBLNOExist)); return await Task.FromResult(DataResult.Failed("海运出口信息主提单号已存在!", MultiLanguageConst.SeaExportMBLNOExist));
} }

Write Preview
Loading…
Cancel
Save