From 3cc9e4551c42c1eb40c09f181857f2e0b1aa8355 Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期四, 05 三月 2026 08:14:34 +0800
Subject: [PATCH] 实现PDA灌桶入库呼叫新料功能，优化Web页面
---
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java
index 769ca22..624cc6d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TaskPathTemplateMergeController.java
@@ -66,7 +66,7 @@
for (String sourceType : sourceTypeR) {
for (String targetType : targetTypeR) {
TaskPathTemplateMerge taskPathTemplateMerge = new TaskPathTemplateMerge();
- taskPathTemplateMerge.setConditionDesc(taskPathTemplateMerge.getConditionDesc());
+ taskPathTemplateMerge.setConditionExpression(taskPathTemplateMerges.getConditionExpression());
taskPathTemplateMerge.setSourceType(sourceType);
taskPathTemplateMerge.setTargetType(targetType);
taskPathTemplateMerge.setCreateBy(getLoginUserId());
--
Gitblit v1.9.1