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

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

Browse Source
dev
cjy 4 weeks ago
parent f846a04583 46a67d44f4
commit 58edd819d9
3 changed files with 88 additions and 3 deletions
Show Stats Download Patch File Download Diff File

10
ds-wms-service/DS.WMS.Core/Op/Dtos/BLIssueManage/BLIssueManageBaseDto.cs
Unescape Escape View File

@ -406,5 +406,15 @@ namespace DS.WMS.Core.Op.Dtos
/// 单证人员
/// </summary>
public string DocName { get; set; }
/// <summary>
/// 是否改签
/// </summary>
public bool IsBLModify { get; set; }
/// <summary>
/// 是否扣单
/// </summary>
public bool IsBLSeize { get; set; }
}
}

12
ds-wms-service/DS.WMS.Core/Op/Entity/BLIssueManage/BLIssueManageBase.cs
Unescape Escape View File

@ -369,5 +369,17 @@ namespace DS.WMS.Core.Op.Entity
/// </summary>
[SqlSugar.SugarColumn(ColumnDescription = "是否换签（背书）", IsNullable = true)]
public bool IsChangeEndorse { get; set; }
/// <summary>
/// 是否改签
/// </summary>
[SqlSugar.SugarColumn(ColumnDescription = "是否改签", IsNullable = true)]
public bool IsBLModify { get; set; }
/// <summary>
/// 是否扣单
/// </summary>
[SqlSugar.SugarColumn(ColumnDescription = "是否扣单", IsNullable = true)]
public bool IsBLSeize { get; set; }
}
}

69
ds-wms-service/DS.WMS.Core/Op/Method/BLIssueManage/BLIssueManageService.cs
Unescape Escape View File

