From 9cd21f4c54a8f834168bc7a97b994e3721192df0 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 20 Mar 2024 09:43:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E5=AE=A4=E5=87=BA=E5=BA=93=E8=A1=A5?= =?UTF-8?q?=E5=8D=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/service/inout/IoChangeInoutService.java | 6 +++--- src/main/resources/schemas/schema_v2.4.sql | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java index a933ebadb..d74913328 100644 --- a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java @@ -193,11 +193,11 @@ public class IoChangeInoutService { BasicBussinessTypeEntity targetBustypeEntity; for (BasicBusTypePreEntity busTypePreEntity : busTypePreEntities) { targetBustypeEntity = basicBussinessTypeService.findByAction(busTypePreEntity.getAction()); - if (busTypePreEntity.getSplitOrder() == ConstantStatus.ACTION_TYPE_NORMAL) { + if (busTypePreEntity.getSplitOrder() == ConstantStatus.ACTION_TYPE_NORMAL && CollUtil.isNotEmpty(normalCodes)) { buildGenOrder(targetBustypeEntity, busTypePreEntity, normalCodes, orderEntity, isGenInovice); - } else if (busTypePreEntity.getSplitOrder() == ConstantStatus.ACTION_TYPE_PREIN) { + } else if (busTypePreEntity.getSplitOrder() == ConstantStatus.ACTION_TYPE_PREIN && CollUtil.isNotEmpty(preInCodes)) { buildGenOrder(targetBustypeEntity, busTypePreEntity, preInCodes, orderEntity, isGenInovice); - } else if (busTypePreEntity.getSplitOrder() == ConstantStatus.ACTION_TYPE_ADVANCE) { + } else if (busTypePreEntity.getSplitOrder() == ConstantStatus.ACTION_TYPE_ADVANCE && CollUtil.isNotEmpty(preCodes)) { buildGenOrder(targetBustypeEntity, busTypePreEntity, preCodes, orderEntity, isGenInovice); } } diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 70b5fbf46..1781f8b2d 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -74,7 +74,7 @@ CREATE TABLE IF NOT EXISTS `sys_app_version` ROW_FORMAT = DYNAMIC; -CREATE TABLE `device_change_log` +CREATE TABLE IF NOT EXISTS `device_change_log` ( `id` bigint NOT NULL COMMENT '日志id', `deviceCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '设备编码',