From 533d543c55aeb903c6da281ee06cbfac80d9decc Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 27 四月 2026 17:40:50 +0800
Subject: [PATCH] fix: 去除人员汇总接口
---
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 667 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 513 insertions(+), 154 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index 046f8c4..2b069af 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -2,72 +2,76 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.pojo.Product;
import com.ruoyi.basic.pojo.ProductModel;
+import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.procurementrecord.utils.StockUtils;
-import com.ruoyi.production.controller.ProductWorkOrderController;
-import com.ruoyi.production.dto.ProductStructureDto;
import com.ruoyi.production.dto.ProductionProductMainDto;
+import com.ruoyi.production.dto.ProductionReportDailySummaryDto;
+import com.ruoyi.production.dto.ProductionReportStateDto;
+import com.ruoyi.production.enums.ProductProcessEnum;
+import com.ruoyi.production.mapper.ProductionProductReportDailyMapper;
+import com.ruoyi.production.pojo.ProductionProductReportDaily;
import com.ruoyi.production.mapper.*;
import com.ruoyi.production.pojo.*;
import com.ruoyi.production.service.ProductionProductMainService;
import com.ruoyi.project.system.domain.SysUser;
-import com.ruoyi.quality.mapper.QualityInspectMapper;
-import com.ruoyi.quality.mapper.QualityInspectParamMapper;
-import com.ruoyi.quality.mapper.QualityTestStandardMapper;
-import com.ruoyi.quality.pojo.QualityInspect;
-import com.ruoyi.quality.pojo.QualityInspectParam;
-import com.ruoyi.quality.pojo.QualityTestStandard;
+import com.ruoyi.project.system.mapper.SysUserMapper;
+import com.ruoyi.quality.mapper.*;
+import com.ruoyi.quality.pojo.*;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.ruoyi.production.mapper.ProductionProductMainMapper;
import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.Duration;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
@Service
@AllArgsConstructor
+@Transactional(rollbackFor = Exception.class)
public class ProductionProductMainServiceImpl extends ServiceImpl<ProductionProductMainMapper, ProductionProductMain> implements ProductionProductMainService {
private ProductionProductMainMapper productionProductMainMapper;
+ private ProductionProductReportDailyMapper productionProductReportDailyMapper;
- private ProductWorkOrderController productWorkOrderController;
private ProductWorkOrderMapper productWorkOrderMapper;
private ProductProcessRouteItemMapper productProcessRouteItemMapper;
+ private SysUserMapper userMapper;
private ProductionProductOutputMapper productionProductOutputMapper;
-
- private ProcessRouteItemMapper processRouteItemMapper;
-
private ProductModelMapper productModelMapper;
-
- private QualityInspectMapper qualityInspectMapper;
-
+ private ProductMapper productMapper;
private ProductProcessMapper productProcessMapper;
- private ProductMapper productMapper;
-
- private QualityTestStandardMapper qualityTestStandardMapper;
+ private QualityInspectMapper qualityInspectMapper;
+ private QualityUnqualifiedMapper qualityUnqualifiedMapper;
private QualityInspectParamMapper qualityInspectParamMapper;
-
- private ProductStructureMapper productStructureMapper;
+ private QualityTestStandardParamMapper qualityTestStandardParamMapper;
+ private QualityTestStandardMapper qualityTestStandardMapper;
private ProductionProductInputMapper productionProductInputMapper;
@@ -79,46 +83,165 @@
@Override
- public IPage<ProductionProductMainDto> listPageProductionProductMainDto(Page page, ProductionProductMainDto productionProductMainDto) {
- return productionProductMainMapper.listPageProductionProductMainDto(page, productionProductMainDto);
+ public IPage<ProductionProductMainDto> listPageProductionProductMainDto(Page<ProductionProductMainDto> page, ProductionProductMainDto productionProductMainDto) {
+ if (productionProductMainDto == null) {
+ productionProductMainDto = new ProductionProductMainDto();
+ }
+// productionProductMainDto.setUserId(SecurityUtils.getUserId());
+ IPage<ProductionProductMainDto> result = productionProductMainMapper.listPageProductionProductMainDto(page, productionProductMainDto);
+ fillHourDefaults(result.getRecords());
+ return result;
}
@Override
- @Transactional(rollbackFor = Exception.class)
+ public IPage<ProductionProductMainDto> listPageProductionProductMainDetailDto(Page<ProductionProductMainDto> page, ProductionProductMainDto productionProductMainDto) {
+ if (productionProductMainDto == null) {
+ productionProductMainDto = new ProductionProductMainDto();
+ }
+ IPage<ProductionProductMainDto> result = productionProductMainMapper.listPageProductionProductMainDetailDto(page, productionProductMainDto);
+ fillHourDefaults(result.getRecords());
+ return result;
+ }
+
+ private void fillHourDefaults(List<ProductionProductMainDto> records) {
+ if (records == null || records.isEmpty()) {
+ return;
+ }
+ records.forEach(item -> {
+ if (item.getProjectTotalHours() == null) {
+ item.setProjectTotalHours(BigDecimal.ZERO);
+ }
+ if (item.getProcessStandardHours() == null) {
+ item.setProcessStandardHours(BigDecimal.ZERO);
+ }
+ if (item.getActualReportHours() == null) {
+ item.setActualReportHours(BigDecimal.ZERO);
+ }
+ if (item.getDailyPersonHours() == null) {
+ item.setDailyPersonHours(BigDecimal.ZERO);
+ }
+ });
+ }
+
+ @Override
public Boolean addProductMain(ProductionProductMainDto dto) {
- if (dto == null) {
- throw new RuntimeException("鍙傛暟涓嶈兘涓虹┖");
+ if (dto.getActionType() == null) {
+ if (dto.getId() != null) {
+ if (dto.getQuantity() == null || dto.getQuantity().compareTo(BigDecimal.ZERO) <= 0) {
+ throw new ServiceException("缁撴潫鎶ュ伐澶辫触: 鏈鐢熶骇鏁伴噺蹇呴』澶т簬0");
+ }
+ return finishReport(dto);
+ }
+
+ Long workOrderId = dto.getWorkOrderId();
+ Long itemId = dto.getProductProcessRouteItemId();
+ if (workOrderId == null || itemId == null) {
+ throw new ServiceException("宸ュ崟ID鍜屽伐鑹鸿矾绾块」鐩甀D涓嶈兘涓虹┖");
+ }
+ ProductionProductMain running = getRunning(workOrderId, itemId);
+ if (running != null) {
+ if (dto.getQuantity() == null || dto.getQuantity().compareTo(BigDecimal.ZERO) <= 0) {
+ throw new ServiceException("缁撴潫鎶ュ伐澶辫触: 鏈鐢熶骇鏁伴噺蹇呴』澶т簬0");
+ }
+ dto.setId(running.getId());
+ return finishReport(dto);
+ }
+ return startReport(dto);
}
- SysUser user = SecurityUtils.getLoginUser().getUser();
+ if (dto.getActionType() == 1) {
+ return startReport(dto);
+ }
+ if (dto.getActionType() == 2) {
+ return finishReport(dto);
+ }
+ throw new ServiceException("鏃犳晥鎶ュ伐鍔ㄤ綔: " + dto.getActionType());
+ }
+ @Override
+ public ProductionProductMain getRunning(Long workOrderId, Long productProcessRouteItemId) {
+ if (workOrderId == null || productProcessRouteItemId == null) {
+ throw new ServiceException("宸ュ崟ID鍜屽伐鑹鸿矾绾块」鐩甀D涓嶈兘涓虹┖");
+ }
+ Long currentUserId = SecurityUtils.getUserId();
+ return productionProductMainMapper.selectOne(
+ Wrappers.<ProductionProductMain>lambdaQuery()
+ .eq(ProductionProductMain::getWorkOrderId, workOrderId)
+ .eq(ProductionProductMain::getProductProcessRouteItemId, productProcessRouteItemId)
+ .eq(ProductionProductMain::getUserId, currentUserId)
+ .eq(ProductionProductMain::getStatus, 0)
+ .orderByDesc(ProductionProductMain::getReportStartTime)
+ .last("limit 1")
+ );
+ }
+ @Override
+ public List<ProductionReportDailySummaryDto> dailyDuration(Long workOrderId, Long productProcessRouteItemId, LocalDate startDate, LocalDate endDate) {
+ Long userId = SecurityUtils.getUserId();
+ return productionProductReportDailyMapper.listDailySummary(
+ workOrderId,
+ productProcessRouteItemId,
+ userId,
+ startDate,
+ endDate
+ );
+ }
- // 鏂板閫昏緫
+ @Override
+ public ProductionReportStateDto reportState(Long workOrderId, Long productProcessRouteItemId) {
+ ProductionProductMain running = getRunning(workOrderId, productProcessRouteItemId);
+ ProductionReportStateDto dto = new ProductionReportStateDto();
+ if (running == null) {
+ dto.setState(1);
+ return dto;
+ }
+ dto.setState(2);
+ dto.setRunningId(running.getId());
+ dto.setStartTime(running.getReportStartTime());
+ return dto;
+ }
+
+ private Boolean startReport(ProductionProductMainDto dto) {
+ if (dto.getWorkOrderId() == null || dto.getProductProcessRouteItemId() == null) {
+ throw new ServiceException("寮�濮嬫姤宸ュけ璐�: 宸ュ崟ID鍜屽伐鑹鸿矾绾块」鐩甀D涓嶈兘涓虹┖");
+ }
+ if (dto.getUserId() == null) {
+ dto.setUserId(SecurityUtils.getUserId());
+ }
+ if (dto.getUserId() == null) {
+ throw new ServiceException("寮�濮嬫姤宸ュけ璐�: 鏃犳硶鑾峰彇褰撳墠鐧诲綍浜�");
+ }
+
+ QueryWrapper<ProductionProductMain> runningWrapper = new QueryWrapper<>();
+ runningWrapper.eq("work_order_id", dto.getWorkOrderId())
+ .eq("product_process_route_item_id", dto.getProductProcessRouteItemId())
+ .eq("user_id", dto.getUserId())
+ .eq("status", 0);
+ Long runningCount = productionProductMainMapper.selectCount(runningWrapper);
+ if (runningCount != null && runningCount > 0) {
+ // 宸叉湁杩涜涓殑鎶ュ伐鏃讹紝涓嶅啀鏂板缓锛岀户缁部鐢ㄥ埌缁撴潫鎶ュ伐
+ return true;
+ }
+
+ SysUser user = userMapper.selectUserById(dto.getUserId());
+ if (user == null) {
+ throw new ServiceException("鎶ュ伐浜轰笉瀛樺湪");
+ }
+
ProductionProductMain productionProductMain = new ProductionProductMain();
- ProductProcessRouteItem productProcessRouteItem = productProcessRouteItemMapper.selectById(dto.getProductProcessRouteItemId());
- if (productProcessRouteItem == null) {
- throw new RuntimeException("宸ヨ壓璺嚎椤逛笉瀛樺湪");
- }
-
- String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
-
+ String datePrefix = "BG" + LocalDate.now().format(DateTimeFormatter.ofPattern("yyMMdd"));
QueryWrapper<ProductionProductMain> queryWrapper = new QueryWrapper<>();
queryWrapper.select("MAX(product_no) as maxNo")
.likeRight("product_no", datePrefix);
-
List<Map<String, Object>> resultList = productionProductMainMapper.selectMaps(queryWrapper);
-
int sequenceNumber = 1;
if (resultList != null && !resultList.isEmpty()) {
Map<String, Object> result = resultList.get(0);
-
if (result != null) {
Object maxNoObj = result.get("maxNo");
if (maxNoObj != null) {
String lastNo = maxNoObj.toString();
System.out.println("lastNo: " + lastNo);
-
if (lastNo.startsWith(datePrefix)) {
try {
String seqStr = lastNo.substring(datePrefix.length());
@@ -130,139 +253,375 @@
}
}
}
-
String productNo = String.format("%s%03d", datePrefix, sequenceNumber);
productionProductMain.setProductNo(productNo);
- productionProductMain.setUserId(user.getUserId());
+ productionProductMain.setUserId(dto.getUserId());
+ productionProductMain.setUserName(user.getNickName());
productionProductMain.setProductProcessRouteItemId(dto.getProductProcessRouteItemId());
productionProductMain.setWorkOrderId(dto.getWorkOrderId());
productionProductMain.setStatus(0);
-
- // 娣诲姞鎶ュ伐涓昏〃
- int insert = productionProductMainMapper.insert(productionProductMain);
-
- //鏇存柊宸ュ崟
- if (insert > 0) {
- Map<String, Object> params = new HashMap<>();
- params.put("quantity", dto.getQuantity());
- params.put("productMainId", productionProductMain.getId());
- params.put("workOrderId", dto.getWorkOrderId());
- params.put("deductQuantity", dto.getQuantity());
-
- productWorkOrderMapper.updatePlanQuantity(params);
- }
- ProductProcess productProcess = productProcessMapper.selectById(productProcessRouteItem.getProcessId());
- ProductModel productModel = productProcessRouteItem.getProductModelId() != null ?
- productModelMapper.selectById(productProcessRouteItem.getProductModelId()) : null;
-
- if (productModel != null) {
- Product product = productMapper.selectById(productModel.getProductId());
- int inspectType = "缁勮".equals(productProcess.getName()) ? 2 : 1;
-
- QualityInspect qualityInspect = new QualityInspect();
- qualityInspect.setProductId(product.getId());
- qualityInspect.setProductName(product.getProductName());
- qualityInspect.setModel(productModel.getModel());
- qualityInspect.setUnit(productModel.getUnit());
- qualityInspect.setQuantity(dto.getQuantity());
- qualityInspect.setProcess(productProcess.getName());
- qualityInspect.setInspectState(0);
- qualityInspect.setInspectType(inspectType);
- qualityInspect.setProductMainId(productionProductMain.getId());
- qualityInspect.setProductModelId(productModel.getId());
- qualityInspectMapper.insert(qualityInspect);
-
- qualityTestStandardMapper.selectList(
- new LambdaQueryWrapper<QualityTestStandard>()
- .eq(QualityTestStandard::getProductId, product.getId())
- ).forEach(standard -> {
- QualityInspectParam param = new QualityInspectParam();
- BeanUtils.copyProperties(standard, param);
- param.setId(null);
- param.setInspectId(qualityInspect.getId());
- qualityInspectParamMapper.insert(param);
- });
- }
- // 娣诲姞鎶曞叆
- if (productModel != null) {
- List<ProductStructureDto> productStructureDtos = productStructureMapper.listByproductModelId(productModel.getId());
- for (ProductStructureDto productStructureDto : productStructureDtos) {
- ProductModel productModel1 = productModelMapper.selectById(productStructureDto.getProductModelId());
-
- BigDecimal stockQuantity = stockUtils.getStockQuantity(productModel1.getId());
- if (!(stockQuantity.compareTo(BigDecimal.ZERO) > 0)) {
- throw new RuntimeException("搴撳瓨涓嶈冻");
- }
- ProductionProductInput productionProductInput = new ProductionProductInput();
- productionProductInput.setProductModelId(productStructureDto.getProductModelId());
- productionProductInput.setQuantity(productStructureDto.getUnitQuantity().multiply(dto.getQuantity()));
- productionProductInput.setProductMainId(productionProductMain.getId());
- productionProductInputMapper.insert(productionProductInput);
- }
- }
-
- // 娣诲姞浜у嚭
- ProductionProductOutput productionProductOutput = new ProductionProductOutput();
- productionProductOutput.setProductMainId(productionProductMain.getId());
- productionProductOutput.setProductModelId(productProcessRouteItem.getProductModelId());
- productionProductOutput.setQuantity(dto.getQuantity() != null ? dto.getQuantity() : BigDecimal.ZERO);
- productionProductOutputMapper.insert(productionProductOutput);
-
- // 鑾峰彇鐢熶骇璁㈠崟
- ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(dto.getWorkOrderId());
- ProductOrder productOrder = productOrderMapper.selectById(productWorkOrder.getProductOrderId());
- if (productOrder == null) {
- throw new RuntimeException("鐢熶骇璁㈠崟涓嶅瓨鍦�");
- }
- // 娣诲姞鐢熶骇鏍哥畻
- SalesLedgerProductionAccounting salesLedgerProductionAccounting = SalesLedgerProductionAccounting.builder()
- .salesLedgerWorkId(productionProductMain.getId())
- .salesLedgerSchedulingId(0L)
- .salesLedgerId(productOrder.getSalesLedgerId())
- .salesLedgerProductId(productOrder.getProductModelId())
- .schedulingUserId(user.getUserId())
- .schedulingUserName(user.getNickName())
- .finishedNum(dto.getQuantity() != null ? dto.getQuantity() : BigDecimal.ZERO)
- .workHours(productProcess.getSalaryQuota())
- .process(productProcess.getName())
- .schedulingDate(LocalDate.now())
- .tenantId(dto.getTenantId())
- .build();
- salesLedgerProductionAccountingMapper.insert(salesLedgerProductionAccounting);
-
+ productionProductMain.setReportStartTime(LocalDateTime.now());
+ productionProductMainMapper.insert(productionProductMain);
return true;
}
- @Override
- @Transactional
- public Boolean removeProductMain(ProductionProductMainDto dto) {
- Long id = dto.getId();
+ private Boolean finishReport(ProductionProductMainDto dto) {
+ if (dto.getId() == null) {
+ throw new ServiceException("缁撴潫鎶ュ伐澶辫触: 鎶ュ伐ID涓嶈兘涓虹┖");
+ }
+ if (dto.getQuantity() == null || dto.getQuantity().compareTo(BigDecimal.ZERO) <= 0) {
+ throw new ServiceException("缁撴潫鎶ュ伐澶辫触: 鏈鐢熶骇鏁伴噺蹇呴』澶т簬0");
+ }
+ ProductionProductMain productionProductMain = productionProductMainMapper.selectById(dto.getId());
+ if (productionProductMain == null) {
+ throw new ServiceException("缁撴潫鎶ュ伐澶辫触: 鎶ュ伐璁板綍涓嶅瓨鍦�");
+ }
+ if (productionProductMain.getStatus() != null && productionProductMain.getStatus() == 1) {
+ throw new ServiceException("璇ユ姤宸ュ凡缁撴潫锛岃鍕块噸澶嶆彁浜�");
+ }
+ if (productionProductMain.getReportStartTime() == null) {
+ throw new ServiceException("璇ユ姤宸ョ己灏戝紑濮嬫椂闂达紝鏃犳硶缁撴潫");
+ }
- // 鏇存柊宸ュ崟
- productWorkOrderMapper.rollbackPlanQuantity(id);
- // 鍒犻櫎璐ㄦ鍙傛暟鍜岃川妫�璁板綍
+ LocalDateTime endTime = LocalDateTime.now();
+ long durationSeconds = Duration.between(productionProductMain.getReportStartTime(), endTime).getSeconds();
+ BigDecimal durationMinutes = secondsToMinutesExact(durationSeconds);
+ int finishRows = productionProductMainMapper.update(
+ null,
+ Wrappers.<ProductionProductMain>lambdaUpdate()
+ .set(ProductionProductMain::getReportEndTime, endTime)
+ .set(ProductionProductMain::getReportDurationMinutes, durationMinutes)
+ .set(ProductionProductMain::getStatus, 1)
+ .eq(ProductionProductMain::getId, productionProductMain.getId())
+ .eq(ProductionProductMain::getStatus, 0)
+ );
+ if (finishRows <= 0) {
+ throw new ServiceException("璇ユ姤宸ュ凡缁撴潫锛岃鍕块噸澶嶆彁浜�");
+ }
+ productionProductMain.setReportEndTime(endTime);
+ productionProductMain.setReportDurationMinutes(durationMinutes);
+ productionProductMain.setStatus(1);
+
+ // 鍐欏叆鈥滄瘡鏃ユ椂闀挎槑缁嗏�濓紝璺ㄥぉ鑷姩鎷嗗垎
+ saveDailyDurations(productionProductMain, productionProductMain.getReportStartTime(), endTime);
+
+ dto.setWorkOrderId(productionProductMain.getWorkOrderId());
+ dto.setProductProcessRouteItemId(productionProductMain.getProductProcessRouteItemId());
+ if (dto.getUserId() == null) {
+ dto.setUserId(productionProductMain.getUserId());
+ }
+ if (dto.getUserName() == null) {
+ dto.setUserName(productionProductMain.getUserName());
+ }
+ if (dto.getScrapQty() == null) {
+ dto.setScrapQty(BigDecimal.ZERO);
+ }
+
+ SysUser user = userMapper.selectUserById(dto.getUserId());
+ if (user == null) {
+ throw new ServiceException("鎶ュ伐浜轰笉瀛樺湪");
+ }
+
+ // 浣跨敤宸ュ崟鍏宠仈鐨勭敓浜ц鍗曚骇鍝佸瀷鍙�
+ ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(dto.getWorkOrderId());
+ if (productWorkOrder == null) {
+ throw new ServiceException("缁撴潫鎶ュ伐澶辫触: 宸ュ崟涓嶅瓨鍦�");
+ }
+ ProductOrder productOrder = productOrderMapper.selectById(productWorkOrder.getProductOrderId());
+ if (productOrder == null) {
+ throw new ServiceException("缁撴潫鎶ュ伐澶辫触: 鍏宠仈鐢熶骇璁㈠崟涓嶅瓨鍦�");
+ }
+ Long outputProductModelId = productOrder.getProductModelId();
+ if (outputProductModelId == null) {
+ throw new ServiceException("缁撴潫鎶ュ伐澶辫触: 鐢熶骇璁㈠崟鏈厤缃骇鍝佸瀷鍙�");
+ }
+
+ /*鏂板鎶ュ伐鎶曞叆琛�(鏃燘OM鍦烘櫙: 鎶曞叆=浜у嚭鍨嬪彿, 鏁伴噺鎸夋湰娆℃姤宸ユ暟閲�)*/
+ ProductionProductInput productionProductInput = new ProductionProductInput();
+ productionProductInput.setProductModelId(outputProductModelId);
+ productionProductInput.setQuantity(dto.getQuantity());
+ productionProductInput.setProductMainId(productionProductMain.getId());
+ productionProductInputMapper.insert(productionProductInput);
+ stockUtils.substractStock(outputProductModelId, dto.getQuantity(), StockOutQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_OUT.getCode(), productionProductMain.getId());
+
+ /*鏂板鎶ュ伐浜у嚭琛�*/
+ ProductionProductOutput productionProductOutput = new ProductionProductOutput();
+ productionProductOutput.setProductMainId(productionProductMain.getId());
+ productionProductOutput.setProductModelId(outputProductModelId);
+ productionProductOutput.setQuantity(dto.getQuantity() != null ? dto.getQuantity() : BigDecimal.ZERO);
+ productionProductOutput.setScrapQty(dto.getScrapQty() != null ? dto.getScrapQty() : BigDecimal.ZERO);
+ productionProductOutputMapper.insert(productionProductOutput);
+ //鍚堟牸鏁伴噺=鎶ュ伐鏁伴噺-鎶ュ簾鏁伴噺
+ BigDecimal productQty = productionProductOutput.getQuantity().subtract(productionProductOutput.getScrapQty());
+ // 鏄惁闇�瑕佽川妫�锛氭寜 product_process.is_quality 鍒ゆ柇锛�1-闇�瑕侊紝0-涓嶉渶瑕侊級
+ boolean needQuality = isNeedQualityByWorkOrder(productWorkOrder);
+
+ //鍙湁鍚堟牸鏁伴噺>0鎵嶈兘澧炲姞鐩稿簲鏁版嵁
+ if (productQty.compareTo(BigDecimal.ZERO) > 0) {
+ // 闇�瑕佽川妫�鏃舵墠鏂板杩囩▼妫�/鍑哄巶妫�
+ if (needQuality) {
+ createQualityInspect(productionProductMain.getId(), outputProductModelId, productQty, 1, "鐢熶骇鎶ュ伐");
+ }
+ stockUtils.addStock(outputProductModelId, productQty, StockInQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_IN.getCode(), productionProductMain.getId());
+ /*鏇存柊宸ュ崟鍜岀敓浜ц鍗�*/
+ int woRows = productWorkOrderMapper.addCompleteQtyIfNotExceed(dto.getWorkOrderId(), productQty);
+ if (woRows <= 0) {
+ ProductWorkOrder current = productWorkOrderMapper.selectById(dto.getWorkOrderId());
+ throw new ServiceException("鏈鐢熶骇鏁伴噺涓嶈兘澶т簬鍓╀綑鏁伴噺锛屽墿浣欐暟閲�: "
+ + (current == null ? "0" : current.getPlanQuantity().subtract(current.getCompleteQuantity())));
+ }
+
+ // 鏃犲伐鑹鸿矾绾垮満鏅細鎶ュ伐鍗宠鍏ョ敓浜ц鍗曞畬鎴愭暟閲�
+ int poRows = productOrderMapper.addCompleteQtyIfNotExceed(productOrder.getId(), productQty);
+ if (poRows <= 0) {
+ ProductOrder currentOrder = productOrderMapper.selectById(productOrder.getId());
+ throw new ServiceException("鏈鐢熶骇鏁伴噺涓嶈兘澶т簬璁㈠崟鍓╀綑鏁伴噺锛屽墿浣欐暟閲�: "
+ + (currentOrder == null ? "0" : currentOrder.getQuantity().subtract(currentOrder.getCompleteQuantity())));
+ }
+ ProductOrder latestOrder = productOrderMapper.selectById(productOrder.getId());
+ if (needQuality
+ && latestOrder != null
+ && latestOrder.getCompleteQuantity() != null
+ && latestOrder.getQuantity() != null
+ && latestOrder.getCompleteQuantity().compareTo(latestOrder.getQuantity()) >= 0) {
+ // 璁㈠崟瀹屾垚鏃舵柊澧炲嚭鍘傛
+ createQualityInspect(productionProductMain.getId(), outputProductModelId, productQty, 2, null);
+ }
+ /*娣诲姞鐢熶骇鏍哥畻 鍖哄垎宸ュ簭鏄浠惰繕鏄鏃�*/
+ BigDecimal workHours = durationMinutes.divide(BigDecimal.valueOf(60), 2, RoundingMode.HALF_UP);
+
+ SalesLedgerProductionAccounting salesLedgerProductionAccounting = SalesLedgerProductionAccounting.builder()
+ .productMainId(productionProductMain.getId())
+ .schedulingUserId(user.getUserId())
+ .schedulingUserName(user.getNickName())
+ .finishedNum(productQty)
+ .workHours(workHours)
+ .process(resolveProcessTypeName(productWorkOrder))
+ .schedulingDate(LocalDate.now())
+ .tenantId(dto.getTenantId())
+ .build();
+ salesLedgerProductionAccountingMapper.insert(salesLedgerProductionAccounting);
+ }
+ //濡傛灉鎶ュ簾鏁伴噺>0,闇�瑕佽繘鍏ユ姤搴熺殑搴撳瓨
+ if (ObjectUtils.isNotEmpty(dto.getScrapQty())) {
+ if (dto.getScrapQty().compareTo(BigDecimal.ZERO) > 0) {
+ stockUtils.addUnStock(outputProductModelId, dto.getScrapQty(), StockInUnQualifiedRecordTypeEnum.PRODUCTION_SCRAP.getCode(), productionProductMain.getId());
+ }
+ }
+ return true;
+ }
+
+ /**
+ * 鍒涘缓璐ㄦ鍙婅川妫�鍙傛暟
+ */
+ private void createQualityInspect(Long productMainId, Long productModelId, BigDecimal qty, Integer inspectType, String process) {
+ ProductModel productModel = productModelMapper.selectById(productModelId);
+ if (productModel == null) {
+ return;
+ }
+ Product product = productMapper.selectById(productModel.getProductId());
+ if (product == null) {
+ return;
+ }
+ QualityInspect qualityInspect = new QualityInspect();
+ qualityInspect.setProductId(product.getId());
+ qualityInspect.setProductName(product.getProductName());
+ qualityInspect.setModel(productModel.getModel());
+ qualityInspect.setUnit(productModel.getUnit());
+ qualityInspect.setQuantity(qty);
+ qualityInspect.setProcess(process);
+ qualityInspect.setInspectState(0);
+ qualityInspect.setInspectType(inspectType);
+ qualityInspect.setProductMainId(productMainId);
+ qualityInspect.setProductModelId(productModelId);
+ qualityInspectMapper.insert(qualityInspect);
+
+ List<QualityTestStandard> qualityTestStandard = qualityTestStandardMapper.getQualityTestStandardByProductId(product.getId(), inspectType, process);
+ if (qualityTestStandard.isEmpty()) {
+ return;
+ }
+ qualityInspect.setTestStandardId(qualityTestStandard.get(0).getId());
+ qualityInspectMapper.updateById(qualityInspect);
+ qualityTestStandardParamMapper.selectList(Wrappers.<QualityTestStandardParam>lambdaQuery()
+ .eq(QualityTestStandardParam::getTestStandardId, qualityTestStandard.get(0).getId()))
+ .forEach(qualityTestStandardParam -> {
+ QualityInspectParam param = new QualityInspectParam();
+ BeanUtils.copyProperties(qualityTestStandardParam, param);
+ param.setId(null);
+ param.setInspectId(qualityInspect.getId());
+ qualityInspectParamMapper.insert(param);
+ });
+ }
+
+ /**
+ * 鏄惁闇�瑕佽川妫�锛氫緷鎹伐搴忚〃 is_quality锛�1-闇�瑕侊紝0-涓嶉渶瑕侊級
+ */
+ private boolean isNeedQualityByWorkOrder(ProductWorkOrder workOrder) {
+ if (workOrder == null || workOrder.getProductProcessRouteItemId() == null) {
+ return true;
+ }
+ ProductProcessRouteItem routeItem = productProcessRouteItemMapper.selectById(workOrder.getProductProcessRouteItemId());
+ if (routeItem == null || routeItem.getProcessId() == null) {
+ return true;
+ }
+ ProductProcess process = productProcessMapper.selectById(routeItem.getProcessId());
+ if (process == null || process.getIsQuality() == null) {
+ return true;
+ }
+ return process.getIsQuality();
+ }
+
+ /**
+ * 鑾峰彇宸ュ簭瀵瑰簲鐨勨�滈儴浠剁被鍨嬧�濇枃妗�
+ */
+ private String resolveProcessTypeName(ProductWorkOrder workOrder) {
+ if (workOrder == null || workOrder.getProductProcessRouteItemId() == null) {
+ return "鍏朵粬";
+ }
+ ProductProcessRouteItem routeItem = productProcessRouteItemMapper.selectById(workOrder.getProductProcessRouteItemId());
+ if (routeItem == null || routeItem.getProcessId() == null) {
+ return "鍏朵粬";
+ }
+ ProductProcess process = productProcessMapper.selectById(routeItem.getProcessId());
+ if (process == null || process.getType() == null) {
+ return "鍏朵粬";
+ }
+ for (ProductProcessEnum value : ProductProcessEnum.values()) {
+ if (value.getCode().equals(process.getType())) {
+ return value.getInfo();
+ }
+ }
+ return "鍏朵粬";
+ }
+
+ private void saveDailyDurations(ProductionProductMain main, LocalDateTime start, LocalDateTime end) {
+ if (main == null || start == null || end == null) {
+ return;
+ }
+ if (end.isBefore(start)) {
+ return;
+ }
+
+ // 闃叉閲嶅鍐欙紙渚嬪璇噸澶嶇粨鏉熸椂锛夛紝鍏堝垹鍐嶆彃
+ productionProductReportDailyMapper.delete(
+ Wrappers.<ProductionProductReportDaily>lambdaQuery()
+ .eq(ProductionProductReportDaily::getProductMainId, main.getId())
+ );
+
+ LocalDateTime cursor = start;
+ while (cursor.isBefore(end)) {
+ LocalDate date = cursor.toLocalDate();
+ LocalDateTime nextDayStart = date.plusDays(1).atStartOfDay();
+ LocalDateTime sliceEnd = end.isBefore(nextDayStart) ? end : nextDayStart;
+
+ long seconds = Duration.between(cursor, sliceEnd).getSeconds();
+ BigDecimal minutes = secondsToMinutesExact(seconds);
+ if (minutes.compareTo(BigDecimal.ZERO) > 0) {
+ ProductionProductReportDaily daily = new ProductionProductReportDaily();
+ daily.setProductMainId(main.getId());
+ daily.setWorkOrderId(main.getWorkOrderId());
+ daily.setProductProcessRouteItemId(main.getProductProcessRouteItemId());
+ daily.setUserId(main.getUserId());
+ daily.setReportDate(date);
+ daily.setStartTime(cursor);
+ daily.setEndTime(sliceEnd);
+ daily.setDurationMinutes(minutes);
+ productionProductReportDailyMapper.insert(daily);
+ }
+ cursor = sliceEnd;
+ }
+ }
+
+ /**
+ * 绉掕浆鍒嗛挓锛氬寘鍚垎绉掑苟鍚戜笂鍙栨暣鍒板垎閽�
+ */
+ private BigDecimal secondsToMinutesExact(long seconds) {
+ if (seconds <= 0L) {
+ return BigDecimal.ZERO;
+ }
+ return BigDecimal.valueOf(seconds).divide(BigDecimal.valueOf(60), 2, RoundingMode.HALF_UP);
+ }
+
+ @Override
+ public Boolean removeProductMain(Long id) {
+ //鍒ゆ柇璇ユ潯鎶ュ伐鏄惁涓嶅悎鏍煎鐞�,濡傛灉涓嶅悎鏍煎鐞嗕簡锛屽垯涓嶅厑璁稿垹闄�
+ List<QualityInspect> qualityInspects = qualityInspectMapper.selectList(Wrappers.<QualityInspect>lambdaQuery().eq(QualityInspect::getProductMainId, id));
+ if (qualityInspects.size() > 0) {
+ List<QualityUnqualified> qualityUnqualifieds = qualityUnqualifiedMapper.selectList(Wrappers.<QualityUnqualified>lambdaQuery()
+ .in(QualityUnqualified::getInspectId, qualityInspects.stream().map(QualityInspect::getId).collect(Collectors.toList())));
+ if (qualityUnqualifieds.size() > 0 && qualityUnqualifieds.get(0).getInspectState() == 1) {
+ throw new ServiceException("璇ユ潯鎶ュ伐宸茬粡涓嶅悎鏍煎鐞嗕簡锛屼笉鍏佽鍒犻櫎");
+ }
+ }
+ ProductionProductMain productionProductMain = productionProductMainMapper.selectById(id);
+ List<ProductionProductOutput> outputList = productionProductOutputMapper.selectList(
+ Wrappers.<ProductionProductOutput>lambdaQuery().eq(ProductionProductOutput::getProductMainId, productionProductMain.getId())
+ );
+ ProductionProductOutput productionProductOutput = outputList.isEmpty() ? null : outputList.get(0);
+ /*鍒犻櫎鏍哥畻*/
+ salesLedgerProductionAccountingMapper.delete(
+ new LambdaQueryWrapper<SalesLedgerProductionAccounting>()
+ .eq(SalesLedgerProductionAccounting::getProductMainId, productionProductMain.getId())
+ );
+ /*鏇存柊宸ュ崟鍜岀敓浜ц鍗�*/
+ ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(productionProductMain.getWorkOrderId());
+ BigDecimal validQuantity = BigDecimal.ZERO;
+ if (productWorkOrder != null && productionProductOutput != null) {
+ BigDecimal outputQty = productionProductOutput.getQuantity() == null ? BigDecimal.ZERO : productionProductOutput.getQuantity();
+ BigDecimal scrapQty = productionProductOutput.getScrapQty() == null ? BigDecimal.ZERO : productionProductOutput.getScrapQty();
+ BigDecimal completeQty = productWorkOrder.getCompleteQuantity() == null ? BigDecimal.ZERO : productWorkOrder.getCompleteQuantity();
+
+ validQuantity = outputQty.subtract(scrapQty);
+
+ productWorkOrder.setCompleteQuantity(completeQty.subtract(validQuantity));
+ productWorkOrder.setActualEndTime(null);
+ productWorkOrderMapper.updateById(productWorkOrder);
+ } else if (productWorkOrder == null) {
+ throw new ServiceException("鎿嶄綔澶辫触锛氬伐鍗曚俊鎭垨浜у嚭璁板綍涓嶅瓨鍦�");
+ }
+ // 鏃犲伐鑹鸿矾绾垮満鏅細鍒犻櫎鎶ュ伐鏃跺彧瑕佹湁鏈夋晥浜у嚭灏辨墸鍑忕敓浜ц鍗曞畬鎴愭暟閲�
+ if (productionProductOutput != null && validQuantity.compareTo(BigDecimal.ZERO) > 0) {
+ ProductOrder productOrder = productOrderMapper.selectById(productWorkOrder.getProductOrderId());
+ if (productOrder == null) {
+ throw new ServiceException("鍏宠仈鐨勭敓浜ц鍗曚笉瀛樺湪");
+ }
+ BigDecimal orderCompleteQty = productOrder.getCompleteQuantity() == null ? BigDecimal.ZERO : productOrder.getCompleteQuantity();
+ BigDecimal newCompleteQty = orderCompleteQty.subtract(validQuantity);
+ productOrder.setCompleteQuantity(newCompleteQty.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : newCompleteQty);
+ productOrder.setEndTime(null);
+ productOrderMapper.updateById(productOrder);
+ }
+ //鍒犻櫎璐ㄦ
qualityInspectMapper.selectList(
new LambdaQueryWrapper<QualityInspect>()
- .eq(QualityInspect::getProductMainId, id)
+ .eq(QualityInspect::getProductMainId, productionProductMain.getId())
).forEach(q -> {
qualityInspectParamMapper.delete(
new LambdaQueryWrapper<QualityInspectParam>()
.eq(QualityInspectParam::getInspectId, q.getId()));
qualityInspectMapper.deleteById(q.getId());
+ stockUtils.deleteStockInRecord(q.getId(), StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode());
});
// 鍒犻櫎浜у嚭璁板綍
productionProductOutputMapper.delete(new LambdaQueryWrapper<ProductionProductOutput>()
- .eq(ProductionProductOutput::getProductMainId, id)
- );
-
- // 鍒犻櫎鍏宠仈鐨勬牳绠楁暟鎹�
- salesLedgerProductionAccountingMapper.delete(
- new LambdaQueryWrapper<SalesLedgerProductionAccounting>()
- .eq(SalesLedgerProductionAccounting::getSalesLedgerWorkId, id)
- );
-
+ .eq(ProductionProductOutput::getProductMainId, productionProductMain.getId()));
+ //鍒犻櫎鎶曞叆璁板綍
+ productionProductInputMapper.delete(new LambdaQueryWrapper<ProductionProductInput>()
+ .eq(ProductionProductInput::getProductMainId, productionProductMain.getId()));
+ //鍒犻櫎鎶ュ簾鐨勫叆搴撹褰�
+ stockUtils.deleteStockInRecord(productionProductMain.getId(), StockInUnQualifiedRecordTypeEnum.PRODUCTION_SCRAP.getCode());
+ //鍒犻櫎涓嶉渶瑕佽川妫�鐨勫悎鏍煎叆搴�
+ stockUtils.deleteStockInRecord(productionProductMain.getId(), StockInQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_IN.getCode());
+ //鍒犻櫎鎶曞叆瀵瑰簲鐨勫嚭搴撹褰�
+ stockUtils.deleteStockOutRecord(productionProductMain.getId(), StockOutQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_OUT.getCode());
// 鍒犻櫎涓昏〃
- return productionProductMainMapper.deleteById(id) > 0;
+ productionProductMainMapper.deleteById(productionProductMain.getId());
+ return true;
+ }
+
+ @Override
+ public ArrayList<Long> listMain(List<Long> idList) {
+ return productionProductMainMapper.listMain(idList);
}
}
--
Gitblit v1.9.3