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/production/service/impl/ProductionOrderServiceImpl.java | 241 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 237 insertions(+), 4 deletions(-)
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 8562f46..978c76d 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
@@ -12,10 +12,15 @@
import com.ruoyi.production.mapper.ProductionOperationTaskMapper;
import com.ruoyi.production.mapper.ProductionOrderBomMapper;
import com.ruoyi.production.mapper.ProductionOrderMapper;
+import com.ruoyi.production.mapper.ProductionOrderPickMapper;
+import com.ruoyi.production.mapper.ProductionOrderPickRecordMapper;
import com.ruoyi.production.mapper.ProductionOrderRoutingMapper;
import com.ruoyi.production.mapper.ProductionOrderRoutingOperationMapper;
import com.ruoyi.production.mapper.ProductionOrderRoutingOperationParamMapper;
+import com.ruoyi.production.mapper.ProductionPlanMapper;
import com.ruoyi.production.mapper.ProductionProductMainMapper;
+import com.ruoyi.production.pojo.ProductionOrderPick;
+import com.ruoyi.production.pojo.ProductionOrderPickRecord;
import com.ruoyi.production.pojo.ProductionBomStructure;
import com.ruoyi.production.pojo.ProductionOperationTask;
import com.ruoyi.production.pojo.ProductionOrder;
@@ -23,7 +28,9 @@
import com.ruoyi.production.pojo.ProductionOrderRouting;
import com.ruoyi.production.pojo.ProductionOrderRoutingOperation;
import com.ruoyi.production.pojo.ProductionOrderRoutingOperationParam;
+import com.ruoyi.production.pojo.ProductionPlan;
import com.ruoyi.production.pojo.ProductionProductMain;
+import com.ruoyi.production.enums.ProductOrderStatusEnum;
import com.ruoyi.production.service.ProductionOrderService;
import com.ruoyi.technology.mapper.TechnologyBomMapper;
import com.ruoyi.technology.mapper.TechnologyBomStructureMapper;
@@ -41,11 +48,16 @@
import java.math.BigDecimal;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Comparator;
import java.util.HashMap;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.Set;
import java.util.stream.Collectors;
@Service
@@ -60,6 +72,9 @@
private final ProductionOrderBomMapper productionOrderBomMapper;
private final ProductionBomStructureMapper productionBomStructureMapper;
private final ProductionProductMainMapper productionProductMainMapper;
+ private final ProductionOrderPickMapper productionOrderPickMapper;
+ private final ProductionOrderPickRecordMapper productionOrderPickRecordMapper;
+ private final ProductionPlanMapper productionPlanMapper;
private final TechnologyRoutingMapper technologyRoutingMapper;
private final TechnologyRoutingOperationMapper technologyRoutingOperationMapper;
private final TechnologyRoutingOperationParamMapper technologyRoutingOperationParamMapper;
@@ -86,23 +101,35 @@
@Override
public boolean saveProductionOrder(ProductionOrder productionOrder) {
ProductionOrder oldOrder = productionOrder.getId() == null ? null : this.getById(productionOrder.getId());
+ // 涓嬪崟鍏ュ彛缁熶竴琛ラ綈鏉ユ簮鍗曟嵁銆佽鍒掑拰宸ヨ壓淇℃伅锛岄伩鍏嶅墠绔垎鍒紶澶氬瀛楁銆�
+ validateAndFillOrder(productionOrder, oldOrder);
if (productionOrder.getNpsNo() == null || productionOrder.getNpsNo().trim().isEmpty()) {
productionOrder.setNpsNo(generateNextOrderNo());
}
if (productionOrder.getCompleteQuantity() == null) {
productionOrder.setCompleteQuantity(BigDecimal.ZERO);
}
+ if (productionOrder.getStatus() == null) {
+ productionOrder.setStatus(ProductOrderStatusEnum.WAIT.getCode());
+ }
boolean saved = this.saveOrUpdate(productionOrder);
if (!saved) {
return false;
}
+ syncProductionPlanIssueStatus(oldOrder, productionOrder);
boolean needSync = productionOrder.getTechnologyRoutingId() != null
&& (oldOrder == null
|| !Objects.equals(oldOrder.getTechnologyRoutingId(), productionOrder.getTechnologyRoutingId())
+ || !Objects.equals(oldOrder.getProductModelId(), productionOrder.getProductModelId())
+ || compareDecimal(oldOrder.getQuantity(), productionOrder.getQuantity()) != 0
|| productionOrderRoutingMapper.selectCount(Wrappers.<ProductionOrderRouting>lambdaQuery()
.eq(ProductionOrderRouting::getProductionOrderId, productionOrder.getId())) == 0);
if (needSync) {
+ // 宸ヨ壓銆佷骇鍝佹垨鏁伴噺鍙樺寲鍚庯紝璁㈠崟蹇収蹇呴』鍜屽綋鍓嶄笅鍗曟暟鎹噸鏂板榻愩��
syncProductionOrderSnapshot(productionOrder.getId());
+ } else {
+ // 鏈噸寤哄揩鐓ф椂锛屼篃瑕佺‘淇濆鏂欎富鍗曞拰璁㈠崟鏁伴噺淇濇寔鍚屾銆�
+ upsertOrderPick(productionOrder);
}
return true;
}
@@ -113,7 +140,9 @@
return false;
}
for (Long id : ids) {
+ ProductionOrder productionOrder = this.getById(id);
clearProductionSnapshot(id);
+ releaseProductionPlanIssueStatus(productionOrder);
}
return this.removeByIds(ids);
}
@@ -131,6 +160,7 @@
if (technologyRouting == null) {
throw new ServiceException("Technology routing not found");
}
+ // 璁㈠崟蹇収鎸夆�滃厛娓呭悗寤衡�濆鐞嗭紝淇濊瘉宸ヨ壓璺嚎銆佸伐搴忋�佸弬鏁般�丅OM 鍏ㄩ儴鏉ヨ嚜鍚屼竴鐗堟湰銆�
clearProductionSnapshot(productionOrderId);
ProductionOrderRouting orderRouting = new ProductionOrderRouting();
@@ -149,6 +179,7 @@
.orderByAsc(TechnologyRoutingOperation::getDragSort)
.orderByAsc(TechnologyRoutingOperation::getId));
for (TechnologyRoutingOperation sourceOperation : routingOperations) {
+ // 璁㈠崟宸ュ簭淇濆瓨鐨勬槸宸ヨ壓宸ュ簭蹇収锛屽悗缁姤宸ュ彧渚濊禆蹇収锛屼笉鍐嶇洿鎺ュ紩鐢ㄥ伐鑹轰富鏁版嵁銆�
ProductionOrderRoutingOperation targetOperation = new ProductionOrderRoutingOperation();
targetOperation.setProductionOrderId(productionOrder.getId());
targetOperation.setTechnologyRoutingOperationId(sourceOperation.getId());
@@ -164,7 +195,7 @@
task.setPlanQuantity(defaultDecimal(productionOrder.getQuantity()));
task.setCompleteQuantity(BigDecimal.ZERO);
task.setWorkOrderNo(generateNextTaskNo());
- task.setStatus(1);
+ task.setStatus(2);
productionOperationTaskMapper.insert(task);
List<TechnologyRoutingOperationParam> sourceParams = technologyRoutingOperationParamMapper.selectList(
@@ -172,6 +203,7 @@
.eq(TechnologyRoutingOperationParam::getTechnologyRoutingOperationId, sourceOperation.getId())
.orderByAsc(TechnologyRoutingOperationParam::getId));
for (TechnologyRoutingOperationParam sourceParam : sourceParams) {
+ // 宸ュ簭鎵ц鍙傛暟鍚屾牱鍋氬揩鐓э紝閬垮厤宸ヨ壓鍙傛暟璋冩暣褰卞搷宸蹭笅杈捐鍗曘��
ProductionOrderRoutingOperationParam targetParam = new ProductionOrderRoutingOperationParam();
targetParam.setProductionOrderId(productionOrder.getId());
targetParam.setTechnologyRoutingOperationId(targetOperation.getId());
@@ -193,6 +225,7 @@
}
syncProductionOrderBomSnapshot(productionOrder, technologyRouting);
+ upsertOrderPick(productionOrder);
return syncedParamCount;
}
@@ -209,6 +242,7 @@
.eq(TechnologyBomStructure::getBomId, technologyBom.getId())
.orderByAsc(TechnologyBomStructure::getId));
TechnologyBomStructure root = structureList.stream().filter(item -> item.getParentId() == null).findFirst().orElse(null);
+ BigDecimal orderQuantity = defaultDecimal(productionOrder.getQuantity());
ProductionOrderBom orderBom = new ProductionOrderBom();
orderBom.setProductionOrderId(productionOrder.getId());
@@ -216,12 +250,13 @@
orderBom.setProductModelId(root != null ? root.getProductModelId() : productionOrder.getProductModelId());
orderBom.setTechnologyOperationId(root == null ? null : root.getOperationId());
orderBom.setUnitQuantity(root != null && root.getUnitQuantity() != null ? root.getUnitQuantity() : BigDecimal.ONE);
- orderBom.setDemandedQuantity(root != null && root.getDemandedQuantity() != null ? root.getDemandedQuantity() : defaultDecimal(productionOrder.getQuantity()));
+ orderBom.setDemandedQuantity(orderQuantity);
orderBom.setUnit(root == null ? null : root.getUnit());
productionOrderBomMapper.insert(orderBom);
Map<Long, Long> idMap = new HashMap<>();
for (TechnologyBomStructure source : structureList) {
+ // 瀛愯妭鐐� parentId 闇�瑕佹槧灏勬垚鏂板揩鐓ц妭鐐� id锛屾墠鑳戒繚鐣欏師濮� BOM 灞傜骇銆�
ProductionBomStructure target = new ProductionBomStructure();
target.setProductionOrderId(productionOrder.getId());
target.setProductionOrderBomId(orderBom.getId());
@@ -229,7 +264,7 @@
target.setProductModelId(source.getProductModelId());
target.setTechnologyOperationId(source.getOperationId());
target.setUnitQuantity(source.getUnitQuantity());
- target.setDemandedQuantity(source.getDemandedQuantity());
+ target.setDemandedQuantity(resolveBomDemandQuantity(source, orderQuantity));
target.setUnit(source.getUnit());
productionBomStructureMapper.insert(target);
idMap.put(source.getId(), target.getId());
@@ -237,11 +272,19 @@
}
private void clearProductionSnapshot(Long productionOrderId) {
+ // 宸蹭骇鐢熼鏂欒褰曞悗绂佹閲嶅缓锛岄伩鍏嶅鏂�/鎶曟枡渚濇嵁涓庤鍗曞揩鐓ц劚鑺傘��
+ boolean hasPickRecord = productionOrderPickRecordMapper.selectCount(
+ Wrappers.<ProductionOrderPickRecord>lambdaQuery()
+ .eq(ProductionOrderPickRecord::getProductionOrderId, productionOrderId)) > 0;
+ if (hasPickRecord) {
+ throw new ServiceException("Production order pick records already exist, snapshot cannot be regenerated");
+ }
List<Long> taskIds = productionOperationTaskMapper.selectList(
Wrappers.<ProductionOperationTask>lambdaQuery()
.eq(ProductionOperationTask::getProductionOrderId, productionOrderId))
.stream().map(ProductionOperationTask::getId).collect(Collectors.toList());
if (!taskIds.isEmpty()) {
+ // 宸叉湁鎶ュ伐璁板綍璇存槑璁㈠崟宸插紑宸ワ紝姝ゆ椂涓嶅厑璁稿啀閲嶅缓蹇収銆�
boolean started = productionProductMainMapper.selectCount(
Wrappers.<ProductionProductMain>lambdaQuery()
.in(ProductionProductMain::getProductionOperationTaskId, taskIds)) > 0;
@@ -261,13 +304,14 @@
.eq(ProductionBomStructure::getProductionOrderId, productionOrderId));
productionOrderBomMapper.delete(Wrappers.<ProductionOrderBom>lambdaQuery()
.eq(ProductionOrderBom::getProductionOrderId, productionOrderId));
+ productionOrderPickMapper.delete(Wrappers.<ProductionOrderPick>lambdaQuery()
+ .eq(ProductionOrderPick::getProductionOrderId, productionOrderId));
}
private LambdaQueryWrapper<ProductionOrder> buildQueryWrapper(ProductionOrderDto dto) {
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())
@@ -314,4 +358,193 @@
private BigDecimal defaultDecimal(BigDecimal value) {
return value == null ? BigDecimal.ZERO : value;
}
+
+ private void validateAndFillOrder(ProductionOrder productionOrder, ProductionOrder oldOrder) {
+ if (productionOrder == null) {
+ throw new ServiceException("Production order is required");
+ }
+ fillFromProductionPlans(productionOrder);
+ if (productionOrder.getProductModelId() == null) {
+ 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");
+ }
+ if (productionOrder.getTechnologyRoutingId() == null) {
+ // 鏈樉寮忔寚瀹氬伐鑹鸿矾绾挎椂锛屾寜浜у搧瑙勬牸閫夋渶鏂颁竴鏉″伐鑹轰綔涓洪粯璁よ矾绾裤��
+ TechnologyRouting technologyRouting = technologyRoutingMapper.selectOne(
+ Wrappers.<TechnologyRouting>lambdaQuery()
+ .eq(TechnologyRouting::getProductModelId, productionOrder.getProductModelId())
+ .orderByDesc(TechnologyRouting::getId)
+ .last("limit 1"));
+ if (technologyRouting == null) {
+ throw new ServiceException("No technology routing found for the product model");
+ }
+ productionOrder.setTechnologyRoutingId(technologyRouting.getId());
+ }
+ if (oldOrder != null && ProductOrderStatusEnum.isStarted(oldOrder.getStatus())) {
+ // 寮�宸ュ悗鍙厑璁镐慨姝ｉ潪鏍稿績瀛楁锛屾牳蹇冪敓浜т緷鎹攣瀹氥��
+ if (!Objects.equals(oldOrder.getProductModelId(), productionOrder.getProductModelId())
+ || !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 fillFromProductionPlans(ProductionOrder productionOrder) {
+ List<Long> planIds = parsePlanIds(productionOrder.getProductionPlanIds());
+ if (planIds.isEmpty()) {
+ return;
+ }
+ // 澶氳鍒掑悎骞惰浆鍗曟椂锛屾墍鏈夎鍒掑繀椤诲睘浜庡悓涓�瑙勬牸锛屼笖鍙兘涓嬪彂涓�娆°��
+ List<ProductionPlan> productionPlans = productionPlanMapper.selectBatchIds(planIds);
+ if (productionPlans.size() != planIds.size()) {
+ throw new ServiceException("Some production plans do not exist");
+ }
+ Set<Long> productModelIds = productionPlans.stream()
+ .map(ProductionPlan::getProductModelId)
+ .collect(Collectors.toSet());
+ if (productModelIds.size() > 1) {
+ throw new ServiceException("Selected production plans must belong to the same product model");
+ }
+ if (Boolean.TRUE.equals(productionPlans.stream().anyMatch(item -> Boolean.TRUE.equals(item.getIssued())))) {
+ throw new ServiceException("Selected production plans already issued");
+ }
+ ProductionPlan firstPlan = productionPlans.get(0);
+ if (productionOrder.getProductModelId() == null) {
+ productionOrder.setProductModelId(firstPlan.getProductModelId());
+ } else if (!Objects.equals(productionOrder.getProductModelId(), firstPlan.getProductModelId())) {
+ throw new ServiceException("productModelId does not match the production plans");
+ }
+ if (productionOrder.getQuantity() == null || productionOrder.getQuantity().compareTo(BigDecimal.ZERO) <= 0) {
+ productionOrder.setQuantity(productionPlans.stream()
+ .map(ProductionPlan::getQtyRequired)
+ .reduce(BigDecimal.ZERO, BigDecimal::add));
+ }
+ if (productionOrder.getPlanCompleteTime() == null) {
+ LocalDate planCompleteTime = productionPlans.stream()
+ .map(this::resolvePlanCompleteDate)
+ .filter(Objects::nonNull)
+ .min(Comparator.naturalOrder())
+ .orElse(null);
+ productionOrder.setPlanCompleteTime(planCompleteTime);
+ }
+ productionOrder.setProductionPlanIds(formatPlanIds(planIds));
+ }
+
+ private void syncProductionPlanIssueStatus(ProductionOrder oldOrder, ProductionOrder newOrder) {
+ // 鍙鐞嗘湰娆″閲忓彉鍖栵紝閬垮厤鏃犲叧璁″垝琚噸澶嶅啓鐘舵�併��
+ Set<Long> oldIds = new LinkedHashSet<>(parsePlanIds(oldOrder == null ? null : oldOrder.getProductionPlanIds()));
+ Set<Long> newIds = new LinkedHashSet<>(parsePlanIds(newOrder == null ? null : newOrder.getProductionPlanIds()));
+ Set<Long> toRelease = new LinkedHashSet<>(oldIds);
+ toRelease.removeAll(newIds);
+ Set<Long> toIssue = new LinkedHashSet<>(newIds);
+ toIssue.removeAll(oldIds);
+ if (!toRelease.isEmpty()) {
+ updatePlanIssuedFlag(new ArrayList<>(toRelease), false);
+ }
+ if (!toIssue.isEmpty()) {
+ updatePlanIssuedFlag(new ArrayList<>(toIssue), true);
+ }
+ }
+
+ private void releaseProductionPlanIssueStatus(ProductionOrder productionOrder) {
+ if (productionOrder == null) {
+ return;
+ }
+ List<Long> planIds = parsePlanIds(productionOrder.getProductionPlanIds());
+ if (!planIds.isEmpty()) {
+ updatePlanIssuedFlag(planIds, false);
+ }
+ }
+
+ private void updatePlanIssuedFlag(List<Long> planIds, boolean issued) {
+ if (planIds == null || planIds.isEmpty()) {
+ return;
+ }
+ List<ProductionPlan> plans = productionPlanMapper.selectBatchIds(planIds);
+ for (ProductionPlan plan : plans) {
+ ProductionPlan update = new ProductionPlan();
+ update.setId(plan.getId());
+ update.setIssued(issued);
+ productionPlanMapper.updateById(update);
+ }
+ }
+
+ private void upsertOrderPick(ProductionOrder productionOrder) {
+ if (productionOrder == null || productionOrder.getId() == null) {
+ return;
+ }
+ // 璁㈠崟涓嬭揪鍚庤嚜鍔ㄧ敓鎴愪竴寮犲鏂欎富鍗曪紝鍚庣画棰嗘枡璁板綍閮芥寕鍦ㄨ繖寮犲崟涓娿��
+ ProductionOrderPick orderPick = productionOrderPickMapper.selectOne(
+ Wrappers.<ProductionOrderPick>lambdaQuery()
+ .eq(ProductionOrderPick::getProductionOrderId, productionOrder.getId())
+ .last("limit 1"));
+ if (orderPick == null) {
+ orderPick = new ProductionOrderPick();
+ orderPick.setProductionOrderId(productionOrder.getId());
+ }
+ orderPick.setProductModelId(productionOrder.getProductModelId() == null ? null : Math.toIntExact(productionOrder.getProductModelId()));
+ orderPick.setQuantity(defaultDecimal(productionOrder.getQuantity()));
+ orderPick.setRemark("涓嬪崟鑷姩鐢熸垚");
+ if (orderPick.getId() == null) {
+ productionOrderPickMapper.insert(orderPick);
+ } else {
+ productionOrderPickMapper.updateById(orderPick);
+ }
+ }
+
+ private BigDecimal resolveBomDemandQuantity(TechnologyBomStructure source, BigDecimal orderQuantity) {
+ // 宸ヨ壓 BOM 涓殑闇�姹傞噺鎸夆�滃崟浠堕渶姹� * 璁㈠崟鏁伴噺鈥濆睍寮�鎴愯鍗曠骇闇�姹傘��
+ BigDecimal baseQuantity = source.getDemandedQuantity() != null ? source.getDemandedQuantity() : source.getUnitQuantity();
+ baseQuantity = baseQuantity == null ? BigDecimal.ZERO : baseQuantity;
+ if (baseQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ return BigDecimal.ZERO;
+ }
+ return baseQuantity.multiply(orderQuantity);
+ }
+
+ private List<Long> parsePlanIds(String productionPlanIds) {
+ if (productionPlanIds == null || productionPlanIds.trim().isEmpty()) {
+ return new ArrayList<>();
+ }
+ String normalized = productionPlanIds.replace("[", "").replace("]", "").trim();
+ if (normalized.isEmpty()) {
+ return new ArrayList<>();
+ }
+ return java.util.Arrays.stream(normalized.split(","))
+ .map(String::trim)
+ .filter(item -> !item.isEmpty())
+ .map(Long::valueOf)
+ .distinct()
+ .collect(Collectors.toList());
+ }
+
+ private String formatPlanIds(List<Long> planIds) {
+ if (planIds == null || planIds.isEmpty()) {
+ return null;
+ }
+ return planIds.stream()
+ .distinct()
+ .map(String::valueOf)
+ .collect(Collectors.joining(",", "[", "]"));
+ }
+
+ private LocalDate resolvePlanCompleteDate(ProductionPlan productionPlan) {
+ if (productionPlan == null) {
+ return null;
+ }
+ if (productionPlan.getPromisedDeliveryDate() != null) {
+ return productionPlan.getPromisedDeliveryDate().toLocalDate();
+ }
+ if (productionPlan.getRequiredDate() != null) {
+ return productionPlan.getRequiredDate().toLocalDate();
+ }
+ return null;
+ }
+
+ private int compareDecimal(BigDecimal left, BigDecimal right) {
+ return defaultDecimal(left).compareTo(defaultDecimal(right));
+ }
}
--
Gitblit v1.9.3