From 7502a974e86933df025fa939159f0046ede69396 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 13 九月 2024 15:09:06 +0800
Subject: [PATCH] 一些更改
---
Tiger.Business.MES/Transaction/Position.cs | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 676be4b..bf6a941 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -122,6 +122,13 @@
action.LocaleMsg = new("MES.Transaction.Position.SelectOrder.LineException", input.OrderNo, CurLine.LINE_CODE);
return action;
}
+ if (batch.STATUS != BIZ_MES_WO_BATCH.STATUSs.Release.GetValue() && batch.STATUS != BIZ_MES_WO_BATCH.STATUSs.Working.GetValue())
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"宸ュ崟[{input.OrderNo}]鐘舵�乕{wo.STATUS.GetEnum<BIZ_MES_WO_BATCH.STATUSs>().GetName()}]涓嶈兘鐢熶骇");
+ action.LocaleMsg = new("MES.Transaction.Position.SelectOrder.StatusException", input.OrderNo, batch.STATUS.GetEnum<BIZ_MES_WO_BATCH.STATUSs>().GetName());
+ return action;
+ }
var wb = new WorkBatch(input.OrderNo).Init(CurLine.LINE_CODE);
WoContext.WoBatchDic.Add(wb.Batch.BATCH_NO, wb);
}
@@ -192,13 +199,13 @@
/// <summary>
/// 璁剧疆褰撳墠鏉＄爜鐨勫伐搴忎俊鎭�
/// </summary>
- public OperInfo SetOperNodeInfo(OperInfo info)
+ public OperInfo SetOperNodeInfo(OperInfo info, string locale)
{
if (CurWipSNs.Any())
{
info.CurNode = CurWipSNs.First().NODE_NAME;
info.NextNode = string.Join(",", CurBatch.GetNextNodes(CurWipSNs.First()).Select(q => q.NODE_NAME));
- info.StepsInfo = Steps.Select(q => q.GetInfo()).ToList();
+ info.StepsInfo = Steps.Select(q => q.GetInfo(locale)).ToList();
}
else
{
@@ -253,6 +260,7 @@
{
var next = new WorkStep(IWorkStep.NodeTypes.Action, this)
{
+ Name = act.ACT_NAME,
Sequence = parent.Sequence + 1,
Node = parent.Node,
OperSetting = CurBatch.NodeSets.FirstOrDefault(q => q.NODE_ID == parent.Node.ID),
--
Gitblit v1.9.3