From becc33ce9681fcc75d26eb2b8fbe650d53cb1f89 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 30 七月 2025 14:55:26 +0800 Subject: [PATCH] 1. 调拔单功能优化 2. 7.30问题及bug修复 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderLogServiceImpl.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 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 13d4c7b..688e732 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 @@ -4,7 +4,7 @@ import com.vincent.rsf.framework.common.R; import com.vincent.rsf.framework.exception.CoolException; import com.vincent.rsf.server.manager.entity.WkOrder; -import com.vincent.rsf.server.manager.entity.AsnOrderItem; +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; @@ -53,7 +53,7 @@ .setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val); WkOrder wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, orderLog.getCode())); - if (Objects.isNull(wkOrder)) { + if (!Objects.isNull(wkOrder)) { throw new CoolException("鏀惰揣鍗曟嵁宸叉坊鍔狅紝鍒锋柊鍚庡啀鎿嶄綔锛侊紒"); } @@ -63,13 +63,13 @@ 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