whm
/
BookingHeChuan
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan

Browse Source
optimize
jianghaiqing 1 year ago
parent 4ece7230dd 5811572118
commit bf3c54aa40
6 changed files with 280 additions and 964 deletions
Show Stats Download Patch File Download Diff File

1116
Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
View File

File diff suppressed because it is too large Load Diff

3
Myshipping.Application/Service/BookingOrder/IBookingOrderService.cs
Unescape Escape View File

@ -15,7 +15,6 @@ namespace Myshipping.Application
Task<BookingOrderOutput> Get(long Id);
Task<dynamic> Page([FromQuery] BookingOrderInput input);
Task<List<BookingLogDto>> GetLog(long Id);
Task<IActionResult> Download(long id);
@ -70,5 +69,7 @@ namespace Myshipping.Application
/// <param name="bookingId"></param>
/// <returns></returns>
Task SetGoodsStatus(string code, long bookingId);
}
}

39
Myshipping.Application/Service/BookingOrderSF/BookingOrderSFService.cs
Unescape Escape View File

@ -134,31 +134,34 @@ namespace Myshipping.Application
.ToPagedListAsync(input.PageNo, input.PageSize);
var list = entities.Adapt<SqlSugarPagedList<BookingOrderSFDto>>();
foreach (var item in list.Items) {
foreach (var item in list.Items) {
item.Business = await _business.AsQueryable().Filter(null, true).Where(x => x.PId == item.Id).ToListAsync();
item.detail= await _detail.AsQueryable().Filter(null, true).Where(x => x.PId == item.Id).ToListAsync();
}
return list;
}
/// <summary>
/// Test
/// 保存并返回数据
/// </summary>
/// <returns></returns>
[HttpGet("/BookingOrderSF/Test")]
public async Task<dynamic> Test()
[HttpGet("/BookingOrderSF/Save")]
public async Task<dynamic> Save(BookingOrderSFDto input)
{
return "1";
if (input.Id == 0)
{
}
else {
}
return null;
}
}

59
Myshipping.Application/Service/BookingOrderSeaeEdi/BookingOrderSeaeEdiService.cs
Unescape Escape View File

