From e042391cb8232d592dc8f02b4ac8240ce7eb571f Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 31 Jul 2024 18:56:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=B2=A1=E6=9C=89=E5=8F=96=E6=B6=88=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E7=9A=84=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=20fix:?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=98=E7=82=B9=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=A2=9E=E5=8A=A0=E5=8F=96=E6=B6=88=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BasicMaterialController.java | 8 +++++ .../basic/service/IBasicMaterialService.java | 3 ++ .../impl/BasicMaterialServiceImpl.java | 29 +++++++++++++++++++ .../mapper/DistributionStockListMapper.xml | 2 +- .../warehouse/mapper/TaskQuestMapper.xml | 2 +- 5 files changed, 42 insertions(+), 2 deletions(-) diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java index 63a3bdeca..797fcbf4d 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java @@ -89,6 +89,14 @@ public class BasicMaterialController extends BladeController { return R.data(pages); } + @GetMapping("/materialList") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "物料新查询列表", notes = "传入basicMaterial") + public R materialList(@ApiIgnore @RequestParam Map basicMaterial) { + List pages = basicMaterialService.materialList(basicMaterial); + return R.data(pages); + } + /** * 查询子物料 diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicMaterialService.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicMaterialService.java index 337a69a82..3f26b7a0d 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicMaterialService.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicMaterialService.java @@ -24,6 +24,7 @@ import com.logpm.basic.vo.BasicMaterialVO; import org.springblade.core.mp.base.BaseService; import java.util.List; +import java.util.Map; /** * 物料基础信息 服务类 @@ -60,4 +61,6 @@ public interface IBasicMaterialService extends BaseService Boolean saveOrUpdateOwn(BasicMaterialEntity basicMaterial); BasicMaterialEntity findEntityByCodeAndName(String materialCode, String materialName); + + List materialList(Map basicMaterial); } diff --git a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java index 7575b5f07..4d8029972 100644 --- a/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java +++ b/blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicMaterialServiceImpl.java @@ -18,6 +18,7 @@ package com.logpm.basic.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; @@ -30,6 +31,7 @@ import com.logpm.basic.service.IBasicMaterialService; import com.logpm.basic.vo.BasicMaterialVO; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; +import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.utils.BeanUtil; import org.springframework.stereotype.Service; @@ -37,6 +39,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; @@ -128,4 +131,30 @@ public class BasicMaterialServiceImpl extends BaseServiceImpl materialList(Map basicMaterial) { + List basicMaterialVOList =null; + try { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if(basicMaterial.get("productCode") != null){ + queryWrapper.like(BasicMaterialEntity::getProductCode,basicMaterial.get("productCode")); + } + if(basicMaterial.get("name") != null){ + queryWrapper.like(BasicMaterialEntity::getName,basicMaterial.get("name")); + } + queryWrapper.eq(BasicMaterialEntity::getHide,1); + queryWrapper.eq(BasicMaterialEntity::getIsDeleted,0); + queryWrapper.last("limit 30"); + basicMaterialVOList = baseMapper.selectList(queryWrapper).stream().map(basicMaterialEntity -> { + BasicMaterialVO basicMaterialVO = new BasicMaterialVO(); + BeanUtil.copy(basicMaterialEntity,basicMaterialVO); + return basicMaterialVO; + }).collect(Collectors.toList()); + } catch (Exception e) { + log.error("查询物料列表异常",e); + throw new ServiceException("服务器异常，请联系管理员"); + } + + return basicMaterialVOList; + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml index 02127e1f1..40be18b37 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml @@ -124,7 +124,7 @@