From 5b976ae793a2a068427fdb9c7d80fdf4ea6a96a5 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 22 八月 2025 15:12:14 +0800
Subject: [PATCH] 盘点功能优化，bug修复
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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..deebdd3 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
@@ -644,18 +644,20 @@
@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);
+ 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()));
- dto.setItems(items);
- dtos.add(dto);
+ checkDto.setItems(items)
+ .setCheckDiff(checkDiff);
+ dtos.add(checkDto);
});
return R.ok().add(dtos);
--
Gitblit v1.9.1