From 7bf8f292234bea48fd9318eee9267c6ef19e19ed Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 01 一月 2025 21:57:41 +0800
Subject: [PATCH] 工步增加行为变量字典
---
Tiger.Business.MES/WorkAction/Assembly.cs | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 101 insertions(+), 16 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/Assembly.cs b/Tiger.Business.MES/WorkAction/Assembly.cs
index 0ac02f5..8062a19 100644
--- a/Tiger.Business.MES/WorkAction/Assembly.cs
+++ b/Tiger.Business.MES/WorkAction/Assembly.cs
@@ -16,6 +16,7 @@
{
#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; }
@@ -23,7 +24,6 @@
public MES_WO_ACTION Setting { get; set; }
#endregion
public List<BAS_PROD_BOM> Boms { get; set; } = new();
- public Dictionary<string, List<BAS_ITEM>> SubItemDic { get; set; } = new();
public AssemblyInfo CurAssembly { get; set; } = new();
#endregion Propertys & Variables
@@ -35,6 +35,7 @@
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;
@@ -42,7 +43,7 @@
#endregion
//鑾峰彇浜у搧BOM
- Boms = Biz.Db.Queryable<BAS_PROD_BOM>().Where(q => q.PROD_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).ToList();
+ Boms = MainDB.Queryable<BAS_PROD_BOM>().Where(q => q.PROD_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).ToList();
//鑾峰彇涓婃枡鐗╂枡
var assyList = new List<AssemblySetting>();
try
@@ -58,7 +59,7 @@
}
}
var codes = assyList.Select(q => q.ITEM_CODE).ToList();
- var items = Biz.Db.Queryable<BAS_ITEM>().Where(q => codes.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
+ var items = MainDB.Queryable<BAS_ITEM>().Where(q => codes.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
//鑾峰彇涓婃枡鐗╂枡鐨勬浛浠ｆ枡
foreach (var assy in assyList)
{
@@ -75,15 +76,21 @@
if (!bom.IsNullOrEmpty())
{
var subs = bom.SUB_CODE.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries);
- var surItems = Biz.Db.Queryable<BAS_ITEM>().Where(q => subs.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
- if (!SubItemDic.ContainsKey(assy.ITEM_CODE))
- {
- SubItemDic.Add(assy.ITEM_CODE, surItems);
- }
+ var surItems = MainDB.Queryable<BAS_ITEM>().Where(q => subs.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
+ foreach (var sub in surItems)
+ {
+ if (!item.SubItems.Any(q => q.ITEM_CODE == sub.ITEM_CODE))
+ {
+ item.SubItems.Add(sub);
+ }
+ }
}
CurAssembly.Items.Add(item);
}
}
+
+ CurStep.Message = Biz.L("鎵弿涓婃枡鐗╂枡");
+ CurStep.Status = StepStatus.Normal;
}
/// <summary>
@@ -112,6 +119,8 @@
}
//濡傛灉杩斿洖鎴愬姛鍒欒涓哄綋鍓嶈涓哄彲浠ュ紑濮嬫墽琛岋紝鍚﹀垯杩斿洖澶辫触
+ CurStep.Message = Biz.L("绛夊緟涓婃枡");
+ CurStep.Status = StepStatus.Normal;
action.IsSuccessed = false;
action.Data.ShortMsg = new("绛夊緟涓婃枡", ShortMessage.Types.Normal);
return action;
@@ -145,12 +154,13 @@
foreach (var item in CurAssembly.Items.Where(q => !q.IsFinished))
{
var isOK = true;
+ var matchItem = item.ItemInfo;
//鏍规嵁鏉＄爜瑙勫垯楠岃瘉涓婃枡鏄惁姝ｇ‘
if (!item.RuleCode.IsNullOrEmpty())
{
- if (!Biz.CodeRule[item.RuleCode].IsNullOrEmpty())
+ if (!Cache.CodeRule[item.RuleCode].IsNullOrEmpty())
{
- var result = Biz.CodeRule[item.RuleCode].Verify(input.SN);
+ var result = Cache.CodeRule[item.RuleCode].Verify(input.SN);
if (!result.IsSuccessed)
{
isOK = false;
@@ -169,6 +179,27 @@
}
}
}
+ //涓绘枡楠岃瘉涓嶉�氳繃锛屽垯灏濊瘯楠岃瘉鏇夸唬鏂�
+ if (!isOK && item.SubItems.Any())
+ {
+ foreach (var subItem in item.SubItems)
+ {
+ if (!subItem.RULE_CODE.IsNullOrEmpty())
+ {
+ if (!Cache.CodeRule[subItem.RULE_CODE].IsNullOrEmpty())
+ {
+ var result = Cache.CodeRule[item.RuleCode].Verify(input.SN);
+ //鍙鏈変竴涓浛浠ｆ枡閫氳繃楠岃瘉鍒欏彲浠ヤ笂鏂�
+ if (result.IsSuccessed)
+ {
+ isOK = true;
+ matchItem = subItem;
+ break;
+ }
+ }
+ }
+ }
+ }
//楠岃瘉閫氳繃鍒欎繚瀛樹笂鏂欎俊鎭�
if (isOK)
{
@@ -184,9 +215,9 @@
WIP_ID = wipSn.ID,
SN = input.SN,
PROD_SN = wipSn.SN,
- ITEM_CODE = item.ItemInfo.ITEM_CODE,
+ ITEM_CODE = matchItem.ITEM_CODE,
QTY = 1,
- UNIT = item.ItemInfo.UNIT,
+ UNIT = matchItem.UNIT,
WORK_ORDER = wipSn.WORK_ORDER,
BATCH_NO = wipSn.BATCH_NO,
ROT_CODE = wipSn.ROT_CODE,
@@ -214,9 +245,9 @@
WIP_ID = wipSn.ID,
SN = input.SN,
PROD_SN = wipSn.SN,
- ITEM_CODE = item.ItemInfo.ITEM_CODE,
+ ITEM_CODE = matchItem.ITEM_CODE,
QTY = 1,
- UNIT = item.ItemInfo.UNIT,
+ UNIT = matchItem.UNIT,
WORK_ORDER = wipSn.WORK_ORDER,
BATCH_NO = wipSn.BATCH_NO,
ROT_CODE = wipSn.ROT_CODE,
@@ -238,11 +269,13 @@
}
}
+ CurStep.Message = Biz.L("涓婃枡鎴愬姛");
+ CurStep.Status = StepStatus.Success;
action.IsSuccessed = true;
action.Data.ShortMsg = new("涓婃枡鎴愬姛", ShortMessage.Types.Success);
action.Data.Data = CurAssembly;
- //action.LocaleMsg = new Locale($"鎵弿鐗╂枡[{item.ItemInfo.ITEM_NAME}({item.ItemInfo.ITEM_CODE})鐨勬潯鐮乕{input.SN}]鎴愬姛锛岃缁х画涓婃枡");
- action.LocaleMsg = new Locale("MES.WorkAction.Assembly.LoadSuccess", item.ItemInfo.ITEM_NAME, item.ItemInfo.ITEM_CODE);
+ //action.LocaleMsg = new Locale($"鎵弿鐗╂枡[{matchItem.ITEM_NAME}({matchItem.ITEM_CODE})鐨勬潯鐮乕{input.SN}]鎴愬姛锛岃缁х画涓婃枡");
+ action.LocaleMsg = new Locale("MES.WorkAction.Assembly.LoadSuccess", matchItem.ITEM_NAME, matchItem.ITEM_CODE);
//涓婃枡瀹屾垚
if (CurAssembly.IsFinished)
@@ -253,6 +286,8 @@
}
}
//閮芥病鏈夌墿鏂欓獙璇侀�氳繃锛屽垯杩斿洖閿欒淇℃伅
+ CurStep.Message = Biz.L("涓婃枡澶辫触");
+ CurStep.Status = StepStatus.Error;
action.IsSuccessed = false;
action.Data.ShortMsg = new("涓婃枡澶辫触", ShortMessage.Types.Failed);
//action.LocaleMsg = new($"鏉＄爜[{input.SN}]楠岃瘉澶辫触锛屼笉鏄互涓嬬墿鏂欑殑鏉＄爜锛歿string.Join("锛�", CurAssembly.Items.Where(q => !q.IsFinished).Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}");
@@ -260,6 +295,8 @@
}
catch (System.Exception ex)
{
+ CurStep.Message = Biz.L("涓婃枡寮傚父");
+ CurStep.Status = StepStatus.Error;
action.Data.ShortMsg = new("涓婃枡寮傚父", ShortMessage.Types.Exception);
action.CatchExceptionWithLog(ex, $"涓婃枡琛屼负锛氶獙璇佹潯鐮乕{input.SN}]骞朵繚瀛樻暟鎹紓甯�");
action.IsSuccessed = false;
@@ -280,6 +317,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()
@@ -316,15 +354,60 @@
ACT_TYPE = NodeAct.ACT_TYPE,
ACT_SN = wipSn.SN,
ACT_VALUE_1 = CurAssembly.ToJson(),
+ ACT_VAR_DIC = CurStep.ActionDic.ToJson(),
ACT_RESULT = "Y",
+ ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(),
TRACE_INFO = $"浠ヤ笅鐗╂枡涓婃枡瀹屾垚锛歿string.Join(",", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}",
};
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,
+ 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();
//鏁寸悊涓婃枡璁板綍
var _records = new List<MES_WIP_ASSY>();
foreach (var item in CurAssembly.Items)
@@ -336,10 +419,12 @@
{
var db = CurPosition.GetCommitDB();
db.Storageable(_wipActs, CurPosition.UserCode).ExecuteCommand();
+ db.Storageable(_wipVars, CurPosition.UserCode).ExecuteCommand();
db.Insertable(_records, CurPosition.UserCode).ExecuteCommand();
};
IsFinished = true;
+ CurStep.Message = Biz.L("涓婃枡瀹屾垚");
CurStep.Status = StepStatus.Finished;
action.Data.ShortMsg = new("涓婃枡瀹屾垚", ShortMessage.Types.Success);
//action.LocaleMsg = new($"浠ヤ笅鐗╂枡涓婃枡瀹屾垚锛歿string.Join("锛�", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}");
--
Gitblit v1.9.3