product-inventory-management-after.git

			@@ -2,6 +2,8 @@

			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
			import com.baomidou.mybatisplus.core.toolkit.Wrappers;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.ruoyi.account.mapper.AccountIncomeMapper;
			import com.ruoyi.account.pojo.AccountExpense;
			@@ -40,6 +42,9 @@
			import com.ruoyi.production.mapper.SalesLedgerProductionAccountingMapper;
			import com.ruoyi.production.pojo.ProductProcess;
			import com.ruoyi.production.pojo.ProductWorkOrder;
			import com.ruoyi.productionPlan.enums.AddressRegionEnum;
			import com.ruoyi.productionPlan.mapper.SalesDeliveryMapper;
			import com.ruoyi.productionPlan.pojo.SalesDelivery;
			import com.ruoyi.project.system.domain.SysDept;
			import com.ruoyi.project.system.mapper.SysDeptMapper;
			import com.ruoyi.purchase.mapper.PaymentRegistrationMapper;
			@@ -145,6 +150,15 @@
			@Autowired
			private ProductProcessMapper productProcessMapper;

			@Autowired
			private AccountExpenseMapper accountExpenseMapper;

			@Autowired
			private AccountIncomeMapper accountIncomeMapper;

			@Autowired
			private SalesDeliveryMapper salesDeliveryMapper;

			@Override
			public HomeBusinessDto business() {
			// 构建结果
			@@ -178,28 +192,31 @@
			LambdaQueryWrapper<PurchaseLedger> queryWrapper = new LambdaQueryWrapper<>();
			queryWrapper.ge(PurchaseLedger::getEntryDate, currentMonth.atDay(1).atStartOfDay()) // 大于等于本月第一天
			.lt(PurchaseLedger::getEntryDate, currentMonth.plusMonths(1).atDay(1).atStartOfDay()); // 小于下月第一天
			// 执行查询并计算总和

			List<PurchaseLedger> purchaseLedgers = purchaseLedgerMapper.selectList(queryWrapper);
			if (!CollectionUtils.isEmpty(purchaseLedgers)) {
			LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductMapperLambdaQueryWrapperCopy = new LambdaQueryWrapper<SalesLedgerProduct>();
			salesLedgerProductMapperLambdaQueryWrapperCopy.eq(SalesLedgerProduct::getType, 2)
			LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductMapperLambdaQueryWrapperCopy = new LambdaQueryWrapper<>();
			salesLedgerProductMapperLambdaQueryWrapperCopy.eq(SalesLedgerProduct::getType, 2) // 采购类型
			.in(SalesLedgerProduct::getSalesLedgerId,
			purchaseLedgers.stream().map(PurchaseLedger::getId).collect(Collectors.toList()));

			List<SalesLedgerProduct> salesLedgerProductsCopy = salesLedgerProductMapper
			.selectList(salesLedgerProductMapperLambdaQueryWrapperCopy);
			// 合计合同金额

			// 合计合同总金额
			BigDecimal receiveAmount = purchaseLedgers.stream()
			.map(PurchaseLedger::getContractAmount)
			.filter(Objects::nonNull)
			.reduce(BigDecimal.ZERO, BigDecimal::add);
			// 未开票金额

			// 待付款总金额
			BigDecimal unReceiptPaymentAmount = salesLedgerProductsCopy.stream()
			.map(SalesLedgerProduct::getNoInvoiceAmount)
			.map(SalesLedgerProduct::getPendingTicketsTotal)
			.filter(Objects::nonNull)
			.reduce(BigDecimal.ZERO, BigDecimal::add);

			homeBusinessDto.setMonthPurchaseMoney(receiveAmount.setScale(2, RoundingMode.HALF_UP).toString());
			homeBusinessDto
			.setMonthPurchaseHaveMoney(unReceiptPaymentAmount.setScale(2, RoundingMode.HALF_UP).toString());
			homeBusinessDto.setMonthPurchaseHaveMoney(unReceiptPaymentAmount.setScale(2, RoundingMode.HALF_UP).toString());
			}
			// 统计库存
			BigDecimal stockQuantityTotal = stockInventoryMapper.selectTotal();
			@@ -464,8 +481,8 @@
			}
			// 应收
			List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(new LambdaQueryWrapper<SalesLedger>()
			// .ge(SalesLedger::getEntryDate, startDate)
			// .lt(SalesLedger::getEntryDate, endDate)
			// .ge(SalesLedger::getEntryDate, startDate)
			// .lt(SalesLedger::getEntryDate, endDate)
			);
			// BigDecimal receivableMoney =
			// salesLedgers.stream().map(SalesLedger::getContractAmount).reduce(BigDecimal.ZERO,
			@@ -474,8 +491,8 @@
			// 应付
			List<PurchaseLedger> procurementRecords = purchaseLedgerMapper
			.selectList(new LambdaQueryWrapper<PurchaseLedger>()
			// .ge(PurchaseLedger::getEntryDate, startDate)
			// .lt(PurchaseLedger::getEntryDate, endDate)
			// .ge(PurchaseLedger::getEntryDate, startDate)
			// .lt(PurchaseLedger::getEntryDate, endDate)
			);
			// BigDecimal payableMoney =
			// procurementRecords.stream().map(PurchaseLedger::getContractAmount).reduce(BigDecimal.ZERO,
			@@ -483,8 +500,8 @@
			BigDecimal payableMoney = sumAmount(procurementRecords, PurchaseLedger::getContractAmount);
			// 预收
			List<ReceiptPayment> receiptPayments = receiptPaymentMapper.selectList(new LambdaQueryWrapper<ReceiptPayment>()
			// .ge(ReceiptPayment::getReceiptPaymentDate, startDate)
			// .lt(ReceiptPayment::getReceiptPaymentDate, endDate)
			// .ge(ReceiptPayment::getReceiptPaymentDate, startDate)
			// .lt(ReceiptPayment::getReceiptPaymentDate, endDate)
			);
			// BigDecimal advanceMoney =
			// receiptPayments.stream().map(ReceiptPayment::getReceiptPaymentAmount).reduce(BigDecimal.ZERO,
			@@ -493,8 +510,8 @@
			// 预付
			List<PaymentRegistration> paymentRegistrations = paymentRegistrationMapper
			.selectList(new LambdaQueryWrapper<PaymentRegistration>()
			// .ge(PaymentRegistration::getPaymentDate, startDate)
			// .lt(PaymentRegistration::getPaymentDate, endDate)
			// .ge(PaymentRegistration::getPaymentDate, startDate)
			// .lt(PaymentRegistration::getPaymentDate, endDate)
			);
			// BigDecimal prepayMoney =
			// paymentRegistrations.stream().map(PaymentRegistration::getCurrentPaymentAmount).reduce(BigDecimal.ZERO,
			@@ -558,7 +575,7 @@
			productionProgressDto.setCompletedOrderDetails(productOrderDtos);
			long totalCount = productOrderDtos.size();
			long count = productOrderDtos.stream().filter(
			productOrderDto -> productOrderDto.getCompleteQuantity().compareTo(productOrderDto.getQuantity()) >= 0)
			productOrderDto -> productOrderDto.getCompleteQuantity().compareTo(productOrderDto.getQuantity()) >= 0)
			.count();
			long count2 = productOrderDtos.stream()
			.filter(productOrderDto -> productOrderDto.getCompleteQuantity().compareTo(BigDecimal.ZERO) == 0)
			@@ -1031,28 +1048,20 @@

			@Override
			public List<MapDto> salesPurchaseStorageProductCount() {
			LocalDate now = LocalDate.now();
			DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
			LocalDateTime now = LocalDateTime.now();
			LocalDateTime currentMonthStart = now.with(TemporalAdjusters.firstDayOfMonth()).with(LocalTime.MIN);
			LocalDateTime lastMonth = now.minusMonths(1);
			LocalDateTime lastMonthStart = lastMonth.with(TemporalAdjusters.firstDayOfMonth()).with(LocalTime.MIN);
			LocalDateTime lastMonthEnd = lastMonth.with(TemporalAdjusters.lastDayOfMonth()).with(LocalTime.MAX);

			String currentMonthStart = now.with(TemporalAdjusters.firstDayOfMonth()).format(dtf);
			String currentMonthNow = now.format(dtf);

			LocalDate lastMonth = now.minusMonths(1);
			String lastMonthStart = lastMonth.with(TemporalAdjusters.firstDayOfMonth()).format(dtf);
			String lastMonthEnd = lastMonth.with(TemporalAdjusters.lastDayOfMonth()).format(dtf);

			// 销售
			int currentSales = salesLedgerProductMapper.selectProductCountByTypeAndDate(1, currentMonthStart,
			currentMonthNow);
			// 销售
			int currentSales = salesLedgerProductMapper.selectProductCountByTypeAndDate(1, currentMonthStart, now);
			int lastSales = salesLedgerProductMapper.selectProductCountByTypeAndDate(1, lastMonthStart, lastMonthEnd);

			// 采购
			int currentPurchase = salesLedgerProductMapper.selectProductCountByTypeAndDate(2, currentMonthStart,
			currentMonthNow);
			// 采购
			int currentPurchase = salesLedgerProductMapper.selectProductCountByTypeAndDate(2, currentMonthStart, now);
			int lastPurchase = salesLedgerProductMapper.selectProductCountByTypeAndDate(2, lastMonthStart, lastMonthEnd);

			// 储存
			int currentStorage = stockInventoryMapper.selectStorageProductCountByDate(currentMonthStart, currentMonthNow);
			// 储存
			int currentStorage = stockInventoryMapper.selectStorageProductCountByDate(currentMonthStart, now);
			int lastStorage = stockInventoryMapper.selectStorageProductCountByDate(lastMonthStart, lastMonthEnd);

			List<MapDto> list = new ArrayList<>();
			@@ -1151,12 +1160,6 @@
			public List<MapDto> productTurnoverDays() {
			return homeMapper.productTurnoverDays();
			}

			@Autowired
			private AccountExpenseMapper accountExpenseMapper;

			@Autowired
			private AccountIncomeMapper accountIncomeMapper;

			public List<Map<String, Object>> incomeExpenseAnalysis(Integer type) {

			@@ -1281,36 +1284,21 @@
			String startStr = startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
			String endStr = endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));

			// List<IncomeExpenseAnalysisDto> incomeList =
			// salesLedgerMapper.selectIncomeStats(startStr, endStr, dateFormat);
			List<IncomeExpenseAnalysisDto> incomeList = new ArrayList<>();
			List<IncomeExpenseAnalysisDto> purchaseList = purchaseLedgerMapper.selectPurchaseStats(startStr, endStr,
			dateFormat);
			List<IncomeExpenseAnalysisDto> expenseList = accountExpenseMapper.selectAccountExpenseStats(startStr, endStr,
			dateFormat);
			List<IncomeExpenseAnalysisDto> incomeList = accountIncomeMapper.selectIncomeStats(startStr, endStr, dateFormat);
			List<IncomeExpenseAnalysisDto> expenseList = accountExpenseMapper.selectAccountExpenseStats(startStr, endStr, dateFormat);

			Map<String, BigDecimal> incomeMap = incomeList.stream().collect(Collectors
			.toMap(IncomeExpenseAnalysisDto::getDateStr, IncomeExpenseAnalysisDto::getAmount, BigDecimal::add));
			Map<String, BigDecimal> purchaseMap = purchaseList.stream().collect(Collectors
			.toMap(IncomeExpenseAnalysisDto::getDateStr, IncomeExpenseAnalysisDto::getAmount, BigDecimal::add));
			Map<String, BigDecimal> expenseMap = expenseList.stream().collect(Collectors
			.toMap(IncomeExpenseAnalysisDto::getDateStr, IncomeExpenseAnalysisDto::getAmount, BigDecimal::add));

			List<MapDto> result = new ArrayList<>();

			for (String month : months) {
			MapDto dto = new MapDto();
			dto.setName(month);

			BigDecimal income = incomeMap.getOrDefault(month, BigDecimal.ZERO);

			BigDecimal purchase = purchaseMap.getOrDefault(month, BigDecimal.ZERO);
			income = BigDecimal.ZERO;
			BigDecimal expense = expenseMap.getOrDefault(month, BigDecimal.ZERO);
			BigDecimal totalExpense = purchase.add(expense);

			BigDecimal profit = income.subtract(totalExpense);

			BigDecimal profit = income.subtract(expense);
			dto.setValue(profit.setScale(2, RoundingMode.HALF_UP).toString());
			result.add(dto);
			}
			@@ -1955,7 +1943,7 @@
			endDate = today.with(DayOfWeek.SUNDAY);
			}

			return new LocalDate[] { startDate, endDate };
			return new LocalDate[]{startDate, endDate};
			}

			private QualityQualifiedAnalysisDto buildQualifiedAnalysis(List<QualityInspect> list) {
			@@ -2201,7 +2189,7 @@
			*/
			public static String[] lastSevenDaysDateRange() {
			LocalDate today = LocalDate.now();
			return new String[] { today.minusDays(6).toString(), today.toString() };
			return new String[]{today.minusDays(6).toString(), today.toString()};
			}

			@Override
			@@ -2434,6 +2422,9 @@
			Map<String, List<QualityInspect>> groupedByCheckResult = qualityInspectList.stream()
			.collect(Collectors.groupingBy(QualityInspect::getCheckResult));
			List<QualityInspect> qualityInspects = groupedByCheckResult.get("不合格");
			if (ObjectUtils.isNull(qualityInspects) \|\| qualityInspects.size() == 0) {
			return null;
			}
			// 4. 处理图表项 (Item)
			List<QualityStatisticsItem> itemList = new ArrayList<>();

			@@ -2497,7 +2488,7 @@

			@Override
			public List<processDataProductionStatisticsDto> processDataProductionStatistics(Integer type,
			List<Long> processIds) {
			List<Long> processIds) {
			LoginUser loginUser = SecurityUtils.getLoginUser();
			Long userId = SecurityUtils.isAdmin(loginUser.getUserId()) ? null : loginUser.getUserId();

			@@ -2528,4 +2519,106 @@

			return productProcessMapper.calculateProductionStatistics(startDateTime, endDateTime, userId, processIds);
			}
			}

			@Override
			public Map<String, Long> total() {
			Map<String, Long> map = new HashMap<>();
			//总销售金额
			List<SalesDelivery> salesDeliveries = salesDeliveryMapper.selectList(null);
			long sum = salesDeliveries.stream().mapToLong(value -> Long.parseLong(value.getPrice().toString())).sum();
			map.put("price",sum/1000);//单位w
			//总发货单
			map.put("delivery",salesDeliveries.stream().count());
			//总销售区?
			//累计客户
			Long count = customerMapper.selectCount(null);
			map.put("customer",count);
			return map;
			}

			@Override
			public String salesAnalysis(SalesDeliveryDto salesDeliveryDto) {
			List<LocalDate> dates = convertDateList(salesDeliveryDto.getDays());
			return null;
			}

			@Override
			public String salesRanking(SalesDeliveryDto salesDeliveryDto) {
			List<LocalDate> dates = convertDateList(salesDeliveryDto.getDays());
			return null;
			}

			@Override
			public String salesAmount(SalesDeliveryDto salesDeliveryDto) {
			List<LocalDate> dates = convertDateList(salesDeliveryDto.getDays());
			return null;
			}

			@Override
			public String salesDataRanking(SalesDeliveryDto salesDeliveryDto) {
			List<LocalDate> dates = convertDateList(salesDeliveryDto.getDays());
			return null;
			}

			@Override
			public SalesTotalDto customerTrends(SalesDeliveryDto salesDeliveryDto) {
			SalesTotalDto salesTotalDto = new SalesTotalDto();
			List<LocalDate> dates = convertDateList(salesDeliveryDto.getDays());
			List<Map<String, Long>> maps = new ArrayList<>();
			for (LocalDate date : dates) {
			LocalDate firstDay = date.with(TemporalAdjusters.firstDayOfMonth());
			LocalDate lastDay = date.with(TemporalAdjusters.lastDayOfMonth());
			Date startDate = Date.from(firstDay.atStartOfDay(ZoneId.systemDefault()).toInstant());
			Date endDate = Date.from(lastDay.atTime(23, 59, 59).atZone(ZoneId.systemDefault()).toInstant());
			List<Customer> customers = customerMapper.selectList(Wrappers.<Customer>lambdaQuery()
			.between(Customer::getMaintenanceTime, startDate, endDate));
			Map<String, Long> regionCountMap = Arrays.stream(AddressRegionEnum.values())
			.filter(addressRegionEnum -> addressRegionEnum.getRegionName().equals("SELF_PICKUP"))
			.collect(Collectors.toMap(
			AddressRegionEnum::getRegionName, // 区域名作为key
			enumItem -> 0L // 初始值全部为0
			));
			if (!CollectionUtils.isEmpty(customers)) {
			regionCountMap = customers.stream()
			// 调用方法将原始地址转换为目标区域
			.map(customer -> AddressRegionEnum.matchRegion(customer.getCompanyAddress()).getRegionName())
			// 过滤掉转换失败/空的区域（可选，根据业务需求）
			.filter(region -> region != null && !region.isEmpty())
			// 按区域分组，统计每个区域的数量
			.collect(Collectors.groupingBy(
			region -> region, // 分组依据：转换后的区域
			Collectors.counting() // 计数
			));
			}
			regionCountMap.put("ALLIN",customers.stream().count());
			maps.add(regionCountMap);
			}
			salesTotalDto.setDates(dates);
			salesTotalDto.setCustomerTrends(maps);
			return salesTotalDto;
			}

			/**
			* 根据前端传参年/月转换为对应LocalDate列表
			* @param days 前端参数："年" / "月"
			* @return List<LocalDate>
			*/
			public static List<LocalDate> convertDateList(String days) {
			List<LocalDate> resultList = new ArrayList<>();
			LocalDate now = LocalDate.now();
			int currentYear = now.getYear();

			if ("年".equals(days)) {
			// 需求：近5年 → 每年的 1月1日
			for (int i = 0; i < 5; i++) {
			resultList.add(LocalDate.of(currentYear - i, 1, 1));
			}
			} else if ("月".equals(days)) {
			// 需求：当年12个月 → 每月1日
			for (int month = 1; month <= 12; month++) {
			resultList.add(LocalDate.of(currentYear, month, 1));
			}
			}
			return resultList;
			}
			}