From 006c12987d7dc7c2081fbf6715ebea98b93fdca0 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期日, 08 十二月 2024 17:04:32 +0800
Subject: [PATCH] 增加工单批次缓存，不良代码缓存，岗位缓存
---
Tiger.Business.MES/Common/WorkBatch.cs | 58 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/Tiger.Business.MES/Common/WorkBatch.cs b/Tiger.Business.MES/Common/WorkBatch.cs
index 413ac6f..7d5fdaa 100644
--- a/Tiger.Business.MES/Common/WorkBatch.cs
+++ b/Tiger.Business.MES/Common/WorkBatch.cs
@@ -50,7 +50,7 @@
#region Functions
/// <summary>
- /// 鍒濆鍖栧伐鍗曡祫鏂�
+ /// 鍒濆鍖栧伐鍗曟壒娆¤祫鏂�
/// </summary>
/// <returns></returns>
public WorkBatch Init(string lineCode)
@@ -63,6 +63,10 @@
return this;
}
+ /// <summary>
+ /// 鏇存柊宸ュ崟鎵规璧勬枡
+ /// </summary>
+ /// <param name="updateAll"></param>
public void Update(bool updateAll = false)
{
var strat = DateTime.Now;
@@ -166,20 +170,22 @@
action.LocaleMsg = new("MES.WorkBatch.WoStatusCanNotWork", WO.ORDER_NO, Batch.STATUS.GetEnumDesc<BIZ_MES_WO.STATUSs>());
}
//宸ュ崟鎵规鎶曞叆鏁伴噺鍑忓幓鎶ュ簾鏁伴噺濡傛灉澶т簬绛変簬璁″垝鏁伴噺锛屽垯涓嶅厑璁哥敓浜�
- if (curNode.IS_FIRST_NODE == "Y" && WoSNs.Count(q => q.BATCH_NO == Batch.BATCH_NO && BIZ_MES_WO_SN.STATUSs.NotInput.GetValue() < q.STATUS && q.STATUS <= BIZ_MES_WO_SN.STATUSs.Finished.GetValue()) >= Batch.PLAN_QTY)
+ var batchInput = WoSNs.Where(q => q.BATCH_NO == Batch.BATCH_NO && BIZ_MES_WO_SN.STATUSs.NotInput.GetValue() < q.STATUS && q.STATUS <= BIZ_MES_WO_SN.STATUSs.Finished.GetValue()).DistinctBy(q => q.WIP_ID).Sum(q => q.QTY);
+ if (curNode.IS_FIRST_NODE == "Y" && batchInput >= Batch.PLAN_QTY)
{
action.IsSuccessed = false;
action.Data.SetValue(this, null);
//action.LocaleMsg = new($"宸ュ崟鎵规[{0}]宸叉姇鍏� {1}锛屽叾涓姤搴� {2}锛屼互婊¤冻璁″垝鏁伴噺[{3}]锛屾棤闇�缁х画鎶曞叆");
- action.LocaleMsg = new("MES.WorkBatch.BatchInputEnough", Batch.BATCH_NO, WoSNs.Count(q => q.BATCH_NO == Batch.BATCH_NO), WoSNs.Count(q => q.BATCH_NO == Batch.BATCH_NO && q.STATUS > BIZ_MES_WO_SN.STATUSs.Finished.GetValue()), Batch.PLAN_QTY);
+ action.LocaleMsg = new("MES.WorkBatch.BatchInputEnough", Batch.BATCH_NO, batchInput, WoSNs.Where(q => q.BATCH_NO == Batch.BATCH_NO && q.STATUS > BIZ_MES_WO_SN.STATUSs.Finished.GetValue()).DistinctBy(q => q.WIP_ID).Sum(q => q.QTY), Batch.PLAN_QTY);
}
//宸ュ崟鎶曞叆鏁伴噺鍑忓幓鎶ュ簾鏁伴噺濡傛灉澶т簬绛変簬璁″垝鏁伴噺锛屽垯涓嶅厑璁哥敓浜�
- if (curNode.IS_FIRST_NODE == "Y" && WoSNs.Count(q =>q.WORK_ORDER == WO.ORDER_NO && BIZ_MES_WO_SN.STATUSs.NotInput.GetValue() < q.STATUS && q.STATUS <= BIZ_MES_WO_SN.STATUSs.Finished.GetValue()) >= WO.PLAN_QTY)
+ var woInput = WoSNs.Where(q => q.WORK_ORDER == WO.ORDER_NO && BIZ_MES_WO_SN.STATUSs.NotInput.GetValue() < q.STATUS && q.STATUS <= BIZ_MES_WO_SN.STATUSs.Finished.GetValue()).DistinctBy(q => q.WIP_ID).Sum(q => q.QTY);
+ if (curNode.IS_FIRST_NODE == "Y" && woInput >= WO.PLAN_QTY)
{
action.IsSuccessed = false;
action.Data.SetValue(this, null);
//action.LocaleMsg = new($"宸ュ崟[{0}]宸叉姇鍏� {1}锛屽叾涓姤搴� {2}锛屼互婊¤冻璁″垝鏁伴噺[{3}]锛屾棤闇�缁х画鎶曞叆");
- action.LocaleMsg = new("MES.WorkBatch.WoInputEnough", WO.ORDER_NO, WoSNs.Count(q => q.WORK_ORDER == WO.ORDER_NO), WoSNs.Count(q => q.WORK_ORDER == WO.ORDER_NO && q.STATUS > BIZ_MES_WO_SN.STATUSs.Finished.GetValue()), WO.PLAN_QTY);
+ action.LocaleMsg = new("MES.WorkBatch.WoInputEnough", WO.ORDER_NO, woInput, WoSNs.Where(q => q.WORK_ORDER == WO.ORDER_NO && q.STATUS > BIZ_MES_WO_SN.STATUSs.Finished.GetValue()).DistinctBy(q => q.WIP_ID).Sum(q => q.QTY), WO.PLAN_QTY);
}
return action;
@@ -350,6 +356,7 @@
action.IsSuccessed = false;
action.Data.SetValue(this, null);
var nextList = Nodes.Where(q => q.IS_FIRST_NODE == "Y");
+ //action.LocaleMsg = new($"鏉＄爜[{0}]鍦ㄥ伐搴廩{1}]杩囩珯鎵弿閿欒锛岃鍏堥�氳繃浠ヤ笅宸ュ簭锛歿2}");
action.LocaleMsg = new("MES.WorkBatch.GotoNextNodeException", input.SN, nextNode.NODE_NAME, string.Join(", ", nextList.Select(q => q.NODE_NAME + (GetNodeSetting(q)?.CAN_SKIP == "Y" ? $"({Biz.T(Biz.L("MES.WorkBatch.Optional"), input.Locale)})" : ""))));
return action;
}
@@ -386,22 +393,25 @@
action.IsSuccessed = false;
action.Data.SetValue(this, null);
var nextList = reflowNodes.Where(q => wipSN.REFLOW_NODE.IsNullOrEmpty() || wipSN.REFLOW_NODE == q.NODE_NAME);
+ //action.LocaleMsg = new($"宸ュ簭[{0}]涓嶆槸鏉＄爜[{1}]鍦ㄥ伐搴廩{2}]缁翠慨鍚庡彲鍥炴祦鐨勫伐搴忥紝璇烽�夋嫨鍥炴祦鍒颁互涓嬪伐搴忥細{3}");
action.LocaleMsg = new("MES.WorkBatch.ReflowToNodeException", nextNode.NODE_NAME, input.SN, curNode.NODE_NAME, string.Join(", ", nextList.Select(q => q.NODE_NAME + (GetNodeSetting(q)?.CAN_SKIP == "Y" ? $"({Biz.T(Biz.L("MES.WorkBatch.Optional"), input.Locale)})" : ""))));
return action;
}
}
- //涓嶈壇鍝佸叆绔欙細濡傛灉浜у搧鏈変笉鑹褰曚笖鐩爣宸ュ簭涓嶆槸缁翠慨宸ュ簭涓斾笉鍏佽涓嶈壇鍝佸叆绔欙紝鍒欐姤閿�
- else if (wipSN.Defects.Any(q => q.WORK_ORDER == WO.ORDER_NO && q.STATUS < MES_WIP_DFT.STATUSs.Resolved.GetValue())
- && nextSetting.ALLOW_DFT_IN != "Y" && nextNode.Operation.OPER_TYPE != MES_OPERATION.OPER_TYPEs.Repair.GetValue())
- {
- action.IsSuccessed = false;
- action.Data.SetValue(this, null);
- action.LocaleMsg = new("MES.WorkBatch.PleaseGotoRepair", curNode.NODE_NAME, input.SN);
- return action;
- }
//姝ｅ父宸ュ簭杩囩珯
else
{
+ //涓嶈壇鍝佸叆绔欙細濡傛灉浜у搧鏈変笉鑹褰曚笖鐩爣宸ュ簭涓嶆槸缁翠慨宸ュ簭涓斾笉鍏佽涓嶈壇鍝佸叆绔欙紝鍒欐姤閿�
+ if (wipSN.Defects.Any(q => q.STATUS < MES_WIP_DFT.STATUSs.Resolved.GetValue())
+ && nextSetting.ALLOW_DFT_IN != "Y" && nextNode.Operation.OPER_TYPE != MES_OPERATION.OPER_TYPEs.Repair.GetValue())
+ {
+ action.IsSuccessed = false;
+ action.Data.SetValue(this, null);
+ //action.LocaleMsg = new($"宸ュ簭[{0}]涓嶅厑璁镐笉鑹搧鍏ョ珯锛屾潯鐮乕{1}]瀛樺湪涓嶈壇璁板綍锛岃鍏堟寜娴佺▼鎸囧紩鎿嶄綔鎴栬�呰繘鍏ョ淮淇�");
+ action.LocaleMsg = new("MES.WorkBatch.PleaseGotoRepair", curNode.NODE_NAME, input.SN);
+ return action;
+ }
+
//娣诲姞鏉＄爜褰撳墠宸ュ簭鐨勪笅涓�涓彲鎵ц宸ュ簭
var nextNodes = GetNextNodes(curNode, wipSN);
//濡傛灉涓嬩竴涓彲鎵ц宸ュ簭鍖呭惈鐩爣宸ュ簭鍒欏厑璁歌繘绔�
@@ -416,7 +426,8 @@
{
action.IsSuccessed = false;
action.Data.SetValue(this, null);
- var nextList = nextNodes.Where(q => NodeSets.Any(s => s.NODE_ID == q.ID && s.IS_ACTIVE == "Y" && s.CAN_SKIP != "Y"));
+ var nextList = nextNodes.Where(q => NodeSets.Any(s => s.NODE_ID == q.ID && s.IS_ACTIVE == "Y"));
+ //action.LocaleMsg = new($"鏉＄爜[{0}]鍦ㄥ伐搴廩{1}]杩囩珯鎵弿閿欒锛岃鍏堥�氳繃浠ヤ笅宸ュ簭锛歿2}");
action.LocaleMsg = new("MES.WorkBatch.GotoNextNodeException", input.SN, nextNode.NODE_NAME, string.Join(", ", nextList.Select(q => q.NODE_NAME + (GetNodeSetting(q)?.CAN_SKIP == "Y" ? $"({Biz.T(Biz.L("MES.WorkBatch.Optional"), input.Locale)})" : ""))));
return action;
}
@@ -446,6 +457,7 @@
action.IsSuccessed = false;
action.Data.SetValue(this, null);
var nextList = nextNodes.Where(q => NodeSets.Any(s => s.NODE_ID == q.ID && s.IS_ACTIVE == "Y"));
+ //action.LocaleMsg = new($"鏉＄爜[{0}]鍦ㄥ伐搴廩{1}]杩囩珯鎵弿閿欒锛岃鍏堥�氳繃浠ヤ笅宸ュ簭锛歿2}");
action.LocaleMsg = new("MES.WorkBatch.GotoNextNodeException", input.SN, nextNode.NODE_NAME, string.Join(", ", nextList.Select(q => q.NODE_NAME + (GetNodeSetting(q)?.CAN_SKIP == "Y" ? $"({Biz.T(Biz.L("MES.WorkBatch.Optional"), input.Locale)})" : ""))));
return action;
}
@@ -464,7 +476,7 @@
private List<MES_WO_NODE> GetNextNodes(MES_WO_NODE parent, MES_WIP_DATA wipSN)
{
var result = new List<MES_WO_NODE>();
- var nextNodes = Nodes.Where(q => q.Operation.OPER_TYPE != MES_OPERATION.OPER_TYPEs.Repair.GetValue()
+ var nextNodes = Nodes.Where(q => q.Operation.OPER_TYPE != MES_OPERATION.OPER_TYPEs.Repair.GetValue()
&& Edges.Any(e => e.SRC_NODE == parent.ID && e.TGT_NODE == q.ID)
&& !wipSN.History.Any(h => h.WORK_ORDER == WO.ORDER_NO && h.UNBIND_FLAG != "Y" && h.NODE_ID == q.ID && h.IsFinished)
).ToList();
@@ -634,7 +646,7 @@
.ExecuteCommand();
//MES_WIP_DATA & MES_WIP_HIS
var wipHiss = new List<MES_WIP_HIS>();
- foreach (var wipSN in wipList.Where(q => q.STATUS != MES_WIP_DATA.STATUSs.Offline.GetValue()))
+ foreach (var wipSN in wipList) //.Where(q => q.STATUS != MES_WIP_DATA.STATUSs.Offline.GetValue())
{
wipSN.STATUS = MES_WIP_DATA.STATUSs.Offline.GetValue();
wipSN.TRAY_SN = wipSN.INNER_SN = wipSN.CARTON_SN = wipSN.PALLET_SN = wipSN.SHIPPING_ORDER = null;
@@ -669,10 +681,16 @@
while (curpkg.Any());
db.Updateable(pkgs, user).ExecuteCommand();
//MES_WIP_DFT锛屽湪涓婁粨搴撹閰嶅拰缁翠慨涔嬪墠锛屽厛鎶婁笉鑹褰曟爣璁颁负宸插鐞�
- db.Updateable<MES_WIP_DFT>(user)
- .SetColumns(q => q.STATUS == MES_WIP_DFT.STATUSs.Resolved.GetValue())
- .Where(q => q.WORK_ORDER == wo.ORDER_NO && wipIDs.Contains(q.WIP_ID))
+ db.Updateable<MES_WIP_DATA>(user)
+ .SetColumns(q => q.DFT_FLAG == "N")
+ .SetColumns(q => q.DFT_COUNT == 0)
+ .SetColumns(q => q.DFT_CODE == null)
+ .Where(q => q.WORK_ORDER == wo.ORDER_NO && wipIDs.Contains(q.ID))
.ExecuteCommand();
+ db.Updateable<MES_WIP_DFT>(user)
+ .SetColumns(q => q.STATUS == MES_WIP_DFT.STATUSs.Resolved.GetValue())
+ .Where(q => q.WORK_ORDER == wo.ORDER_NO && wipIDs.Contains(q.WIP_ID))
+ .ExecuteCommand();
});
if (!dbTran.IsSuccess)
{
--
Gitblit v1.9.3