From b852254d90e7d1955db31db154193ec8ee84d8b3 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 09 九月 2026 10:57:59 +0800
Subject: [PATCH] feat(hrm): 新增员工用工性质、班组归属字段及考勤异常处理优化
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/stocktaking/task/MesWmStockTakingTaskServiceImpl.java | 243 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 197 insertions(+), 46 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..c419242 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
@@ -9,26 +9,40 @@
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.user.AdminUserApi;
+import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
+import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
+import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.repository.ProcessDefinition;
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.util.List;
+import java.time.LocalDateTime;
+import java.util.*;
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.module.mes.enums.ErrorCodeConstants.*;
/**
@@ -38,10 +52,16 @@
*/
@Service
@Validated
+@Slf4j
public class MesWmStockTakingTaskServiceImpl implements MesWmStockTakingTaskService {
@Resource
private MesWmStockTakingTaskMapper stockTakingTaskMapper;
+
+ @Resource
+ private BpmProcessInstanceApi processInstanceApi;
+ @Resource
+ private BpmProcessDefinitionService bpmProcessDefinitionService;
@Resource
private MesWmMaterialStockService materialStockService;
@@ -56,6 +76,9 @@
@Resource
private MesWmTransactionService wmTransactionService;
+
+ @Resource
+ private MesMdAutoCodeRecordService mesMdAutoCodeRecordService;
@Resource
private AdminUserApi adminUserApi;
@@ -82,6 +105,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
@@ -143,19 +198,114 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void finishStockTakingTask(Long id) {
- // 1. 鏍￠獙浠诲姟瀛樺湪涓斾负瀹℃壒涓姸鎬�
+ public void submitStockTakingResultApproval(Long id, String processDefinitionKey) {
+ // 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 (task.getProcessInstanceId() != null) {
+ 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);
+ }
+
+ // 2. 鍒涘缓 BPM 娴佺▼瀹炰緥
+ String processInstanceId = processInstanceApi.createProcessInstance(getCurrentUserId(),
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(processDefinitionKey)
+ .setBusinessKey(String.valueOf(id)));
+
+ // 3. 鍥炲啓娴佺▼瀹炰緥缂栧彿锛堜换鍔′繚鎸佺洏鐐逛腑锛岀瓑寰呭鎵癸級
+ stockTakingTaskMapper.updateById(new MesWmStockTakingTaskDO()
+ .setId(id).setProcessInstanceId(processInstanceId));
+ }
+
+ @Override
+ public List<Map<String, Object>> getStockTakingTaskResultApprovalProcessDefinitionList() {
+ return getProcessDefinitionListByCategory(APPROVE_CATEGORY_CODE);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updateStockTakingTaskResultAuditStatus(Long id, Integer bpmResult) {
+ // 1. 鏍￠獙浠诲姟瀛樺湪
+ MesWmStockTakingTaskDO task = validateStockTakingTaskExists(id);
+ if (!MesWmStockTakingTaskStatusEnum.APPROVING.getStatus().equals(task.getStatus())) {
+ log.warn("[updateStockTakingTaskResultAuditStatus] 鐩樼偣浠诲姟({}) 涓嶅浜庣洏鐐逛腑鐘舵�侊紝蹇界暐瀹℃壒浜嬩欢", id);
+ return;
+ }
+ // 2. 瀹℃壒閫氳繃锛氬厛缃负宸插畬鎴愶紝鍐嶈В鍐诲苟鍚屼簨鍔¤嚜鍔ㄦ牳閿�宸紓
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
+ // 2.1 鍏堢疆涓哄凡瀹屾垚锛氫换鍔＄姸鎬佸彉鏇村悗锛屽悗缁噸澶嶇殑瀹℃壒浜嬩欢璇诲彇鍒� FINISHED 鍗宠蹇界暐锛岄伩鍏嶉噸澶嶆牳閿�
+ stockTakingTaskMapper.updateById(new MesWmStockTakingTaskDO().setId(id)
+ .setStatus(MesWmStockTakingTaskStatusEnum.FINISHED.getStatus()));
+ // 2.2 瑙ｅ喕搴撳瓨锛氶』鍦ㄥ樊寮傛牳閿�鍓嶈В鍐伙紝鍚﹀垯鏍搁攢浜嬪姟浼氳搴撳瓨鍐荤粨鏍￠獙鎷︽埅
+ if (Boolean.TRUE.equals(task.getFrozen())) {
+ updateMaterialStockFrozen(stockTakingTaskLineService.getStockTakingTaskLineListByTaskId(id), false);
+ }
+ // 2.3 鑷姩鏍搁攢鐩樼偣宸紓锛氱洏鐩堝叆搴� / 鐩樹簭鍑哄簱锛屽悓浜嬪姟鍐呮洿鏂板簱瀛樺彴璐︼紱浠讳竴姝ュけ璐ユ暣浣撳洖婊氾紝浠诲姟鍥為��涓虹洏鐐逛腑
+ doProcessStockTakingDifference(task);
+ return;
+ }
+ // 3. 瀹℃壒椹冲洖锛氭竻绌烘祦绋嬪疄渚嬬紪鍙凤紝浠诲姟淇濇寔鐩樼偣涓紝鍙慨鏀瑰疄鐩樺悗閲嶆柊鎻愪氦缁撴灉瀹℃壒
+ if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmResult)) {
+ stockTakingTaskMapper.clearProcessInstanceId(id);
+ return;
+ }
+ // 4. 瀹℃壒鍙栨秷锛氳В鍐诲簱瀛樺苟缃负宸插彇娑�
+ if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
+ if (Boolean.TRUE.equals(task.getFrozen())) {
+ updateMaterialStockFrozen(stockTakingTaskLineService.getStockTakingTaskLineListByTaskId(id), false);
+ }
+ stockTakingTaskMapper.clearProcessInstanceId(id);
+ stockTakingTaskMapper.updateById(new MesWmStockTakingTaskDO().setId(id)
+ .setStatus(MesWmStockTakingTaskStatusEnum.CANCELED.getStatus()));
+ }
+ }
+
+ /**
+ * 鑾峰彇鍒嗙被涓嬬殑鍙敤 BPM 娴佺▼瀹氫箟锛堣繃婊ゆ寕璧锋祦绋嬶紝鍚� Key 淇濈暀鏈�鏂扮増鏈級
+ *
+ * @param categoryCode 娴佺▼鍒嗙被缂栫爜
+ * @return 娴佺▼瀹氫箟鍒楄〃锛坕d/key/name锛�
+ */
+ private List<Map<String, Object>> getProcessDefinitionListByCategory(String categoryCode) {
+ List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(categoryCode);
+ if (CollUtil.isEmpty(definitionInfoList)) {
+ return Collections.emptyList();
+ }
+ // 杩囨护婵�娲荤姸鎬侊紝淇濈暀鏈�鏂扮増鏈�
+ Map<String, ProcessDefinition> latestVersionMap = new HashMap<>();
+ for (BpmProcessDefinitionInfoDO info : definitionInfoList) {
+ ProcessDefinition pd = bpmProcessDefinitionService.getProcessDefinition(info.getProcessDefinitionId());
+ if (pd == null || pd.isSuspended()) {
+ continue;
+ }
+ ProcessDefinition existing = latestVersionMap.get(pd.getKey());
+ if (existing == null || pd.getVersion() > existing.getVersion()) {
+ latestVersionMap.put(pd.getKey(), pd);
+ }
+ }
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (ProcessDefinition pd : latestVersionMap.values()) {
+ Map<String, Object> item = new HashMap<>();
+ item.put("id", pd.getId());
+ item.put("key", pd.getKey());
+ item.put("name", pd.getName());
+ result.add(item);
+ }
+ return result;
+ }
+
+ private Long getCurrentUserId() {
+ Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+ if (authentication != null && authentication.getPrincipal() instanceof Long) {
+ return (Long) authentication.getPrincipal();
+ }
+ return 1L; // 榛樿鐢ㄦ埛
}
@Override
@@ -168,6 +318,8 @@
}
task.setStatus(MesWmStockTakingTaskStatusEnum.CANCELED.getStatus());
stockTakingTaskMapper.updateById(task);
+ // 鍙栨秷鍚庢竻绌烘祦绋嬪疄渚嬬紪鍙凤紝閬垮厤娈嬬暀瀹℃壒鏍囪褰卞搷鍚庣画閲嶆柊寮�濮嬬洏鐐�
+ stockTakingTaskMapper.clearProcessInstanceId(id);
if (Boolean.TRUE.equals(task.getFrozen())) {
updateMaterialStockFrozen(stockTakingTaskLineService.getStockTakingTaskLineListByTaskId(id), false);
}
@@ -229,20 +381,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 #updateStockTakingTaskResultAuditStatus} 鐨勫鎵归�氳繃鍒嗘敮鍦ㄥ悓浜嬪姟鍐呰皟鐢紱
+ * 澶辫触鏁翠綋鍥炴粴锛屼换鍔″洖閫�涓虹洏鐐逛腑鐘舵�侊紝閬垮厤閲嶅璋冩暣銆�
+ *
+ * @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 +411,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