From 01a5cb6f77739630a88fc2f95be694b53ade0d41 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 19 七月 2024 14:14:47 +0800
Subject: [PATCH] 工步修改为支持并行执行行为，优化工步执行逻辑
---
Tiger.Business.MES/WorkAction/IPQC.cs | 108 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 96 insertions(+), 12 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/IPQC.cs b/Tiger.Business.MES/WorkAction/IPQC.cs
index 22cb3cb..3989998 100644
--- a/Tiger.Business.MES/WorkAction/IPQC.cs
+++ b/Tiger.Business.MES/WorkAction/IPQC.cs
@@ -23,20 +23,42 @@
#region Functions
/// <summary>
- /// 寮�濮嬫墽琛屽伐搴忚涓�
+ /// 鍒濆鍖栧伐搴忚涓�
/// </summary>
/// <returns></returns>
- public ApiAction<SubmitOutput> Begin(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
+ public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
{
CurStep = curStep;
CurPosition = position;
NodeAct = nodeAct;
Setting = setting;
+ }
+
+ /// <summary>
+ /// 鑾峰彇琛屼负寮�濮嬬殑鎻愮ず淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ public Locale GetBeginMsg()
+ {
+ //var msg = new Locale("MES.WorkAction.IPQC.BeginMsg");
+ var msg = new Locale($"璇锋彁浜ゆ祴璇曠粨鏋�");
+ return msg;
+ }
+
+ /// <summary>
+ /// 灏濊瘯寮�濮嬫墽琛屽伐搴忚涓�
+ /// </summary>
+ /// <returns></returns>
+ public ApiAction<SubmitOutput> TryBegin(SubmitInput input)
+ {
var action = new ApiAction<SubmitOutput>();
//action.LocaleMsg = new($"璇锋寜娴嬭瘯椤规彁浜ゆ祴璇曟暟鎹�");
action.LocaleMsg = new("MES.WorkAction.IPQC.PleaseTest");
+
+ //濡傛灉鏍规嵁杈撳叆鍙互寮�濮嬫墽琛屽綋鍓嶈涓哄垯鏍囪涓烘垚鍔燂紝鍚﹀垯澶辫触
+ action.IsSuccessed = false;
return action;
}
/// <summary>
@@ -46,6 +68,31 @@
public ApiAction<SubmitOutput> Submit(SubmitInput input)
{
var action = new ApiAction<SubmitOutput>();
+
+ //鎻愪氦鏁版嵁鎵ц鎴愬姛
+ if (true)
+ {
+ action.IsSuccessed = true;
+ action.LocaleMsg = new($"鎵ц鎴愬姛");
+ //action.LocaleMsg = new("MES.WorkAction.IPQC.Success");
+ //琛屼负鎵ц瀹屾垚
+ if (false)
+ {
+ action = End();
+ }
+ }
+ //鎻愪氦鏁版嵁鎵ц澶辫触
+ else
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"鎵ц澶辫触");
+ action.LocaleMsg = new("MES.WorkAction.IPQC.Fail");
+ //濡傛灉琛屼负璁剧疆涓哄嚭閿欓渶瑕侀噸缃伐搴忔搷浣�
+ if (NodeAct.NEED_RESET == "Y")
+ {
+ CurPosition.ResetSteps();
+ }
+ }
return action;
}
@@ -57,18 +104,55 @@
{
var action = new ApiAction<SubmitOutput>();
+ //璁板綍琛屼负鎿嶄綔璁板綍
+ var wipAct = new MES_WIP_ACT()
+ {
+ HIS_ID = CurPosition.CurWipSNHis.ID,
+ SN = CurPosition.CurWipSN.SN,
+ STATUS = CurPosition.CurWipSN.STATUS,
+ ITEM_CODE = CurPosition.CurWipSN.ITEM_CODE,
+ WORK_ORDER = CurPosition.CurWipSN.WORK_ORDER,
+ BATCH_NO = CurPosition.CurWipSN.BATCH_NO,
+ ROT_CODE = CurPosition.CurWipSN.ROT_CODE,
+ NODE_ID = CurPosition.CurWipSN.NODE_ID,
+ NODE_NAME = CurPosition.CurWipSN.NODE_NAME,
+ ACT_ID = NodeAct.ID,
+ ACT_NAME = NodeAct.ACT_NAME,
+ FTY_CODE = CurPosition.CurWipSN.FTY_CODE,
+ WS_CODE = CurPosition.CurWipSN.WS_CODE,
+ LINE_CODE = CurPosition.CurWipSN.LINE_CODE,
+ POST_CODE = CurPosition.CurWipSN.POST_CODE,
+ OPER_CODE = CurPosition.CurWipSN.OPER_CODE,
+ SEGMENT = CurPosition.CurWipSN.SEGMENT,
+ TRAY_SN = CurPosition.CurWipSN.TRAY_SN,
+ OPERATION_TIME = DateTime.Now,
+ SFTS_CODE = CurPosition.CurWipSN.SFTS_CODE,
+ SFT_CODE = CurPosition.CurWipSN.SFT_CODE,
+ PRD_CODE = CurPosition.CurWipSN.PRD_CODE,
+ ACT_TYPE = NodeAct.ACT_TYPE,
+ ACT_SN = CurPosition.CurWipSN.SN,
+ ACT_VALUE_1 = "",
+ ACT_VALUE_2 = "",
+ ACT_VALUE_3 = "",
+ ACT_VALUE_4 = "",
+ ACT_VALUE_5 = "",
+ ACT_RESULT = "Y",
+ TRACE_INFO = $"鎵ц鎴愬姛",
+ };
+
+ //淇濆瓨鏁版嵁
+ CurStep.DBSubmitAction = () =>
+ {
+ var db = CurPosition.GetCommitDB();
+ db.Storageable(wipAct, CurPosition.UserCode).ExecuteCommand();
+ };
+
+ IsFinished = true;
+ action.LocaleMsg = new($"琛屼负缁撴潫");
+ //action.LocaleMsg = new("MES.WorkAction.IPQC.Finish");
return action;
}
- /// <summary>
- /// 鑾峰彇琛屼负鎻愮ず淇℃伅
- /// </summary>
- /// <returns></returns>
- public ApiAction GetPrompt()
- {
- var action = new ApiAction();
- action.LocaleMsg = new($"寮�濮嬫墦鍗版潯鐮�");
- return action;
- }
+
#endregion Functions
}
--
Gitblit v1.9.3