|
@@ -2371,6 +2371,7 @@ public class OrderController : BaseController
|
|
|
var order = await _orderRepository.Queryable()
|
|
|
.Includes(d => d.OrderExtension)
|
|
|
.Includes(d => d.OrderDelays)
|
|
|
+ .Includes(d=> d.OrderPublish)
|
|
|
//.Includes(d => d.OrderScreens)
|
|
|
.Includes(d => d.OrderVisits, x => x.OrderVisitDetails)
|
|
|
.Includes(d => d.OrderVisits, x => x.Employee)
|
|
@@ -2436,6 +2437,11 @@ public class OrderController : BaseController
|
|
|
|
|
|
//dto.CanPrevious = canPrevious;
|
|
|
|
|
|
+ if (order.OrderPublish!=null)
|
|
|
+ {
|
|
|
+ dto.PublishState = order.OrderPublish.PublishState;
|
|
|
+ }
|
|
|
+
|
|
|
if (dto.FileJson != null && dto.FileJson.Any())
|
|
|
{
|
|
|
var ids = order.FileJson.Select(x => x.Id).ToList();
|