From 3767c658e315be5279bea5c1d42b7881c1f45d97 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 25 二月 2025 10:04:17 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Business.MES/WorkAction/PrintLabel.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/PrintLabel.cs b/Tiger.Business.MES/WorkAction/PrintLabel.cs
index ff83bd4..a1dede3 100644
--- a/Tiger.Business.MES/WorkAction/PrintLabel.cs
+++ b/Tiger.Business.MES/WorkAction/PrintLabel.cs
@@ -24,7 +24,7 @@
public MES_WO_ACTION Setting { get; set; }
#endregion
public BAS_LABEL_TEMP Label { get; set; }
- public List<BAS_LABEL_PV> LabelPV { get; set; }
+ public List<BAS_PROCESS_VAR> LabelPV { get; set; }
#endregion Propertys & Variables
#region Functions
@@ -43,7 +43,7 @@
#endregion
Label = MainDB.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == setting.LABEL_CODE).IncludesAllFirstLayer().First();
- LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();
+ LabelPV = MainDB.Queryable<BAS_PROCESS_VAR>().ToList();
CurStep.Message = Biz.L("绛夊緟鏍囩鎵撳嵃");
CurStep.Status = StepStatus.Normal;
@@ -207,6 +207,7 @@
VAR_NAME = item.VAR_NAME,
VAR_CONTROL = item.VAR_CONTROL,
VALUE_TYPE = item.VALUE_TYPE,
+ PROCESS_VAR = item.PROCESS_VAR,
INPUT_VALUE = CurStep.ActionDic.GetOrDefault(item.VAR_CODE),
TRACE_INFO = CurStep.ActionDic.ToJson(),
};
--
Gitblit v1.9.3