From 474103da0c9793ec9cd7559f109491ece282e269 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 28 七月 2025 17:03:16 +0800
Subject: [PATCH] 调拔单功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java | 80 +++++++++++++++++++++++++++++++++++----
1 files changed, 71 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java
index e31cddf..29d4a58 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java
@@ -10,23 +10,19 @@
import com.vincent.rsf.server.common.domain.PageResult;
import com.vincent.rsf.server.manager.controller.params.TransferItemParams;
import com.vincent.rsf.server.manager.entity.*;
-import com.vincent.rsf.server.manager.enums.AsnExceStatus;
-import com.vincent.rsf.server.manager.enums.CheckExceStatus;
-import com.vincent.rsf.server.manager.enums.OrderSourceType;
-import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.mapper.TransferMapper;
-import com.vincent.rsf.server.manager.service.AsnOrderItemService;
-import com.vincent.rsf.server.manager.service.TransferItemService;
-import com.vincent.rsf.server.manager.service.TransferService;
+import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vincent.rsf.server.manager.service.WarehouseAreasService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -36,9 +32,12 @@
@Autowired
private TransferItemService transferItemService;
-
@Autowired
private WarehouseAreasService warehouseAreasService;
+ @Autowired
+ private OutStockService outStockService;
+ @Autowired
+ private OutStockItemService outStockItemService;
/**
* @author Ryan
@@ -171,4 +170,67 @@
}
return this.baseMapper.transfersPage(pageParam, one.getId());
}
+
+ /**
+ * @author Ryan
+ * @date 2025/7/28
+ * @description: 璋冩嫈鍗曠敓鎴愬嚭搴撳崟
+ * @version 1.0
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Transfer genOutStock(Transfer param, Long loginUserId) {
+ Transfer transfer = this.getById(param.getId());
+ if (Objects.isNull(transfer)) {
+ throw new CoolException("鏁版嵁閿欒锛氬崟鎹笉瀛樺湪锛侊紒");
+ }
+ List<TransferItem> items = transferItemService.list(new LambdaQueryWrapper<TransferItem>().eq(TransferItem::getTransferId, transfer.getId()));
+ if (items.isEmpty()) {
+ throw new CoolException("鏁版嵁閿欒锛氳皟鎷斿崟鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+ WkOrder wkOrder = new WkOrder();
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TRANSFER_ORDER_CODE, transfer);
+ if (StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("璋冩嫈鍗曞彿鐢熸垚澶辫触锛侊紒");
+ }
+
+ Double anfmes = items.stream().mapToDouble(TransferItem::getAnfme).sum();
+ wkOrder.setCode(ruleCode)
+ .setAnfme(anfmes)
+ .setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val)
+ .setType(OrderType.ORDER_TRANSFER.type)
+ .setWkType(OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type)
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
+ .setPoCode(transfer.getCode())
+ .setPoId(transfer.getId());
+ if (!outStockService.saveOrUpdate(wkOrder)) {
+ throw new CoolException("鍑哄簱鍗曚繚瀛樺け璐ワ紒锛�");
+ }
+
+ List<WkOrderItem> orderItems = new ArrayList<>();
+ items.forEach(item -> {
+ WkOrderItem orderItem = new WkOrderItem();
+ BeanUtils.copyProperties(item, orderItem);
+ orderItem.setOrderCode(wkOrder.getCode())
+ .setSplrBatch(item.getBatch())
+ .setSplrCode(item.getSplrCode())
+ .setSplrName(item.getSplrName())
+ .setOrderId(wkOrder.getId());
+ orderItems.add(orderItem);
+ });
+
+ if (!outStockItemService.saveBatch(orderItems)) {
+ throw new CoolException("鍑哄簱鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
+ }
+
+ transfer.setExceStatus(WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val);
+
+ if (!this.updateById(transfer)) {
+ throw new CoolException("璋冩嫈鍗曟洿鏂板け璐ワ紒锛�");
+ }
+ return transfer;
+ }
}
--
Gitblit v1.9.1