From 2c51e2bac7e271f6bd1a7da060e4ffd327d5a8d2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 28 四月 2026 18:06:06 +0800
Subject: [PATCH] feat(production): 更新生产核算逻辑以支持设备和工时计算
---
src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java
index 76ac503..195bdd3 100644
--- a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java
@@ -1,19 +1,27 @@
package com.ruoyi.production.service.impl;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.production.dto.ProductionProductMainDto;
import com.ruoyi.production.dto.SalesLedgerProductionAccountingDto;
+import com.ruoyi.production.dto.UserAccountDto;
+import com.ruoyi.production.dto.UserProductionAccountingDto;
import com.ruoyi.production.mapper.ProductionProductMainMapper;
import com.ruoyi.production.mapper.SalesLedgerProductionAccountingMapper;
import com.ruoyi.production.pojo.SalesLedgerProductionAccounting;
import com.ruoyi.production.service.SalesLedgerProductionAccountingService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.tuple.Pair;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* @author :yys
@@ -42,15 +50,49 @@
@Override
public IPage<SalesLedgerProductionAccountingDto> pageProductionAccounting(SalesLedgerProductionAccountingDto salesLedgerProductionAccountingDto, Page page) {
- // TODO 绠＄悊鍛樻煡璇㈡墍鏈夛紝鍏朵粬浜哄彧鑳芥煡鑷繁
- return salesLedgerProductionAccountingMapper.pageProductionAccounting(page, salesLedgerProductionAccountingDto);
+ boolean admin = SecurityUtils.isAdmin(SecurityUtils.getUserId());
+ if (!admin) {
+ salesLedgerProductionAccountingDto.setSchedulingUserName(SecurityUtils.getLoginUser().getNickName());
+ }
+ if (salesLedgerProductionAccountingDto.getDateType().equals("month")) {
+ salesLedgerProductionAccountingDto.setEntryDate(null);
+ }else {
+ salesLedgerProductionAccountingDto.setEntryDateStart(null);
+ salesLedgerProductionAccountingDto.setEntryDateEnd(null);
+ }
+ IPage<SalesLedgerProductionAccountingDto> salesLedgerProductionAccountingDtoIPage = salesLedgerProductionAccountingMapper.pageProductionAccounting(page, salesLedgerProductionAccountingDto);
+ salesLedgerProductionAccountingDtoIPage.getRecords().forEach(it->{
+ // 鎷垮埌鏈哄彴缁熻 鍒嗛挓-鏈哄彴, 杩欐牱鎺掑垪
+ String deviceWorkInfo = it.getDeviceWorkInfo();
+ List<String> str = StrUtil.split(deviceWorkInfo, ">>>");
+ List<Pair<String,Integer>> collect = str.stream().map(n1 -> {
+ List<String> strPair = StrUtil.split(n1, "|$|");
+ if (strPair.size() == 2) {
+ return Pair.of(strPair.get(1),Integer.parseInt(strPair.get(0)));
+ }
+ return null;
+ }).filter(Objects::nonNull).collect(Collectors.toList());
+ it.setDeviceWorkInfoPairList(collect);
+ });
+ return salesLedgerProductionAccountingDtoIPage;
}
@Override
public IPage<ProductionProductMainDto> listProductionDetails(SalesLedgerProductionAccountingDto salesLedgerProductionAccountingDto, Page page) {
+ if (salesLedgerProductionAccountingDto.getDateType().equals("month")) {
+ salesLedgerProductionAccountingDto.setEntryDate(null);
+ }else {
+ salesLedgerProductionAccountingDto.setEntryDateStart(null);
+ salesLedgerProductionAccountingDto.setEntryDateEnd(null);
+ }
return productionProductMainMapper.listProductionDetails(salesLedgerProductionAccountingDto, page);
}
+ @Override
+ public UserAccountDto getByUserId(UserProductionAccountingDto userProductionAccountingDto) {
+ return salesLedgerProductionAccountingMapper.getByUserId( userProductionAccountingDto);
+ }
+
public static boolean isNumeric(String str) {
if (str == null || str.isEmpty()) {
return false;
--
Gitblit v1.9.3