From 398551392afc2ab879f837f60f95f9c9d8cf3c98 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 27 四月 2026 13:08:24 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java | 163 ++++++++++++++++++++++++++----------------------------
1 files changed, 79 insertions(+), 84 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 b05665f..bb56608 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
@@ -16,14 +16,13 @@
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.production.bean.dto.ProductionOrderDto;
import com.ruoyi.production.bean.vo.ProductionOrderVo;
+import com.ruoyi.production.bean.vo.ProductionPlanVo;
import com.ruoyi.production.enums.ProductOrderStatusEnum;
import com.ruoyi.production.mapper.*;
import com.ruoyi.production.pojo.*;
import com.ruoyi.production.service.ProductionOrderService;
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.technology.mapper.*;
import com.ruoyi.technology.pojo.*;
import lombok.RequiredArgsConstructor;
@@ -105,7 +104,6 @@
if (!saved) {
return false;
}
- syncProductionPlanIssueStatus(oldOrder, productionOrder);
boolean needSync = productionOrder.getTechnologyRoutingId() != null
&& (oldOrder == null
|| !Objects.equals(oldOrder.getTechnologyRoutingId(), productionOrder.getTechnologyRoutingId())
@@ -180,6 +178,16 @@
}
@Override
+ public List<ProductionPlanVo> getSource(Long id) {
+ ProductionOrder productionOrder = baseMapper.selectById(id);
+ if (productionOrder != null && productionOrder.getProductionPlanIds() != null) {
+ List<Long> planIds = parsePlanIds(productionOrder.getProductionPlanIds());
+ return productionPlanMapper.getSource(planIds);
+ }
+ return null;
+ }
+
+ @Override
public int syncProductionOrderSnapshot(Long productionOrderId) {
ProductionOrder productionOrder = this.getById(productionOrderId);
if (productionOrder == null) {
@@ -224,11 +232,12 @@
ProductionOrderRoutingOperation targetOperation = new ProductionOrderRoutingOperation();
targetOperation.setProductionOrderId(productionOrder.getId());
targetOperation.setTechnologyRoutingOperationId(sourceOperation.getId());
- targetOperation.setTechnologyRoutingId(orderRouting.getId());
+ targetOperation.setOrderRoutingId(orderRouting.getId());
targetOperation.setProductModelId(sourceOperation.getProductModelId());
targetOperation.setDragSort(sourceOperation.getDragSort());
targetOperation.setIsQuality(sourceOperation.getIsQuality());
targetOperation.setOperationName(operationNameMap.get(sourceOperation.getTechnologyOperationId()));
+ targetOperation.setTechnologyOperationId(sourceOperation.getTechnologyOperationId());
productionOrderRoutingOperationMapper.insert(targetOperation);
ProductionOperationTask task = new ProductionOperationTask();
@@ -248,7 +257,7 @@
// 宸ュ簭鎵ц鍙傛暟鍚屾牱鍋氬揩鐓э紝閬垮厤宸ヨ壓鍙傛暟璋冩暣褰卞搷宸蹭笅杈捐鍗曘��
ProductionOrderRoutingOperationParam targetParam = new ProductionOrderRoutingOperationParam();
targetParam.setProductionOrderId(productionOrder.getId());
- targetParam.setTechnologyRoutingOperationId(targetOperation.getId());
+ targetParam.setProductionOrderRoutingOperationId(targetOperation.getId());
targetParam.setTechnologyRoutingOperationParamId(sourceParam.getId());
targetParam.setParamId(sourceParam.getParamId());
targetParam.setTechnologyOperationId(sourceParam.getTechnologyOperationId());
@@ -289,10 +298,9 @@
orderBom.setProductionOrderId(productionOrder.getId());
orderBom.setBomId(Long.valueOf(technologyBom.getId()));
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(orderQuantity);
- orderBom.setUnit(root == null ? null : root.getUnit());
+ orderBom.setRemark(technologyBom.getRemark());
+ orderBom.setBomNo(technologyBom.getBomNo());
+ orderBom.setVersion(technologyBom.getVersion());
productionOrderBomMapper.insert(orderBom);
Map<Long, Long> idMap = new HashMap<>();
@@ -305,7 +313,7 @@
target.setProductModelId(source.getProductModelId());
target.setTechnologyOperationId(source.getOperationId());
target.setUnitQuantity(source.getUnitQuantity());
- target.setDemandedQuantity(resolveBomDemandQuantity(source, orderQuantity));
+ target.setDemandedQuantity(source.getUnitQuantity().multiply(orderQuantity));
target.setUnit(source.getUnit());
productionBomStructureMapper.insert(target);
idMap.put(source.getId(), target.getId());
@@ -354,7 +362,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())
@@ -406,7 +413,6 @@
if (productionOrder == null) {
throw new ServiceException("鐢熶骇璁㈠崟涓嶈兘涓虹┖");
}
- fillFromSalesLedgerProduct(productionOrder);
fillFromProductionPlans(productionOrder);
if (productionOrder.getProductModelId() == null) {
throw new ServiceException("浜у搧瑙勬牸ID涓嶈兘涓虹┖");
@@ -414,54 +420,23 @@
if (defaultDecimal(productionOrder.getQuantity()).compareTo(BigDecimal.ZERO) <= 0) {
throw new ServiceException("涓嬪崟鏁伴噺蹇呴』澶т簬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("鏈壘鍒拌浜у搧瑙勬牸瀵瑰簲鐨勫伐鑹鸿矾绾�");
-// }
-// productionOrder.setTechnologyRoutingId(technologyRouting.getId());
-// }
+ 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) {
+ 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("鐢熶骇璁㈠崟宸插紑宸ワ紝涓嶈兘淇敼浜у搧銆佸伐鑹鸿矾绾挎垨鏁伴噺");
- }
- }
- }
-
- private void fillFromSalesLedgerProduct(ProductionOrder productionOrder) {
- if (productionOrder.getSalesLedgerProductId() == null) {
- return;
- }
- // 閿�鍞槑缁嗘槸璁㈠崟鏉ユ簮鏃讹紝浠ラ攢鍞槑缁嗕负鍑嗗洖濉攢鍞彴璐︺�佷骇鍝佽鏍煎拰榛樿鏁伴噺銆�
- SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(productionOrder.getSalesLedgerProductId().longValue());
- if (salesLedgerProduct == null) {
- throw new ServiceException("閿�鍞彴璐︿骇鍝佷笉瀛樺湪");
- }
- if (productionOrder.getSalesLedgerId() == null) {
- productionOrder.setSalesLedgerId(salesLedgerProduct.getSalesLedgerId());
- } else if (!Objects.equals(productionOrder.getSalesLedgerId(), salesLedgerProduct.getSalesLedgerId())) {
- throw new ServiceException("閿�鍞彴璐D涓庨攢鍞彴璐︿骇鍝佷笉涓�鑷�");
- }
- if (productionOrder.getProductModelId() == null) {
- productionOrder.setProductModelId(salesLedgerProduct.getProductModelId());
- } else if (!Objects.equals(productionOrder.getProductModelId(), salesLedgerProduct.getProductModelId())) {
- throw new ServiceException("浜у搧瑙勬牸ID涓庨攢鍞彴璐︿骇鍝佷笉涓�鑷�");
- }
- 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());
}
}
}
@@ -507,43 +482,73 @@
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);
+ // 鐢熶骇璁㈠崟鍒犻櫎--瀵瑰簲鐨勭敓浜ц鍒掔殑宸蹭笅鍙戞暟閲忚鍑忓幓
+ updatePlanIssuedFlag(planIds, productionOrder.getQuantity());
}
}
- private void updatePlanIssuedFlag(List<Long> planIds, boolean issued) {
+ //鐢熶骇璁㈠崟鍒犻櫎锛岀敓浜ц鍒掔殑宸蹭笅鍙戞暟閲忓搴斿彉鏇�
+ private void updatePlanIssuedFlag(List<Long> planIds, BigDecimal remainingAssignedQuantity) {
if (planIds == null || planIds.isEmpty()) {
return;
}
List<ProductionPlan> plans = productionPlanMapper.selectBatchIds(planIds);
+ //涓嬪彂鏁伴噺鍑忓幓
+ List<ProductionPlan> updates = new ArrayList<>();
for (ProductionPlan plan : plans) {
+ BigDecimal requiredQuantity = Optional.ofNullable(plan.getQtyRequired()).orElse(BigDecimal.ZERO);
+ if (requiredQuantity.compareTo(BigDecimal.ZERO) < 0) {
+ requiredQuantity = BigDecimal.ZERO;
+ }
+ BigDecimal remainingQuantity = resolveRemainingQuantity(plan);
+ BigDecimal historicalIssuedQuantity = requiredQuantity.subtract(remainingQuantity);
+ BigDecimal issuedQuantity = remainingAssignedQuantity.min(historicalIssuedQuantity);
+ remainingAssignedQuantity = remainingAssignedQuantity.subtract(issuedQuantity);
+ BigDecimal totalIssuedQuantity = historicalIssuedQuantity.subtract(issuedQuantity);
+ int planStatus = resolvePlanStatus(requiredQuantity, totalIssuedQuantity);
ProductionPlan update = new ProductionPlan();
update.setId(plan.getId());
- update.setIssued(issued);
- productionPlanMapper.updateById(update);
+ update.setStatus(planStatus);
+ update.setQuantityIssued(totalIssuedQuantity);
+ updates.add(update);
}
+ if (!updates.isEmpty()) {
+ productionPlanMapper.updateById(updates);
+ }
+ }
+
+ private BigDecimal resolveRemainingQuantity(ProductionPlan plan) {
+ if (plan == null) {
+ return BigDecimal.ZERO;
+ }
+ BigDecimal requiredQuantity = Optional.ofNullable(plan.getQtyRequired()).orElse(BigDecimal.ZERO);
+ if (requiredQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ return BigDecimal.ZERO;
+ }
+ BigDecimal issuedQuantity = Optional.ofNullable(plan.getQuantityIssued()).orElse(BigDecimal.ZERO);
+ if (issuedQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ return requiredQuantity;
+ }
+ if (issuedQuantity.compareTo(requiredQuantity) >= 0) {
+ return BigDecimal.ZERO;
+ }
+ return requiredQuantity.subtract(issuedQuantity);
+ }
+
+ private int resolvePlanStatus(BigDecimal requiredQuantity, BigDecimal issuedQuantity) {
+ if (requiredQuantity == null || requiredQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ return 0;
+ }
+ if (issuedQuantity == null || issuedQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ return 0;
+ }
+ return issuedQuantity.compareTo(requiredQuantity) < 0 ? 1 : 2;
}
private void upsertOrderPick(ProductionOrder productionOrder) {
@@ -567,16 +572,6 @@
} 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) {
--
Gitblit v1.9.3