diff --git a/src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java b/src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java index 3d71f94..98eb1a3 100644 --- a/src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java +++ b/src/main/java/org/energy/modules/system/service/impl/RoleDataServiceImpl.java @@ -31,14 +31,8 @@ import org.energy.modules.smart.entity.WorkPermit; import org.energy.modules.smart.service.IOperationTicketService; import org.energy.modules.smart.service.IWorkOrderService; import org.energy.modules.smart.service.IWorkPermitService; -import org.energy.modules.spares.entity.ManufacturerInfo; -import org.energy.modules.spares.entity.Material; -import org.energy.modules.spares.entity.SupplierInfo; -import org.energy.modules.spares.entity.Warehouse; -import org.energy.modules.spares.service.IManufacturerInfoService; -import org.energy.modules.spares.service.IMaterialService; -import org.energy.modules.spares.service.ISupplierInfoService; -import org.energy.modules.spares.service.IWarehouseService; +import org.energy.modules.spares.entity.*; +import org.energy.modules.spares.service.*; import org.energy.modules.system.service.IRoleDataService; import org.energy.modules.system.vo.HomePageVO; import org.springframework.beans.factory.annotation.Autowired; @@ -74,6 +68,10 @@ public class RoleDataServiceImpl implements IRoleDataService { private IInspectionTasksService inspectionTasksService; @Autowired private IProductionInformationService productionInformationService; + @Autowired + private IInboundService inboundService; + @Autowired + private IOutboundService outboundService; @Override public HomePageVO findCurrHomePageInfo() { @@ -146,6 +144,18 @@ public class RoleDataServiceImpl implements IRoleDataService { qw11.lambda().eq(ProductionInformation::getIsDiscontinue, 1); hp.setProductionInformationAudit(productionInformationService.list(qw11)); + // Inbound Service + QueryWrapper qw12 = new QueryWrapper<>(); + qw12.lambda().eq(Inbound::getIstatus, 1); + qw12.lambda().eq(Inbound::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setInboundAudit(inboundService.list(qw12)); + + // Outbound Service + QueryWrapper qw13 = new QueryWrapper<>(); + qw13.lambda().eq(Outbound::getIstatus, 1); + qw13.lambda().eq(Outbound::getIsDeleted, DafConstant.DB_NOT_DELETED); + hp.setOutboundAudit(outboundService.list(qw13)); + return hp; } diff --git a/src/main/java/org/energy/modules/system/vo/HomePageVO.java b/src/main/java/org/energy/modules/system/vo/HomePageVO.java index dead014..fc1abaf 100644 --- a/src/main/java/org/energy/modules/system/vo/HomePageVO.java +++ b/src/main/java/org/energy/modules/system/vo/HomePageVO.java @@ -8,10 +8,7 @@ import org.energy.modules.release.entity.ProductionInformation; import org.energy.modules.smart.entity.OperationTicket; import org.energy.modules.smart.entity.WorkOrder; import org.energy.modules.smart.entity.WorkPermit; -import org.energy.modules.spares.entity.ManufacturerInfo; -import org.energy.modules.spares.entity.Material; -import org.energy.modules.spares.entity.SupplierInfo; -import org.energy.modules.spares.entity.Warehouse; +import org.energy.modules.spares.entity.*; import java.util.List; @@ -32,6 +29,8 @@ public class HomePageVO { private List manufacturerInfoAudit; private List supplierInfoAudit; private List materialAudit; + private List inboundAudit; + private List outboundAudit; // 工单 private List workOrderAudit; // 生产信息发布