From 7d2ee3cef2e0d68ba6400bc5957640d2771bbf4c Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 16 九月 2026 18:05:40 +0800
Subject: [PATCH] refactor: 单据审核改为审批配置状态机（新增:audit接口/审核人字段/DB变更脚本）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskServiceImpl.java | 237 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 189 insertions(+), 48 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskServiceImpl.java
index a192e7a..09ae4b4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.MesWmStockTakingTaskPageReqVO;
@@ -9,26 +10,39 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task.MesWmStockTakingTaskDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task.MesWmStockTakingTaskLineDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.task.MesWmStockTakingTaskResultDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.stocktaking.plan.MesWmStockTakingPlanDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.stocktaking.task.MesWmStockTakingTaskMapper;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
+import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmStockTakingTaskStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
+import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService;
import cn.iocoder.yudao.module.mes.service.wm.stocktaking.plan.MesWmStockTakingPlanService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
+import cn.iocoder.yudao.module.system.api.approval.ApprovalConfigApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
/**
@@ -38,7 +52,15 @@
*/
@Service
@Validated
+@Slf4j
public class MesWmStockTakingTaskServiceImpl implements MesWmStockTakingTaskService {
+
+ /**
+ * 鐩樼偣缁撴灉瀹℃壒鐨勪笟鍔＄被鍨嬬紪鐮�
+ *
+ * 涓� system_approval_config.biz_type 瀵瑰簲锛屽鏍镐汉鍦ㄣ�岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶄腑缁存姢銆�
+ */
+ private static final String STOCK_TAKING_RESULT_APPROVE_BIZ_TYPE = "stock_taking_result_approve";
@Resource
private MesWmStockTakingTaskMapper stockTakingTaskMapper;
@@ -58,7 +80,13 @@
private MesWmTransactionService wmTransactionService;
@Resource
+ private MesMdAutoCodeRecordService mesMdAutoCodeRecordService;
+
+ @Resource
private AdminUserApi adminUserApi;
+
+ @Resource
+ private ApprovalConfigApi approvalConfigApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -82,6 +110,38 @@
stockTakingTaskLineService.generateStockTakingLines(task, true);
}
return task.getId();
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long createStockTakingTaskFromPlan(Long planId) {
+ // 1. 鏍￠獙鏂规瀛樺湪銆佸凡鍚敤涓斿紑鍚畾鏈熻嚜鍔ㄧ敓鎴�
+ MesWmStockTakingPlanDO plan = stockTakingPlanService.validateStockTakingPlanEnabled(planId);
+ if (!Boolean.TRUE.equals(plan.getAutoGenerate())) {
+ throw exception(WM_STOCK_TAKING_PLAN_NOT_AUTO_GENERATE);
+ }
+
+ // 2. 鑷姩鐢熸垚浠诲姟缂栫爜锛堣鍒欙細鐩樼偣浠诲姟缂栫爜锛�
+ String code = mesMdAutoCodeRecordService.generateAutoCode(
+ MesMdAutoCodeRuleCodeEnum.WM_STOCK_TAKING_CODE.getCode());
+
+ // 3. 澶嶇敤鍒涘缓閫昏緫鐢熸垚鑽夌浠诲姟锛堝唴閮ㄦ牎楠岀紪鐮佸敮涓�銆佹柟妗堝彲鐢紝骞舵寜鏂规鐢熸垚鐩樼偣鏄庣粏琛岋級
+ Long taskId = createStockTakingTask(new MesWmStockTakingTaskSaveReqVO()
+ .setCode(code)
+ .setName(plan.getName())
+ .setTakingDate(LocalDateTime.now())
+ .setType(plan.getType())
+ .setUserId(getCurrentUserId())
+ .setPlanId(planId)
+ .setStartTime(plan.getStartTime())
+ .setEndTime(plan.getEndTime())
+ .setBlindFlag(plan.getBlindFlag())
+ .setFrozen(plan.getFrozen())
+ .setRemark("鏂规瀹氭湡鑷姩鐢熸垚"));
+
+ // 4. 鍥炲啓鏈鐢熸垚鏃堕棿锛岄伩鍏嶅悓涓�鍛ㄦ湡閲嶅鐢熸垚锛堜笌鍒涘缓鍚屼簨鍔★級
+ stockTakingPlanService.updateStockTakingPlanLastGenerateTime(planId, LocalDateTime.now());
+ return taskId;
}
@Override
@@ -131,9 +191,8 @@
throw exception(WM_STOCK_TAKING_TASK_NO_LINE);
}
- // 2. 鏇存柊浠诲姟鐘舵�佷负瀹℃壒涓�
- stockTakingTaskMapper.updateById(new MesWmStockTakingTaskDO().setId(id)
- .setStatus(MesWmStockTakingTaskStatusEnum.APPROVING.getStatus()));
+ // 2. 鏇存柊浠诲姟鐘舵�佷负鐩樼偣涓紝骞舵竻绌哄鏍告爣璁�
+ stockTakingTaskMapper.submitAndResetAuditInfo(id, MesWmStockTakingTaskStatusEnum.APPROVING.getStatus());
// 3. 鏍规嵁鍐荤粨鏍囪瘑锛屽鐗╄祫杩涜鍐荤粨
if (Boolean.TRUE.equals(task.getFrozen())) {
@@ -143,19 +202,100 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void finishStockTakingTask(Long id) {
- // 1. 鏍￠獙浠诲姟瀛樺湪涓斾负瀹℃壒涓姸鎬�
+ public void submitStockTakingResultApproval(Long id) {
+ // 1.1 鏍￠獙浠诲姟瀛樺湪涓斿浜庣洏鐐逛腑鐘舵��
MesWmStockTakingTaskDO task = validateStockTakingTaskExistsAndApproving(id);
-
- // 2. 鏇存柊浠诲姟鐘舵�佷负宸插畬鎴�
- stockTakingTaskMapper.updateById(new MesWmStockTakingTaskDO().setId(id)
- .setStatus(MesWmStockTakingTaskStatusEnum.FINISHED.getStatus()));
-
- // 3. 瑙ｅ喕搴撳瓨
- if (Boolean.TRUE.equals(task.getFrozen())) {
- List<MesWmStockTakingTaskLineDO> lines = stockTakingTaskLineService.getStockTakingTaskLineListByTaskId(id);
- updateMaterialStockFrozen(lines, false);
+ // 1.2 鏍￠獙鏈疆缁撴灉瀹℃壒鏈彁浜よ繃锛堥伩鍏嶉噸澶嶆彁浜わ級
+ if (isResultApprovalPending(task)) {
+ throw exception(WM_STOCK_TAKING_TASK_ALREADY_SUBMIT_APPROVAL);
}
+ // 1.3 鏍￠獙鑷冲皯鏈変竴鏉＄洏鐐圭粨鏋�
+ List<MesWmStockTakingTaskResultDO> results = stockTakingTaskResultService.getStockTakingTaskResultListByTaskId(id);
+ if (CollUtil.isEmpty(results)) {
+ throw exception(WM_STOCK_TAKING_TASK_NO_RESULT);
+ }
+ // 1.4 鏍￠獙瀹℃壒閰嶇疆宸插惎鐢ㄤ笖閰嶇疆浜嗘湁鏁堝鏍镐汉锛堟湭閰嶇疆鏃舵姏鍑哄甫鏄庣‘鎻愮ず鐨勪笟鍔″紓甯革級
+ approvalConfigApi.validateApprovalEnabledAndGetApprovers(STOCK_TAKING_RESULT_APPROVE_BIZ_TYPE);
+
+ // 2. 璁板綍鎻愪氦鏃堕棿骞舵竻绌轰笂涓�杞鏍哥粨鏋滐紙浠诲姟淇濇寔鐩樼偣涓紝绛夊緟瀹℃牳锛�
+ stockTakingTaskMapper.markResultApprovalSubmitted(id);
+ }
+
+ @Override
+ public Set<Long> getStockTakingTaskApproverUserIds() {
+ return approvalConfigApi.getApproverUserIds(STOCK_TAKING_RESULT_APPROVE_BIZ_TYPE);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void auditStockTakingResult(Long id, Boolean pass, String reviewRemark) {
+ // 1. 鏍￠獙浠诲姟瀛樺湪
+ MesWmStockTakingTaskDO task = validateStockTakingTaskExists(id);
+ // 2. 鏍￠獙澶勪簬鐩樼偣涓紙鍚粨鏋滃鎵逛腑锛夌姸鎬�
+ if (!MesWmStockTakingTaskStatusEnum.APPROVING.getStatus().equals(task.getStatus())) {
+ throw exception(WM_STOCK_TAKING_TASK_NOT_APPROVING);
+ }
+ // 3. 鏍￠獙鏈疆缁撴灉瀹℃壒宸叉彁浜や笖灏氭湭瀹℃牳
+ if (!isResultApprovalPending(task)) {
+ throw exception(WM_STOCK_TAKING_TASK_RESULT_NOT_SUBMITTED);
+ }
+ // 4. 鏍￠獙褰撳墠鐧诲綍鐢ㄦ埛鏄涓氬姟绫诲瀷鐨勫鏍镐汉锛堟垨绛撅細浠讳竴浜哄潎鍙鏍革級
+ Long userId = getLoginUserId();
+ approvalConfigApi.validateApprover(STOCK_TAKING_RESULT_APPROVE_BIZ_TYPE, userId);
+ // 5. 瀹℃牳涓嶉�氳繃锛氬繀椤诲～鍐欏師鍥狅紝浠诲姟淇濇寔鐩樼偣涓紝鍙慨鏀瑰疄鐩樺悗閲嶆柊鎻愪氦缁撴灉瀹℃壒
+ if (!Boolean.TRUE.equals(pass)) {
+ if (StrUtil.isBlank(reviewRemark)) {
+ throw exception(WM_STOCK_TAKING_TASK_REJECT_REASON_REQUIRED);
+ }
+ stockTakingTaskMapper.auditStockTakingTask(id, MesWmStockTakingTaskStatusEnum.APPROVING.getStatus(),
+ userId, getUserNickname(userId), reviewRemark);
+ return;
+ }
+ // 6. 瀹℃牳閫氳繃锛氬厛缃负宸插畬鎴愬苟璁板綍瀹℃牳浜轰笌瀹℃牳鎰忚
+ stockTakingTaskMapper.auditStockTakingTask(id, MesWmStockTakingTaskStatusEnum.FINISHED.getStatus(),
+ userId, getUserNickname(userId), reviewRemark);
+ // 7. 瑙ｅ喕搴撳瓨锛氶』鍦ㄥ樊寮傛牳閿�鍓嶈В鍐伙紝鍚﹀垯鏍搁攢浜嬪姟浼氳搴撳瓨鍐荤粨鏍￠獙鎷︽埅
+ if (Boolean.TRUE.equals(task.getFrozen())) {
+ updateMaterialStockFrozen(stockTakingTaskLineService.getStockTakingTaskLineListByTaskId(id), false);
+ }
+ // 8. 鑷姩鏍搁攢鐩樼偣宸紓锛氱洏鐩堝叆搴� / 鐩樹簭鍑哄簱锛屽悓浜嬪姟鍐呮洿鏂板簱瀛樺彴璐︼紱浠讳竴姝ュけ璐ユ暣浣撳洖婊氾紝浠诲姟鍥為��涓虹洏鐐逛腑
+ doProcessStockTakingDifference(task);
+ }
+
+ /**
+ * 鍒ゆ柇鏈疆鐩樼偣缁撴灉瀹℃壒鏄惁宸叉彁浜や笖灏氭湭瀹℃牳
+ *
+ * 浠诲姟鐘舵�� 2锛堢洏鐐逛腑锛夊悓鏃舵壙杞姐�岀洏鐐逛腑銆嶄笌銆岀洏鐐圭粨鏋滃鎵逛腑銆嶄袱涓樁娈碉紝
+ * 浠� reviewTime 闈炵┖涓� reviewerId 涓虹┖浣滀负銆屽凡鎻愪氦銆佺瓑寰呭鏍搞�嶇殑鍒ゅ畾鏉′欢锛�
+ * 瀹℃牳涓嶉�氳繃鍚� reviewerId 闈炵┖锛屼换鍔″洖鍒板彲閲嶆柊鎻愪氦缁撴灉瀹℃壒鐨勭姸鎬併��
+ *
+ * @param task 鐩樼偣浠诲姟
+ * @return 鏄惁澶勪簬缁撴灉瀹℃壒涓�
+ */
+ private boolean isResultApprovalPending(MesWmStockTakingTaskDO task) {
+ return task.getReviewerId() == null && task.getReviewTime() != null;
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鏄电О
+ *
+ * @param userId 鐢ㄦ埛缂栧彿
+ * @return 鏄电О锛岀敤鎴蜂笉瀛樺湪鏃惰繑鍥� null
+ */
+ private String getUserNickname(Long userId) {
+ if (userId == null) {
+ return null;
+ }
+ AdminUserRespDTO user = adminUserApi.getUser(userId);
+ return user == null ? null : user.getNickname();
+ }
+
+ private Long getCurrentUserId() {
+ Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+ if (authentication != null && authentication.getPrincipal() instanceof Long) {
+ return (Long) authentication.getPrincipal();
+ }
+ return 1L; // 榛樿鐢ㄦ埛
}
@Override
@@ -168,6 +308,8 @@
}
task.setStatus(MesWmStockTakingTaskStatusEnum.CANCELED.getStatus());
stockTakingTaskMapper.updateById(task);
+ // 鍙栨秷鍚庢竻绌哄鏍告爣璁帮紝閬垮厤娈嬬暀瀹℃壒鏍囪褰卞搷鍚庣画閲嶆柊寮�濮嬬洏鐐�
+ stockTakingTaskMapper.clearAuditInfo(id);
if (Boolean.TRUE.equals(task.getFrozen())) {
updateMaterialStockFrozen(stockTakingTaskLineService.getStockTakingTaskLineListByTaskId(id), false);
}
@@ -229,20 +371,26 @@
}
}
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void processStockTakingDifference(Long id) {
- // 1. 鏍￠獙浠诲姟瀛樺湪涓斿凡瀹屾垚
- MesWmStockTakingTaskDO task = validateStockTakingTaskExists(id);
- if (!MesWmStockTakingTaskStatusEnum.FINISHED.getStatus().equals(task.getStatus())) {
- throw exception(WM_STOCK_TAKING_TASK_NOT_FINISHED);
- }
-
- // 2. 鑾峰彇鐩樼偣缁撴灉鍒楄〃
- List<MesWmStockTakingTaskResultDO> results = stockTakingTaskResultService.getStockTakingTaskResultListByTaskId(id);
+ /**
+ * 鑷姩鏍搁攢鐩樼偣宸紓锛氭寜鐩樼偣缁撴灉閫愯鐢熸垚 IN/OUT 搴撳瓨浜嬪姟鏇存柊搴撳瓨鍙拌处
+ *
+ * <p>浠呯敱 {@link #auditStockTakingResult} 鐨勫鏍搁�氳繃鍒嗘敮鍦ㄥ悓浜嬪姟鍐呰皟鐢紱
+ * 澶辫触鏁翠綋鍥炴粴锛屼换鍔″洖閫�涓虹洏鐐逛腑鐘舵�侊紝閬垮厤閲嶅璋冩暣銆�
+ *
+ * @param task 宸茬疆涓哄凡瀹屾垚銆佸凡瑙ｅ喕鐨勭洏鐐逛换鍔�
+ */
+ private void doProcessStockTakingDifference(MesWmStockTakingTaskDO task) {
+ // 1. 鑾峰彇鐩樼偣缁撴灉鍒楄〃
+ List<MesWmStockTakingTaskResultDO> results = stockTakingTaskResultService.getStockTakingTaskResultListByTaskId(task.getId());
if (CollUtil.isEmpty(results)) {
return; // 鏃犵洏鐐圭粨鏋滐紝鏃犻渶澶勭悊
}
+
+ // 2. 寤虹珛 琛屽彿 -> 鐩樼偣琛� 鏄犲皠锛氫互鐩樼偣琛岋紙搴撳瓨蹇収锛変负鍑嗗洖濉簱瀛樼紪鍙蜂笌缁村害锛�
+ // 閬垮厤鍑哄簱鏍搁攢鎸� (鐗╂枡+浣嶇疆+鎵规) 缁勫悎閿尮閰嶅埌鍏跺畠渚涘簲鍟�/搴撲綅鐨勮处闈㈣鑰屾墸閿欏簱瀛�
+ Map<Long, MesWmStockTakingTaskLineDO> lineMap = convertMap(
+ stockTakingTaskLineService.getStockTakingTaskLineListByTaskId(task.getId()),
+ MesWmStockTakingTaskLineDO::getId);
// 3. 閬嶅巻缁撴灉锛屽鐞嗗樊寮�
for (MesWmStockTakingTaskResultDO result : results) {
@@ -253,37 +401,30 @@
continue;
}
- // 璁＄畻宸紓锛氱洏鐐规暟閲� - 璐﹂潰鏁伴噺
+ // 璁＄畻宸紓锛氱洏鐐规暟閲� - 璐﹂潰鏁伴噺锛堢洏鐩堜负姝ｃ�佺洏浜忎负璐燂級
BigDecimal difference = takingQuantity.subtract(bookQuantity);
-
if (difference.compareTo(BigDecimal.ZERO) == 0) {
continue; // 鏃犲樊寮傦紝璺宠繃
}
- // 4. 鍒涘缓搴撳瓨璋冩暣浜嬪姟
+ MesWmStockTakingTaskLineDO line = result.getLineId() != null ? lineMap.get(result.getLineId()) : null;
+
+ // 4. 鍒涘缓搴撳瓨璋冩暣浜嬪姟锛氱洏鐩堜紶姝ｆ暟鍏ュ簱锛涚洏浜忕洿鎺ヤ紶璐熸暟鍑哄簱锛坈reateTransaction 鏍￠獙鍑哄簱鏁伴噺蹇呴』涓鸿礋锛�
MesWmTransactionSaveReqDTO transaction = new MesWmTransactionSaveReqDTO()
- .setItemId(result.getItemId())
- .setBatchId(result.getBatchId())
- .setBatchCode(result.getBatchCode())
- .setWarehouseId(result.getWarehouseId())
- .setLocationId(result.getLocationId())
- .setAreaId(result.getAreaId())
+ .setType(difference.compareTo(BigDecimal.ZERO) > 0
+ ? MesWmTransactionTypeEnum.IN.getType() : MesWmTransactionTypeEnum.OUT.getType())
+ .setQuantity(difference)
+ .setItemId(line != null ? line.getItemId() : result.getItemId())
+ .setBatchId(line != null ? line.getBatchId() : result.getBatchId())
+ .setBatchCode(line != null ? line.getBatchCode() : result.getBatchCode())
+ .setWarehouseId(line != null ? line.getWarehouseId() : result.getWarehouseId())
+ .setLocationId(line != null ? line.getLocationId() : result.getLocationId())
+ .setAreaId(line != null ? line.getAreaId() : result.getAreaId())
+ .setMaterialStockId(line != null ? line.getMaterialStockId() : result.getMaterialStockId())
.setBizId(task.getId())
.setBizCode(task.getCode())
- .setBizLineId(result.getLineId());
-
- if (difference.compareTo(BigDecimal.ZERO) > 0) {
- // 鐩樼泩锛氬簱瀛樺鍔�
- transaction.setType(MesWmTransactionTypeEnum.IN.getType())
- .setQuantity(difference)
- .setBizType(MesBizTypeConstants.WM_STOCK_TAKING);
- } else {
- // 鐩樹簭锛氬簱瀛樺噺灏�
- transaction.setType(MesWmTransactionTypeEnum.OUT.getType())
- .setQuantity(difference.negate()) // 鍑哄簱鏁伴噺浼犳鏁帮紝浣嗗唴閮ㄤ細杞负璐熸暟
- .setBizType(MesBizTypeConstants.WM_STOCK_TAKING);
- }
-
+ .setBizLineId(result.getLineId())
+ .setBizType(MesBizTypeConstants.WM_STOCK_TAKING);
wmTransactionService.createTransaction(transaction);
}
}
--
Gitblit v1.9.3