diff --git a/EntrustSettle.Api/Controllers/OrderController.cs b/EntrustSettle.Api/Controllers/OrderController.cs index 36120b2..d4c64a1 100644 --- a/EntrustSettle.Api/Controllers/OrderController.cs +++ b/EntrustSettle.Api/Controllers/OrderController.cs @@ -237,6 +237,7 @@ namespace EntrustSettle.Api.Controllers var ctnList = await billtraceCtnService.Query(x => x.PID == order.BilltraceGid, x => new CtnBilltraceDto() { + CtnAll = x.CTNALL, Cntrno = x.CNTRNO, FanKongTime = x.TimeFanKong, StockpilingDays = x.StoreDays, diff --git a/EntrustSettle.Api/appsettings.Staging.json b/EntrustSettle.Api/appsettings.Staging.json index 5ba3f8e..c5bf13f 100644 --- a/EntrustSettle.Api/appsettings.Staging.json +++ b/EntrustSettle.Api/appsettings.Staging.json @@ -64,7 +64,7 @@ } }, "RecordAccessLogs": { - "Enabled": true, + "Enabled": false, "LogToFile": { "Enabled": true }, diff --git a/EntrustSettle.Model/Dtos/Order/CtnBilltraceDto.cs b/EntrustSettle.Model/Dtos/Order/CtnBilltraceDto.cs index 7f656ec..44067e2 100644 --- a/EntrustSettle.Model/Dtos/Order/CtnBilltraceDto.cs +++ b/EntrustSettle.Model/Dtos/Order/CtnBilltraceDto.cs @@ -8,7 +8,10 @@ namespace EntrustSettle.Model.Dtos /// 箱号 /// public string Cntrno { get; set; } - + /// + /// 箱型 + /// + public string CtnAll { get; set; } /// /// 提箱时间 /// diff --git a/EntrustSettle.Model/Models/BillTrace/OpSeaiBillTraceCtn.cs b/EntrustSettle.Model/Models/BillTrace/OpSeaiBillTraceCtn.cs index 3d5a252..76d38fd 100644 --- a/EntrustSettle.Model/Models/BillTrace/OpSeaiBillTraceCtn.cs +++ b/EntrustSettle.Model/Models/BillTrace/OpSeaiBillTraceCtn.cs @@ -12,7 +12,7 @@ namespace EntrustSettle.Model.Models.BillTrace public string PID { get; set; } public string MBLNO { get; set; } public string CNTRNO { get; set; } - + public string CTNALL { get; set; } public string StaCangDan { get; set; } public string StaTiHuo { get; set; } public string StaFanKong { get; set; }