From 0fdb04b7c451d7c59b226c25425722afd3364916 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 25 九月 2024 16:37:52 +0800
Subject: [PATCH] 优化工序和行为逻辑
---
Tiger.Business.MES/WorkAction/IPQC.cs | 116 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 73 insertions(+), 43 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/IPQC.cs b/Tiger.Business.MES/WorkAction/IPQC.cs
index 0925cd6..8e423ab 100644
--- a/Tiger.Business.MES/WorkAction/IPQC.cs
+++ b/Tiger.Business.MES/WorkAction/IPQC.cs
@@ -6,6 +6,7 @@
using System.Text;
using System.Threading.Tasks;
using Tiger.IBusiness;
+using Tiger.IBusiness.MES.WorkAction;
using Tiger.Model;
using Tiger.Model.Entitys.MES.Position;
@@ -14,11 +15,13 @@
public class IPQC : IIPQC
{
#region Propertys & Variables
+ #region 鍥哄畾鍐欐硶锛屽伐搴忎腑鐨勫繀瑕佷俊鎭�
public bool IsFinished { get; set; } = false;
public IWorkStep CurStep { get; set; }
public IPosition CurPosition { get; set; }
public MES_WO_NODE_ACT NodeAct { get; set; }
public MES_WO_ACTION Setting { get; set; }
+ #endregion
#endregion Propertys & Variables
#region Functions
@@ -28,10 +31,15 @@
/// <returns></returns>
public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
{
+ #region 鍥哄畾鍐欐硶锛岀粰榛樿鍙橀噺璧嬪��
CurStep = curStep;
CurPosition = position;
NodeAct = nodeAct;
Setting = setting;
+ #endregion
+
+ CurStep.Message = Biz.L("绛夊緟娴嬭瘯缁撴灉");
+ CurStep.Status = StepStatus.Normal;
}
/// <summary>
@@ -51,14 +59,17 @@
/// <returns></returns>
public ApiAction<SubmitOutput> TryBegin(SubmitInput input)
{
- var action = new ApiAction<SubmitOutput>();
+ var action = new ApiAction<SubmitOutput>(new SubmitOutput());
//action.LocaleMsg = new($"璇锋寜娴嬭瘯椤规彁浜ゆ祴璇曟暟鎹�");
action.LocaleMsg = new("MES.WorkAction.IPQC.PleaseTest");
//濡傛灉鏍规嵁杈撳叆鍙互寮�濮嬫墽琛屽綋鍓嶈涓哄垯鏍囪涓烘垚鍔燂紝鍚﹀垯澶辫触
+ CurStep.Message = Biz.L("绛夊緟娴嬭瘯");
+ CurStep.Status = StepStatus.Normal;
action.IsSuccessed = false;
+ action.Data.ShortMsg = new("绛夊緟娴嬭瘯", ShortMessage.Types.Success);
return action;
}
/// <summary>
@@ -67,7 +78,7 @@
/// <returns></returns>
public ApiAction<SubmitOutput> Submit(SubmitInput input)
{
- var action = new ApiAction<SubmitOutput>();
+ var action = new ApiAction<SubmitOutput>(new SubmitOutput());
//鎻愪氦鏁版嵁鎵ц鎴愬姛
if (true)
@@ -78,19 +89,22 @@
//琛屼负鎵ц瀹屾垚
if (false)
{
- action = End();
+ action = End(input);
}
}
//鎻愪氦鏁版嵁鎵ц澶辫触
else
{
+ CurStep.Message = Biz.L("娴嬭瘯澶辫触");
+ CurStep.Status = StepStatus.Error;
+ action.Data.ShortMsg = new("娴嬭瘯澶辫触", ShortMessage.Types.Failed);
action.IsSuccessed = false;
//action.LocaleMsg = new($"鎵ц澶辫触");
action.LocaleMsg = new("MES.WorkAction.IPQC.Fail");
//濡傛灉琛屼负璁剧疆涓哄嚭閿欓渶瑕侀噸缃伐搴忔搷浣�
if (NodeAct.NEED_RESET == "Y")
{
- CurPosition.ResetSteps();
+ CurPosition.ResetNode();
}
}
@@ -100,57 +114,73 @@
/// 缁撴潫鎵ц宸ュ簭琛屼负
/// </summary>
/// <returns></returns>
- public ApiAction<SubmitOutput> End()
+ public ApiAction<SubmitOutput> End(SubmitInput input)
{
- var action = new ApiAction<SubmitOutput>();
+ var action = new ApiAction<SubmitOutput>(new SubmitOutput());
//璁板綍琛屼负鎿嶄綔璁板綍
- var wipAct = new MES_WIP_ACT()
+ var wipActs = new List<MES_WIP_ACT>();
+ foreach (var wipSn in CurPosition.CurWipSNs)
{
- AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
- AUTH_PROD = CurPosition.CurLine.LINE_CODE,
- 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 = $"鎵ц鎴愬姛",
- };
+ var wipAct = new MES_WIP_ACT()
+ {
+ AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
+ AUTH_PROD = CurPosition.CurLine.LINE_CODE,
+ WIP_ID = wipSn.ID,
+ HIS_ID = CurPosition.CurWipSNHiss.First(q => q.SN == wipSn.SN).ID,
+ SN = wipSn.SN,
+ STATUS = wipSn.STATUS,
+ ITEM_CODE = wipSn.ITEM_CODE,
+ WORK_ORDER = wipSn.WORK_ORDER,
+ BATCH_NO = wipSn.BATCH_NO,
+ ROT_CODE = wipSn.ROT_CODE,
+ NODE_ID = wipSn.NODE_ID,
+ NODE_NAME = wipSn.NODE_NAME,
+ ACT_ID = NodeAct.ID,
+ ACT_NAME = NodeAct.ACT_NAME,
+ FTY_CODE = wipSn.FTY_CODE,
+ WS_CODE = wipSn.WS_CODE,
+ LINE_CODE = wipSn.LINE_CODE,
+ POST_CODE = wipSn.POST_CODE,
+ OPER_CODE = wipSn.OPER_CODE,
+ SEGMENT = wipSn.SEGMENT,
+ FLOW_SN = wipSn.FLOW_SN,
+ TRAY_SN = wipSn.TRAY_SN,
+ INNER_SN = wipSn.INNER_SN,
+ CARTON_SN = wipSn.CARTON_SN,
+ PALLET_SN = wipSn.PALLET_SN,
+ OPERATION_TIME = DateTime.Now,
+ SFTS_CODE = wipSn.SFTS_CODE,
+ SFT_CODE = wipSn.SFT_CODE,
+ PRD_CODE = wipSn.PRD_CODE,
+ ACT_TYPE = NodeAct.ACT_TYPE,
+ ACT_SN = wipSn.SN,
+ ACT_VALUE_1 = "",
+ ACT_VALUE_2 = "",
+ ACT_VALUE_3 = "",
+ ACT_VALUE_4 = "",
+ ACT_VALUE_5 = "",
+ ACT_RESULT = "Y",
+ ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(),
+ TRACE_INFO = $"鎵ц鎴愬姛",
+ };
+ wipActs.Add(wipAct);
+ }
+ //鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
+ var _wipActs = wipActs.Clone();
//淇濆瓨鏁版嵁
CurStep.DBSubmitAction = () =>
{
var db = CurPosition.GetCommitDB();
- db.Storageable(wipAct, CurPosition.UserCode).ExecuteCommand();
+ db.Storageable(_wipActs, CurPosition.UserCode).ExecuteCommand();
};
IsFinished = true;
- action.LocaleMsg = new($"琛屼负缁撴潫");
+ CurStep.Message = Biz.L("娴嬭瘯瀹屾垚");
+ CurStep.Status = StepStatus.Finished;
+ action.Data.ShortMsg = new("娴嬭瘯瀹屾垚", ShortMessage.Types.Success);
+ action.LocaleMsg = new($"娴嬭瘯缁撴潫");
//action.LocaleMsg = new("MES.WorkAction.IPQC.Finish");
return action;
}
--
Gitblit v1.9.3