|
@@ -1506,7 +1506,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
|
|
|
case GoodsAuditEnum.UnApproved: //领用拒绝
|
|
|
_jv = await GoodsReceiveUnApproved(preChangeStatus, receiveId, userId, currUserName, auditEnum);
|
|
|
break;
|
|
|
- case GoodsAuditEnum.OutPending: //出库待确认(出库确认、出库拒绝)
|
|
|
+ case GoodsAuditEnum.OutPending: //出库待确认(取消出库确认、取消出库拒绝)
|
|
|
_jv = await GoodsReceiveOutPending(preChangeStatus, receiveInfo, userId, auditDep, auditEnum);
|
|
|
break;
|
|
|
case GoodsAuditEnum.OutConfirmed: //出库确认
|
|
@@ -1880,7 +1880,10 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
|
|
|
{
|
|
|
_jv.Code = StatusCodes.Status400BadRequest;
|
|
|
|
|
|
- if (auditEnum < GoodsAuditEnum.OutPending)
|
|
|
+ //更改前状态
|
|
|
+ var preChangeStatus = receiveInfo.AuditStatus;
|
|
|
+
|
|
|
+ if (preChangeStatus < GoodsAuditEnum.OutPending)
|
|
|
{
|
|
|
_jv.Msg = $"领用确认执行成功!才可执行出库确认或出库拒绝操作!";
|
|
|
return _jv;
|
|
@@ -1953,8 +1956,7 @@ namespace OASystem.Infrastructure.Repositories.PersonnelModule
|
|
|
statusDesc.Append(auditInfStatusDesc);
|
|
|
}
|
|
|
|
|
|
- //更改前状态
|
|
|
- var preChangeStatus = receiveInfo.AuditStatus;
|
|
|
+
|
|
|
|
|
|
if (preChangeStatus == auditEnum)
|
|
|
{
|