From b2f5cdd75a01410d5c87c8dfe2850c5d86e6a557 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Wed, 26 Mar 2025 18:52:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Ewebcad=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5=EF=BC=9Acad=E6=8B=86=E5=8D=95?= =?UTF-8?q?=E6=9D=BF=E6=9D=90=E5=AF=B9=E5=BA=94order=5Fbody=E8=A1=A5?= =?UTF-8?q?=E5=85=85=E5=88=A0=E9=99=A4=E7=8A=B6=E6=80=81=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orderImport/factory/WebCadOrderImportFactory.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java index 8cbe35c83..dbbb847f7 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java @@ -513,7 +513,8 @@ public class WebCadOrderImportFactory { List existRoomNameBodys = orderBodyMapper.selectList(new LambdaUpdateWrapper() .eq(OrderBodyDO::getOrderId, orderId) .eq(OrderBodyDO::getRoomName, roomName) - .eq(OrderBodyDO::getOrganId, organId)); + .eq(OrderBodyDO::getOrganId, organId) + .eq(OrderBodyDO::getDeleted, false)); if (CollUtil.isNotEmpty(existRoomNameBodys)) { roomId = existRoomNameBodys.get(0).getRoomId(); } @@ -862,7 +863,8 @@ public class WebCadOrderImportFactory { List existRoomNameBodys = orderBodyMapper.selectList(new LambdaUpdateWrapper() .eq(OrderBodyDO::getOrderId, orderId) .eq(OrderBodyDO::getRoomName, roomName) - .eq(OrderBodyDO::getOrganId, organId)); + .eq(OrderBodyDO::getOrganId, organId) + .eq(OrderBodyDO::getDeleted, false)); if (CollUtil.isNotEmpty(existRoomNameBodys)) { roomId = existRoomNameBodys.get(0).getRoomId(); }