|
@@ -736,6 +736,7 @@ namespace OASystem.API.Controllers
|
|
|
}
|
|
|
|
|
|
var receipt = _sqlsugar.Queryable<Task_WorkTaskReceipt>()
|
|
|
+ .Includes<Task_WorkTask>(o => o.WorkTask)
|
|
|
.First(x => x.Id == dto.ReceiptId && x.IsDel == 0);
|
|
|
|
|
|
if (receipt == null)
|
|
@@ -761,7 +762,7 @@ namespace OASystem.API.Controllers
|
|
|
.Where(x => x.Id == dto.ReceiptId)
|
|
|
.ExecuteCommand();
|
|
|
|
|
|
- if (existsApproved == null)
|
|
|
+ if (existsApproved == null && dto.Approve == 1 && !receipt.WorkTask.IsExtraTask)
|
|
|
{
|
|
|
_sqlsugar.Updateable<Task_WorkOrder>()
|
|
|
.SetColumns(x => new Task_WorkOrder
|