From 0005d49a697ce934c6fc2a61ecb75d881b9a76f2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 11:48:31 +0800
Subject: [PATCH] feat(production): 完善生产订单管理功能
---
src/main/java/com/ruoyi/production/controller/ProductionPlanController.java | 2
src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java | 234 +++++++++++++++++++++++++
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 27 ++
src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java | 277 ++++++++++++++++++++++++++++++
4 files changed, 528 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionPlanController.java b/src/main/java/com/ruoyi/production/controller/ProductionPlanController.java
index 29ec05b..0edd898 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionPlanController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionPlanController.java
@@ -82,7 +82,7 @@
@Log(title = "鍒犻櫎鐢熶骇璁″垝", businessType = BusinessType.DELETE)
@ApiOperation("鍒犻櫎鐢熶骇璁″垝")
public R delete(@RequestBody List<Long> ids) {
- return R.ok(productionPlanService.removeByIds(ids));
+ return R.ok(productionPlanService.delete(ids));
}
@PostMapping("/downloadTemplate")
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..8214709 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,13 @@
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.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;
@@ -41,11 +52,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 +76,11 @@
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 SalesLedgerMapper salesLedgerMapper;
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
private final TechnologyRoutingMapper technologyRoutingMapper;
private final TechnologyRoutingOperationMapper technologyRoutingOperationMapper;
private final TechnologyRoutingOperationParamMapper technologyRoutingOperationParamMapper;
@@ -86,23 +107,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 +146,9 @@
return false;
}
for (Long id : ids) {
+ ProductionOrder productionOrder = this.getById(id);
clearProductionSnapshot(id);
+ releaseProductionPlanIssueStatus(productionOrder);
}
return this.removeByIds(ids);
}
@@ -131,6 +166,7 @@
if (technologyRouting == null) {
throw new ServiceException("Technology routing not found");
}
+ // 璁㈠崟蹇収鎸夆�滃厛娓呭悗寤衡�濆鐞嗭紝淇濊瘉宸ヨ壓璺嚎銆佸伐搴忋�佸弬鏁般�丅OM 鍏ㄩ儴鏉ヨ嚜鍚屼竴鐗堟湰銆�
clearProductionSnapshot(productionOrderId);
ProductionOrderRouting orderRouting = new ProductionOrderRouting();
@@ -149,6 +185,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 +201,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 +209,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 +231,7 @@
}
syncProductionOrderBomSnapshot(productionOrder, technologyRouting);
+ upsertOrderPick(productionOrder);
return syncedParamCount;
}
@@ -209,6 +248,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 +256,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 +270,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 +278,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,6 +310,8 @@
.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) {
@@ -314,4 +365,224 @@
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");
+ }
+ fillFromSalesLedgerProduct(productionOrder);
+ fillFromProductionPlans(productionOrder);
+ if (productionOrder.getProductModelId() == null) {
+ throw new ServiceException("productModelId is required");
+ }
+ 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 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());
+ }
+ }
+ }
+
+ 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));
+ }
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
index 6113736..6ba0eb0 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
@@ -1,56 +1,176 @@
package com.ruoyi.production.service.impl;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.production.bean.dto.ProductionPlanDto;
+import com.ruoyi.production.bean.dto.ProductionOrderDto;
import com.ruoyi.production.bean.vo.ProductionPlanVo;
import com.ruoyi.production.mapper.ProductionPlanMapper;
+import com.ruoyi.production.pojo.ProductionOrder;
import com.ruoyi.production.pojo.ProductionPlan;
+import com.ruoyi.production.service.ProductionOrderService;
import com.ruoyi.production.service.ProductionPlanService;
+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 jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Comparator;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
@Service
@RequiredArgsConstructor
+@Transactional(rollbackFor = Exception.class)
public class ProductionPlanServiceImpl extends ServiceImpl<ProductionPlanMapper, ProductionPlan> implements ProductionPlanService {
+
+ private final ProductionOrderService productionOrderService;
+ private final SalesLedgerMapper salesLedgerMapper;
+ private final SalesLedgerProductMapper salesLedgerProductMapper;
+
@Override
public IPage<ProductionPlanVo> listPage(Page<ProductionPlanDto> page, ProductionPlanDto productionPlanDto) {
- return null;
+ Page<ProductionPlan> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
+ return this.page(entityPage, buildQueryWrapper(productionPlanDto))
+ .convert(item -> BeanUtil.copyProperties(item, ProductionPlanVo.class));
}
@Override
public void loadProdData() {
-
+ // 鐢ㄩ攢鍞槑缁嗕綔涓烘潵婧愬悓姝ョ敓浜ц鍒掞紝source 瀛楁鎵挎媴骞傜瓑鍘婚噸浣滅敤銆�
+ List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(
+ Wrappers.<SalesLedgerProduct>lambdaQuery()
+ .isNotNull(SalesLedgerProduct::getProductModelId)
+ .gt(SalesLedgerProduct::getQuantity, BigDecimal.ZERO));
+ for (SalesLedgerProduct salesLedgerProduct : salesLedgerProducts) {
+ String source = buildSalesSource(salesLedgerProduct.getId());
+ long exists = this.count(Wrappers.<ProductionPlan>lambdaQuery().eq(ProductionPlan::getSource, source));
+ if (exists > 0) {
+ continue;
+ }
+ SalesLedger salesLedger = salesLedgerMapper.selectById(salesLedgerProduct.getSalesLedgerId());
+ ProductionPlan productionPlan = new ProductionPlan();
+ productionPlan.setMpsNo(generateNextPlanNo());
+ productionPlan.setProductModelId(salesLedgerProduct.getProductModelId());
+ productionPlan.setQtyRequired(defaultDecimal(salesLedgerProduct.getQuantity()));
+ productionPlan.setRequiredDate(resolveDeliveryTime(salesLedger));
+ productionPlan.setPromisedDeliveryDate(resolveDeliveryTime(salesLedger));
+ productionPlan.setSource(source);
+ productionPlan.setIssued(Boolean.FALSE);
+ productionPlan.setState("1");
+ this.save(productionPlan);
+ }
}
@Override
public void syncProdDataJob() {
-
+ loadProdData();
}
@Override
public boolean combine(ProductionPlanDto productionPlanDto) {
- return false;
+ // 澶氫釜璁″垝鍚堝苟杞崟鍚庯紝浠嶇粺涓�璧扮敓浜ц鍗曚繚瀛橀�昏緫锛岄伩鍏嶄袱濂椾笅鍗曟祦绋嬩笉涓�鑷淬��
+ if (productionPlanDto == null || productionPlanDto.getIds() == null || productionPlanDto.getIds().isEmpty()) {
+ throw new ServiceException("璇烽�夋嫨鐢熶骇璁″垝");
+ }
+ List<ProductionPlan> productionPlans = this.listByIds(productionPlanDto.getIds());
+ if (productionPlans.size() != productionPlanDto.getIds().size()) {
+ throw new ServiceException("閮ㄥ垎鐢熶骇璁″垝涓嶅瓨鍦�");
+ }
+ if (productionPlans.stream().anyMatch(item -> Boolean.TRUE.equals(item.getIssued()))) {
+ throw new ServiceException("宸蹭笅鍙戠殑鐢熶骇璁″垝涓嶈兘閲嶅杞崟");
+ }
+ Long productModelId = productionPlans.stream()
+ .map(ProductionPlan::getProductModelId)
+ .distinct()
+ .reduce((left, right) -> {
+ throw new ServiceException("浠呮敮鎸佺浉鍚屼骇鍝佽鏍肩殑鐢熶骇璁″垝鍚堝苟杞崟");
+ })
+ .orElseThrow(() -> new ServiceException("鐢熶骇璁″垝缂哄皯浜у搧瑙勬牸"));
+ BigDecimal totalRequiredQuantity = productionPlans.stream()
+ .map(ProductionPlan::getQtyRequired)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal assignedQuantity = defaultDecimal(productionPlanDto.getTotalAssignedQuantity());
+ if (assignedQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+ assignedQuantity = totalRequiredQuantity;
+ }
+ if (assignedQuantity.compareTo(totalRequiredQuantity) > 0) {
+ throw new ServiceException("涓嬪彂鏁伴噺涓嶈兘澶т簬璁″垝鎬婚渶姹傛暟閲�");
+ }
+
+ ProductionOrder productionOrder = new ProductionOrder();
+ productionOrder.setProductModelId(productModelId);
+ productionOrder.setQuantity(assignedQuantity);
+ productionOrder.setProductionPlanIds(formatPlanIds(productionPlans));
+ productionOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime() != null
+ ? productionPlanDto.getPlanCompleteTime()
+ : resolveEarliestPlanDate(productionPlans));
+ productionOrder.setStrength(productionPlanDto.getStrength());
+ return productionOrderService.saveProductionOrder(productionOrder);
}
@Override
public boolean add(ProductionPlanDto productionPlanDto) {
- return false;
+ // 鎵嬪伐寤鸿鍒掓椂琛ラ綈榛樿缂栧彿鍜岀姸鎬侊紝淇濊瘉鍚庣画鍙互鐩存帴涓嬪彂杞崟銆�
+ ProductionPlan productionPlan = BeanUtil.copyProperties(productionPlanDto, ProductionPlan.class);
+ validateProductionPlan(productionPlan, false);
+ if (productionPlan.getMpsNo() == null || productionPlan.getMpsNo().trim().isEmpty()) {
+ productionPlan.setMpsNo(generateNextPlanNo());
+ }
+ if (productionPlan.getIssued() == null) {
+ productionPlan.setIssued(Boolean.FALSE);
+ }
+ if (productionPlan.getState() == null || productionPlan.getState().trim().isEmpty()) {
+ productionPlan.setState("1");
+ }
+ return this.save(productionPlan);
}
@Override
public boolean update(ProductionPlanDto productionPlanDto) {
- return false;
+ // 宸蹭笅鍙戣鍒掔殑鏍稿績瀛楁涓嶈兘鍐嶅彉鏇达紝鍚﹀垯浼氬拰宸茬敓鎴愯鍗曡劚鑺傘��
+ if (productionPlanDto == null || productionPlanDto.getId() == null) {
+ throw new ServiceException("鐢熶骇璁″垝ID涓嶈兘涓虹┖");
+ }
+ ProductionPlan current = this.getById(productionPlanDto.getId());
+ if (current == null) {
+ throw new ServiceException("鐢熶骇璁″垝涓嶅瓨鍦�");
+ }
+ if (Boolean.TRUE.equals(current.getIssued()) && hasPlanCoreChanges(current, productionPlanDto)) {
+ throw new ServiceException("宸蹭笅鍙戠殑鐢熶骇璁″垝涓嶅厑璁镐慨鏀逛骇鍝併�佹暟閲忓拰浜ゆ湡");
+ }
+ ProductionPlan update = BeanUtil.copyProperties(productionPlanDto, ProductionPlan.class);
+ validateProductionPlan(update, true);
+ return this.updateById(update);
}
@Override
public boolean delete(List<Long> ids) {
- return false;
+ // 鍒犻櫎鍓嶆牎楠� issued锛岄伩鍏嶆妸宸茶浆鍗曡鍒掔洿鎺ヤ粠婧愬ご鍒犳帀銆�
+ if (ids == null || ids.isEmpty()) {
+ return false;
+ }
+ List<ProductionPlan> productionPlans = this.listByIds(ids);
+ if (productionPlans.stream().anyMatch(item -> Boolean.TRUE.equals(item.getIssued()))) {
+ throw new ServiceException("宸蹭笅鍙戠殑鐢熶骇璁″垝涓嶅厑璁稿垹闄�");
+ }
+ return this.removeByIds(ids);
}
@Override
@@ -62,4 +182,104 @@
public void exportProdData(HttpServletResponse response, List<Long> ids) {
}
+
+ private LambdaQueryWrapper<ProductionPlan> buildQueryWrapper(ProductionPlanDto dto) {
+ ProductionPlan query = dto == null ? new ProductionPlan() : dto;
+ return Wrappers.<ProductionPlan>lambdaQuery()
+ .eq(query.getId() != null, ProductionPlan::getId, query.getId())
+ .eq(query.getProductModelId() != null, ProductionPlan::getProductModelId, query.getProductModelId())
+ .eq(query.getIssued() != null, ProductionPlan::getIssued, query.getIssued())
+ .eq(query.getState() != null && !query.getState().trim().isEmpty(), ProductionPlan::getState, query.getState())
+ .eq(query.getIsAudit() != null && !query.getIsAudit().trim().isEmpty(), ProductionPlan::getIsAudit, query.getIsAudit())
+ .like(query.getMpsNo() != null && !query.getMpsNo().trim().isEmpty(), ProductionPlan::getMpsNo, query.getMpsNo())
+ .like(query.getSource() != null && !query.getSource().trim().isEmpty(), ProductionPlan::getSource, query.getSource())
+ .orderByDesc(ProductionPlan::getId);
+ }
+
+ private void validateProductionPlan(ProductionPlan productionPlan, boolean update) {
+ if (productionPlan == null) {
+ throw new ServiceException("鐢熶骇璁″垝涓嶈兘涓虹┖");
+ }
+ if (update && productionPlan.getId() == null) {
+ throw new ServiceException("鐢熶骇璁″垝ID涓嶈兘涓虹┖");
+ }
+ if (productionPlan.getProductModelId() == null) {
+ throw new ServiceException("productModelId涓嶈兘涓虹┖");
+ }
+ if (defaultDecimal(productionPlan.getQtyRequired()).compareTo(BigDecimal.ZERO) <= 0) {
+ throw new ServiceException("qtyRequired蹇呴』澶т簬0");
+ }
+ }
+
+ private boolean hasPlanCoreChanges(ProductionPlan current, ProductionPlanDto update) {
+ // 杩欎簺瀛楁浼氱洿鎺ュ奖鍝嶈浆鍗曠粨鏋滐紝鐢ㄦ潵鍒ゆ柇鏄惁灞炰簬鏍稿績鍙樻洿銆�
+ return !Objects.equals(current.getProductModelId(), update.getProductModelId())
+ || defaultDecimal(current.getQtyRequired()).compareTo(defaultDecimal(update.getQtyRequired())) != 0
+ || !Objects.equals(toLocalDate(current.getPromisedDeliveryDate()), update.getPlanCompleteTime())
+ || !Objects.equals(toLocalDate(current.getRequiredDate()), toLocalDate(update.getRequiredDate()));
+ }
+
+ private String generateNextPlanNo() {
+ // 缂栧彿鎸夋棩鏈熼�掑鐢熸垚锛屾柟渚垮拰璁㈠崟銆佸伐鍗曠粺涓�杩借釜銆�
+ String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+ String prefix = "MPS" + datePrefix;
+ ProductionPlan latestPlan = this.getOne(Wrappers.<ProductionPlan>lambdaQuery()
+ .likeRight(ProductionPlan::getMpsNo, prefix)
+ .orderByDesc(ProductionPlan::getMpsNo)
+ .last("limit 1"));
+ int sequence = 1;
+ if (latestPlan != null && latestPlan.getMpsNo() != null && latestPlan.getMpsNo().startsWith(prefix)) {
+ try {
+ sequence = Integer.parseInt(latestPlan.getMpsNo().substring(prefix.length())) + 1;
+ } catch (NumberFormatException ignored) {
+ sequence = 1;
+ }
+ }
+ return prefix + String.format("%04d", sequence);
+ }
+
+ private String formatPlanIds(List<ProductionPlan> productionPlans) {
+ return productionPlans.stream()
+ .map(ProductionPlan::getId)
+ .distinct()
+ .map(String::valueOf)
+ .collect(Collectors.joining(",", "[", "]"));
+ }
+
+ private LocalDate resolveEarliestPlanDate(List<ProductionPlan> productionPlans) {
+ return productionPlans.stream()
+ .map(this::resolvePlanDate)
+ .filter(Objects::nonNull)
+ .min(Comparator.naturalOrder())
+ .orElse(null);
+ }
+
+ private LocalDate resolvePlanDate(ProductionPlan productionPlan) {
+ if (productionPlan.getPromisedDeliveryDate() != null) {
+ return productionPlan.getPromisedDeliveryDate().toLocalDate();
+ }
+ if (productionPlan.getRequiredDate() != null) {
+ return productionPlan.getRequiredDate().toLocalDate();
+ }
+ return null;
+ }
+
+ private LocalDateTime resolveDeliveryTime(SalesLedger salesLedger) {
+ if (salesLedger == null || salesLedger.getDeliveryDate() == null) {
+ return null;
+ }
+ return salesLedger.getDeliveryDate().atStartOfDay();
+ }
+
+ private String buildSalesSource(Long salesLedgerProductId) {
+ return "salesLedgerProduct:" + salesLedgerProductId;
+ }
+
+ private LocalDate toLocalDate(LocalDateTime value) {
+ return value == null ? null : value.toLocalDate();
+ }
+
+ private BigDecimal defaultDecimal(BigDecimal value) {
+ return value == null ? BigDecimal.ZERO : value;
+ }
}
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 92fd9f2..ff43daf 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -19,6 +19,7 @@
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.production.bean.dto.ProductStructureDto;
import com.ruoyi.production.bean.dto.ProductionProductMainDto;
+import com.ruoyi.production.enums.ProductOrderStatusEnum;
import com.ruoyi.production.mapper.*;
import com.ruoyi.production.pojo.*;
import com.ruoyi.production.service.ProductionProductMainService;
@@ -107,6 +108,7 @@
}
private Boolean addProductMainByProductionTask(ProductionProductMainDto dto) {
+ // 鎶ュ伐浠ヨ鍗曞伐搴忓揩鐓т负鍑嗭紝閬垮厤宸ヨ壓涓绘暟鎹彉鏇村悗褰卞搷鍘嗗彶宸ュ崟鎵ц銆�
SysUser user = userMapper.selectUserById(dto.getUserId());
ProductionOperationTask productionOperationTask = productionOperationTaskMapper.selectById(dto.getProductionOperationTaskId());
if (productionOperationTask == null) {
@@ -144,6 +146,7 @@
productStructureDto.setUnitQuantity(BigDecimal.ONE);
productStructureDtos.add(productStructureDto);
for (ProductStructureDto item : productStructureDtos) {
+ // 褰撳墠瀹炵幇鎸夊伐搴忔垚鍝佺洿鎺ヤ綔涓烘姇鍏ワ紝鍚庣画鑻ユ帴鍏ラ鏂欒褰曞彲鍦ㄨ繖閲屾浛鎹㈡潵婧愩��
ProductionProductInput productionProductInput = new ProductionProductInput();
productionProductInput.setProductionProductMainId(productionProductMain.getId());
productionProductInput.setProductMainId(productionProductMain.getId());
@@ -171,6 +174,7 @@
boolean isLastOperation = routingOperation.getDragSort() != null && routingOperation.getDragSort().equals(routingOperationList.size());
if (productQty.compareTo(BigDecimal.ZERO) > 0) {
if (Boolean.TRUE.equals(routingOperation.getIsQuality())) {
+ // 璐ㄦ宸ュ簭鍏堢敓鎴愭楠屽崟锛岄潪璐ㄦ宸ュ簭鐩存帴鍏ュ悎鏍煎搧搴撳瓨銆�
int inspectType = isLastOperation ? 2 : 1;
String process = isLastOperation ? null : technologyOperation == null ? null : technologyOperation.getName();
Product product = productMapper.selectById(productModel.getProductId());
@@ -209,20 +213,26 @@
if (ObjectUtils.isNull(productionOperationTask.getActualStartTime())) {
productionOperationTask.setActualStartTime(LocalDate.now());
}
+ // 鎶ュ伐椹卞姩宸ュ崟鐘舵�佹祦杞細鏈変骇鍑哄嵆杩涜涓紝杈惧埌璁″垝閲忓嵆瀹屽伐銆�
+ productionOperationTask.setStatus(3);
if (productionOperationTask.getPlanQuantity() != null
&& productionOperationTask.getCompleteQuantity().compareTo(productionOperationTask.getPlanQuantity()) >= 0) {
productionOperationTask.setActualEndTime(LocalDate.now());
+ productionOperationTask.setStatus(4);
}
productionOperationTaskMapper.updateById(productionOperationTask);
if (ObjectUtils.isNull(productionOrder.getStartTime())) {
productionOrder.setStartTime(LocalDateTime.now());
}
+ // 璁㈠崟鐘舵�佺敱鏈�鍚庝竴閬撳伐搴忕殑鍚堟牸浜у嚭鎺ㄥ姩锛岄伩鍏嶄腑闂村伐搴忔彁鍓嶅畬宸ャ��
+ productionOrder.setStatus(ProductOrderStatusEnum.RUNNING.getCode());
if (isLastOperation) {
productionOrder.setCompleteQuantity(defaultDecimal(productionOrder.getCompleteQuantity()).add(productQty));
if (productionOrder.getQuantity() != null
&& productionOrder.getCompleteQuantity().compareTo(productionOrder.getQuantity()) >= 0) {
productionOrder.setEndTime(LocalDateTime.now());
+ productionOrder.setStatus(ProductOrderStatusEnum.FINISHED.getCode());
}
}
productionOrderMapper.updateById(productionOrder);
@@ -253,6 +263,7 @@
}
private Boolean removeProductMainByProductionTask(ProductionProductMain productionProductMain) {
+ // 鍒犻櫎鎶ュ伐闇�瑕佸悓姝ュ洖婊氳川妫�銆佸簱瀛樸�佸伐鏃舵牳绠楀拰璁㈠崟/宸ュ崟杩涘害銆�
List<QualityInspect> qualityInspects = qualityInspectMapper.selectList(
Wrappers.<QualityInspect>lambdaQuery().eq(QualityInspect::getProductMainId, productionProductMain.getId()));
if (qualityInspects.size() > 0) {
@@ -275,11 +286,19 @@
BigDecimal validQuantity = defaultDecimal(productionProductOutput.getQuantity()).subtract(defaultDecimal(productionProductOutput.getScrapQty()));
productionOperationTask.setCompleteQuantity(defaultDecimal(productionOperationTask.getCompleteQuantity()).subtract(validQuantity));
productionOperationTask.setActualEndTime(null);
+ if (defaultDecimal(productionOperationTask.getCompleteQuantity()).compareTo(BigDecimal.ZERO) <= 0) {
+ productionOperationTask.setCompleteQuantity(BigDecimal.ZERO);
+ productionOperationTask.setActualStartTime(null);
+ productionOperationTask.setStatus(2);
+ } else {
+ productionOperationTask.setStatus(3);
+ }
productionOperationTaskMapper.updateById(productionOperationTask);
ProductionOrder productionOrder = productionOrderMapper.selectById(productionOperationTask.getProductionOrderId());
ProductionOrderRoutingOperation routingOperation = productionOrderRoutingOperationMapper.selectById(productionOperationTask.getTechnologyRoutingOperationId());
if (productionOrder != null && routingOperation != null) {
+ // 鍙湁鏈�鍚庝竴閬撳伐搴忕殑鎶ュ伐鎵嶄細褰卞搷鐢熶骇璁㈠崟瀹屽伐鏁伴噺銆�
List<ProductionOrderRoutingOperation> routingOperationList = productionOrderRoutingOperationMapper.selectList(
Wrappers.<ProductionOrderRoutingOperation>lambdaQuery()
.eq(ProductionOrderRoutingOperation::getTechnologyRoutingId, routingOperation.getTechnologyRoutingId())
@@ -289,8 +308,14 @@
BigDecimal newCompleteQty = defaultDecimal(productionOrder.getCompleteQuantity()).subtract(validQuantity);
productionOrder.setCompleteQuantity(newCompleteQty.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : newCompleteQty);
productionOrder.setEndTime(null);
- productionOrderMapper.updateById(productionOrder);
}
+ if (defaultDecimal(productionOrder.getCompleteQuantity()).compareTo(BigDecimal.ZERO) <= 0) {
+ productionOrder.setStartTime(null);
+ productionOrder.setStatus(ProductOrderStatusEnum.WAIT.getCode());
+ } else {
+ productionOrder.setStatus(ProductOrderStatusEnum.RUNNING.getCode());
+ }
+ productionOrderMapper.updateById(productionOrder);
}
}
--
Gitblit v1.9.3