From 0fb66b980ec9dd3378ffb230633b263a23d71823 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 17 Aug 2026 20:48:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=9A=E4=B9=89=E5=AD=90=E5=8D=B7?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=85=B3=E7=B3=BB=E6=89=B9=E9=87=8F=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=A5=91=E7=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ubPackageRelationBatchCreateItemReqVO.java | 50 ++++++++++++++++ .../SubPackageRelationBatchCreateReqVO.java | 18 ++++++ .../SubPackageRelationBatchCreateRespVO.java | 58 +++++++++++++++++++ .../lms/dal/mysql/boxtype/BoxTypeMapper.java | 9 ++- .../SubPackageRelationMapper.java | 12 +++- 5 files changed, 145 insertions(+), 2 deletions(-) create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/subpackagerelation/vo/SubPackageRelationBatchCreateItemReqVO.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/subpackagerelation/vo/SubPackageRelationBatchCreateReqVO.java create mode 100644 nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/subpackagerelation/vo/SubPackageRelationBatchCreateRespVO.java diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/subpackagerelation/vo/SubPackageRelationBatchCreateItemReqVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/subpackagerelation/vo/SubPackageRelationBatchCreateItemReqVO.java new file mode 100644 index 00000000..fff62615 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/subpackagerelation/vo/SubPackageRelationBatchCreateItemReqVO.java @@ -0,0 +1,50 @@ +package cn.code.nl.module.lms.controller.admin.subpackagerelation.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Schema(description = "管理后台 - 子卷包装关系批量新增单条数据 Request VO") +@Data +public class SubPackageRelationBatchCreateItemReqVO { + + /** 客户端唯一标识 */ + @Schema(description = "客户端唯一标识") + private String clientKey; + + /** 木箱唯一码 */ + @Schema(description = "木箱唯一码") + private String packageBoxSn; + + /** 木箱料号 */ + @Schema(description = "木箱料号") + private String boxType; + + /** 木箱长度 */ + @Schema(description = "木箱长度") + private String boxLength; + + /** 木箱宽度 */ + @Schema(description = "木箱宽度") + private String boxWidth; + + /** 木箱高度 */ + @Schema(description = "木箱高度") + private String boxHigh; + + /** 保质期 */ + @Schema(description = "保质期") + private String qualityGuaranPeriod; + + /** 入库日期 */ + @Schema(description = "入库日期") + private String dateOfFgInbound; + + /** 子卷号 */ + @Schema(description = "子卷号") + private String containerName; + + /** 状态 */ + @Schema(description = "状态") + private String status; + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/subpackagerelation/vo/SubPackageRelationBatchCreateReqVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/subpackagerelation/vo/SubPackageRelationBatchCreateReqVO.java new file mode 100644 index 00000000..11ea5db1 --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/subpackagerelation/vo/SubPackageRelationBatchCreateReqVO.java @@ -0,0 +1,18 @@ +package cn.code.nl.module.lms.controller.admin.subpackagerelation.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import lombok.Data; + +import java.util.List; + +@Schema(description = "管理后台 - 子卷包装关系批量新增 Request VO") +@Data +public class SubPackageRelationBatchCreateReqVO { + + /** 批量新增数据 */ + @Schema(description = "批量新增数据") + @NotEmpty(message = "批量新增数据不能为空") + private List items; + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/subpackagerelation/vo/SubPackageRelationBatchCreateRespVO.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/subpackagerelation/vo/SubPackageRelationBatchCreateRespVO.java new file mode 100644 index 00000000..2aaf449f --- /dev/null +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/controller/admin/subpackagerelation/vo/SubPackageRelationBatchCreateRespVO.java @@ -0,0 +1,58 @@ +package cn.code.nl.module.lms.controller.admin.subpackagerelation.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Schema(description = "管理后台 - 子卷包装关系批量新增 Response VO") +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SubPackageRelationBatchCreateRespVO { + + /** 成功数量 */ + @Schema(description = "成功数量") + private Integer successCount; + + /** 失败数量 */ + @Schema(description = "失败数量") + private Integer failureCount; + + /** 失败数据 */ + @Schema(description = "失败数据") + private List failures; + + /** + * 批量新增失败数据 + */ + @Schema(description = "批量新增失败数据") + @Data + @Builder + @NoArgsConstructor + @AllArgsConstructor + public static class Failure { + + /** 客户端唯一标识 */ + @Schema(description = "客户端唯一标识") + private String clientKey; + + /** 数据行号 */ + @Schema(description = "数据行号") + private Integer rowIndex; + + /** 错误编码 */ + @Schema(description = "错误编码") + private String errorCode; + + /** 错误信息 */ + @Schema(description = "错误信息") + private String message; + + } + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/boxtype/BoxTypeMapper.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/boxtype/BoxTypeMapper.java index f19823b6..a8ba0cce 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/boxtype/BoxTypeMapper.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/boxtype/BoxTypeMapper.java @@ -30,4 +30,11 @@ public interface BoxTypeMapper extends BaseMapperX { return selectOne(BoxTypeDO::getBoxType, boxType); } -} \ No newline at end of file + /** + * 根据木箱料号集合查询木箱类型 + */ + default List selectListByBoxTypes(Collection boxTypes) { + return selectList(BoxTypeDO::getBoxType, boxTypes); + } + +} diff --git a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/subpackagerelation/SubPackageRelationMapper.java b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/subpackagerelation/SubPackageRelationMapper.java index 84e207cb..6f8b5b69 100644 --- a/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/subpackagerelation/SubPackageRelationMapper.java +++ b/nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/dal/mysql/subpackagerelation/SubPackageRelationMapper.java @@ -2,6 +2,7 @@ package cn.code.nl.module.lms.dal.mysql.subpackagerelation; import java.util.*; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import cn.code.nl.framework.common.pojo.PageResult; import cn.code.nl.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.code.nl.framework.mybatis.core.mapper.BaseMapperX; @@ -31,4 +32,13 @@ public interface SubPackageRelationMapper extends BaseMapperX() + .eq(SubPackageRelationDO::getPackageBoxSn, packageBoxSn) + .eq(SubPackageRelationDO::getBoxType, boxType)); + } + +}