APP根据标签头和版本号查询主信息以及子信息集合

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,12 +130,13 @@ public class LabeltypeController {
         ExcelUtils.write(response, "标签定义.xls", "数据", LabeltypeExcelVO.class, datas);
     }
 
-    @GetMapping("/getDetailsById")
+    @GetMapping("/getDetailsByHeader")
-    @Operation(summary = "根据id获取类型信息以及类型下所有的条码片段信息")
+    @Operation(summary = "根据标签头及版本获取类型信息以及类型下所有的条码片段信息")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('wms:labeltypeService:query')")
-    public CommonResult<LabeltypeRespVO> getDetalisById(@RequestParam("id") Long id) {
+    public CommonResult<LabeltypeRespVO> getDetailsByHeader(LabeltypeRespVO LabeltypeRespVO) {
-        LabeltypeDO labeltypeDO = labeltypeService.getLabeltype(id);
+        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());
@@ -140,5 +144,10 @@ public class LabeltypeController {
             List<BarcodeExcelVO> datas = BarcodeConvert.INSTANCE.convertList02(barcodeList);
             result.setSubList(datas);
             return success(result);
+
+        }else{
+            return CommonResult.error(BAD_REQUEST.getCode(), "请求参数不能为空！");
+        }
+
     }
 }

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<LabeltypeDO> {
                 .orderByDesc(LabeltypeDO::getId));
     }
 
+    default LabeltypeDO getOneLabelByHeader(LabeltypeRespVO reqVO) {
+        return selectOne(new LambdaQueryWrapperX<LabeltypeDO>()
+                .eqIfPresent(LabeltypeDO::getHeader, reqVO.getHeader())
+                .eqIfPresent(LabeltypeDO::getVersion, reqVO.getVersion()));
+    }
+
 }

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.*;
-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.dal.dataobject.labeltype.LabeltypeDO;
 
 import javax.validation.Valid;
@@ -80,4 +77,6 @@ public interface LabeltypeService {
      */
     List<LabeltypeDO> getLabeltypeList(LabeltypeExportReqVO exportReqVO);
 
+    LabeltypeDO getOneLabelByHeader(LabeltypeRespVO LabeltypeRespVO);
+
 }

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.*;
-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.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);
+    }
+
 }