From 531f16f2f15bf792e3e719e00abb57a95356dedd Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期一, 21 四月 2025 12:04:15 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Business.MES/Transaction/Position.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index f4cf4b5..7ded706 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -500,8 +500,8 @@
{
DBCommitList.Add("AppendSaveAction", new List<Action>());
}
- var commitList = DBCommitList["AppendSaveAction"];
- commitList.Add(appendToSave);
+ var appendList = DBCommitList["AppendSaveAction"];
+ appendList.Add(appendToSave);
}
}
@@ -570,12 +570,12 @@
/// <param name="labelPVs">杩囩▼鍙橀噺鍒楄〃</param>
/// <param name="label">鏍囩妯℃澘</param>
/// <returns></returns>
- public BAS_LABEL_TEMP SetLabelVariables(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_TEMP label, IWorkAction action)
+ public BAS_LABEL_TEMP SetLabelVariables(List<BAS_PROCESS_VAR> labelPVs, BAS_LABEL_TEMP label, IWorkAction action)
{
return SetLabelVariables(labelPVs, label, action, null);
}
- public BAS_LABEL_TEMP SetLabelVariables(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_TEMP label, IWorkAction action, WipPkg? CurPkg)
+ public BAS_LABEL_TEMP SetLabelVariables(List<BAS_PROCESS_VAR> labelPVs, BAS_LABEL_TEMP label, IWorkAction action, WipPkg? CurPkg)
{
foreach (var item in label.Variables.OrderBy(q => q.VAR_TYPE == BAS_LABEL_VAR.VAR_TYPEs.BarcodeGenerate.GetValue() ? 0 : 1))
{
@@ -608,14 +608,14 @@
/// <param name="labelPVs">杩囩▼鍙橀噺鍒楄〃</param>
/// <param name="lv">鏍囩妯℃澘鍙橀噺</param>
/// <returns></returns>
- public string GetPrintProcessValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv, List<BAS_LABEL_VAR> lvars, IWorkAction curAction, WipPkg? CurPkg)
+ public string GetPrintProcessValue(List<BAS_PROCESS_VAR> labelPVs, BAS_LABEL_VAR lv, List<BAS_LABEL_VAR> lvars, IWorkAction curAction, WipPkg? CurPkg)
{
var pv = labelPVs.FirstOrDefault(q => q.VAR_CODE == lv.VAR_VALUE);
if (!pv.IsNullOrEmpty())
{
- switch (pv.VAR_TYPE.GetEnum<BAS_LABEL_PV.VAR_TYPEs>())
+ switch (pv.VAR_TYPE.GetEnum<BAS_PROCESS_VAR.VAR_TYPEs>())
{
- case BAS_LABEL_PV.VAR_TYPEs.ServerMethod:
+ case BAS_PROCESS_VAR.VAR_TYPEs.ServerMethod:
{
switch (pv.VAR_METHOD)
{
@@ -759,9 +759,9 @@
return "";
}
}
- case BAS_LABEL_PV.VAR_TYPEs.WebApi:
+ case BAS_PROCESS_VAR.VAR_TYPEs.WebApi:
break;
- case BAS_LABEL_PV.VAR_TYPEs.StoredProcedure:
+ case BAS_PROCESS_VAR.VAR_TYPEs.StoredProcedure:
break;
default:
break;
@@ -776,14 +776,14 @@
/// <param name="labelPVs"></param>
/// <param name="lv"></param>
/// <returns></returns>
- public string GetGeneratePValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv)
+ public string GetGeneratePValue(List<BAS_PROCESS_VAR> labelPVs, BAS_LABEL_VAR lv)
{
var pv = labelPVs.FirstOrDefault(q => q.VAR_CODE == lv.VAR_VALUE);
if (!pv.IsNullOrEmpty())
{
- switch (pv.VAR_TYPE.GetEnum<BAS_LABEL_PV.VAR_TYPEs>())
+ switch (pv.VAR_TYPE.GetEnum<BAS_PROCESS_VAR.VAR_TYPEs>())
{
- case BAS_LABEL_PV.VAR_TYPEs.BarcodeGenerate:
+ case BAS_PROCESS_VAR.VAR_TYPEs.BarcodeGenerate:
{
switch (pv.VAR_METHOD)
{
--
Gitblit v1.9.3