From ec1bf4658e36a17f971a54007920a44c5378b7dc Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期一, 16 六月 2025 10:41:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/OutboundOrderServiceImpl.java | 72 +++++++++++++++++++++++++++++++----
1 files changed, 63 insertions(+), 9 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 936e09c..2ef6f18 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
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
@@ -42,6 +43,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.io.Serializable;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
@@ -83,6 +85,8 @@
private OutboundOrderMapper outboundOrderMapper;
@Autowired
private OutboundDetailMapper outboundDetailMapper;
+ @Autowired
+ private OutboundOrderConvert outboundOrderConvert;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -103,7 +107,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void addTotal(OutboundOrderAndDetailDto outboundOrder) {
- OutboundOrder order = OutboundOrderConvert.INSTANCE.convert(outboundOrder);
+ OutboundOrder order = outboundOrderConvert.convert(outboundOrder);
order.setHandler(Objects.requireNonNull(getCurrentUser()).getId());
order.setOutNum(businessCodeRuleService.generateBusinessCodeSeq("outBoundOrder"));
order.setOrderStatus(OutBillStatus.DRAFT.getValue());
@@ -155,7 +159,7 @@
//鍒犻櫎鎵�鏈夋槑缁�
outboundDetailService.remove(new LambdaQueryWrapper<OutboundDetail>()
.eq(OutboundDetail::getOutStorehouseId, outboundOrder.getId()));
- OutboundOrder outboundOrderUpdate = BeanUtil.copyProperties(outboundOrder, OutboundOrder.class);
+ OutboundOrder outboundOrderUpdate = outboundOrderConvert.convert(outboundOrder);
outboundOrderMapper.updateById(outboundOrderUpdate);
List<OutboundDetail> detailList = CollectionUtil.newArrayList();
outboundOrder.getOutboundDetailList().forEach(item->{
@@ -175,13 +179,14 @@
if (!Objects.equals(outboundOrder.getOrderStatus(), OutBillStatus.DRAFT.getValue())) {
throw new JeecgBootException("鏃犳硶鎻愪氦闈炶崏绋跨姸鎬佺殑鍑哄簱鐢宠鍗曪紒");
}
- //閿佸畾鐢宠鍗曟槑缁嗕腑宸ュ叿搴撳瓨
- if (lockOutboundStock(id)) {
- //鍚姩娴佺▼
- if (triggerProcess(outboundOrder)) {
- outboundOrder.setOrderStatus(OutBillStatus.SUBMITTED.getValue());
- updateById(outboundOrder);
- }
+ if (!OutStorehouseType.PREPARATION_OUTBOUND.getValue().equals(outboundOrder.getOutStorehouseType())) {
+ //涓嶆槸浠庡噯澶囧崟杞叆鐨勫嚭搴撶敵璇凤紝鎵ц閿佸簱
+ lockOutboundStock(id);
+ }
+ //鍚姩娴佺▼
+ if (triggerProcess(outboundOrder)) {
+ outboundOrder.setOrderStatus(OutBillStatus.SUBMITTED.getValue());
+ updateById(outboundOrder);
}
}
@@ -382,6 +387,10 @@
Map<String, BigDecimal> outBoundRequestMap = outBoundRequestList.stream()
.collect(Collectors.toMap(OutBoundRequestDto::getOutboundDetailId, OutBoundRequestDto::getOutboundQuantity));
+ Map<String, BigDecimal> ratedLifeMap = outBoundRequestList.stream()
+ .collect(Collectors.toMap(OutBoundRequestDto::getOutboundDetailId, dto->dto.getRatedLife() != null ? dto.getRatedLife() : null));
+ Map<String, BigDecimal> useLifeMap = outBoundRequestList.stream()
+ .collect(Collectors.toMap(OutBoundRequestDto::getOutboundDetailId, dto->dto.getUseLife() != null ? dto.getUseLife() : null));
//澶勭悊搴撳瓨鍙拌处鍙婂彴璐︽槑缁�
Map<String, ToolLedger> toolLedgerMap = toolLedgerService.list(new LambdaQueryWrapper<ToolLedger>().in(ToolLedger::getToolId, toolIdList)).stream()
.collect(Collectors.toMap(ToolLedger::getToolId, item -> item, (k1, k2) -> k1));
@@ -417,6 +426,14 @@
//鏇存柊搴撳瓨鍙拌处
ToolLedger toolLedger = toolLedgerMap.get(detail.getToolCode());
BigDecimal outboundQuantity = outBoundRequestMap.get(detail.getId());
+ BigDecimal ratedLife = ratedLifeMap.get(detail.getId());
+ BigDecimal useLife = useLifeMap.get(detail.getId());
+ //鍞竴缂栫爜涓嶄负绌烘椂锛堢鍒版妸锛�,璁＄畻鍓╀綑瀵垮懡
+ BigDecimal remandLife = null;
+ if(StringUtils.isNotBlank(detail.getToolId())){
+ ToolLedgerDetail toolLedgerDetail = toolLedgerDetailService.lambdaQuery().eq(ToolLedgerDetail::getToolId,detail.getToolId()).one();
+ remandLife = (ratedLife.multiply(toolLedgerDetail.getRemainingPercentage()).subtract(useLife).max(BigDecimal.ZERO)).divide(ratedLife, 4, RoundingMode.HALF_UP);
+ }
OutStorehouseType outStorehouseType = OutStorehouseType.getByValue(outboundOrder.getOutStorehouseType());
switch (outStorehouseType) {
case TOOL_BORROW:
@@ -437,20 +454,33 @@
toolLedgerUpdateList.add(toolLedger);
//鏇存柊鍙拌处鏄庣粏
+ BigDecimal finalRemandLife = remandLife;
toolLedgerDetailList.stream().filter(item -> item.getToolCode().equals(detail.getToolCode()) && item.getToolId().equals(detail.getToolId()))
.findFirst().ifPresent(item -> {
switch (outStorehouseType) {
case TOOL_BORROW:
item.setStatus(ToolCirculationStatus.BORROWED.getValue());
+ item.setRatedLife(ratedLife);
+ item.setUseLife(useLife);
+ item.setRemainingPercentage(finalRemandLife);
break;
case MAINTENANCE_OUTBOUND:
item.setStatus(ToolCirculationStatus.REPAIRING.getValue());
+ item.setRatedLife(ratedLife);
+ item.setUseLife(useLife);
+ item.setRemainingPercentage(finalRemandLife);
break;
case CALIBRATION_OUTBOUND:
item.setStatus(ToolCirculationStatus.INSPECTING.getValue());
+ item.setRatedLife(ratedLife);
+ item.setUseLife(useLife);
+ item.setRemainingPercentage(finalRemandLife);
break;
case GRINDING_OUTBOUND:
item.setStatus(ToolCirculationStatus.GRINDING.getValue());
+ item.setRatedLife(ratedLife);
+ item.setUseLife(useLife);
+ item.setRemainingPercentage(finalRemandLife);
break;
default:
throw new JeecgBootException("鏈煡鐨勫嚭搴撶被鍨嬶紒");
@@ -475,6 +505,9 @@
.setGoodsShelvesCode(detail.getOutboundLocation())
.setOutNumber(outboundQuantity)
.setOutStorehouseId(outboundOrder.getId())
+ .setRatedLife(ratedLife)
+ .setUseLife(useLife)
+ .setRemainingPercentage(remandLife)
.setOperateType("1");//1锛氭寜鐢宠鍗�
outStoreAddList.add(outStoreDetail);
@@ -561,6 +594,8 @@
for (String toolLedgerDetailId : boundAddDtoMap.keySet()) {
OutBoundAddDto outBoundAddDto = boundAddDtoMap.get(toolLedgerDetailId);
BigDecimal outboundQuantity = outBoundAddDto.getOutboundQuantity();
+ BigDecimal ratedLife = outBoundAddDto.getRatedLife();
+ BigDecimal useLife = outBoundAddDto.getUseLife();
ToolLedgerDetail toolLedgerDetail = toolLedgerDetailMap.get(toolLedgerDetailId);
if (Objects.isNull(toolLedgerDetail) || toolLedgerDetail.getQuantity().compareTo(outboundQuantity) < 0) {
BaseTools tools = baseToolsService.getById(outBoundAddDto.getToolCode());
@@ -572,20 +607,34 @@
toolLedgerDetail.setQuantity(toolLedgerDetail.getQuantity().subtract(outboundQuantity));
} else {
//鏈夊敮涓�缂栫爜锛岀閬撴妸鐨�
+ //璁＄畻鍓╀綑瀵垮懡
+ BigDecimal remandLife = (ratedLife.multiply(toolLedgerDetail.getRemainingPercentage()).subtract(useLife).max(BigDecimal.ZERO)).divide(ratedLife, 4, RoundingMode.HALF_UP);
toolLedgerDetail.setQuantity(BigDecimal.ZERO);//鏁伴噺鍙細鏄�0鍜�1
OutStorehouseType outStorehouseType = OutStorehouseType.getByValue(boundAddList.get(0).getOutStorehouseType());
switch (outStorehouseType) {
case TOOL_BORROW:
toolLedgerDetail.setStatus(ToolCirculationStatus.BORROWED.getValue());
+ toolLedgerDetail.setRatedLife(ratedLife);
+ toolLedgerDetail.setUseLife(useLife);
+ toolLedgerDetail.setRemainingPercentage(remandLife);
break;
case MAINTENANCE_OUTBOUND:
toolLedgerDetail.setStatus(ToolCirculationStatus.REPAIRING.getValue());
+ toolLedgerDetail.setRatedLife(ratedLife);
+ toolLedgerDetail.setUseLife(useLife);
+ toolLedgerDetail.setRemainingPercentage(remandLife);
break;
case CALIBRATION_OUTBOUND:
toolLedgerDetail.setStatus(ToolCirculationStatus.INSPECTING.getValue());
+ toolLedgerDetail.setRatedLife(ratedLife);
+ toolLedgerDetail.setUseLife(useLife);
+ toolLedgerDetail.setRemainingPercentage(remandLife);
break;
case GRINDING_OUTBOUND:
toolLedgerDetail.setStatus(ToolCirculationStatus.GRINDING.getValue());
+ toolLedgerDetail.setRatedLife(ratedLife);
+ toolLedgerDetail.setUseLife(useLife);
+ toolLedgerDetail.setRemainingPercentage(remandLife);
//鍚屾椂鏇存柊鍒冪（鍗曠姸鎬�
toolSharpeningList.stream().filter(item -> item.getToolCode().equals(outBoundAddDto.getToolCode())
&& item.getToolId().equals(outBoundAddDto.getToolId())).findFirst().ifPresent(item -> {
@@ -606,12 +655,17 @@
//璁板綍鍑哄簱娴佹按
List<OutStoreDetail> outStoreAddList = CollectionUtil.newArrayList();
for (OutBoundAddDto outBoundAddDto : boundAddList) {
+ //鑾峰彇鍓╀綑瀵垮懡
+ ToolLedgerDetail toolLedgerDetail = toolLedgerDetailService.getById(outBoundAddDto.getToolLedgerDetailId());
OutStoreDetail outStoreDetail = new OutStoreDetail()
.setToolCode(outBoundAddDto.getToolCode())
.setToolId(outBoundAddDto.getToolId())
.setOutStorehouseType(outBoundAddDto.getOutStorehouseType())
.setGoodsShelvesCode(outBoundAddDto.getOutboundLocation())
.setOutNumber(outBoundAddDto.getOutboundQuantity())
+ .setRatedLife(outBoundAddDto.getRatedLife())
+ .setUseLife(outBoundAddDto.getUseLife())
+ .setRemainingPercentage(toolLedgerDetail.getRemainingPercentage())
.setOperateType("2");//2锛氭墜宸ユ搷浣�
outStoreAddList.add(outStoreDetail);
}
--
Gitblit v1.9.3