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 '设备编码',