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 | 73 +++++++++++++++++++++++++++++++++---
1 files changed, 67 insertions(+), 6 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 8e3ff5b..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
@@ -7,6 +7,7 @@
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;
@@ -25,6 +26,8 @@
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;
@@ -32,6 +35,8 @@
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;
@@ -39,6 +44,7 @@
import javax.annotation.Resource;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.*;
/**
@@ -69,6 +75,12 @@
private IFlowMyBusinessService flowMyBusinessService;
@Autowired
private TaskService taskService;
+
+ @Autowired
+ private IToolLedgerService toolLedgerService;
+
+ @Autowired
+ private IToolLedgerDetailService toolLedgerDetailService;
@Override
public void delMain(String id) {
@@ -125,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();
@@ -147,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())) {
@@ -220,6 +230,58 @@
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);
@@ -239,8 +301,7 @@
}
private FlowMyBusiness getFlowMyBusiness(String instanceId) {
- List<FlowMyBusiness> businessList = flowMyBusinessService.list(
- new LambdaQueryWrapper<FlowMyBusiness>().eq(FlowMyBusiness::getProcessInstanceId, instanceId));
+ List<FlowMyBusiness> businessList = flowMyBusinessService.list(new LambdaQueryWrapper<FlowMyBusiness>().eq(FlowMyBusiness::getProcessInstanceId, instanceId));
return businessList.isEmpty() ? null : businessList.get(0);
}
--
Gitblit v1.9.3