From 7496e718f10286651b9e2d08a8b8548cd3b242b6 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期六, 09 五月 2026 10:14:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_浪潮_pro' into dev_浪潮_pro
---
src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
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 5fba66d..0d1a982 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionPlanServiceImpl.java
@@ -131,6 +131,7 @@
productionOrder.setProductionPlanIds(formatPlanIds(issuedPlanIds));
productionOrder.setProductModelId(firstPlan.getProductModelId());
productionOrder.setQuantity(assignedQuantity);
+ productionOrder.setWorkshopId(productionPlanDto.getWorkshopId());
productionOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
boolean saved = productionOrderService.saveProductionOrder(productionOrder);
@@ -160,7 +161,6 @@
update.setId(plan.getId());
update.setStatus(planStatus);
update.setQuantityIssued(totalIssuedQuantity);
- update.setIssued(planStatus == PLAN_STATUS_ISSUED);
updates.add(update);
}
if (!updates.isEmpty()) {
--
Gitblit v1.9.3