From 32a41ca494eed0cc37fcb3aff1e9f83e1a3792fc Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 22 八月 2025 17:08:38 +0800
Subject: [PATCH] 库存调整功能接口功能优化 库存调整功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 65 +++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 15 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
index f0c4fa6..23c1c0a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -21,7 +21,6 @@
import com.vincent.rsf.server.manager.service.impl.MatnrServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.entity.Fields;
-import com.vincent.rsf.server.system.service.FieldsItemService;
import com.vincent.rsf.server.system.service.FieldsService;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import com.vincent.rsf.server.api.service.ReceiveMsgService;
@@ -432,17 +431,17 @@
*/
@Override
@Transactional(timeout = 60, rollbackFor = Exception.class)
- public R syncTransfer(SyncTransferParams transferParams) {
+ public R syncTransfer(SyncTransferParams transferParams, Long loginUserId) {
Transfer transfer = new Transfer();
WarehouseAreas warehouseAreas = warehouseAreasService
.getOne(new LambdaQueryWrapper<WarehouseAreas>()
- .eq(WarehouseAreas::getName, transfer.getOrgAreaName()));
+ .eq(WarehouseAreas::getName, transferParams.getOrgAreaName()));
if (Objects.isNull(warehouseAreas)) {
throw new CoolException("鍘熷簱鍖轰笉瀛樺湪锛侊紒");
}
WarehouseAreas warehouseAreas1 = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>()
- .eq(WarehouseAreas::getName, transfer.getTarAreaName()));
+ .eq(WarehouseAreas::getName, transferParams.getTarAreaName()));
if (Objects.isNull(warehouseAreas1)) {
throw new CoolException("鐩爣搴撳尯涓嶅瓨鍦紒锛�");
}
@@ -456,6 +455,11 @@
.setTarAreaId(warehouseAreas1.getId())
.setTarWareName(warehouseAreas1.getWarehouseId$())
.setTarWareId(warehouseAreas1.getWarehouseId())
+ .setCreateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
+ .setUpdateBy(loginUserId)
+ .setCode(SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TRANSFER_ORDER_CODE, null))
.setSource(OrderSourceType.ORDER_SOURCE_TYPE_ERP.val);
if (!transferService.save(transfer)) {
@@ -471,6 +475,10 @@
}
transferItem.setMatnrId(matnr.getId())
.setTransferId(transfer.getId())
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
.setTransferCode(transfer.getCode());
if (!transferItemService.save(transferItem)) {
@@ -489,7 +497,7 @@
*/
@Override
@Transactional(timeout = 60, rollbackFor = Exception.class)
- public R syncLocRevise(SyncLocReviseParams reviseParams) {
+ public R syncLocRevise(SyncLocReviseParams reviseParams, Long loginUserId) {
LocRevise locRevise = new LocRevise();
if (Objects.isNull(reviseParams.getAreaName())) {
throw new CoolException("搴撳尯涓嶈兘涓虹┖锛侊紒");
@@ -500,7 +508,13 @@
if (Objects.isNull(warehouseAreas)) {
throw new CoolException("搴撳尯涓嶅瓨鍦紒锛�");
}
- locRevise.setAreaName(locRevise.getAreaName())
+
+ locRevise.setAreaName(warehouseAreas.getName())
+ .setType(LocReviseType.getLocRevise(reviseParams.getType()))
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
.setAreaId(warehouseAreas.getId());
locRevise.setCode(SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LOC_REVISE_CODE, null));
@@ -508,22 +522,40 @@
throw new CoolException("搴撳瓨璋冩暣鍗曚繚瀛樺け璐ワ紒锛�");
}
- reviseParams.getItems().forEach(revise -> {
+ reviseParams.getReviseItems().forEach(revise -> {
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, revise.getLocCode()));
ReviseLog reviseLog = new ReviseLog();
BeanUtils.copyProperties(loc, reviseLog);
- reviseLog.setReviseId(locRevise.getId()).setReviseCode(locRevise.getCode());
+ reviseLog.setReviseId(locRevise.getId())
+ .setLocCode(loc.getCode())
+ .setType(Integer.parseInt(loc.getType()))
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
+ .setReviseCode(locRevise.getCode());
if (!reviseLogService.save(reviseLog)) {
throw new CoolException("搴撳瓨璋冩暣鍗曚笉鑳戒负绌猴紒锛�");
}
revise.getItems().forEach(reviseItem -> {
ReviseLogItem logItem = new ReviseLogItem();
BeanUtils.copyProperties(reviseItem, logItem);
+ Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, reviseItem.getMatnrCode()));
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("鐗╂枡涓嶅瓨鍦紒锛�");
+ }
logItem.setLocId(loc.getId())
.setLocCode(loc.getCode())
.setId(null)
+ .setMaktx(matnr.getName())
+ .setMatnrCode(matnr.getCode())
+ .setMatnrId(matnr.getId())
+ .setReviseLogId(reviseLog.getId())
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
+ .setCreateTime(new Date())
+ .setUpdateTime(new Date())
.setReviseQty(reviseItem.getAnfme());
-
if (!reviseLogItemService.save(logItem)) {
throw new CoolException("璋冩暣搴撳瓨鏄庣粏淇濆瓨澶辫触锛侊紒");
}
@@ -644,18 +676,21 @@
@Transactional(timeout = 60, rollbackFor = Exception.class)
public R syncCheckDiffs(SyncCheckDiffParams syncParams) {
List<CheckDiff> diffs = checkDiffService.list(new LambdaQueryWrapper<CheckDiff>()
- .eq(CheckDiff::getExceStatus, CheckExceStatus.CHECK_ORDER_STATUS_EXCE_DONE.val)
+ .eq(CheckDiff::getExceStatus, CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_END.val)
.in(CheckDiff::getOrderCode, syncParams.getDiffCode()));
if (diffs.isEmpty()) {
return R.ok();
}
List<CheckDiffDto> dtos = new ArrayList<>();
diffs.forEach(check -> {
- CheckDiffDto dto = new CheckDiffDto();
- BeanUtils.copyProperties(check, dto);
- List<CheckDiffItem> items = checkDiffItemService.list(new LambdaQueryWrapper<CheckDiffItem>().eq(CheckDiffItem::getCheckId, check.getId()));
- dto.setItems(items);
- dtos.add(dto);
+ CheckDiffDto checkDto = new CheckDiffDto();
+ CheckDiff checkDiff = new CheckDiff();
+ BeanUtils.copyProperties(check, checkDiff);
+ List<CheckDiffItem> items = checkDiffItemService.list(new LambdaQueryWrapper<CheckDiffItem>()
+ .eq(CheckDiffItem::getCheckId, check.getId()));
+ checkDto.setItems(items)
+ .setCheckDiff(checkDiff);
+ dtos.add(checkDto);
});
return R.ok().add(dtos);
--
Gitblit v1.9.1