From 2e71bdbcdf853bb35e68016b84f0254f7366bfeb Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 24 四月 2026 11:14:28 +0800
Subject: [PATCH] 文件工具类变更
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java | 112 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 75 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
index 1f79c28..56cfbb0 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -6,7 +6,6 @@
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.exception.ServiceException;
import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.framework.web.domain.R;
@@ -14,8 +13,9 @@
import com.ruoyi.production.mapper.*;
import com.ruoyi.production.pojo.ProductionAccount;
import com.ruoyi.production.pojo.ProductionOperationTask;
-import com.ruoyi.production.pojo.ProductionPlan;
+import com.ruoyi.production.pojo.ProductionOrder;
import com.ruoyi.production.pojo.ProductionProductMain;
+import com.ruoyi.production.service.ProductionOrderService;
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.quality.mapper.QualityInspectMapper;
@@ -44,7 +44,9 @@
import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
@@ -66,8 +68,9 @@
private final ProductionAccountMapper productionAccountMapper;
private final SalesLedgerMapper salesLedgerMapper;
private final PurchaseLedgerMapper purchaseLedgerMapper;
- private final ProductionPlanMapper productionPlanMapper;
+ private final ProductionOrderMapper productionOrderMapper;
private final ProductionOperationTaskMapper productionOperationTaskMapper;
+ private final ProductionOrderService productionOrderService;
private final TechnologyRoutingMapper technologyRoutingMapper;
private final TechnologyBomStructureMapper technologyBomStructureMapper;
private final InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
@@ -253,49 +256,70 @@
* 鏂板鐢熶骇鏁版嵁
*/
public void addProductionData(SalesLedgerProduct salesLedgerProduct) {
- if (!Integer.valueOf(1).equals(salesLedgerProduct.getType())) {
- return;
+ ProductionOrder productionOrder = new ProductionOrder();
+ productionOrder.setSalesLedgerId(salesLedgerProduct.getSalesLedgerId());
+ productionOrder.setProductModelId(salesLedgerProduct.getProductModelId());
+ productionOrder.setSaleLedgerProductId(salesLedgerProduct.getId().intValue());
+ productionOrder.setNpsNo(generateNextOrderNo(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"))));
+ productionOrder.setQuantity(salesLedgerProduct.getQuantity());
+ productionOrder.setCompleteQuantity(BigDecimal.ZERO);
+
+ TechnologyRouting routing = technologyRoutingMapper.selectOne(
+ new QueryWrapper<TechnologyRouting>().lambda()
+ .eq(TechnologyRouting::getProductModelId, salesLedgerProduct.getProductModelId())
+ .orderByDesc(TechnologyRouting::getCreateTime)
+ .last("LIMIT 1"));
+ if (routing != null) {
+ productionOrder.setTechnologyRoutingId(routing.getId());
}
- SalesLedger salesLedger = salesLedgerMapper.selectById(salesLedgerProduct.getSalesLedgerId());
- ProductionPlan productionPlan = new ProductionPlan();
- productionPlan.setApplyNo(buildSalesPlanApplyNo(salesLedgerProduct.getId()));
- productionPlan.setSource("sales");
- productionPlan.setProductModelId(salesLedgerProduct.getProductModelId());
- productionPlan.setQtyRequired(salesLedgerProduct.getQuantity());
- productionPlan.setRemark("閿�鍞彴璐﹁嚜鍔ㄧ敓鎴�");
- productionPlan.setIssued(Boolean.FALSE);
- productionPlan.setStatus(0);
- if (salesLedger != null) {
- productionPlan.setMpsNo(salesLedger.getSalesContractNo());
- if (salesLedger.getDeliveryDate() != null) {
- productionPlan.setRequiredDate(salesLedger.getDeliveryDate().atStartOfDay());
- productionPlan.setPromisedDeliveryDate(salesLedger.getDeliveryDate().atStartOfDay());
- }
+ productionOrderMapper.insert(productionOrder);
+ if (productionOrder.getTechnologyRoutingId() != null) {
+ productionOrderService.syncProductionOrderSnapshot(productionOrder.getId());
}
- productionPlanMapper.insert(productionPlan);
}
/**
* 鍒犻櫎鐢熶骇鏁版嵁
*/
public void deleteProductionData(List<Long> productIds) {
- List<String> applyNos = productIds.stream()
- .filter(Objects::nonNull)
- .map(this::buildSalesPlanApplyNo)
- .collect(Collectors.toList());
- if (CollectionUtils.isEmpty(applyNos)) {
+ List<ProductionOrder> productionOrders = productionOrderMapper.selectList(
+ new LambdaQueryWrapper<ProductionOrder>()
+ .in(ProductionOrder::getSaleLedgerProductId, productIds.stream().map(Long::intValue).collect(Collectors.toList())));
+ if (org.springframework.util.CollectionUtils.isEmpty(productionOrders)) {
return;
}
- List<ProductionPlan> productionPlans = productionPlanMapper.selectList(
- new LambdaQueryWrapper<ProductionPlan>().in(ProductionPlan::getApplyNo, applyNos));
- if (CollectionUtils.isEmpty(productionPlans)) {
- return;
+ List<Long> orderIds = productionOrders.stream().map(ProductionOrder::getId).collect(Collectors.toList());
+ List<Long> taskIds = productionOperationTaskMapper.selectList(
+ new LambdaQueryWrapper<ProductionOperationTask>()
+ .in(ProductionOperationTask::getProductionOrderId, orderIds))
+ .stream().map(ProductionOperationTask::getId).collect(Collectors.toList());
+ if (!taskIds.isEmpty()) {
+ List<ProductionProductMain> productMains = productionProductMainMapper.selectList(
+ new LambdaQueryWrapper<ProductionProductMain>()
+ .in(ProductionProductMain::getProductionOperationTaskId, taskIds));
+ List<Long> productMainIds = productMains.stream().map(ProductionProductMain::getId).collect(Collectors.toList());
+ if (!productMainIds.isEmpty()) {
+ List<QualityInspect> qualityInspects = qualityInspectMapper.selectList(
+ new LambdaQueryWrapper<QualityInspect>().in(QualityInspect::getProductMainId, productMainIds));
+ qualityInspects.forEach(qualityInspect -> {
+ if (qualityInspect.getInspectState() == 1) {
+ throw new RuntimeException("宸叉彁浜ょ殑妫�楠屽崟涓嶈兘鍒犻櫎");
+ }
+ });
+ productionProductOutputMapper.deleteByProductMainIds(productMainIds);
+ productionProductInputMapper.deleteByProductMainIds(productMainIds);
+ qualityInspectMapper.deleteByProductMainIds(productMainIds);
+ productionAccountMapper.delete(new LambdaQueryWrapper<ProductionAccount>()
+ .in(ProductionAccount::getProductionProductMainId, productMainIds));
+ for (Long productMainId : productMainIds) {
+ stockUtils.deleteStockOutRecord(productMainId, StockOutQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_OUT.getCode());
+ stockUtils.deleteStockInRecord(productMainId, StockInUnQualifiedRecordTypeEnum.PRODUCTION_SCRAP.getCode());
+ }
+ }
+ productionProductMainMapper.delete(new LambdaQueryWrapper<ProductionProductMain>()
+ .in(ProductionProductMain::getProductionOperationTaskId, taskIds));
}
- boolean hasIssued = productionPlans.stream().anyMatch(item -> Boolean.TRUE.equals(item.getIssued()) || (item.getStatus() != null && item.getStatus() > 0));
- if (hasIssued) {
- throw new ServiceException("瀵瑰簲鐢熶骇璁″垝宸蹭笅鍙戠敓鎴愮敓浜ц鍗曪紝璇峰厛澶勭悊鐢熶骇璁″垝/鐢熶骇璁㈠崟鍚庡啀淇敼閿�鍞彴璐�");
- }
- productionPlanMapper.deleteByIds(productionPlans.stream().map(ProductionPlan::getId).collect(Collectors.toList()));
+ productionOrderService.removeProductionOrder(orderIds);
}
@Override
@@ -408,7 +432,21 @@
return R.ok();
}
- private String buildSalesPlanApplyNo(Long salesLedgerProductId) {
- return "SALE_PRODUCT_" + salesLedgerProductId;
+ private String generateNextOrderNo(String datePrefix) {
+ QueryWrapper<ProductionOrder> queryWrapper = new QueryWrapper<>();
+ queryWrapper.likeRight("nps_no", "SC" + datePrefix);
+ queryWrapper.orderByDesc("nps_no");
+ queryWrapper.last("LIMIT 1");
+ ProductionOrder latestOrder = productionOrderMapper.selectOne(queryWrapper);
+ int sequence = 1;
+ if (latestOrder != null && latestOrder.getNpsNo() != null && !latestOrder.getNpsNo().isEmpty()) {
+ String sequenceStr = latestOrder.getNpsNo().substring(("SC" + datePrefix).length());
+ try {
+ sequence = Integer.parseInt(sequenceStr) + 1;
+ } catch (NumberFormatException e) {
+ sequence = 1;
+ }
+ }
+ return "SC" + datePrefix + String.format("%04d", sequence);
}
}
--
Gitblit v1.9.3