From b1612c81901953cda4c9c6f682f3c454d52abe09 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期六, 06 九月 2025 18:06:55 +0800 Subject: [PATCH] art: 物料出库 --- src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialInventoryServiceImpl.java | 39 +++++++++++++++++++++++++++++---------- 1 files changed, 29 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialInventoryServiceImpl.java b/src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialInventoryServiceImpl.java index 127cfb7..11de910 100644 --- a/src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialInventoryServiceImpl.java +++ b/src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialInventoryServiceImpl.java @@ -1,36 +1,55 @@ package org.jeecg.modules.lsw.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.lsw.entity.LswMaterial; import org.jeecg.modules.lsw.entity.LswMaterialInventory; +import org.jeecg.modules.lsw.enums.MaterialInventoryStatusEnum; import org.jeecg.modules.lsw.mapper.LswMaterialInventoryMapper; import org.jeecg.modules.lsw.service.ILswMaterialInventoryService; +import org.jeecg.modules.lsw.service.ILswMaterialService; import org.jeecg.modules.lsw.vo.LswMaterialInventoryVo; import org.jeecg.modules.lsw.vo.MaterialInventoryStatisticsVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Collections; import java.util.List; /** * @Description: 鐗╂枡搴撳瓨淇℃伅 * @Author: jeecg-boot - * @Date: 2025-06-30 + * @Date: 2025-06-30 * @Version: V1.0 */ @Service public class LswMaterialInventoryServiceImpl extends ServiceImpl<LswMaterialInventoryMapper, LswMaterialInventory> implements ILswMaterialInventoryService { - - @Autowired - private LswMaterialInventoryMapper lswMaterialInventoryMapper; + + @Autowired + private LswMaterialInventoryMapper lswMaterialInventoryMapper; + @Autowired + private ILswMaterialService materialService; @Override public List<LswMaterialInventoryVo> selectLineSideMaterialInventoryByMaterialNumber(List<String> bomMaterialNumberList, String factoryId) { - return lswMaterialInventoryMapper.selectLineSideMaterialInventoryByMaterialNumber(bomMaterialNumberList, factoryId); + return lswMaterialInventoryMapper.selectLineSideMaterialInventoryByMaterialNumber(bomMaterialNumberList, factoryId); } - @Override - public List<MaterialInventoryStatisticsVO> statisticsInventory(String materialId) { - return lswMaterialInventoryMapper.statisticsInventory(materialId); - } + @Override + public List<MaterialInventoryStatisticsVO> statisticsInventory(String materialId) { + return lswMaterialInventoryMapper.statisticsInventory(materialId); + } + + @Override + public LswMaterialInventory queryByMaterialNumberAndBatchNumber(String materialNumber, String batchNumber, String warehouseId) { + LswMaterial material = materialService.queryByMaterialNumber(materialNumber); + if (material == null) { + return null; + } + LambdaQueryWrapper<LswMaterialInventory> queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(LswMaterialInventory::getWarehouseId, warehouseId); + queryWrapper.eq(LswMaterialInventory::getMaterialId, material.getId()); + queryWrapper.eq(LswMaterialInventory::getBatchNumber, batchNumber); + queryWrapper.eq(LswMaterialInventory::getInventoryStatus, MaterialInventoryStatusEnum.NORMAL.name()); + return lswMaterialInventoryMapper.selectOne(queryWrapper); + } } -- Gitblit v1.9.3