feat(asset): 优化资产领用流程增加仓位清空和申请人信息展示

- 确认领用时清空资产当前仓位并更新使用归属
- 新增当前登录用户申请人和申请部门信息展示功能
- 优化代码注释明确业务意图和操作流程
- 在新增页面默认填充当前用户部门和人员ID信息
- 更新资产流转履历生成逻辑以反映仓位变化
main
yangk 1 week ago
parent 790ba7ab39
commit 248dc64a6b

@ -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());
}
/**

@ -55,7 +55,7 @@ public interface IAmsReceiveOrderService
/**
*
* COMPLETED ()
* `assetStatusTransitionService` 使/
* `assetStatusTransitionService` 使
*/
public int confirmReceive(Long orderId, Long operateUserId, String operateUserName, String operateLoginName);

@ -261,7 +261,7 @@ public class AmsReceiveOrderServiceImpl implements IAmsReceiveOrderService
context.setChangeSummary("确认资产领用");
context.setRemark(order.getRemark());
// 调用底层公共状态转移模块。内部会将资产状态更改为 IN_USE 并更新最新使用人/部门,级联生成历史履历项
// 领用确认后实物离开仓库,公共流转服务会清空当前仓位、更新使用归属并生成履历。
assetStatusTransitionService.confirmReceive(item.getAssetId(), item.getReceiveDeptId(),
item.getReceiveUserId(), context);
}

Loading…
Cancel
Save