@ -122,7 +122,8 @@ namespace Myshipping.Application
{
entity.CARRIER = _cache.GetAllCodeCarrier().Result.Where(x => x.Code == entity.CARRIERID).Select(x => x.EdiCode).FirstOrDefault();
}
if (entity.CARGOID!="D") {
if (entity.CARGOID != "D")
{
entity.DCLASS = string.Empty;
entity.DUNNO = string.Empty;
@ -160,6 +161,7 @@ namespace Myshipping.Application
{
entity.CARRIER = _cache.GetAllCodeCarrier().Result.Where(x => x.Code == entity.CARRIERID).Select(x => x.EdiCode).FirstOrDefault();
}
if (entity.CARGOID != "D")
{
@ -329,12 +331,12 @@ namespace Myshipping.Application
var strResp = await dicUrl.Value.SetContentType("multipart/form-data").SetBody(sendObj).PostAsStringAsync();
_logger.LogInformation($"调用舱单接口返回：{strResp}");
var jobjResp = JObject.Parse(strResp);
bool respCode = jobjResp.GetBooleanValue("Success");
if (respCode == false)
{
throw Oops.Bah(jobjResp.GetStringValue("Message").Replace("<br />", "\r\n").Replace("<br/>",""));
throw Oops.Bah(jobjResp.GetStringValue("Message").Replace("<br />", "\r\n").Replace("<br/>", ""));
}
//货运动态
var bsl = new BookingStatusLog();
@ -367,13 +369,11 @@ namespace Myshipping.Application
{
await _seaeedi.UpdateAsync(x => x.Id == Id, x => new BookingOrderSeaeEdi { State = "已发送", SENDREMARK = SENDREMARK });
}
if (type == "0")
{
await _seaeedi.UpdateAsync(x => x.Id == Id, x => new BookingOrderSeaeEdi { State = "已直发", SENDREMARK = SENDREMARK });
}
if (type == "1")
if (type == "0" || type == "1")
{
await _seaeedi.UpdateAsync(x => x.Id == Id, x => new BookingOrderSeaeEdi { State = "已直发", SENDREMARK = SENDREMARK });
await _rep.SetGoodsStatus("YFCD", Id);
await _rep.SendBookingOrder(new long[] { Id });
}
if (type == "2")
{
@ -387,51 +387,8 @@ namespace Myshipping.Application
}
if (type == "3"|| type == "0"||type == "1") {
#region 插入货运动态
//配置中所有的货物状态
var config = _goodsStatusConfig.AsQueryable().Where(config => config.CreatedUserId == order.CreatedUserId).ToList().DistinctBy(x => x.StatusName).Select(config => new GoodsStatusQuery
{
ConfigId = config.Id,
SystemCode = config.SystemCode,
StatusName = config.StatusName,
FinishTime = null,
FinishUser = null,
FinishUserId = null,
IsPublic = false,
ExtData = null,
Remark = null,
Sort = config.Sort
}).ToList();
var ConfigId = config.Where(x => x.SystemCode == "YFCD").Select(x => x.ConfigId).First();
await _goodsStatus.InsertAsync(new BookingGoodsStatus
{
bookingId= Id,
ConfigId= ConfigId,
FinishTime=DateTime.Now,
FinishUser= order.CreatedUserName,
FinishUserId = order.CreatedUserId,
IsPublic=false
});
List<long> tslist = new List<long>();
tslist.Add((long)Id);
var itemcode = _cache.GetAllTenantParam().Result.Where(x => x.ParaCode == "BOOKING_DATA_PUSH" && x.TenantId == UserManager.TENANT_ID).Select(x => x.ItemCode).FirstOrDefault();
if (!string.IsNullOrEmpty(itemcode))
{
if (itemcode == "true")
await _rep.SendBookingOrder(tslist.ToArray());
_logger.LogInformation(Id + "自动订舱货物状态推送成功！");
}
}
#endregion

2
Myshipping.Application/Service/BookingTruck/BookingTruckService.cs
Unescape Escape View File

@ -848,7 +848,7 @@ namespace Myshipping.Application
//派车后填写货物状态
await _bookingOrderService.SetGoodsStatus("YPC", model.Id);
await _bookingOrderService.SendBookingOrder(new long[] { model.Id });
//更新派车订单为已提交
model.Status = BookingTruckStatus.SUBMITED.ToString();
model.UpdatedTime = DateTime.Now;

25
Myshipping.Application/Service/DataSync/DataSyncService.cs
Unescape Escape View File

@ -1746,7 +1746,7 @@ namespace Myshipping.Application
});
it.YgtETD = item.ETD;
}
if (it.ATD != item.ATD&& it.ATD==null)
if (it.ATD != item.ATD && it.ATD == null)
{
flag = true;
////添加booking日志
@ -1800,21 +1800,7 @@ namespace Myshipping.Application
}
if (issend)
{
var itemcode = _cache.GetAllTenantParam().Result.Where(x => x.ParaCode == "BOOKING_DATA_PUSH" && x.TenantId == UserManager.TENANT_ID).Select(x => x.ItemCode).FirstOrDefault();
if (!string.IsNullOrEmpty(itemcode))
{
if (itemcode == "true")
{
List<long> list = new List<long>();
list = order.Where(x => x.ParentId == 0).Select(x => x.Id).ToList();
if (list != null && list.Count > 0)
{
await _bookingorderservice.SendBookingOrder(list.ToArray());
}
}
}
await _bookingorderservice.SendBookingOrder(order.Where(x => x.ParentId == 0).Select(x => x.Id).ToArray());
}
}
}
@ -1993,13 +1979,8 @@ namespace Myshipping.Application
}
if (issend)
{
await _bookingorderservice.SendBookingOrder(order.Where(x => x.ParentId == 0).Select(x => x.Id).ToArray());
var itemcode = _cache.GetAllTenantParam().Result.Where(x => x.ParaCode == "BOOKING_DATA_PUSH" && x.TenantId == UserManager.TENANT_ID).Select(x => x.ItemCode).FirstOrDefault();
if (!string.IsNullOrEmpty(itemcode))
{
if (itemcode == "true")
await _bookingorderservice.SendBookingOrder(order.Where(x => x.ParentId == 0).Select(x => x.Id).ToArray());
}
}
}

Write Preview
Loading…
Cancel
Save