From 422ca5b2fb6f9270ae0067a1c0dc9a02b84b9d67 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 19 三月 2025 01:19:39 +0800
Subject: [PATCH] 优化了一些已知问题
---
Tiger.Business.MES/WorkAction/VerifyCustomSN.cs | 117 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 80 insertions(+), 37 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/VerifyCustomSN.cs b/Tiger.Business.MES/WorkAction/VerifyCustomSN.cs
index 3be4358..cb872d9 100644
--- a/Tiger.Business.MES/WorkAction/VerifyCustomSN.cs
+++ b/Tiger.Business.MES/WorkAction/VerifyCustomSN.cs
@@ -1,4 +1,5 @@
-锘縰sing Rhea.Common;
+锘�
+using Rhea.Common;
using SqlSugar;
using System;
using System.Collections.Generic;
@@ -12,17 +13,18 @@
namespace Tiger.Business.MES.WorkAction
{
- public class VerifyCustomSN : IVerifyItem
+ public class VerifyCustomSN : IVerifyCustomSN
{
#region Propertys & Variables
#region 鍥哄畾鍐欐硶锛屽伐搴忎腑鐨勫繀瑕佷俊鎭�
+ public DbClient MainDB { get; set; }
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
-
+ public BAS_ITEM_CUST CustInfo { get; set; }
#endregion Propertys & Variables
#region Functions
@@ -33,14 +35,17 @@
public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
{
#region 鍥哄畾鍐欐硶锛岀粰榛樿鍙橀噺璧嬪��
+ MainDB = position.MainDB;
CurStep = curStep;
CurPosition = position;
NodeAct = nodeAct;
Setting = setting;
#endregion
- CurStep.Message = Biz.L("楠岃瘉浜у搧鏁版嵁");
- CurStep.Status = StepStatus.Normal;
+ //鑾峰彇褰撳墠浜у搧鍦ㄥ綋鍓嶅鎴风殑鍏崇郴
+ CustInfo = MainDB.Queryable<BAS_ITEM_CUST>().Where(q => q.ITEM_ID == CurPosition.WorkBatch.WO.ItemInfo.ID && q.CUST_CODE == CurPosition.WorkBatch.WO.CUST_CODE).First();
+
+ CurStep.SetStatusMessage(StepStatus.Normal, Biz.L("楠岃瘉鏄惁瀹㈡埛鏍囩"));
}
/// <summary>
@@ -49,8 +54,8 @@
/// <returns></returns>
public Locale GetBeginMsg()
{
- var msg = new Locale("MES.WorkAction.VerifyItem.BeginMsg");
- //var msg = new Locale($"寮�濮嬮獙璇佷骇鍝乕{CurPosition.CurWipSN.SN}]");
+ var msg = new Locale("MES.WorkAction.VerifyCustomSN.BeginMsg", CurPosition.CurSN);
+ //var msg = new Locale($"寮�濮嬮獙璇佹潯鐮乕{0}]鏄惁瀹㈡埛鏍囩");
return msg;
}
@@ -85,7 +90,7 @@
if (!action.IsSuccessed)
{
//濡傛灉琛屼负璁剧疆涓哄嚭閿欓渶瑕侀噸缃伐搴忔搷浣�
- if (NodeAct.NEED_RESET == "Y")
+ //if (NodeAct.NEED_RESET == "Y")
{
CurPosition.ResetNode();
}
@@ -99,23 +104,17 @@
{
var isOK = true;
//楠岃瘉閫昏緫
- //if (input.SN.IsNullOrEmpty())
+ if (!CustInfo.RULE_CODE.IsNullOrEmpty() && !Cache.CodeRule[CustInfo.RULE_CODE].IsNullOrEmpty())
{
- CurStep.Message = Biz.L("楠岃瘉澶辫触");
- CurStep.Status = StepStatus.Error;
- action.Data.ShortMsg = new("楠岃瘉澶辫触", ShortMessage.Types.Failed);
- action.IsSuccessed = isOK = false;
- //action.LocaleMsg = new Locale($"閿欒锛歔{ExtInfo.FIELD_NAME}]鏍囩鏉＄爜涓嶈兘涓虹┖锛岃閲嶆柊鎵弿");
- //action.LocaleMsg = new Locale("MES.WorkAction.VerifyItem.SnEmptyError", ExtInfo.FIELD_NAME);
- }
- //if (CurPosition.CurWipSNs.Any(w => w.SN == input.SN))
- {
- CurStep.Message = Biz.L("楠岃瘉澶辫触");
- CurStep.Status = StepStatus.Error;
- action.Data.ShortMsg = new("楠岃瘉澶辫触", ShortMessage.Types.Failed);
- action.IsSuccessed = isOK = false;
- //action.LocaleMsg = new Locale($"閿欒锛氭壂鎻忓埌浜у搧鏉＄爜[{input.SN}]锛岃閲嶆柊鎵弿[{ExtInfo.FIELD_NAME}]鏍囩鏉＄爜");
- //action.LocaleMsg = new Locale("MES.WorkAction.VerifyItem.ScanProdSnError", input.SN, ExtInfo.FIELD_NAME);
+ var result = Cache.CodeRule[CustInfo.RULE_CODE].Verify(CurPosition.CurSN);
+ if (!result.IsSuccessed)
+ {
+ CurStep.SetStatusMessage(StepStatus.Error, Biz.L("瀹㈡埛鏍囩楠岃瘉澶辫触"));
+ action.Data.ShortMsg = new("瀹㈡埛鏍囩楠岃瘉澶辫触", ShortMessage.Types.Failed);
+ action.IsSuccessed = isOK = false;
+ //action.LocaleMsg = new Locale($"鏍囩鏉＄爜[{0}]鏈�氳繃瀹㈡埛鏍囩瑙勫垯[{1}]楠岃瘉锛屽伐搴忓凡閲嶇疆锛岃閲嶆柊鎵弿杩涚珯浜у搧鏉＄爜");
+ action.LocaleMsg = new Locale("MES.WorkAction.VerifyCustomSN.CustSnVerifyError", CurPosition.CurSN, CustInfo.RULE_CODE);
+ }
}
//楠岃瘉閫氳繃鍒欎繚瀛�
@@ -123,18 +122,15 @@
{
action = End(input);
}
-
- //閮芥病鏈夌墿鏂欓獙璇侀�氳繃锛屽垯杩斿洖閿欒淇℃伅
}
catch (System.Exception ex)
{
- CurStep.Message = Biz.L("楠岃瘉寮傚父");
- CurStep.Status = StepStatus.Error;
- action.Data.ShortMsg = new("楠岃瘉寮傚父", ShortMessage.Types.Exception);
- action.CatchExceptionWithLog(ex, $"楠岃瘉寮傚父");
+ CurStep.SetStatusMessage(StepStatus.Error, Biz.L("瀹㈡埛鏍囩楠岃瘉寮傚父"));
+ action.Data.ShortMsg = new("瀹㈡埛鏍囩楠岃瘉寮傚父", ShortMessage.Types.Exception);
+ action.CatchExceptionWithLog(ex, $"瀹㈡埛鏍囩楠岃瘉寮傚父");
action.IsSuccessed = false;
- //action.LocaleMsg = new($"浜у搧[{CurPosition.CurSN}]楠岃瘉寮傚父锛屽伐搴忓凡閲嶇疆锛岃閲嶆柊鎵弿杩涚珯浜у搧鏉＄爜");
- //action.LocaleMsg = new("MES.WorkAction.VerifyItem.SaveExtInfoException", CurPosition.CurSN);
+ //action.LocaleMsg = new($"鏍囩鏉＄爜[{0}]楠岃瘉寮傚父锛屽伐搴忓凡閲嶇疆锛岃閲嶆柊鎵弿杩涚珯浜у搧鏉＄爜");
+ action.LocaleMsg = new("MES.WorkAction.VerifyCustomSN.CustSnVerifyException", CurPosition.CurSN);
CurPosition.ResetNode();
}
return action;
@@ -150,6 +146,7 @@
//璁板綍琛屼负鎿嶄綔璁板綍
var wipActs = new List<MES_WIP_ACT>();
+ var wipVars = new List<MES_WIP_ACT_VAR>();
foreach (var wipSn in CurPosition.CurWipSNs)
{
var wipAct = new MES_WIP_ACT()
@@ -185,27 +182,73 @@
PRD_CODE = wipSn.PRD_CODE,
ACT_TYPE = NodeAct.ACT_TYPE,
ACT_SN = wipSn.SN,
+ ACT_VAR_DIC = CurStep.ActionDic.ToJson(),
ACT_RESULT = "Y",
+ ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(),
TRACE_INFO = $"浜у搧[{CurPosition.CurSN}]楠岃瘉閫氳繃",
};
wipActs.Add(wipAct);
+ foreach (var item in NodeAct.Variables)
+ {
+ var wipVar = new MES_WIP_ACT_VAR()
+ {
+ AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
+ AUTH_PROD = CurPosition.CurLine.LINE_CODE,
+ HIS_ID = CurPosition.CurWipSNHiss.First(q => q.SN == wipSn.SN).ID,
+ WIP_ID = wipSn.ID,
+ SN = wipSn.SN,
+ ITEM_CODE = wipSn.ITEM_CODE,
+ WORK_ORDER = wipSn.WORK_ORDER,
+ BATCH_NO = wipSn.BATCH_NO,
+ CUST_CODE = CurPosition.WorkBatch.WO.CUST_CODE,
+ 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,
+ VAR_CODE = item.VAR_CODE,
+ VAR_NAME = item.VAR_NAME,
+ VAR_CONTROL = item.VAR_CONTROL,
+ VALUE_TYPE = item.VALUE_TYPE,
+ PROCESS_VAR = item.PROCESS_VAR,
+ INPUT_VALUE = CurStep.ActionDic.GetOrDefault(item.VAR_CODE),
+ TRACE_INFO = CurStep.ActionDic.ToJson(),
+ };
+ wipVars.Add(wipVar);
+ }
}
//鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
var _wipActs = wipActs.Clone();
+ var _wipVars = wipVars.Clone();
//淇濆瓨鏁版嵁
CurStep.DBSubmitAction = () =>
{
var db = CurPosition.GetCommitDB();
db.Storageable(_wipActs, CurPosition.UserCode).ExecuteCommand();
+ db.Storageable(_wipVars, CurPosition.UserCode).ExecuteCommand();
};
IsFinished = true;
- CurStep.Message = Biz.L("楠岃瘉閫氳繃");
- CurStep.Status = StepStatus.Finished;
- action.Data.ShortMsg = new("楠岃瘉閫氳繃", ShortMessage.Types.Success);
- //action.LocaleMsg = new($"浜у搧[{CurPosition.CurSN}]楠岃瘉閫氳繃");
- action.LocaleMsg = new("MES.WorkAction.VerifyItem.VerifySuccess", CurPosition.CurSN);
+ CurStep.SetStatusMessage(StepStatus.Finished, Biz.L("瀹㈡埛鏍囩楠岃瘉閫氳繃"));
+ action.Data.ShortMsg = new("瀹㈡埛鏍囩楠岃瘉閫氳繃", ShortMessage.Types.Success);
+ //action.LocaleMsg = new($"瀹㈡埛鏍囩鏉＄爜[{0}]楠岃瘉閫氳繃");
+ action.LocaleMsg = new("MES.WorkAction.VerifyCustomSN.VerifySuccess", CurPosition.CurSN);
return action;
}
--
Gitblit v1.9.3