From b37300ef8c056da2cdc7636c37d1b4b8e42acf73 Mon Sep 17 00:00:00 2001 From: liuzhu Date: Tue, 3 Mar 2026 15:03:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/auth/handler/CardLoginHandler.java | 18 +++++++++--------- .../material/model/entity/MaterialInfoDO.java | 8 ++++---- .../material/model/req/MaterialInfoReq.java | 10 +++++----- .../material/model/resp/MaterialInfoResp.java | 8 ++++---- .../material/service/MaterialInfoService.java | 3 ++- .../service/impl/MaterialInfoServiceImpl.java | 12 ++++++++++++ .../meterial/MaterialInfoController.java | 8 +++++++- 7 files changed, 43 insertions(+), 24 deletions(-) diff --git a/wms-module-system/src/main/java/top/wms/admin/auth/handler/CardLoginHandler.java b/wms-module-system/src/main/java/top/wms/admin/auth/handler/CardLoginHandler.java index 3847914..3bd4dd0 100644 --- a/wms-module-system/src/main/java/top/wms/admin/auth/handler/CardLoginHandler.java +++ b/wms-module-system/src/main/java/top/wms/admin/auth/handler/CardLoginHandler.java @@ -26,15 +26,15 @@ public class CardLoginHandler extends AbstractLoginHandler { return LoginResp.builder().token(token).build(); } - @Override - public void preLogin(PhoneLoginReq req, ClientResp client, HttpServletRequest request) { - String phone = req.getPhone(); - String captchaKey = CacheConstants.CAPTCHA_KEY_PREFIX + phone; - String captcha = RedisUtils.get(captchaKey); - ValidationUtils.throwIfBlank(captcha, CAPTCHA_EXPIRED); - ValidationUtils.throwIfNotEqualIgnoreCase(req.getCaptcha(), captcha, CAPTCHA_ERROR); - RedisUtils.delete(captchaKey); - } +// @Override +// public void preLogin(PhoneLoginReq req, ClientResp client, HttpServletRequest request) { +// String phone = req.getPhone(); +// String captchaKey = CacheConstants.CAPTCHA_KEY_PREFIX + phone; +// String captcha = RedisUtils.get(captchaKey); +// ValidationUtils.throwIfBlank(captcha, CAPTCHA_EXPIRED); +// ValidationUtils.throwIfNotEqualIgnoreCase(req.getCaptcha(), captcha, CAPTCHA_ERROR); +// RedisUtils.delete(captchaKey); +// } @Override public AuthTypeEnum getAuthType() { diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/entity/MaterialInfoDO.java b/wms-module-system/src/main/java/top/wms/admin/material/model/entity/MaterialInfoDO.java index 49d67fd..c780623 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/model/entity/MaterialInfoDO.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/model/entity/MaterialInfoDO.java @@ -37,10 +37,10 @@ public class MaterialInfoDO extends BaseDO { */ private BigDecimal unitWeight; - /** - * 物料单次可称量最大重量(kg) - */ - private BigDecimal maxWeight; + /* + 物料规格 + */ + private String materialSpec; /** * 物料照片地址 diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialInfoReq.java b/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialInfoReq.java index 688cfa8..2f2d84e 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialInfoReq.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/model/req/MaterialInfoReq.java @@ -46,11 +46,11 @@ public class MaterialInfoReq implements Serializable { @Schema(description = "物料单位重量(g)") private Double unitWeight; - /** - * 物料单次可称量最大重量(kg) - */ - @Schema(description = "物料单次可称量最大重量(kg)") - private Double maxWeight; + /* + * 物料规格 + * */ + @Schema(description = "物料规格") + private String materialSpec; /** * 物料照片地址 diff --git a/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java b/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java index 9551ccb..bb572ef 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/model/resp/MaterialInfoResp.java @@ -45,11 +45,11 @@ public class MaterialInfoResp extends BaseDetailResp { private Double unitWeight; /** - * 物料单次可称量最大重量(kg) + * 物料规格 */ - @Schema(description = "物料单次可称量最大重量(kg)") - @ExcelProperty(value = "物料单次可称量最大重量(kg)") - private Double maxWeight; + @Schema(description = "物料规格") + @ExcelProperty(value = "物料规格") + private Double materialSpec; /** * 物料照片地址 diff --git a/wms-module-system/src/main/java/top/wms/admin/material/service/MaterialInfoService.java b/wms-module-system/src/main/java/top/wms/admin/material/service/MaterialInfoService.java index bd879ab..1841a66 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/service/MaterialInfoService.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/service/MaterialInfoService.java @@ -1,6 +1,7 @@ package top.wms.admin.material.service; import top.continew.starter.extension.crud.service.BaseService; +import top.wms.admin.material.model.entity.MaterialInfoDO; import top.wms.admin.material.model.query.MaterialInfoQuery; import top.wms.admin.material.model.req.MaterialInfoReq; import top.wms.admin.material.model.resp.MaterialInfoResp; @@ -12,5 +13,5 @@ import top.wms.admin.material.model.resp.MaterialInfoResp; * @since 2026/02/27 14:19 */ public interface MaterialInfoService extends BaseService { - + public MaterialInfoDO getMaterialInfoByCode(String code); } diff --git a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java index e24ae18..d0119a0 100644 --- a/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java +++ b/wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java @@ -1,5 +1,9 @@ package top.wms.admin.material.service.impl; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -22,4 +26,12 @@ import top.wms.admin.material.service.MaterialInfoService; @RequiredArgsConstructor public class MaterialInfoServiceImpl extends BaseServiceImpl implements MaterialInfoService { + @Override + public MaterialInfoDO getMaterialInfoByCode(String code) { + if(StrUtil.isNotBlank(code)){ + return baseMapper.lambdaQuery().eq(MaterialInfoDO::getEncoding, code).one(); + }else{ + return null; + } + } } diff --git a/wms-webapi/src/main/java/top/wms/admin/controller/meterial/MaterialInfoController.java b/wms-webapi/src/main/java/top/wms/admin/controller/meterial/MaterialInfoController.java index 7d0088e..380b692 100644 --- a/wms-webapi/src/main/java/top/wms/admin/controller/meterial/MaterialInfoController.java +++ b/wms-webapi/src/main/java/top/wms/admin/controller/meterial/MaterialInfoController.java @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.*; import lombok.RequiredArgsConstructor; import top.continew.starter.extension.crud.annotation.CrudRequestMapping; import top.wms.admin.common.controller.BaseController; +import top.wms.admin.material.model.entity.MaterialInfoDO; import top.wms.admin.material.model.query.MaterialInfoQuery; import top.wms.admin.material.model.req.MaterialInfoReq; import top.wms.admin.material.model.resp.MaterialInfoResp; @@ -23,8 +24,13 @@ import top.wms.admin.material.service.MaterialInfoService; @Tag(name = "物料信息管理 API") @RestController @RequiredArgsConstructor -@CrudRequestMapping(value = "/admin/meterialInfo", api = {Api.PAGE, Api.DETAIL, Api.ADD, Api.UPDATE, Api.DELETE, +@CrudRequestMapping(value = "/admin/materialInfo", api = {Api.PAGE, Api.DETAIL, Api.ADD, Api.UPDATE, Api.DELETE, Api.EXPORT}) public class MaterialInfoController extends BaseController { + + @GetMapping("/code/{code}") + public MaterialInfoDO getMaterialInfoByCode(@PathVariable String code) { + return baseService.getMaterialInfoByCode(code); + } }