|
@@ -378,7 +378,6 @@ public class OrderComplementController : BaseController
|
|
|
};
|
|
|
|
|
|
var copyNew = await _orderComplementCopyRepository.Queryable()
|
|
|
- .Includes(p => p.Order)
|
|
|
.OrderBy(x => x.CreationTime)
|
|
|
.FirstAsync(p => p.ComplementId == updateData.ComplementId && p.CreationTime > updateData.CreationTime);
|
|
|
|
|
@@ -388,27 +387,26 @@ public class OrderComplementController : BaseController
|
|
|
newInfo = new ComplementOrderCopyDetailDto
|
|
|
{
|
|
|
No = copyNew.No,
|
|
|
- OrderTitle = copyNew.Order.Title,
|
|
|
- UserName = copyNew.SupplyName,
|
|
|
- OrgName = copyNew.SupplyOrg,
|
|
|
- SupplyTime = copyNew.SupplyTime,
|
|
|
- Opinion = copyNew.Opinion
|
|
|
+ OrderTitle = updateData.Order.Title,
|
|
|
+ UserName = updateData.CreatorName,
|
|
|
+ OrgName = updateData.CreatorOrgName,
|
|
|
+ SupplyTime = updateData.CreationTime,
|
|
|
+ Opinion = copyNew.Opinion,
|
|
|
};
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
var orderComplement = await _orderComplementRepository.Queryable()
|
|
|
- .Includes(p => p.Order)
|
|
|
.FirstAsync(d => d.Id == updateData.ComplementId);
|
|
|
if (orderComplement is not null)
|
|
|
{
|
|
|
newInfo = new ComplementOrderCopyDetailDto
|
|
|
{
|
|
|
No = orderComplement.No,
|
|
|
- OrderTitle = orderComplement.Order.Title,
|
|
|
- UserName = orderComplement.SupplyName,
|
|
|
- OrgName = orderComplement.SupplyOrg,
|
|
|
- SupplyTime = orderComplement.SupplyTime,
|
|
|
+ OrderTitle = updateData.Order.Title,
|
|
|
+ UserName = updateData.CreatorName,
|
|
|
+ OrgName = updateData.CreatorOrgName,
|
|
|
+ SupplyTime = updateData.CreationTime,
|
|
|
Opinion = orderComplement.Opinion
|
|
|
};
|
|
|
}
|