|
|
|
|
@ -135,6 +135,7 @@ public class AmsReceiveOrderController extends BaseController
|
|
|
|
|
public String add(ModelMap mmap)
|
|
|
|
|
{
|
|
|
|
|
putReceiveOptions(mmap);
|
|
|
|
|
putCurrentApplicant(mmap);
|
|
|
|
|
return prefix + "/add";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -195,7 +196,7 @@ public class AmsReceiveOrderController extends BaseController
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 确认领用申请。
|
|
|
|
|
* 业务意图:将单据状态置为 COMPLETED (已完成)。锁定各资产明细、执行状态转移(变为在用并更新使用人和部门)、生成资产流转履历。
|
|
|
|
|
* 业务意图:将单据状态置为 COMPLETED (已完成)。锁定各资产明细、执行状态转移(变为在用、清空仓位并更新使用归属)、生成资产流转履历。
|
|
|
|
|
*/
|
|
|
|
|
@RequiresPermissions("asset:receive:confirm")
|
|
|
|
|
@Log(title = "领用管理", businessType = BusinessType.UPDATE)
|
|
|
|
|
@ -243,6 +244,21 @@ public class AmsReceiveOrderController extends BaseController
|
|
|
|
|
SysUser user = new SysUser();
|
|
|
|
|
user.setStatus(UserConstants.NORMAL);
|
|
|
|
|
mmap.put("userList", sysUserService.selectUserList(user));
|
|
|
|
|
SysUser currentUser = getSysUser();
|
|
|
|
|
mmap.put("defaultReceiveDeptId", currentUser.getDeptId());
|
|
|
|
|
mmap.put("defaultReceiveUserId", currentUser.getUserId());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 新增领用单时展示当前登录用户的申请人和申请部门快照。
|
|
|
|
|
* 实际保存仍由新增接口从当前会话强制获取,不信任页面提交值。
|
|
|
|
|
*/
|
|
|
|
|
private void putCurrentApplicant(ModelMap mmap)
|
|
|
|
|
{
|
|
|
|
|
SysUser currentUser = getSysUser();
|
|
|
|
|
mmap.put("applicantName", currentUser.getUserName());
|
|
|
|
|
SysDept currentDept = sysDeptService.selectDeptById(currentUser.getDeptId());
|
|
|
|
|
mmap.put("applyDeptName", currentDept == null ? "" : currentDept.getDeptName());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|