From 297abc24fdbd3987fe529e6895387940502ee864 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 02 八月 2024 23:49:16 +0800
Subject: [PATCH] new SubmitOutput()
---
Tiger.Business.MES/Transaction/Position.cs | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index eabfb3b..84d0477 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -222,6 +222,7 @@
NodeAct = act,
Setting = CurBatch.ActionSets.FirstOrDefault(q => q.ACT_ID == act.ID),
};
+ next.Init();
next.PrepNodeIDs.Add(parent.NodeID);
next.PrepNodeIDs.AddRange(parent.PrepNodeIDs);
next.PrepNodeIDs = next.PrepNodeIDs.Distinct().ToList();
@@ -280,7 +281,7 @@
/// <param name="input"></param>
public ApiAction<SubmitOutput> BeginNextActionStep(SubmitInput input)
{
- var result = new ApiAction<SubmitOutput>();
+ var result = new ApiAction<SubmitOutput>(new SubmitOutput());
//璁剧疆鍚庣画鍙墽琛岀殑宸ユ鍒楄〃
NextSteps = GetNextSteps(CurStep);
//灏濊瘯鏈夋病鏈夊彲浠ョ洿鎺ュ紑濮嬬殑鍚庣画宸ユ
@@ -298,7 +299,7 @@
//杩斿洖缁撴灉鍒板鎴风
result = canBegin;
result.Data.SetValue(CurBatch, CurStep, CurStep?.ID, IsFinishAllSteps);
-
+
return result;
}
}
@@ -372,6 +373,8 @@
return WorkBatch.Product.ToJson();
case "GetCustomer":
return WorkBatch.Batch.ToJson();
+ case "GetVarByWo":
+ return GetLabelVarWo(lv);
default:
return "";
}
@@ -387,6 +390,26 @@
return "";
}
+ /// <summary>
+ /// 鑾峰彇宸ュ崟缁存姢鐨勬ā鏉垮彉閲�
+ /// </summary>
+ /// <param name="labelId"></param>
+ /// <returns></returns>
+ private string GetLabelVarWo(BAS_LABEL_VAR lv)
+ {
+ string result = "";
+ var labelVarwos = Biz.Db.Queryable<BAS_LABEL_VAR_WO>().Where(x => x.LABEL_ID == lv.LABEL_ID && x.VAR_NAME == lv.VAR_NAME).ToList();
+ if (labelVarwos.Any(q => q.WORK_ORDER == WorkBatch.Batch.ORDER_NO))
+ {
+ result = labelVarwos.First(q => q.WORK_ORDER == WorkBatch.Batch.ORDER_NO).VAR_VALUE;
+ }
+ else
+ {
+ result = labelVarwos.Count > 0 ? labelVarwos[0].DEFAULT_VALUE : "";
+ }
+ return result;
+ }
+
#endregion Functions
public override bool Close(bool needSaveHistoryLog = false)
--
Gitblit v1.9.3