From ab6d5bfea26aebbb9d7bbc191781521abad61f5b Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 24 四月 2026 17:35:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java
index 380ad00..e0ab30b 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java
@@ -60,7 +60,7 @@
pdto.setProcessRouteNum(it.getProcessPositive());
pdto.setProcessRouteAddNum(it.getProcessPositive());
// pdto.setProcessRouteRequire(); 宸ヨ壓瑕佹眰
- pdto.setProductModelId(materialInfoDtoFirst.getId());
+ pdto.setProductModelId(Long.valueOf(materialInfoDtoFirst.getProductModelId()));
pdto.setUserIds(it.getReportWorkerList().stream().map(SimplePersonDto::getUserId).map(String::valueOf).collect(Collectors.joining(",")));
pdto.setUserNames(it.getReportWorkerList().stream().map(SimplePersonDto::getUserName).collect(Collectors.joining(",")));
pdto.setDeviceId(it.getDeviceId());
--
Gitblit v1.9.3