From f6c6eda12d8add8c7bc398646080f30fcae4242f Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 12 Apr 2024 20:52:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=88=86=E5=B8=83?= =?UTF-8?q?=E5=BC=8F=E4=BA=8B=E7=89=A9=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96?= =?UTF-8?q?fegin=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/basicdata/BasicDataApplication.java | 5 +++- .../logpm/trunkline/TrunkLineApplication.java | 4 +++- .../service/impl/TaskQuestServiceImpl.java | 24 +++++++++---------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java index c98b3bd15..c0721789f 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/BasicDataApplication.java @@ -4,13 +4,16 @@ package com.logpm.basicdata; import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.cloud.client.BladeCloudApplication; import org.springblade.core.launch.BladeApplication; +import org.springblade.core.transaction.annotation.SeataCloudApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; /** * Basic启动器 * * @author lmy */ -@BladeCloudApplication +@EnableFeignClients +@SeataCloudApplication public class BasicDataApplication { public static void main(String[] args) { diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java index 5e3b60b60..17ee6821e 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/TrunkLineApplication.java @@ -20,13 +20,15 @@ import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.cloud.client.BladeCloudApplication; import org.springblade.core.launch.BladeApplication; import org.springblade.core.transaction.annotation.SeataCloudApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; /** * Demo启动器 * * @author Chill */ -@BladeCloudApplication +@EnableFeignClients +@SeataCloudApplication public class TrunkLineApplication { public static void main(String[] args) { diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java index 97a6741d1..6b63b27c3 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java @@ -598,23 +598,23 @@ public class TaskQuestServiceImpl extends BaseServiceImpl 0) { - List list = taskQuest.getList(); - for (TaskQuestChildEntity taskQuestChildEntity : list) { - taskQuestChildEntity.setWarehouseId(id); - taskQuestChildEntity.setQuestId(taskQuest.getId()); - - } - taskQuestChildService.saveBatch(list); - //添加包件信息 - List collect = list.stream().map(TaskQuestChildEntity::getRefId).collect(Collectors.toList()); - addQuestDetail(myCurrentWarehouse.getId(), collect, questNum, taskQuest.getId()); + if (!taskQuest.getList().isEmpty()) { +// List list = taskQuest.getList(); +// for (TaskQuestChildEntity taskQuestChildEntity : list) { +// taskQuestChildEntity.setWarehouseId(id); +// taskQuestChildEntity.setQuestId(taskQuest.getId()); +// +// } +// taskQuestChildService.saveBatch(list); +// //添加包件信息 +// List collect = list.stream().map(TaskQuestChildEntity::getRefId).collect(Collectors.toList()); +// addQuestDetail(myCurrentWarehouse.getId(), collect, questNum, taskQuest.getId()); } else { addQuestDetail(myCurrentWarehouse.getId(), null, questNum, taskQuest.getId()); }