From 3f364634b79a0f97a550c54f67313dfc0cfd4cb5 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 27 十一月 2024 22:16:01 +0800
Subject: [PATCH] 一大波签入来了
---
Tiger.Business.MES/WorkAction/Assembly.cs | 79 +++++++++++++++++++++++++++++++--------
1 files changed, 62 insertions(+), 17 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/Assembly.cs b/Tiger.Business.MES/WorkAction/Assembly.cs
index ab68c80..7173fd3 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,7 +119,10 @@
}
//濡傛灉杩斿洖鎴愬姛鍒欒涓哄綋鍓嶈涓哄彲浠ュ紑濮嬫墽琛岋紝鍚﹀垯杩斿洖澶辫触
+ CurStep.Message = Biz.L("绛夊緟涓婃枡");
+ CurStep.Status = StepStatus.Normal;
action.IsSuccessed = false;
+ action.Data.ShortMsg = new("绛夊緟涓婃枡", ShortMessage.Types.Normal);
return action;
}
@@ -144,6 +154,7 @@
foreach (var item in CurAssembly.Items.Where(q => !q.IsFinished))
{
var isOK = true;
+ var matchItem = item.ItemInfo;
//鏍规嵁鏉＄爜瑙勫垯楠岃瘉涓婃枡鏄惁姝ｇ‘
if (!item.RuleCode.IsNullOrEmpty())
{
@@ -168,6 +179,27 @@
}
}
}
+ //涓绘枡楠岃瘉涓嶉�氳繃锛屽垯灏濊瘯楠岃瘉鏇夸唬鏂�
+ if (!isOK && item.SubItems.Any())
+ {
+ foreach (var subItem in item.SubItems)
+ {
+ if (!subItem.RULE_CODE.IsNullOrEmpty())
+ {
+ if (!Biz.CodeRule[subItem.RULE_CODE].IsNullOrEmpty())
+ {
+ var result = Biz.CodeRule[item.RuleCode].Verify(input.SN);
+ //鍙鏈変竴涓浛浠ｆ枡閫氳繃楠岃瘉鍒欏彲浠ヤ笂鏂�
+ if (result.IsSuccessed)
+ {
+ isOK = true;
+ matchItem = subItem;
+ break;
+ }
+ }
+ }
+ }
+ }
//楠岃瘉閫氳繃鍒欎繚瀛樹笂鏂欎俊鎭�
if (isOK)
{
@@ -183,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,
@@ -213,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,
@@ -237,26 +269,35 @@
}
}
+ CurStep.Message = Biz.L("涓婃枡鎴愬姛");
+ CurStep.Status = StepStatus.Success;
action.IsSuccessed = true;
- 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.Data.ShortMsg = new("涓婃枡鎴愬姛", ShortMessage.Types.Success);
+ action.Data.Data = CurAssembly;
+ //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)
{
- action = End();
+ action = End(input);
}
return action;
}
}
//閮芥病鏈夌墿鏂欓獙璇侀�氳繃锛屽垯杩斿洖閿欒淇℃伅
+ 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})"))}");
action.LocaleMsg = new("MES.WorkAction.Assembly.LoadFail", input.SN, string.Join("锛�", CurAssembly.Items.Where(q => !q.IsFinished).Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})")));
}
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;
//action.LocaleMsg = new($"楠岃瘉鏉＄爜[{input.SN}]骞朵繚瀛樻暟鎹紓甯革紝宸ュ簭宸查噸缃紝璇烽噸鏂版壂鎻忚繘绔欎骇鍝佹潯鐮�");
@@ -270,7 +311,7 @@
/// 缁撴潫鎵ц宸ュ簭琛屼负
/// </summary>
/// <returns></returns>
- public ApiAction<SubmitOutput> End()
+ public ApiAction<SubmitOutput> End(SubmitInput input)
{
var action = new ApiAction<SubmitOutput>(new SubmitOutput());
@@ -313,6 +354,7 @@
ACT_SN = wipSn.SN,
ACT_VALUE_1 = CurAssembly.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);
@@ -336,6 +378,9 @@
};
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})"))}");
action.LocaleMsg = new("MES.WorkAction.Assembly.LoadFinish", string.Join("锛�", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})")));
return action;
--
Gitblit v1.9.3