From 0116b5d2ed16a0825da9e7474fc786ee06b2d60c Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 04 九月 2024 08:40:31 +0800
Subject: [PATCH] 增加公布提示信息和状态
---
Tiger.Business.MES/WorkAction/Assembly.cs | 254 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 173 insertions(+), 81 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/Assembly.cs b/Tiger.Business.MES/WorkAction/Assembly.cs
index f2fa2bc..9dc8ee7 100644
--- a/Tiger.Business.MES/WorkAction/Assembly.cs
+++ b/Tiger.Business.MES/WorkAction/Assembly.cs
@@ -3,7 +3,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using Tiger.IBusiness;
@@ -24,7 +23,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
@@ -48,38 +46,42 @@
var assyList = new List<AssemblySetting>();
try
{
- assyList = setting.ITEM_CODE.JsonToObject<List<AssemblySetting>>();
+ assyList = (setting.ITEM_CODE ?? "").JsonToObject<List<AssemblySetting>>();
}
catch (System.Exception ex)
{
var codeList = setting.ITEM_CODE.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries);
foreach (var code in codeList)
{
- assyList.Add(new(){ ItemCode = code });
+ assyList.Add(new(){ ITEM_CODE = code, QTY = 1 });
}
}
- var codes = assyList.Select(q => q.ItemCode).ToList();
+ 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();
//鑾峰彇涓婃枡鐗╂枡鐨勬浛浠ｆ枡
foreach (var assy in assyList)
{
- var info = items.FirstOrDefault(q => q.ITEM_CODE == assy.ItemCode);
+ var info = items.FirstOrDefault(q => q.ITEM_CODE == assy.ITEM_CODE);
if (!info.IsNullOrEmpty())
{
var item = new AssemblyItem {
ItemInfo = info,
- RuleCode = assy.RuleCode,
- LoadQty = assy.Qty,
+ RuleCode = assy.RULE_CODE,
+ LoadQty = assy.QTY,
+ IsBatchItem = assy.IsBatchItem,
};
- var bom = Boms.FirstOrDefault(q => q.ITEM_CODE == assy.ItemCode);
+ var bom = Boms.FirstOrDefault(q => q.ITEM_CODE == assy.ITEM_CODE);
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.ItemCode))
- {
- SubItemDic.Add(assy.ItemCode, surItems);
- }
+ foreach (var sub in surItems)
+ {
+ if (!item.SubItems.Any(q => q.ITEM_CODE == sub.ITEM_CODE))
+ {
+ item.SubItems.Add(sub);
+ }
+ }
}
CurAssembly.Items.Add(item);
}
@@ -105,14 +107,17 @@
{
var action = new ApiAction<SubmitOutput>(new SubmitOutput());
- if (input.SN != CurPosition.CurWipSN.SN)
+ if (!CurPosition.CurWipSNs.Any(w => w.SN == input.SN))
{
action = SaveAssembly(input, action);
return action;
}
//濡傛灉杩斿洖鎴愬姛鍒欒涓哄綋鍓嶈涓哄彲浠ュ紑濮嬫墽琛岋紝鍚﹀垯杩斿洖澶辫触
+ CurStep.Message = Biz.L("绛夊緟涓婃枡");
+ CurStep.Status = StepStatus.Normal;
action.IsSuccessed = false;
+ action.Data.ShortMsg = new("绛夊緟涓婃枡", ShortMessage.Types.Normal);
return action;
}
@@ -144,6 +149,7 @@
foreach (var item in CurAssembly.Items.Where(q => !q.IsFinished))
{
var isOK = true;
+ var matchItem = item.ItemInfo;
//鏍规嵁鏉＄爜瑙勫垯楠岃瘉涓婃枡鏄惁姝ｇ‘
if (!item.RuleCode.IsNullOrEmpty())
{
@@ -168,59 +174,128 @@
}
}
}
+ //涓绘枡楠岃瘉涓嶉�氳繃锛屽垯灏濊瘯楠岃瘉鏇夸唬鏂�
+ 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)
{
- var record = new MES_WIP_ASSY()
+ //鎵规鐗╂枡鍒欏彧璁板綍涓�娆★紝闈炴壒娆＄墿鏂欏垯瑕佹寜涓暟楠岃瘉鏁伴噺
+ if (item.IsBatchItem)
{
- AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
- AUTH_PROD = CurPosition.CurLine.LINE_CODE,
- SN = input.SN,
- PROD_SN = CurPosition.CurWipSN.SN,
- ITEM_CODE = item.ItemInfo.ITEM_CODE,
- QTY = 1,
- UNIT = item.ItemInfo.UNIT,
- 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,
- 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,
- };
- item.Records.Add(record);
- if (item.Records.Sum(q => q.QTY) >= item.LoadQty)
+ foreach (var wipSn in CurPosition.CurWipSNs)
+ {
+ var record = new MES_WIP_ASSY()
+ {
+ AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
+ AUTH_PROD = CurPosition.CurLine.LINE_CODE,
+ WIP_ID = wipSn.ID,
+ SN = input.SN,
+ PROD_SN = wipSn.SN,
+ ITEM_CODE = matchItem.ITEM_CODE,
+ QTY = 1,
+ UNIT = matchItem.UNIT,
+ 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,
+ 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,
+ };
+ item.Records.Add(record);
+ }
+ item.IsFinished = true;
+ }
+ else
{
- item.IsFinished = true;
+ foreach (var wipSn in CurPosition.CurWipSNs)
+ {
+ var record = new MES_WIP_ASSY()
+ {
+ AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
+ AUTH_PROD = CurPosition.CurLine.LINE_CODE,
+ WIP_ID = wipSn.ID,
+ SN = input.SN,
+ PROD_SN = wipSn.SN,
+ ITEM_CODE = matchItem.ITEM_CODE,
+ QTY = 1,
+ UNIT = matchItem.UNIT,
+ 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,
+ 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,
+ };
+ item.Records.Add(record);
+ }
+
+ if (item.Records.Sum(q => q.QTY) / item.Records.Count >= item.LoadQty * CurPosition.CurWipSNs.Count)
+ {
+ item.IsFinished = true;
+ }
}
+ 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)
{
- action.CatchExceptionWithLog(ex, $"涓婃枡琛屼负锛氶獙璇佹潯鐮乕{input.SN}]骞朵繚瀛樻暟鎹け璐�");
+ 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}]骞朵繚瀛樻暟鎹け璐ワ紝宸ュ簭宸查噸缃紝璇烽噸鏂版壂鎻忚繘绔欎骇鍝佹潯鐮�");
+ //action.LocaleMsg = new($"楠岃瘉鏉＄爜[{input.SN}]骞朵繚瀛樻暟鎹紓甯革紝宸ュ簭宸查噸缃紝璇烽噸鏂版壂鎻忚繘绔欎骇鍝佹潯鐮�");
action.LocaleMsg = new("MES.WorkAction.Assembly.SaveAssemblyException", input.SN);
CurPosition.ResetNode();
}
@@ -231,58 +306,75 @@
/// 缁撴潫鎵ц宸ュ簭琛屼负
/// </summary>
/// <returns></returns>
- public ApiAction<SubmitOutput> End()
+ public ApiAction<SubmitOutput> End(SubmitInput input)
{
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 = CurAssembly.ToJson(),
- ACT_RESULT = "Y",
- TRACE_INFO = $"浠ヤ笅鐗╂枡涓婃枡瀹屾垚锛歿string.Join(",", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}",
- };
- var records = new List<MES_WIP_ASSY>();
- foreach (var item in CurAssembly.Items)
- {
- records.AddRange(item.Records);
+ 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 = CurAssembly.ToJson(),
+ ACT_RESULT = "Y",
+ TRACE_INFO = $"浠ヤ笅鐗╂枡涓婃枡瀹屾垚锛歿string.Join(",", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}",
+ };
+ wipActs.Add(wipAct);
}
+
+ //鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
+ var _wipActs = wipActs.Clone();
+ //鏁寸悊涓婃枡璁板綍
+ var _records = new List<MES_WIP_ASSY>();
+ foreach (var item in CurAssembly.Items)
+ {
+ _records.AddRange(item.Records.Clone());
+ }
//淇濆瓨鏁版嵁
CurStep.DBSubmitAction = () =>
{
var db = CurPosition.GetCommitDB();
- db.Storageable(wipAct, CurPosition.UserCode).ExecuteCommand();
- db.Insertable(records, CurPosition.UserCode).ExecuteCommand();
+ db.Storageable(_wipActs, 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})"))}");
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