@ -105,15 +105,26 @@ namespace DS.WMS.Core.Op.Method
{
/*
1、海运出口的订单数据跟提单管理表的数据关联，有提单记录的以提单记录为准。
*/
var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
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)
&& querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.CheckInQuery.ToString(), StringComparison.OrdinalIgnoreCase),(l,r)=> r.IsCheckIn == false)
.WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode)
&& querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.CheckOutQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsCheckIn == true)
.WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode)
&& querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.HasCheckOutQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsCheckOut == true)
.WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode)
&& querySearch.OtherQueryCondition.QueryTabCode.Equals("CheckOutQuery", StringComparison.OrdinalIgnoreCase), (l, r) => r.IsCheckIn == true)
&& querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.BLModifyQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsBLModify == true)
.WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode)
&& querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.BLSeizeQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsBLSeize == true)
.WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.MHouseFlag)
&& querySearch.OtherQueryCondition.QueryTabCode.Equals("M", StringComparison.OrdinalIgnoreCase), (l, r) => l.ParentId == 0)
.WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.MHouseFlag)
&& querySearch.OtherQueryCondition.QueryTabCode.Equals("H", StringComparison.OrdinalIgnoreCase), (l, r) => l.ParentId > 0)
.Select((l, r) => new { order = l, bl = r });
BLIssueMangeQueryExtDto otherQuery = null;
@ -151,6 +162,8 @@ namespace DS.WMS.Core.Op.Method
currBl.DischargePort = data.order.DischargePort;
currBl.CustomerService = data.order.CustomerService;
currBl.CustomerServiceName = data.order.CustomerServiceName;
currBl.Doc = data.order.Doc;
currBl.DocName = data.order.DocName;
resultList.Add(currBl);
@ -183,7 +196,8 @@ namespace DS.WMS.Core.Op.Method
BLType = BLTypeEnum.BL.ToString(),
BLTypeName = BLTypeEnum.BL.GetDescription(),
StlDate = data.order.StlDate,
Doc = data.order.Doc,
DocName = data.order.DocName,
});
start++;
@ -206,6 +220,20 @@ 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(BLQueryStatusEnum.CheckInQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsCheckIn == false)
.WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode)
&& querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.CheckOutQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsCheckIn == true)
.WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode)
&& querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.HasCheckOutQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsCheckOut == true)
.WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode)
&& querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.BLModifyQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsBLModify == true)
.WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.QueryTabCode)
&& querySearch.OtherQueryCondition.QueryTabCode.Equals(BLQueryStatusEnum.BLSeizeQuery.ToString(), StringComparison.OrdinalIgnoreCase), (l, r) => r.IsBLSeize == true)
.WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.MHouseFlag)
&& querySearch.OtherQueryCondition.QueryTabCode.Equals("M", StringComparison.OrdinalIgnoreCase), (l, r) => l.ParentId == 0)
.WhereIF(querySearch.OtherQueryCondition != null && !string.IsNullOrWhiteSpace(querySearch.OtherQueryCondition.MHouseFlag)
&& querySearch.OtherQueryCondition.QueryTabCode.Equals("H", StringComparison.OrdinalIgnoreCase), (l, r) => l.ParentId > 0)
.Select((l, r) => new { order = l, bl = r });
if (!querySearch.QueryCondition.IsNullOrEmpty())
@ -243,6 +271,8 @@ namespace DS.WMS.Core.Op.Method
currBl.DischargePort = data.order.DischargePort;
currBl.CustomerService = data.order.CustomerService;
currBl.CustomerServiceName = data.order.CustomerServiceName;
currBl.Doc = data.order.Doc;
currBl.DocName = data.order.DocName;
resultList.Add(currBl);
@ -274,6 +304,8 @@ namespace DS.WMS.Core.Op.Method
BusiTypeName = BLIssueBusiTypeEnum.SeaExport.GetDescription(),
BLType = BLTypeEnum.BL.ToString(),
BLTypeName = BLTypeEnum.BL.GetDescription(),
Doc = data.order.Doc,
DocName = data.order.DocName,
});
start++;
@ -353,6 +385,9 @@ namespace DS.WMS.Core.Op.Method
CustomerServiceName = data.order.CustomerServiceName,
BLType = BLTypeEnum.BL.ToString(),
BLTypeName = BLTypeEnum.BL.GetDescription(),
BusiType = BLIssueBusiTypeEnum.SeaExport.ToString(),
BusiTypeName = BLIssueBusiTypeEnum.SeaExport.GetDescription(),
StlDate = data.order.StlDate,
};
var saveRlt = await Save(dto);
@ -569,6 +604,11 @@ namespace DS.WMS.Core.Op.Method
DischargePort = data.order.DischargePort,
CustomerService = data.order.CustomerService,
CustomerServiceName = data.order.CustomerServiceName,
BLType = BLTypeEnum.BL.ToString(),
BLTypeName = BLTypeEnum.BL.GetDescription(),
BusiType = BLIssueBusiTypeEnum.SeaExport.ToString(),
BusiTypeName = BLIssueBusiTypeEnum.SeaExport.GetDescription(),
StlDate = data.order.StlDate,
};
var saveRlt = await Save(dto);
@ -749,6 +789,9 @@ namespace DS.WMS.Core.Op.Method
CustomerServiceName = data.order.CustomerServiceName,
BLType = BLTypeEnum.BL.ToString(),
BLTypeName = BLTypeEnum.BL.GetDescription(),
BusiType = BLIssueBusiTypeEnum.SeaExport.ToString(),
BusiTypeName = BLIssueBusiTypeEnum.SeaExport.GetDescription(),
StlDate = data.order.StlDate,
};
var saveRlt = await Save(dto);
@ -922,6 +965,11 @@ namespace DS.WMS.Core.Op.Method
DischargePort = data.order.DischargePort,
CustomerService = data.order.CustomerService,
CustomerServiceName = data.order.CustomerServiceName,
BLType = BLTypeEnum.BL.ToString(),
BLTypeName = BLTypeEnum.BL.GetDescription(),
BusiType = BLIssueBusiTypeEnum.SeaExport.ToString(),
BusiTypeName = BLIssueBusiTypeEnum.SeaExport.GetDescription(),
StlDate = data.order.StlDate,
};
var saveRlt = await Save(dto);
@ -1107,6 +1155,9 @@ namespace DS.WMS.Core.Op.Method
CustomerServiceName = data.order.CustomerServiceName,
BLType = BLTypeEnum.BL.ToString(),
BLTypeName = BLTypeEnum.BL.GetDescription(),
BusiType = BLIssueBusiTypeEnum.SeaExport.ToString(),
BusiTypeName = BLIssueBusiTypeEnum.SeaExport.GetDescription(),
StlDate = data.order.StlDate,
};
var saveRlt = await Save(dto);
@ -1215,6 +1266,9 @@ namespace DS.WMS.Core.Op.Method
CustomerServiceName = data.order.CustomerServiceName,
BLType = BLTypeEnum.BL.ToString(),
BLTypeName = BLTypeEnum.BL.GetDescription(),
BusiType = BLIssueBusiTypeEnum.SeaExport.ToString(),
BusiTypeName = BLIssueBusiTypeEnum.SeaExport.GetDescription(),
StlDate = data.order.StlDate,
};
var saveRlt = await Save(dto);
@ -1320,6 +1374,9 @@ namespace DS.WMS.Core.Op.Method
CustomerServiceName = data.order.CustomerServiceName,
BLType = BLTypeEnum.BL.ToString(),
BLTypeName = BLTypeEnum.BL.GetDescription(),
BusiType = BLIssueBusiTypeEnum.SeaExport.ToString(),
BusiTypeName = BLIssueBusiTypeEnum.SeaExport.GetDescription(),
StlDate = data.order.StlDate,
};
var saveRlt = await Save(dto);
@ -1425,6 +1482,9 @@ namespace DS.WMS.Core.Op.Method
CustomerServiceName = data.order.CustomerServiceName,
BLType = BLTypeEnum.BL.ToString(),
BLTypeName = BLTypeEnum.BL.GetDescription(),
BusiType = BLIssueBusiTypeEnum.SeaExport.ToString(),
BusiTypeName = BLIssueBusiTypeEnum.SeaExport.GetDescription(),
StlDate = data.order.StlDate,
};
var saveRlt = await Save(dto);
@ -1528,6 +1588,9 @@ namespace DS.WMS.Core.Op.Method
CustomerServiceName = data.order.CustomerServiceName,
BLType = BLTypeEnum.BL.ToString(),
BLTypeName = BLTypeEnum.BL.GetDescription(),
BusiType = BLIssueBusiTypeEnum.SeaExport.ToString(),
BusiTypeName = BLIssueBusiTypeEnum.SeaExport.GetDescription(),
StlDate = data.order.StlDate,
};
var saveRlt = await Save(dto);

Write Preview
Loading…
Cancel
Save