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

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

Browse Source
optimize
jianghaiqing 2 years ago
parent 449db95ea9 08c804cb46
commit 1ff9bad2da
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File

6
Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
Unescape Escape View File

@ -455,7 +455,7 @@ namespace Myshipping.Application
throw Oops.Bah(ms); throw Oops.Bah(ms);
} }
JsonUtil.PropToUpper(input, "ORDNO", "BSSTATUS", "YardContract", "YardContractTel", "YardContractEmail", "MARKS", "DESCRIPTION", "CONSIGNEENAME", "SHIPPERNAME", "NOTIFYPARTYNAME"); JsonUtil.PropToUpper(input, "ORDNO", "BSSTATUS", "YARDID", "YardContract", "YardContractTel", "YardContractEmail", "MARKS", "DESCRIPTION", "CONSIGNEENAME", "SHIPPERNAME", "NOTIFYPARTYNAME");
if (input.ctnInputs != null) if (input.ctnInputs != null)
{ {
var groupList = input.ctnInputs.Where(x => x.CTNNUM > 0).GroupBy(c => c.CTNALL).Select(g => $"{g.Key}*{g.Sum(gg => gg.CTNNUM)}"); var groupList = input.ctnInputs.Where(x => x.CTNNUM > 0).GroupBy(c => c.CTNALL).Select(g => $"{g.Key}*{g.Sum(gg => gg.CTNNUM)}");
@ -740,7 +740,7 @@ namespace Myshipping.Application
[HttpPost("/BookingOrder/Add")] [HttpPost("/BookingOrder/Add")]
public async Task<long> Add(BookingOrderDto input) public async Task<long> Add(BookingOrderDto input)
{ {
JsonUtil.PropToUpper(input, "ORDNO", "BSSTATUS", "YardContract", "YardContractTel", "YardContractEmail", "MARKS", "DESCRIPTION", "CONSIGNEENAME", "SHIPPERNAME", "NOTIFYPARTYNAME"); JsonUtil.PropToUpper(input, "ORDNO", "BSSTATUS", "YARDID", "YardContract", "YardContractTel", "YardContractEmail", "MARKS", "DESCRIPTION", "CONSIGNEENAME", "SHIPPERNAME", "NOTIFYPARTYNAME");
var ms = JsonUtil.TrimFields(input); var ms = JsonUtil.TrimFields(input);
if (!string.IsNullOrEmpty(ms)) if (!string.IsNullOrEmpty(ms))
{ {
@ -860,7 +860,7 @@ namespace Myshipping.Application
public async Task Update(BookingOrderDto input) public async Task Update(BookingOrderDto input)
{ {
JsonUtil.PropToUpper(input, "ORDNO", "BSSTATUS", "YardContract", "YardContractTel", "YardContractEmail", "MARKS", "DESCRIPTION", "CONSIGNEENAME", "SHIPPERNAME", "NOTIFYPARTYNAME"); JsonUtil.PropToUpper(input, "ORDNO", "BSSTATUS", "YARDID", "YardContract", "YardContractTel", "YardContractEmail", "MARKS", "DESCRIPTION", "CONSIGNEENAME", "SHIPPERNAME", "NOTIFYPARTYNAME");
JsonUtil.TrimFields(input); JsonUtil.TrimFields(input);
if (input.ctnInputs != null) if (input.ctnInputs != null)
{ {

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

@ -441,7 +441,7 @@ namespace Myshipping.Application
throw Oops.Bah("请填写提单号！"); throw Oops.Bah("请填写提单号！");
} }
JsonUtil.PropToUpper(model, "ORDNO", "BSSTATUS", "YardContract", "YardContractTel", "YardContractEmail", "MARKS", "DESCRIPTION", "CONSIGNEENAME", "SHIPPERNAME", "NOTIFYPARTYNAME"); JsonUtil.PropToUpper(model, "ORDNO", "BSSTATUS", "YARDID", "YardContract", "YardContractTel", "YardContractEmail", "MARKS", "DESCRIPTION", "CONSIGNEENAME", "SHIPPERNAME", "NOTIFYPARTYNAME");
var ms = JsonUtil.TrimFields(model); var ms = JsonUtil.TrimFields(model);
if (!string.IsNullOrEmpty(ms)) if (!string.IsNullOrEmpty(ms))
{ {
@ -599,7 +599,7 @@ namespace Myshipping.Application
{ {
throw Oops.Bah("请填写分提单号！"); throw Oops.Bah("请填写分提单号！");
} }
JsonUtil.PropToUpper(item, "ORDNO", "BSSTATUS", "YardContract", "YardContractTel", "YardContractEmail", "MARKS", "DESCRIPTION", "CONSIGNEENAME", "SHIPPERNAME", "NOTIFYPARTYNAME"); JsonUtil.PropToUpper(item, "ORDNO", "BSSTATUS", "YARDID", "YardContract", "YardContractTel", "YardContractEmail", "MARKS", "DESCRIPTION", "CONSIGNEENAME", "SHIPPERNAME", "NOTIFYPARTYNAME");
var fms = JsonUtil.TrimFields(item); var fms = JsonUtil.TrimFields(item);
if (!string.IsNullOrEmpty(fms)) if (!string.IsNullOrEmpty(fms))
@ -863,7 +863,7 @@ namespace Myshipping.Application
throw Oops.Bah("请填写提单号！"); throw Oops.Bah("请填写提单号！");
} }
JsonUtil.PropToUpper(model, "ORDNO", "BSSTATUS", "YardContract", "YardContractTel", "YardContractEmail", "MARKS", "DESCRIPTION", "CONSIGNEENAME", "SHIPPERNAME", "NOTIFYPARTYNAME"); JsonUtil.PropToUpper(model, "ORDNO", "BSSTATUS", "YARDID", "YardContract", "YardContractTel", "YardContractEmail", "MARKS", "DESCRIPTION", "CONSIGNEENAME", "SHIPPERNAME", "NOTIFYPARTYNAME");
var ms = JsonUtil.TrimFields(model); var ms = JsonUtil.TrimFields(model);
if (!string.IsNullOrEmpty(ms)) if (!string.IsNullOrEmpty(ms))
@ -1181,7 +1181,7 @@ namespace Myshipping.Application
{ {
throw Oops.Bah("请填写分提单号！"); throw Oops.Bah("请填写分提单号！");
} }
JsonUtil.PropToUpper(item, "ORDNO", "BSSTATUS", "YardContract", "YardContractTel", "YardContractEmail", "MARKS", "DESCRIPTION", "CONSIGNEENAME", "SHIPPERNAME", "NOTIFYPARTYNAME"); JsonUtil.PropToUpper(item, "ORDNO", "BSSTATUS", "YARDID", "YardContract", "YardContractTel", "YardContractEmail", "MARKS", "DESCRIPTION", "CONSIGNEENAME", "SHIPPERNAME", "NOTIFYPARTYNAME");
var fms = JsonUtil.TrimFields(item); var fms = JsonUtil.TrimFields(item);
if (!string.IsNullOrEmpty(fms)) if (!string.IsNullOrEmpty(fms))

Write Preview
Loading…
Cancel
Save