diff --git a/ruoyi-asset/src/main/java/com/ruoyi/asset/controller/AmsReceiveOrderController.java b/ruoyi-asset/src/main/java/com/ruoyi/asset/controller/AmsReceiveOrderController.java index a632c1a..ebfd96c 100644 --- a/ruoyi-asset/src/main/java/com/ruoyi/asset/controller/AmsReceiveOrderController.java +++ b/ruoyi-asset/src/main/java/com/ruoyi/asset/controller/AmsReceiveOrderController.java @@ -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()); } /** diff --git a/ruoyi-asset/src/main/java/com/ruoyi/asset/service/IAmsReceiveOrderService.java b/ruoyi-asset/src/main/java/com/ruoyi/asset/service/IAmsReceiveOrderService.java index 749a1e9..29e269f 100644 --- a/ruoyi-asset/src/main/java/com/ruoyi/asset/service/IAmsReceiveOrderService.java +++ b/ruoyi-asset/src/main/java/com/ruoyi/asset/service/IAmsReceiveOrderService.java @@ -55,7 +55,7 @@ public interface IAmsReceiveOrderService /** * 确认资产领用。 * 业务意图:将单据状态置为 COMPLETED (已完成)。 - * 在加锁保护下,逐一调用底层 `assetStatusTransitionService` 将资产状态转移为在用,更新最新使用人/部门,并生成资产履历。 + * 在加锁保护下,逐一调用底层 `assetStatusTransitionService` 将资产状态转移为在用,清空当前仓位、更新使用归属,并生成资产履历。 */ public int confirmReceive(Long orderId, Long operateUserId, String operateUserName, String operateLoginName); diff --git a/ruoyi-asset/src/main/java/com/ruoyi/asset/service/impl/AmsReceiveOrderServiceImpl.java b/ruoyi-asset/src/main/java/com/ruoyi/asset/service/impl/AmsReceiveOrderServiceImpl.java index c1e0e3f..eac40c7 100644 --- a/ruoyi-asset/src/main/java/com/ruoyi/asset/service/impl/AmsReceiveOrderServiceImpl.java +++ b/ruoyi-asset/src/main/java/com/ruoyi/asset/service/impl/AmsReceiveOrderServiceImpl.java @@ -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); }