From 42f887929f3003026f33ba6822703b1a89a13489 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 17:12:40 +0800
Subject: [PATCH] 盘点单据取消任务功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java
index e2f1ef7..2b7b816 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java
@@ -3,8 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.manager.entity.AsnOrder;
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.WkOrder;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.AsnOrderItemLog;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.mapper.AsnOrderLogMapper;
@@ -46,14 +46,14 @@
if (Objects.isNull(orderLog)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
- AsnOrder order = new AsnOrder();
+ WkOrder order = new WkOrder();
BeanUtils.copyProperties(orderLog, order);
order.setId(orderLog.getAsnId())
.setDeleted(0)
.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val);
- AsnOrder asnOrder = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, orderLog.getCode()));
- if (Objects.isNull(asnOrder)) {
+ WkOrder wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, orderLog.getCode()));
+ if (Objects.isNull(wkOrder)) {
throw new CoolException("鏀惰揣鍗曟嵁宸叉坊鍔狅紝鍒锋柊鍚庡啀鎿嶄綔锛侊紒");
}
@@ -63,13 +63,14 @@
List<AsnOrderItemLog> itemLogs = asnOrderItemLogService
.list(new LambdaQueryWrapper<AsnOrderItemLog>()
.eq(AsnOrderItemLog::getLogId, id));
- List<AsnOrderItem> orderItems = new ArrayList<>();
+ List<WkOrderItem> orderItems = new ArrayList<>();
if (!Objects.isNull(itemLogs) || !itemLogs.isEmpty()) {
for (AsnOrderItemLog itemLog : itemLogs) {
- AsnOrderItem item = new AsnOrderItem();
+ WkOrderItem item = new WkOrderItem();
BeanUtils.copyProperties(itemLog, item);
item.setId(itemLog.getAsnItemId())
- .setAsnId(order.getId())
+ .setOrderId(order.getId())
+ .setMatnrId(Long.parseLong(itemLog.getMatnrId()))
.setDeleted(0);
orderItems.add(item);
}
--
Gitblit v1.9.1