From 89dcf021bcb3c3393e03e2ebcb4b26e54aa360ad Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 26 五月 2025 16:35:01 +0800
Subject: [PATCH] 工具管理-出库流水代码生成及工具出库接口
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 170 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java
index d0f5668..f5cdf56 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java
@@ -26,22 +26,25 @@
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.OutboundOrder;
-import org.jeecg.modules.tms.entity.OutboundDetail;
+import org.jeecg.modules.tms.entity.*;
import org.jeecg.modules.tms.entity.dto.OutBoundOrderFlowDto;
+import org.jeecg.modules.tms.entity.dto.OutBoundRequestDto;
import org.jeecg.modules.tms.entity.dto.OutboundOrderAndDetailDto;
import org.jeecg.modules.tms.enums.OutBillStatus;
import org.jeecg.modules.tms.enums.OutBoundStatusEnum;
+import org.jeecg.modules.tms.enums.OutStorehouseType;
+import org.jeecg.modules.tms.enums.ToolCirculationStatus;
import org.jeecg.modules.tms.mapper.OutboundDetailMapper;
import org.jeecg.modules.tms.mapper.OutboundOrderMapper;
-import org.jeecg.modules.tms.service.IOutboundDetailService;
-import org.jeecg.modules.tms.service.IOutboundOrderService;
+import org.jeecg.modules.tms.service.*;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.*;
+import java.util.stream.Collectors;
/**
* @Description: tms_outbound_order
@@ -55,6 +58,12 @@
@Autowired
private IOutboundDetailService outboundDetailService;
+ @Autowired
+ private IToolLedgerService toolLedgerService;
+ @Autowired
+ private IToolLedgerDetailService toolLedgerDetailService;
+ @Autowired
+ private IOutStoreDetailService outStoreDetailService;
@Autowired
private ISysBusinessCodeRuleService businessCodeRuleService;
@Autowired
@@ -207,9 +216,13 @@
//鏍规嵁浠诲姟瀹屾垚缁撴灉鏇存柊鐢宠鍗曠姸鎬�
if (result.isSuccess()) {
- outboundOrder.setOrderStatus(outBoundOrderFlowDto.getStatus());
if (OutBillStatus.APPROVED.getValue().equals(outBoundOrderFlowDto.getStatus())) {
outboundOrder.setOutStatus(OutBoundStatusEnum.NOT_OUTBOUND.getValue());
+ outboundOrder.setOrderStatus(OutBillStatus.APPROVED.getValue());
+ }
+ if (OutBillStatus.REJECTED.getValue().equals(outBoundOrderFlowDto.getStatus())) {
+ //濡傛灉椹冲洖锛屽鎵瑰崟鐘舵�佸洖鍒拌崏绋�
+ outboundOrder.setOrderStatus(OutBillStatus.DRAFT.getValue());
}
outboundOrder.setAuditDate(new Date());
outboundOrder.setApprovalOpinion(outBoundOrderFlowDto.getApprovalOpinion());
@@ -217,6 +230,158 @@
}
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void outBound(List<OutBoundRequestDto> outBoundRequestList) {
+ //鏍￠獙鏄惁鏉ヨ嚜涓�涓敵璇峰崟
+ if (!fromOneApply(outBoundRequestList)) {
+ throw new JeecgBootException("鍑哄簱鏄庣粏蹇呴』鏉ヨ嚜鍚屼竴鍑哄簱鐢宠鍗曪紒");
+ }
+ //鏄惁鍙嚭搴撴牎楠�
+ if (!readyToOutbound(outBoundRequestList)) {
+ throw new JeecgBootException("鏈粡瀹℃壒閫氳繃鐨勭敵璇峰崟涓嶈兘鍑哄簱锛�");
+ }
+ //寮�濮嬪嚭搴�
+ OutboundOrder outboundOrder = getById(outBoundRequestList.get(0).getOutBoundOrderId());
+ List<String> detailIds = outBoundRequestList.stream().map(OutBoundRequestDto::getOutboundDetailId).collect(Collectors.toList());
+ List<OutboundDetail> outboundDetailList = outboundDetailService.listByIds(detailIds);
+ List<String> toolIdList = outboundDetailList.stream().map(OutboundDetail::getToolCode).collect(Collectors.toList());
+
+ Map<String, BigDecimal> outBoundRequestMap = outBoundRequestList.stream()
+ .collect(Collectors.toMap(OutBoundRequestDto::getOutboundDetailId, OutBoundRequestDto::getOutboundQuantity));
+ //澶勭悊搴撳瓨鍙拌处鍙婂彴璐︽槑缁�
+ Map<String, ToolLedger> toolLedgerMap = toolLedgerService.list(new LambdaQueryWrapper<ToolLedger>().in(ToolLedger::getToolId, toolIdList)).stream()
+ .collect(Collectors.toMap(ToolLedger::getToolId, item -> item, (k1, k2) -> k1));
+
+ LambdaQueryWrapper<ToolLedgerDetail> queryWrapper = new LambdaQueryWrapper<>();
+ for (int i = 0; i < outboundDetailList.size(); i++) {
+ if (i > 0) {
+ queryWrapper.or();
+ }
+ OutboundDetail detail = outboundDetailList.get(i);
+ queryWrapper.and(wrapper ->
+ wrapper.eq(ToolLedgerDetail::getToolCode, detail.getToolCode())
+ .eq(ToolLedgerDetail::getToolId, detail.getToolId()) //濡傛灉涓嶇鍒版妸锛岃瀛楁涓虹┖
+ );
+ }
+ List<ToolLedgerDetail> toolLedgerDetailList = toolLedgerDetailService.list(queryWrapper);
+ List<ToolLedger> toolLedgerUpdateList = CollectionUtil.newArrayList();
+ List<ToolLedgerDetail> toolLedgerDetailUpdateList = CollectionUtil.newArrayList();
+ List<OutStoreDetail> outStoreAddList = CollectionUtil.newArrayList();
+ List<OutboundDetail> outboundDetailUpdateList = CollectionUtil.newArrayList();
+
+ for (OutboundDetail detail : outboundDetailList) {
+ //鏇存柊搴撳瓨鍙拌处
+ ToolLedger toolLedger = toolLedgerMap.get(detail.getToolCode());
+ BigDecimal outboundQuantity = outBoundRequestMap.get(detail.getId());
+ OutStorehouseType outStorehouseType = OutStorehouseType.getByValue(outboundOrder.getOutStorehouseType());
+ switch (outStorehouseType) {
+ case TOOL_BORROW:
+ toolLedger.setLendCount(toolLedger.getLendCount().add(outboundQuantity));
+ break;
+ case MAINTENANCE_OUTBOUND:
+ toolLedger.setRepairCount(toolLedger.getRepairCount().add(outboundQuantity));
+ break;
+ case CALIBRATION_OUTBOUND:
+ toolLedger.setDetectionCount(toolLedger.getDetectionCount().add(outboundQuantity));
+ break;
+ case GRINDING_OUTBOUND:
+ toolLedger.setSharpeningCount(toolLedger.getSharpeningCount().add(outboundQuantity));
+ break;
+ default:
+ throw new JeecgBootException("鏈煡鐨勫嚭搴撶被鍨嬶紒");
+ }
+ toolLedgerUpdateList.add(toolLedger);
+
+ //鏇存柊鍙拌处鏄庣粏
+ toolLedgerDetailList.stream().filter(item -> item.getToolCode().equals(detail.getToolCode()) && item.getToolId().equals(detail.getToolId()))
+ .findFirst().ifPresent(item -> {
+ if (StrUtil.isNotBlank(item.getToolId())) {
+ item.setQuantity(BigDecimal.ZERO);
+ switch (outStorehouseType) {
+ case TOOL_BORROW:
+ item.setStatus(ToolCirculationStatus.BORROWED.getValue());
+ break;
+ case MAINTENANCE_OUTBOUND:
+ item.setStatus(ToolCirculationStatus.REPAIRING.getValue());
+ break;
+ case CALIBRATION_OUTBOUND:
+ item.setStatus(ToolCirculationStatus.INSPECTING.getValue());
+ break;
+ case GRINDING_OUTBOUND:
+ item.setStatus(ToolCirculationStatus.GRINDING.getValue());
+ break;
+ default:
+ throw new JeecgBootException("鏈煡鐨勫嚭搴撶被鍨嬶紒");
+ }
+ } else {
+ item.setQuantity(item.getQuantity().subtract(outboundQuantity));
+ }
+ toolLedgerDetailUpdateList.add(item);
+ });
+
+ //璁板綍鍑哄簱娴佹按
+ OutStoreDetail outStoreDetail = new OutStoreDetail()
+ .setToolCode(detail.getToolCode())
+ .setToolId(detail.getToolId())
+ .setOutStorehouseType(outboundOrder.getOutStorehouseType())
+ .setGoodsShelvesCode(detail.getOutboundLocation())
+ .setOutNumber(outboundQuantity)
+ .setOutStorehouseId(outboundOrder.getId())
+ .setOperateType("1");//1锛氭寜鐢宠鍗�
+ outStoreAddList.add(outStoreDetail);
+
+ //鏇存柊鐢宠鍗曟槑缁�
+ detail.setOutActualCount(detail.getOutActualCount().add(outboundQuantity));
+ detail.setOutboundTime(new Date());
+ if (detail.getOutActualCount().compareTo(detail.getOutboundQuantity()) == 0) {
+ detail.setStatus(OutBoundStatusEnum.COMPLETED.getValue());
+ } else {
+ detail.setStatus(OutBoundStatusEnum.PARTIAL_OUTBOUND.getValue());
+ }
+ outboundDetailUpdateList.add(detail);
+ }
+ toolLedgerService.updateBatchById(toolLedgerUpdateList);
+ toolLedgerDetailService.updateBatchById(toolLedgerDetailUpdateList);
+ outStoreDetailService.saveBatch(outStoreAddList);
+ outboundDetailService.updateBatchById(outboundDetailUpdateList);
+
+ //鏇存柊鐢宠鍗�
+ boolean allMatch = outboundDetailService.list(new LambdaQueryWrapper<OutboundDetail>()
+ .eq(OutboundDetail::getOutStorehouseId, outboundOrder.getId()))
+ .stream().filter(i -> !detailIds.contains(i.getId()))
+ .allMatch(i -> i.getStatus().equals(OutBoundStatusEnum.COMPLETED.getValue()));
+ List<OutboundDetail> partialOutboundList = outboundDetailUpdateList.stream()
+ .filter(i -> !i.getStatus().equals(OutBoundStatusEnum.COMPLETED.getValue())).collect(Collectors.toList());
+ if (allMatch && partialOutboundList.isEmpty()) {
+ outboundOrder.setOutStatus(OutBoundStatusEnum.COMPLETED.getValue());
+ } else {
+ outboundOrder.setOutStatus(OutBoundStatusEnum.PARTIAL_OUTBOUND.getValue());
+ }
+ outboundOrder.setOutboundTime(new Date());
+ updateById(outboundOrder);
+ }
+
+ private boolean fromOneApply(List<OutBoundRequestDto> outBoundRequestList) {
+ long count = outBoundRequestList.stream().map(OutBoundRequestDto::getOutBoundOrderId).distinct().count();
+ if (count > 1) {
+ return false;
+ }
+ List<String> outDetailIds = outBoundRequestList.stream().map(OutBoundRequestDto::getOutboundDetailId).collect(Collectors.toList());
+ String outboundDetailId = outBoundRequestList.get(0).getOutboundDetailId();
+ OutboundDetail outboundDetail = outboundDetailService.getById(outboundDetailId);
+ List<String> detailIds = outboundDetailService.list(new LambdaQueryWrapper<OutboundDetail>()
+ .eq(OutboundDetail::getOutStorehouseId, outboundDetail.getOutStorehouseId())).stream()
+ .map(OutboundDetail::getId).collect(Collectors.toList());
+ return new HashSet<>(detailIds).containsAll(outDetailIds);
+ }
+
+ private boolean readyToOutbound(List<OutBoundRequestDto> outBoundRequestList) {
+ String outBoundOrderId = outBoundRequestList.get(0).getOutBoundOrderId();
+ OutboundOrder outboundOrder = getById(outBoundOrderId);
+ return OutBillStatus.APPROVED.getValue().equals(outboundOrder.getOrderStatus());
+ }
+
public boolean triggerProcess(OutboundOrder outboundOrder) {
flowCommonService.initActBusiness("鍗曞彿涓猴細" + outboundOrder.getOutNum() + " 鐨勫嚭搴撶敵璇凤紝寮�濮嬭繘琛屽鎵�",
outboundOrder.getId(), "outboundOrderServiceImpl", "tool_out_storage", null);
--
Gitblit v1.9.3