From ebf08431bb703086da2129f59d11d5bce25ffb49 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 27 四月 2026 09:32:47 +0800
Subject: [PATCH] fix(mapper): 修正生产产品主表查询中的工单ID关联字段
---
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
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 4487851..31f8e77 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -160,8 +160,13 @@
productionProductMain.setAuditUserId(dto.getAuditUserId());
productionProductMain.setAuditUserName(dto.getAuditUserName());
productionProductMain.setStatus(0);
- productionProductMain.setStartTime(productWorkOrder.getStartProductTime());
- productionProductMain.setEndTime(now);
+ if (ObjectUtils.isNotEmpty(dto.getStartTime())&&ObjectUtils.isNotEmpty(dto.getEndTime())) {
+ productionProductMain.setStartTime(dto.getStartTime());
+ productionProductMain.setEndTime(dto.getEndTime());
+ }else {
+ productionProductMain.setStartTime(productWorkOrder.getStartProductTime());
+ productionProductMain.setEndTime(now);
+ }
productionProductMain.setDeviceId(productProcess.getDeviceId());
productionProductMain.setDeviceName(productProcess.getDeviceName());
productionProductMainMapper.insert(productionProductMain);
--
Gitblit v1.9.3