diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialCheckServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialCheckServiceImpl.java index 29268461d0e25aa9045bad2ccaac959625afd511..b81055dd3dd1ce127d253c5940af4bde38220d7f 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialCheckServiceImpl.java +++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialCheckServiceImpl.java @@ -58,6 +58,7 @@ public class ErpMaterialCheckServiceImpl implements IErpMaterialCheckService { private final ErpMaterialPickingMapper materialPickingMapper; private final ErpMaterialPickingInfoMapper materialPickingInfoMapper; private final ErpMaterialInventoryRecordMapper materialInventoryRecordMapper; + /** * 查询物资盘点 */ @@ -102,6 +103,7 @@ public class ErpMaterialCheckServiceImpl implements IErpMaterialCheckService { } private LambdaQueryWrapper buildQueryWrapper(ErpMaterialCheckBo bo) { + List sysDeptList = deptMapper.selectChildrenDeptById(LoginHelper.getDeptId(), null); Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.like(StringUtils.isNotBlank(bo.getTaskCode()), ErpMaterialCheck::getTaskCode, bo.getTaskCode()); @@ -117,6 +119,7 @@ public class ErpMaterialCheckServiceImpl implements IErpMaterialCheckService { lqw.eq(bo.getDeptId() != null, ErpMaterialCheck::getDeptId, bo.getDeptId()); lqw.like(StringUtils.isNotBlank(bo.getDeptName()), ErpMaterialCheck::getDeptName, bo.getDeptName()); lqw.eq(bo.getCreateDeptId() != null, ErpMaterialCheck::getCreateDeptId, bo.getCreateDeptId()); + lqw.in(!sysDeptList.isEmpty(), ErpMaterialCheck::getDeptId, sysDeptList.stream().map(SysDept::getDeptId).collect(Collectors.toList())); lqw.orderByDesc(ErpMaterialCheck::getCreateTime); return lqw; } diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPickingServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPickingServiceImpl.java index a58786ed0f1bbe6eb00cbff0faa3d3be35e54f02..00cc390418a25dc0658865d0d15706237166e587 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPickingServiceImpl.java +++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPickingServiceImpl.java @@ -9,6 +9,7 @@ import com.maintain.business.domain.vo.*; import com.maintain.business.mapper.*; import com.maintain.business.service.IErpMaterialService; import com.maintain.common.core.domain.BaseEntity; +import com.maintain.common.core.domain.entity.SysDept; import com.maintain.common.enums.InventoryType; import com.maintain.common.enums.IsEnableStatus; import com.maintain.common.enums.PickingState; @@ -21,6 +22,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.maintain.common.utils.redis.RedisUtils; +import com.maintain.system.mapper.SysDeptMapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import com.maintain.business.domain.bo.ErpMaterialPickingBo; @@ -50,6 +52,7 @@ public class ErpMaterialPickingServiceImpl implements IErpMaterialPickingService private final ErpMaterialMapper materialMapper; private final ErpMaterialInventoryRecordMapper materialInventoryRecordMapper; private final ErpWarehouseMapper warehouseMapper; + private final SysDeptMapper deptMapper; /** * 查询报修单-领料出库单 @@ -113,6 +116,7 @@ public class ErpMaterialPickingServiceImpl implements IErpMaterialPickingService } private LambdaQueryWrapper buildQueryWrapper(ErpMaterialPickingBo bo) { + List sysDeptList = deptMapper.selectChildrenDeptById(LoginHelper.getDeptId(), null); Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq( bo.getType() != null, ErpMaterialPicking::getType, bo.getType()); @@ -129,6 +133,7 @@ public class ErpMaterialPickingServiceImpl implements IErpMaterialPickingService lqw.eq(bo.getReceiveTime() != null, ErpMaterialPicking::getReceiveTime, bo.getReceiveTime()); lqw.eq(bo.getState() != null, ErpMaterialPicking::getState, bo.getState()); lqw.in(bo.getStateList() != null, ErpMaterialPicking::getState, bo.getStateList()); + lqw.in(!sysDeptList.isEmpty(), ErpMaterialPicking::getCreateDeptId, sysDeptList.stream().map(SysDept::getDeptId).collect(Collectors.toList())); lqw.orderByDesc(BaseEntity::getCreateTime); return lqw; } diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPutawayServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPutawayServiceImpl.java index 7a3c33b2b9cb8c391525990de97a9e804be7dbc0..4ee6479f035af5770547ccdf74c236b15e23ced8 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPutawayServiceImpl.java +++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialPutawayServiceImpl.java @@ -15,12 +15,14 @@ import com.maintain.business.service.IErpMaterialPutawayService; import com.maintain.business.service.IErpMaterialService; import com.maintain.common.core.domain.BaseEntity; import com.maintain.common.core.domain.PageQuery; +import com.maintain.common.core.domain.entity.SysDept; import com.maintain.common.core.page.TableDataInfo; import com.maintain.common.enums.InventoryType; import com.maintain.common.enums.PickingState; import com.maintain.common.helper.LoginHelper; import com.maintain.common.utils.StringUtils; import com.maintain.common.utils.redis.RedisUtils; +import com.maintain.system.mapper.SysDeptMapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,6 +49,7 @@ public class ErpMaterialPutawayServiceImpl implements IErpMaterialPutawayService private final ErpMaterialMapper materialMapper; private final IErpMaterialService materialService; private final ErpMaterialInventoryRecordMapper materialInventoryRecordMapper; + private final SysDeptMapper deptMapper; /** * 查询物料入库 @@ -80,6 +83,7 @@ public class ErpMaterialPutawayServiceImpl implements IErpMaterialPutawayService } private LambdaQueryWrapper buildQueryWrapper(ErpMaterialPutawayBo bo) { + List sysDeptList = deptMapper.selectChildrenDeptById(LoginHelper.getDeptId(), null); Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.like(StringUtils.isNotBlank(bo.getOrderNumber()), ErpMaterialPutaway::getOrderNumber, bo.getOrderNumber()); @@ -94,6 +98,7 @@ public class ErpMaterialPutawayServiceImpl implements IErpMaterialPutawayService lqw.like(StringUtils.isNotBlank(bo.getVendorName()), ErpMaterialPutaway::getVendorName, bo.getVendorName()); lqw.eq(bo.getCreateDeptId() != null, ErpMaterialPutaway::getCreateDeptId, bo.getCreateDeptId()); lqw.eq(bo.getState() != null, ErpMaterialPutaway::getState, bo.getState()); + lqw.in(!sysDeptList.isEmpty(), ErpMaterialPutaway::getCreateDeptId, sysDeptList.stream().map(SysDept::getDeptId).collect(Collectors.toList())); lqw.orderByDesc(BaseEntity::getCreateTime); return lqw; } diff --git a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialReturnsServiceImpl.java b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialReturnsServiceImpl.java index f8934be9d2054e6ed5194da934cd86bba92f76af..017365a3a60d74dfbd96bb169bb8898ff0488712 100644 --- a/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialReturnsServiceImpl.java +++ b/maintain-business/src/main/java/com/maintain/business/service/impl/ErpMaterialReturnsServiceImpl.java @@ -13,6 +13,7 @@ import com.maintain.business.domain.vo.ErpWarehouseVo; import com.maintain.business.mapper.*; import com.maintain.business.service.IErpMaterialService; import com.maintain.common.core.domain.BaseEntity; +import com.maintain.common.core.domain.entity.SysDept; import com.maintain.common.enums.InventoryType; import com.maintain.common.enums.IsEnableStatus; import com.maintain.common.helper.LoginHelper; @@ -23,6 +24,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.maintain.common.utils.redis.RedisUtils; +import com.maintain.system.mapper.SysDeptMapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import com.maintain.business.domain.bo.ErpMaterialReturnsBo; @@ -53,6 +55,7 @@ public class ErpMaterialReturnsServiceImpl implements IErpMaterialReturnsService private final IErpMaterialService materialService; private final ErpMaterialInventoryRecordMapper erpMaterialInventoryRecordMapper; private final ErpWarehouseMapper warehouseMapper; + private final SysDeptMapper deptMapper; /** * 查询物料退货 @@ -87,6 +90,7 @@ public class ErpMaterialReturnsServiceImpl implements IErpMaterialReturnsService } private LambdaQueryWrapper buildQueryWrapper(ErpMaterialReturnsBo bo) { + List sysDeptList = deptMapper.selectChildrenDeptById(LoginHelper.getDeptId(), null); Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(bo.getReturnsMoney() != null, ErpMaterialReturns::getReturnsMoney, bo.getReturnsMoney()); @@ -104,6 +108,7 @@ public class ErpMaterialReturnsServiceImpl implements IErpMaterialReturnsService lqw.eq(bo.getVendorId() != null, ErpMaterialReturns::getVendorId, bo.getVendorId()); lqw.like(StringUtils.isNotBlank(bo.getVendorName()), ErpMaterialReturns::getVendorName, bo.getVendorName()); lqw.eq(bo.getCreateDeptId() != null, ErpMaterialReturns::getCreateDeptId, bo.getCreateDeptId()); + lqw.in(!sysDeptList.isEmpty(), ErpMaterialReturns::getCreateDeptId, sysDeptList.stream().map(SysDept::getDeptId).collect(Collectors.toList())); lqw.orderByDesc(BaseEntity::getCreateTime); return lqw; } diff --git a/maintain-business/src/main/resources/mapper/ErpRepairFormMapper.xml b/maintain-business/src/main/resources/mapper/ErpRepairFormMapper.xml index 6cbec660f69f445ed64ff106b38e3e365266b509..741e6822743ef14fadcc09d0ddfedd6bbfa1d725 100644 --- a/maintain-business/src/main/resources/mapper/ErpRepairFormMapper.xml +++ b/maintain-business/src/main/resources/mapper/ErpRepairFormMapper.xml @@ -165,19 +165,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN erp_vehicle_model evm on erf.vehicle_model_id = evm.id LEFT JOIN erp_client ec2 on erf.client_id = ec2.id LEFT JOIN ( - SELECT - repair_form_id, - SUM(actual_time) AS totalActualTime, - SUM(actual_time * standard_price) AS totalActualTimeMoney - FROM erp_repair_form_project - GROUP BY repair_form_id) erfpd ON erf.id = erfpd.repair_form_id + SELECT repair_form_id, SUM(actual_time) AS totalActualTime, SUM(actual_time * standard_price) AS totalActualTimeMoney + FROM erp_repair_form_project + GROUP BY repair_form_id + ) erfpd ON erf.id = erfpd.repair_form_id LEFT JOIN ( - SELECT - repair_form_id, - SUM(selling_price * collect_number) AS totalMaterialMoney - FROM erp_material_picking_info - GROUP BY repair_form_id - ) empi ON erf.id = empi.repair_form_id + SELECT repair_form_id, SUM(selling_price * collect_number) AS totalMaterialMoney + FROM erp_material_picking_info + GROUP BY repair_form_id + ) empi ON erf.id = empi.repair_form_id