From 06ddb489776d6d3859238ae89724efc9db8d7e9d Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期一, 26 五月 2025 17:35:17 +0800
Subject: [PATCH] 工具报损-审批提交(扣减库存/更新台账状态/更新单据审批状态)
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsLossBoundServiceImpl.java | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 165 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsLossBoundServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsLossBoundServiceImpl.java
index b789be8..534804b 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsLossBoundServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsLossBoundServiceImpl.java
@@ -4,27 +4,39 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.shiro.SecurityUtils;
+import org.flowable.engine.TaskService;
+import org.flowable.task.api.Task;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
+import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
import org.jeecg.modules.flowable.service.IFlowDefinitionService;
import org.jeecg.modules.flowable.service.IFlowTaskService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
+import org.jeecg.modules.tms.entity.ToolLedger;
+import org.jeecg.modules.tms.entity.ToolLedgerDetail;
import org.jeecg.modules.tms.entity.ToolsLossBound;
import org.jeecg.modules.tms.entity.ToolsLossBoundDetail;
+import org.jeecg.modules.tms.entity.dto.LossBoundFlowDto;
import org.jeecg.modules.tms.enums.OutBillStatus;
+import org.jeecg.modules.tms.enums.OutBoundStatusEnum;
import org.jeecg.modules.tms.mapper.ToolsLossBoundDetailMapper;
import org.jeecg.modules.tms.mapper.ToolsLossBoundMapper;
+import org.jeecg.modules.tms.service.IToolLedgerDetailService;
+import org.jeecg.modules.tms.service.IToolLedgerService;
import org.jeecg.modules.tms.service.IToolsLossBoundDetailService;
import org.jeecg.modules.tms.service.IToolsLossBoundService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +44,7 @@
import javax.annotation.Resource;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.*;
/**
@@ -58,7 +71,16 @@
private IFlowTaskService flowTaskService;
@Autowired
private ISysBusinessCodeRuleService businessCodeRuleService;
+ @Autowired
+ private IFlowMyBusinessService flowMyBusinessService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private IToolLedgerService toolLedgerService;
+
+ @Autowired
+ private IToolLedgerDetailService toolLedgerDetailService;
@Override
public void delMain(String id) {
@@ -77,9 +99,9 @@
@Override
public void addTotal(ToolsLossBound toolsLossBound) {
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- if (loginUser != null){
- toolsLossBound.setHandler(loginUser.getId());
- }
+ if (loginUser != null) {
+ toolsLossBound.setHandler(loginUser.getId());
+ }
toolsLossBound.setOrderCode(businessCodeRuleService.generateBusinessCodeSeq("LossBound"));
toolsLossBound.setOrderStatus(OutBillStatus.DRAFT.getValue());
save(toolsLossBound);
@@ -115,8 +137,7 @@
@Override
public void editTotal(ToolsLossBound toolsLossBound) {
//鍒犻櫎鎵�鏈夋槑缁�
- toolsLossBoundDetailService.remove(new LambdaQueryWrapper<ToolsLossBoundDetail>()
- .eq(ToolsLossBoundDetail::getLossBoundId, toolsLossBound.getId()));
+ toolsLossBoundDetailService.remove(new LambdaQueryWrapper<ToolsLossBoundDetail>().eq(ToolsLossBoundDetail::getLossBoundId, toolsLossBound.getId()));
ToolsLossBound toolsLossBound1 = BeanUtil.copyProperties(toolsLossBound, ToolsLossBound.class);
this.baseMapper.updateById(toolsLossBound1);
List<ToolsLossBoundDetail> detailList = CollectionUtil.newArrayList();
@@ -137,8 +158,7 @@
} else {
toolsLossBound.setReviewer(toolsLossBound.getReviewer());
- flowCommonService.initActBusiness("鎶ユ崯鍗曞彿:" + toolsLossBound.getOrderCode() + ";鎶ユ崯浜�: " + toolsLossBound.getLosser() + ";杩涜鎶ユ崯",
- toolsLossBound.getId(), "IToolsStocktakingBoundService", "tools_Loss_Approval", null);
+ flowCommonService.initActBusiness("鎶ユ崯鍗曞彿:" + toolsLossBound.getOrderCode() + ";鎶ユ崯浜�: " + toolsLossBound.getLosser() + ";杩涜鎶ユ崯", toolsLossBound.getId(), "IToolsStocktakingBoundService", "tools_Loss_Approval", null);
Map<String, Object> variables = new HashMap<>();
variables.put("dataId", toolsLossBound.getId());
if (StrUtil.isEmpty(toolsLossBound.getReviewer())) {
@@ -165,6 +185,144 @@
}
@Override
+ public void approvalProcess(LossBoundFlowDto lossBoundFlowDto) {
+ if (StrUtil.isBlank(lossBoundFlowDto.getTaskId()) || StrUtil.isBlank(lossBoundFlowDto.getDataId())) {
+ throw new JeecgBootException("闈炴硶鍙傛暟锛�");
+ }
+
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (user == null || StrUtil.isBlank(user.getId())) {
+ throw new JeecgBootException("璐﹀彿涓嶅瓨鍦�");
+ }
+
+ //鑾峰彇鎶ユ崯鍗曚俊鎭�
+ ToolsLossBound toolsLossBound = getById(lossBoundFlowDto.getDataId());
+ if (toolsLossBound == null) {
+ throw new JeecgBootException("鏈壘鍒板搴旂殑鍑哄簱鐢宠鍗曪紒");
+ }
+
+ //鑾峰彇娴佺▼涓氬姟璁板綍
+ FlowMyBusiness flowMyBusiness = getFlowMyBusiness(lossBoundFlowDto.getInstanceId());
+ if (flowMyBusiness == null) {
+ throw new JeecgBootException("娴佺▼璁板綍涓嶅瓨鍦�");
+ }
+
+ // 妫�鏌ョ敤鎴锋槸鍚︽湁鏉冮檺鎿嶄綔浠诲姟
+ if (!isUserAuthorized(flowMyBusiness, user)) {
+ throw new JeecgBootException("鐢ㄦ埛鏃犳潈鎿嶄綔姝や换鍔�");
+ }
+
+ // 璁ら浠诲姟
+ if (!claimTask(flowMyBusiness.getTaskId(), user)) {
+ throw new JeecgBootException("浠诲姟涓嶅瓨鍦ㄣ�佸凡瀹屾垚鎴栧凡琚粬浜鸿棰�");
+ }
+
+ //璁剧疆娴佺▼鍙橀噺
+ setupProcessVariables(lossBoundFlowDto, toolsLossBound, user);
+
+ //瀹屾垚娴佺▼浠诲姟
+ Result result = flowTaskService.complete(lossBoundFlowDto);
+
+ //鏍规嵁浠诲姟瀹屾垚缁撴灉鏇存柊鐢宠鍗曠姸鎬�
+ if (result.isSuccess()) {
+ toolsLossBound.setOrderStatus(lossBoundFlowDto.getStatus());
+ if (OutBillStatus.APPROVED.getValue().equals(lossBoundFlowDto.getStatus())) {
+ toolsLossBound.setOrderStatus(OutBoundStatusEnum.NOT_OUTBOUND.getValue());
+ }
+ /**
+ * 鏇存柊瀹℃壒鏃堕棿銆佸鎵规剰瑙� 鏇存柊搴撳瓨鎵ｅ噺 搴撳瓨鎬绘暟
+ * 鑾峰彇宸ュ叿鏄庣粏鍒楄〃锛岄亶鍘嗘瘡涓伐鍏锋槑缁嗭紝鏇存柊瀵瑰簲鐨勫伐鍏峰簱瀛樿褰曘��
+ * 瀵逛簬姣忎釜宸ュ叿锛岃幏鍙栧搴旂殑宸ュ叿搴撳瓨璁板綍锛圱oolLedger锛夛紝骞舵洿鏂版�诲簱瀛樻暟閲忥紙totalCount锛夊拰鎹熷け鏁伴噺锛坙ossCount锛夈��
+ * 纭繚鍦ㄦ洿鏂版�诲簱瀛樻暟閲忎箣鍓嶏紝妫�鏌ユ�诲簱瀛樻暟閲忔槸鍚﹀ぇ浜庢垨绛変簬鎹熷け鏁伴噺銆傚鏋滀笉婊¤冻鏉′欢锛屾姏鍑哄紓甯告垨杩涜鍏朵粬澶勭悊銆�
+ * 鏈�鍚庯紝淇濆瓨鏇存柊鍚庣殑宸ュ叿搴撳瓨璁板綍銆�
+ */
+
+ List<ToolsLossBoundDetail> detailList = toolsLossBound.getToolsLossBoundDetailList();
+
+ if (CollectionUtils.isEmpty(detailList)) {
+ throw new JeecgBootException("鎶ユ崯鏄庣粏涓虹┖锛屾棤娉曡繘琛屽簱瀛樻墸鍑�");
+ }
+ Map<String, BigDecimal> toolLossMap = new HashMap<>();
+ for (ToolsLossBoundDetail item : detailList) {
+ if (item.getToolId() == null || item.getLossNumber() == null) {
+ continue; //
+ }
+ toolLossMap.put(item.getToolId(), toolLossMap.getOrDefault(item.getToolId(), BigDecimal.ZERO).add(item.getLossNumber()));
+ }
+ /**
+ * 閬嶅巻姣忎釜 toolId锛屾洿鏂板搴旂殑 ToolLedger
+ */
+ for (Map.Entry<String, BigDecimal> entry : toolLossMap.entrySet()) {
+ String toolId = entry.getKey();
+ BigDecimal totalLossNumber = entry.getValue();
+
+ ToolLedger toolLedger = toolLedgerService.getOne(new QueryWrapper<ToolLedger>().eq("id", toolId));
+ if (toolLedger == null) {
+ throw new JeecgBootException("鏈壘鍒板搴旂殑宸ュ叿搴撳瓨璁板綍锛宼oolId锛�" + toolId);
+ }
+
+ // 鎵ｅ噺鎬诲簱瀛�
+ if (toolLedger.getTotalCount() != null && toolLedger.getTotalCount().compareTo(totalLossNumber) >= 0) {
+ toolLedger.setTotalCount(toolLedger.getTotalCount().subtract(totalLossNumber));
+ toolLedger.setLossCount(toolLedger.getLossCount().add(totalLossNumber));
+ } else {
+ throw new JeecgBootException("搴撳瓨涓嶈冻锛屾棤娉曞畬鎴愭姤鎹熸搷浣滐紝toolId锛�" + toolId);
+ }
+
+ // 鏇存柊鏁版嵁搴撲腑鐨� ToolLedger
+ toolLedgerService.updateById(toolLedger);
+ /**
+ * 鏂板閫昏緫锛氭洿鏂板彴璐︽槑缁嗚〃 ToolLedgerDetail 涓殑鐘舵�佸瓧娈典负 6
+ */
+ UpdateWrapper<ToolLedgerDetail> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("tool_id", toolId)
+ .set("status", 6); // 鐘舵�佽缃负 6
+
+ toolLedgerDetailService.update(updateWrapper);
+ }
+
+ toolsLossBound.setApprovalDate(new Date());
+ toolsLossBound.setApprovalOpinion(lossBoundFlowDto.getApprovalOpinion());
+ updateById(toolsLossBound);
+ }
+ }
+
+ private void setupProcessVariables(LossBoundFlowDto lossBoundFlowDto, ToolsLossBound toolsLossBound, LoginUser user) {
+ if (OutBillStatus.SUBMITTED.getValue().equals(toolsLossBound.getOrderStatus()) && user.getUsername().equals(toolsLossBound.getReviewer())) {
+ Map<String, Object> values = new HashMap<>();
+ values.put("dataId", toolsLossBound.getId());
+ values.put("organization", lossBoundFlowDto.getApprovalOpinion());
+ values.put("comment", lossBoundFlowDto.getApprovalOpinion());
+ values.put("status", lossBoundFlowDto.getStatus());
+ values.put("NextAssignee", Collections.singletonList(toolsLossBound.getReviewer()));
+ lossBoundFlowDto.setValues(values);
+ }
+ }
+
+ private FlowMyBusiness getFlowMyBusiness(String instanceId) {
+ List<FlowMyBusiness> businessList = flowMyBusinessService.list(new LambdaQueryWrapper<FlowMyBusiness>().eq(FlowMyBusiness::getProcessInstanceId, instanceId));
+ return businessList.isEmpty() ? null : businessList.get(0);
+ }
+
+ private boolean isUserAuthorized(FlowMyBusiness flowMyBusiness, LoginUser user) {
+ List<String> todoUsers = JSON.parseArray(flowMyBusiness.getTodoUsers(), String.class);
+ return todoUsers != null && todoUsers.contains(user.getUsername());
+ }
+
+ private boolean claimTask(String taskId, LoginUser user) {
+ Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+ if (task == null) {
+ return false;
+ }
+ if (task.getAssignee() != null && !task.getAssignee().equals(user.getUsername())) {
+ return false;
+ }
+ taskService.claim(taskId, user.getUsername());
+ return true;
+ }
+
+ @Override
public void afterFlowHandle(FlowMyBusiness business) {
business.getTaskNameId();//鎺ヤ笅鏉ュ鎵圭殑鑺傜偣
business.getValues();//鍓嶇浼犺繘鏉ョ殑鍙傛暟
--
Gitblit v1.9.3