From d8b93793b028ff8d27e065b9e7140a5124b75e76 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Mon, 6 Nov 2023 10:24:46 +0800 Subject: [PATCH] =?UTF-8?q?APP=E6=A0=B9=E6=8D=AE=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E5=A4=B4=E5=92=8C=E7=89=88=E6=9C=AC=E5=8F=B7=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=BB=E4=BF=A1=E6=81=AF=E4=BB=A5=E5=8F=8A=E5=AD=90=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E9=9B=86=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../labeltype/LabeltypeController.java | 31 ++++++++++++------- .../dal/mysql/labeltype/LabeltypeMapper.java | 8 +++++ .../service/labeltype/LabeltypeService.java | 7 ++--- .../labeltype/LabeltypeServiceImpl.java | 10 +++--- 4 files changed, 37 insertions(+), 19 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java index 291af08b..a526ff1f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java @@ -19,6 +19,7 @@ import com.win.module.wms.service.labeltype.LabeltypeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import jodd.util.StringUtil; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -30,6 +31,8 @@ import java.io.IOException; import java.util.Collection; import java.util.List; +import static com.win.framework.common.exception.enums.GlobalErrorCodeConstants.BAD_REQUEST; +import static com.win.framework.common.exception.enums.GlobalErrorCodeConstants.NOT_IMPLEMENTED; import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @@ -127,18 +130,24 @@ public class LabeltypeController { ExcelUtils.write(response, "标签定义.xls", "数据", LabeltypeExcelVO.class, datas); } - @GetMapping("/getDetailsById") - @Operation(summary = "根据id获取类型信息以及类型下所有的条码片段信息") + @GetMapping("/getDetailsByHeader") + @Operation(summary = "根据标签头及版本获取类型信息以及类型下所有的条码片段信息") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('wms:labeltypeService:query')") - public CommonResult getDetalisById(@RequestParam("id") Long id) { - LabeltypeDO labeltypeDO = labeltypeService.getLabeltype(id); - LabeltypeRespVO result = LabeltypeConvert.INSTANCE.convert(labeltypeDO); - BarcodeExportReqVO barcodeExportReqVO = new BarcodeExportReqVO(); - barcodeExportReqVO.setMasterId(result.getId()); - List barcodeList = barcodeService.getBarcodeList(barcodeExportReqVO); - List datas = BarcodeConvert.INSTANCE.convertList02(barcodeList); - result.setSubList(datas); - return success(result); + public CommonResult getDetailsByHeader(LabeltypeRespVO LabeltypeRespVO) { + if(LabeltypeRespVO.getHeader()!=null&& !LabeltypeRespVO.getHeader().isEmpty()&& LabeltypeRespVO.getVersion()!=null&& !LabeltypeRespVO.getVersion().isEmpty()){ + LabeltypeDO labeltypeDO = labeltypeService.getOneLabelByHeader(LabeltypeRespVO); + LabeltypeRespVO result = LabeltypeConvert.INSTANCE.convert(labeltypeDO); + BarcodeExportReqVO barcodeExportReqVO = new BarcodeExportReqVO(); + barcodeExportReqVO.setMasterId(result.getId()); + List barcodeList = barcodeService.getBarcodeList(barcodeExportReqVO); + List datas = BarcodeConvert.INSTANCE.convertList02(barcodeList); + result.setSubList(datas); + return success(result); + + }else{ + return CommonResult.error(BAD_REQUEST.getCode(), "请求参数不能为空！"); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labeltype/LabeltypeMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labeltype/LabeltypeMapper.java index fb3e94c5..ec08636a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labeltype/LabeltypeMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labeltype/LabeltypeMapper.java @@ -4,9 +4,11 @@ import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.win.framework.mybatis.core.query.QueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.labeltype.vo.LabeltypeExportReqVO; import com.win.module.wms.controller.labeltype.vo.LabeltypePageReqVO; +import com.win.module.wms.controller.labeltype.vo.LabeltypeRespVO; import com.win.module.wms.dal.dataobject.labeltype.LabeltypeDO; import org.apache.ibatis.annotations.Mapper; @@ -66,4 +68,10 @@ public interface LabeltypeMapper extends BaseMapperX { .orderByDesc(LabeltypeDO::getId)); } + default LabeltypeDO getOneLabelByHeader(LabeltypeRespVO reqVO) { + return selectOne(new LambdaQueryWrapperX() + .eqIfPresent(LabeltypeDO::getHeader, reqVO.getHeader()) + .eqIfPresent(LabeltypeDO::getVersion, reqVO.getVersion())); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeService.java index fa2e7120..c57afcb5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeService.java @@ -2,10 +2,7 @@ package com.win.module.wms.service.labeltype; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.controller.labeltype.vo.LabeltypeCreateReqVO; -import com.win.module.wms.controller.labeltype.vo.LabeltypeExportReqVO; -import com.win.module.wms.controller.labeltype.vo.LabeltypePageReqVO; -import com.win.module.wms.controller.labeltype.vo.LabeltypeUpdateReqVO; +import com.win.module.wms.controller.labeltype.vo.*; import com.win.module.wms.dal.dataobject.labeltype.LabeltypeDO; import javax.validation.Valid; @@ -80,4 +77,6 @@ public interface LabeltypeService { */ List getLabeltypeList(LabeltypeExportReqVO exportReqVO); + LabeltypeDO getOneLabelByHeader(LabeltypeRespVO LabeltypeRespVO); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeServiceImpl.java index c64b9919..c553d426 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labeltype/LabeltypeServiceImpl.java @@ -2,10 +2,7 @@ package com.win.module.wms.service.labeltype; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.module.wms.controller.labeltype.vo.LabeltypeCreateReqVO; -import com.win.module.wms.controller.labeltype.vo.LabeltypeExportReqVO; -import com.win.module.wms.controller.labeltype.vo.LabeltypePageReqVO; -import com.win.module.wms.controller.labeltype.vo.LabeltypeUpdateReqVO; +import com.win.module.wms.controller.labeltype.vo.*; import com.win.module.wms.convert.labeltype.LabeltypeConvert; import com.win.module.wms.dal.dataobject.labeltype.LabeltypeDO; import com.win.module.wms.dal.mysql.labeltype.LabeltypeMapper; @@ -89,4 +86,9 @@ public class LabeltypeServiceImpl implements LabeltypeService { return labletypeMapper.selectList(exportReqVO); } + @Override + public LabeltypeDO getOneLabelByHeader(LabeltypeRespVO LabeltypeRespVO) { + return labletypeMapper.getOneLabelByHeader(LabeltypeRespVO); + } + }