From 4cb12d21253d754152b7591fe49fa131fed1b3c8 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 14:37:28 +0800
Subject: [PATCH] refactor(production): 移除销售台账关联逻辑并优化生产订单创建流程
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java | 112 +++++++++------------------
src/main/java/com/ruoyi/production/controller/ProductionOrderController.java | 15 +++
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 2
src/main/java/com/ruoyi/production/pojo/ProductionOrder.java | 16 +--
src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java | 40 ---------
src/main/resources/mapper/production/ProductionOrderMapper.xml | 2
6 files changed, 57 insertions(+), 130 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java b/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
index 32d48f2..2206cad 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionOrderController.java
@@ -8,6 +8,8 @@
import com.ruoyi.production.service.ProductionOrderService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -47,7 +49,18 @@
}
@PostMapping
- @Operation(summary = "鏂板鐢熶骇璁㈠崟")
+ @Operation(
+ summary = "鏂板鐢熶骇璁㈠崟",
+ description = "鏂板涓嬪崟鍙敮鎸佷袱绉嶆柟寮忥細1. 鐢熶骇璁″垝鐢熸垚锛屼紶 productionPlanIds锛岀郴缁熻嚜鍔ㄦ眹鎬昏鍒掑緱鍒颁骇鍝佽鏍煎拰鏁伴噺锛�"
+ + "2. 鎵嬪姩鏂板锛屽繀椤讳紶 productModelId 鍜� quantity銆�"
+ + "technologyRoutingId 涓虹┖鏃朵細鑷姩鍖归厤璇ヤ骇鍝佽鏍兼渶鏂板伐鑹鸿矾绾匡紝quantity 鏈�缁堝繀椤诲ぇ浜� 0銆�"
+ )
+ @io.swagger.v3.oas.annotations.parameters.RequestBody(
+ required = true,
+ description = "鍓嶇鍙嬪ソ鎻愮ず锛氬鏋滄槸鐢熶骇璁″垝鐢熸垚锛岃浼� productionPlanIds锛�"
+ + "濡傛灉鏄墜鍔ㄦ柊澧烇紝璇疯嚦灏戝～鍐� productModelId銆乹uantity锛屼笖 quantity 蹇呴』澶т簬 0銆�",
+ content = @Content(schema = @Schema(implementation = ProductionOrder.class))
+ )
public R<Boolean> add(@RequestBody ProductionOrder productionOrder) {
return R.ok(productionOrderService.saveProductionOrder(productionOrder));
}
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
index 0f634bd..a5570dd 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionOrder.java
@@ -29,13 +29,10 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @Schema(description = "閿�鍞彴璐d")
- private Long salesLedgerId;
-
- @Schema(description = "鐢熶骇璁″垝ID鍒楄〃锛屾牸寮忥細[1,2,3]")
+ @Schema(description = "鐢熶骇璁″垝ID鍒楄〃锛屾牸寮忥細[1,2,3]銆傚鏋滄寜鐢熶骇璁″垝鐢熸垚璁㈠崟锛屾柊澧炴椂浼犺繖涓瓧娈靛嵆鍙紝绯荤粺浼氳嚜鍔ㄦ眹鎬讳骇鍝佽鏍煎拰鏁伴噺銆�")
private String productionPlanIds;
- @Schema(description = "浜у搧瑙勬牸id")
+ @Schema(description = "浜у搧瑙勬牸id銆傛墜鍔ㄦ柊澧炴椂蹇呭～锛涘鏋滀紶浜� productionPlanIds锛屽垯鍙敱绯荤粺鑷姩甯﹀嚭銆�")
private Long productModelId;
@Schema(description = "鐢熶骇璁㈠崟鍙�")
@@ -49,10 +46,10 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @Schema(description = "宸ヨ壓璺嚎id")
+ @Schema(description = "宸ヨ壓璺嚎id銆傛柊澧炴椂閫夊～锛屼笉浼犲垯绯荤粺鎸変骇鍝佽鏍艰嚜鍔ㄥ尮閰嶆渶鏂板伐鑹鸿矾绾裤��")
private Long technologyRoutingId;
- @Schema(description = "闇�姹傛暟閲�")
+ @Schema(description = "闇�姹傛暟閲忋�傛墜鍔ㄦ柊澧炴椂蹇呭～涓斿繀椤诲ぇ浜� 0锛涘鏋滀紶浜� productionPlanIds锛屽垯鍙敱绯荤粺鑷姩甯﹀嚭銆�")
private BigDecimal quantity;
@Schema(description = "瀹屾垚鏁伴噺")
@@ -64,9 +61,6 @@
@Schema(description = "缁撴潫鏃ユ湡")
private LocalDateTime endTime;
- @Schema(description = "閿�鍞骇鍝佽鏍糹d")
- private Integer saleLedgerProductId;
-
@Schema(description = "鍒涘缓浜篒D")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
@@ -75,7 +69,7 @@
@TableField(fill = FieldFill.INSERT)
private Long deptId;
- @Schema(description = "璁″垝瀹屾垚鏃堕棿")
+ @Schema(description = "璁″垝瀹屾垚鏃堕棿銆傞�夊～锛涙寜鐢熶骇璁″垝鐢熸垚璁㈠崟鏃讹紝绯荤粺浼氫紭鍏堣嚜鍔ㄥ甫鍑轰氦鏈熴��")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate planCompleteTime;
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
index 8214709..978c76d 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
@@ -31,10 +31,6 @@
import com.ruoyi.production.pojo.ProductionPlan;
import com.ruoyi.production.pojo.ProductionProductMain;
import com.ruoyi.production.enums.ProductOrderStatusEnum;
-import com.ruoyi.sales.mapper.SalesLedgerMapper;
-import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
-import com.ruoyi.sales.pojo.SalesLedger;
-import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.production.service.ProductionOrderService;
import com.ruoyi.technology.mapper.TechnologyBomMapper;
import com.ruoyi.technology.mapper.TechnologyBomStructureMapper;
@@ -79,8 +75,6 @@
private final ProductionOrderPickMapper productionOrderPickMapper;
private final ProductionOrderPickRecordMapper productionOrderPickRecordMapper;
private final ProductionPlanMapper productionPlanMapper;
- private final SalesLedgerMapper salesLedgerMapper;
- private final SalesLedgerProductMapper salesLedgerProductMapper;
private final TechnologyRoutingMapper technologyRoutingMapper;
private final TechnologyRoutingOperationMapper technologyRoutingOperationMapper;
private final TechnologyRoutingOperationParamMapper technologyRoutingOperationParamMapper;
@@ -318,7 +312,6 @@
ProductionOrder query = dto == null ? new ProductionOrder() : dto;
return Wrappers.<ProductionOrder>lambdaQuery()
.eq(query.getId() != null, ProductionOrder::getId, query.getId())
- .eq(query.getSalesLedgerId() != null, ProductionOrder::getSalesLedgerId, query.getSalesLedgerId())
.eq(query.getProductModelId() != null, ProductionOrder::getProductModelId, query.getProductModelId())
.eq(query.getTechnologyRoutingId() != null, ProductionOrder::getTechnologyRoutingId, query.getTechnologyRoutingId())
.like(query.getNpsNo() != null && !query.getNpsNo().trim().isEmpty(), ProductionOrder::getNpsNo, query.getNpsNo())
@@ -370,10 +363,9 @@
if (productionOrder == null) {
throw new ServiceException("Production order is required");
}
- fillFromSalesLedgerProduct(productionOrder);
fillFromProductionPlans(productionOrder);
if (productionOrder.getProductModelId() == null) {
- throw new ServiceException("productModelId is required");
+ throw new ServiceException("productModelId is required when manually creating a production order");
}
if (defaultDecimal(productionOrder.getQuantity()).compareTo(BigDecimal.ZERO) <= 0) {
throw new ServiceException("quantity must be greater than 0");
@@ -396,36 +388,6 @@
|| !Objects.equals(oldOrder.getTechnologyRoutingId(), productionOrder.getTechnologyRoutingId())
|| compareDecimal(oldOrder.getQuantity(), productionOrder.getQuantity()) != 0) {
throw new ServiceException("Started production orders cannot modify product, routing or quantity");
- }
- }
- }
-
- private void fillFromSalesLedgerProduct(ProductionOrder productionOrder) {
- if (productionOrder.getSaleLedgerProductId() == null) {
- return;
- }
- // 閿�鍞槑缁嗘槸璁㈠崟鏉ユ簮鏃讹紝浠ラ攢鍞槑缁嗕负鍑嗗洖濉攢鍞彴璐︺�佷骇鍝佽鏍煎拰榛樿鏁伴噺銆�
- SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(productionOrder.getSaleLedgerProductId().longValue());
- if (salesLedgerProduct == null) {
- throw new ServiceException("Sales ledger product not found");
- }
- if (productionOrder.getSalesLedgerId() == null) {
- productionOrder.setSalesLedgerId(salesLedgerProduct.getSalesLedgerId());
- } else if (!Objects.equals(productionOrder.getSalesLedgerId(), salesLedgerProduct.getSalesLedgerId())) {
- throw new ServiceException("salesLedgerId does not match the sales ledger product");
- }
- if (productionOrder.getProductModelId() == null) {
- productionOrder.setProductModelId(salesLedgerProduct.getProductModelId());
- } else if (!Objects.equals(productionOrder.getProductModelId(), salesLedgerProduct.getProductModelId())) {
- throw new ServiceException("productModelId does not match the sales ledger product");
- }
- if (productionOrder.getQuantity() == null || productionOrder.getQuantity().compareTo(BigDecimal.ZERO) <= 0) {
- productionOrder.setQuantity(salesLedgerProduct.getQuantity());
- }
- if (productionOrder.getPlanCompleteTime() == null && productionOrder.getSalesLedgerId() != null) {
- SalesLedger salesLedger = salesLedgerMapper.selectById(productionOrder.getSalesLedgerId());
- if (salesLedger != null && salesLedger.getDeliveryDate() != null) {
- productionOrder.setPlanCompleteTime(salesLedger.getDeliveryDate());
}
}
}
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 ff43daf..a104fc1 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -245,8 +245,6 @@
}
ProductionAccount productionAccount = new ProductionAccount();
productionAccount.setProductionProductMainId(productionProductMain.getId());
- productionAccount.setSalesLedgerId(productionOrder.getSalesLedgerId());
- productionAccount.setSalesLedgerProductId(productionOrder.getSaleLedgerProductId() == null ? null : productionOrder.getSaleLedgerProductId().longValue());
productionAccount.setSchedulingUserId(user == null ? null : user.getUserId());
productionAccount.setSchedulingUserName(user == null ? dto.getUserName() : user.getNickName());
productionAccount.setFinishedNum(productQty);
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 56cfbb0..1f79c28 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -6,6 +6,7 @@
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;
@@ -13,9 +14,8 @@
import com.ruoyi.production.mapper.*;
import com.ruoyi.production.pojo.ProductionAccount;
import com.ruoyi.production.pojo.ProductionOperationTask;
-import com.ruoyi.production.pojo.ProductionOrder;
+import com.ruoyi.production.pojo.ProductionPlan;
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,9 +44,7 @@
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;
@@ -68,9 +66,8 @@
private final ProductionAccountMapper productionAccountMapper;
private final SalesLedgerMapper salesLedgerMapper;
private final PurchaseLedgerMapper purchaseLedgerMapper;
- private final ProductionOrderMapper productionOrderMapper;
+ private final ProductionPlanMapper productionPlanMapper;
private final ProductionOperationTaskMapper productionOperationTaskMapper;
- private final ProductionOrderService productionOrderService;
private final TechnologyRoutingMapper technologyRoutingMapper;
private final TechnologyBomStructureMapper technologyBomStructureMapper;
private final InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
@@ -256,70 +253,49 @@
* 鏂板鐢熶骇鏁版嵁
*/
public void addProductionData(SalesLedgerProduct salesLedgerProduct) {
- 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());
+ if (!Integer.valueOf(1).equals(salesLedgerProduct.getType())) {
+ return;
}
- productionOrderMapper.insert(productionOrder);
- if (productionOrder.getTechnologyRoutingId() != null) {
- productionOrderService.syncProductionOrderSnapshot(productionOrder.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());
+ }
}
+ productionPlanMapper.insert(productionPlan);
}
/**
* 鍒犻櫎鐢熶骇鏁版嵁
*/
public void deleteProductionData(List<Long> productIds) {
- 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)) {
+ List<String> applyNos = productIds.stream()
+ .filter(Objects::nonNull)
+ .map(this::buildSalesPlanApplyNo)
+ .collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(applyNos)) {
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));
+ List<ProductionPlan> productionPlans = productionPlanMapper.selectList(
+ new LambdaQueryWrapper<ProductionPlan>().in(ProductionPlan::getApplyNo, applyNos));
+ if (CollectionUtils.isEmpty(productionPlans)) {
+ return;
}
- productionOrderService.removeProductionOrder(orderIds);
+ 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()));
}
@Override
@@ -432,21 +408,7 @@
return R.ok();
}
- 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);
+ private String buildSalesPlanApplyNo(Long salesLedgerProductId) {
+ return "SALE_PRODUCT_" + salesLedgerProductId;
}
}
diff --git a/src/main/resources/mapper/production/ProductionOrderMapper.xml b/src/main/resources/mapper/production/ProductionOrderMapper.xml
index 3c26d4e..b2d1cb6 100644
--- a/src/main/resources/mapper/production/ProductionOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderMapper.xml
@@ -5,7 +5,6 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ruoyi.production.pojo.ProductionOrder">
<id column="id" property="id" />
- <result column="sales_ledger_id" property="salesLedgerId" />
<result column="production_plan_ids" property="productionPlanIds" />
<result column="product_model_id" property="productModelId" />
<result column="nps_no" property="npsNo" />
@@ -16,7 +15,6 @@
<result column="complete_quantity" property="completeQuantity" />
<result column="start_time" property="startTime" />
<result column="end_time" property="endTime" />
- <result column="sale_ledger_product_id" property="saleLedgerProductId" />
<result column="create_user" property="createUser" />
<result column="dept_id" property="deptId" />
</resultMap>
--
Gitblit v1.9.3