岗位当班班次不能为空
This commit is contained in:
parent
ea491a66f0
commit
55d7f7c690
@ -126,10 +126,10 @@ namespace APT.FO.WebApi.Controllers.Api.FO
|
|||||||
//throw new Exception("未找到排班班次,请联系管理员排查");
|
//throw new Exception("未找到排班班次,请联系管理员排查");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//if (entity.CLASS_ID == null)
|
if (entity.CLASS_ID == null)
|
||||||
//{
|
{
|
||||||
// throw new Exception("班次不能为空,请联系管理员排查");
|
throw new Exception("班次不能为空!");
|
||||||
//}
|
}
|
||||||
entity.EDITOR_ID = userID;
|
entity.EDITOR_ID = userID;
|
||||||
|
|
||||||
var files = entity.Nav_Files;
|
var files = entity.Nav_Files;
|
||||||
@ -301,6 +301,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
|
|||||||
List<T_FO_CURRENT_CLASS_RECORD_USER> currRecordUsers = null;
|
List<T_FO_CURRENT_CLASS_RECORD_USER> currRecordUsers = null;
|
||||||
if (entity.CODE.Equals("1"))
|
if (entity.CODE.Equals("1"))
|
||||||
{
|
{
|
||||||
|
//判断班次
|
||||||
if (entity.CLASS_ID == null || entity.CLASS_ID == Guid.Empty)
|
if (entity.CLASS_ID == null || entity.CLASS_ID == Guid.Empty)
|
||||||
{
|
{
|
||||||
currRecord.AUDIT_DATE = DateTime.Now;
|
currRecord.AUDIT_DATE = DateTime.Now;
|
||||||
@ -309,6 +310,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
|
|||||||
currRecord.AUDIT_OPINION = entity.AUDIT_OPINION;
|
currRecord.AUDIT_OPINION = entity.AUDIT_OPINION;
|
||||||
var users = currRecord.Nav_Users;
|
var users = currRecord.Nav_Users;
|
||||||
var files = currRecord.Nav_Files;
|
var files = currRecord.Nav_Files;
|
||||||
|
//直接创建交接班
|
||||||
CreateChangeShiftRecord(currRecord, users, files, null);
|
CreateChangeShiftRecord(currRecord, users, files, null);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -318,7 +320,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
|
|||||||
currRecord.AUDIT_DATE = DateTime.Now;
|
currRecord.AUDIT_DATE = DateTime.Now;
|
||||||
currRecord.SHIFT_STATUS = (int)FOShiftStatusEnum.审批归档;
|
currRecord.SHIFT_STATUS = (int)FOShiftStatusEnum.审批归档;
|
||||||
currRecord.AUDIT_OPINION = entity.AUDIT_OPINION;
|
currRecord.AUDIT_OPINION = entity.AUDIT_OPINION;
|
||||||
if (currDepartmentConfig.Nav_DepartmentCalendarConfig.IS_HANDOVER == true)
|
if (currDepartmentConfig!=null && currDepartmentConfig.Nav_DepartmentCalendarConfig.IS_HANDOVER == true)
|
||||||
{
|
{
|
||||||
var users = currRecord.Nav_Users;
|
var users = currRecord.Nav_Users;
|
||||||
var files = currRecord.Nav_Files;
|
var files = currRecord.Nav_Files;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user