From 53577ae0fcba9342b22ad1758303aa61409160d1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 12 九月 2025 19:10:58 +0800
Subject: [PATCH] art: 设备保养标准导入问题修改
---
src/main/java/org/jeecg/modules/lsw/service/impl/LswMaterialInventoryServiceImpl.java | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 insertions(+), 2 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 11de910..542a11a 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
@@ -2,17 +2,26 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.base.entity.Factory;
+import org.jeecg.modules.base.entity.LineSideWarehouse;
+import org.jeecg.modules.base.enums.ProductionTypeEnum;
+import org.jeecg.modules.base.service.IFactoryService;
+import org.jeecg.modules.base.service.ILineSideWarehouseService;
import org.jeecg.modules.lsw.entity.LswMaterial;
import org.jeecg.modules.lsw.entity.LswMaterialInventory;
+import org.jeecg.modules.lsw.enums.MaterialCategoryEnum;
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.jeecg.modules.lsw.vo.MaterialInventoryVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
/**
@@ -28,10 +37,14 @@
private LswMaterialInventoryMapper lswMaterialInventoryMapper;
@Autowired
private ILswMaterialService materialService;
+ @Autowired
+ private ILineSideWarehouseService lineSideWarehouseService;
+ @Autowired
+ private IFactoryService factoryService;
@Override
- public List<LswMaterialInventoryVo> selectLineSideMaterialInventoryByMaterialNumber(List<String> bomMaterialNumberList, String factoryId) {
- return lswMaterialInventoryMapper.selectLineSideMaterialInventoryByMaterialNumber(bomMaterialNumberList, factoryId);
+ public List<LswMaterialInventoryVo> selectLineSideMaterialInventoryByMaterialNumber(List<String> bomMaterialNumberList, String factoryId, String heatFlag) {
+ return lswMaterialInventoryMapper.selectLineSideMaterialInventoryByMaterialNumber(bomMaterialNumberList, factoryId, heatFlag);
}
@Override
@@ -52,4 +65,31 @@
queryWrapper.eq(LswMaterialInventory::getInventoryStatus, MaterialInventoryStatusEnum.NORMAL.name());
return lswMaterialInventoryMapper.selectOne(queryWrapper);
}
+
+ @Override
+ public List<MaterialInventoryVO> queryMaterialInventory(String factoryId) {
+ Factory factory = factoryService.getById(factoryId);
+ if (factory == null) {
+ return Collections.emptyList();
+ }
+ LineSideWarehouse warehouse = lineSideWarehouseService.queryByFactoryId(factoryId);
+ if (warehouse == null) {
+ return Collections.emptyList();
+ }
+ List<String> materialCategory = new ArrayList<>();
+ if (ProductionTypeEnum.ASSEMBLE.name().equals(factory.getProductionType())) {
+ materialCategory.add(MaterialCategoryEnum.OUTER_FLANGE.name());
+ materialCategory.add(MaterialCategoryEnum.INNER_FLANGE.name());
+ materialCategory.add(MaterialCategoryEnum.SMALL_INNER_RING.name());
+ materialCategory.add(MaterialCategoryEnum.STEEL_BALL.name());
+ materialCategory.add(MaterialCategoryEnum.COMPONENTS.name());
+ } else if (ProductionTypeEnum.INNERFLANGE.name().equals(factory.getProductionType())) {
+ materialCategory.add(MaterialCategoryEnum.BLANK.name());
+ } else if (ProductionTypeEnum.OUTERFLANGE.name().equals(factory.getProductionType())) {
+ materialCategory.add(MaterialCategoryEnum.BLANK.name());
+ } else if (ProductionTypeEnum.HEATTREATMENT.name().equals(factory.getProductionType())) {
+ materialCategory.add(MaterialCategoryEnum.BLANK.name());
+ }
+ return lswMaterialInventoryMapper.queryMaterialInventory(warehouse.getId(), materialCategory);
+ }
}
--
Gitblit v1.9.3