From 050fdd3ef7d0e17143093ee355941bd6437b5486 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 13 十一月 2024 12:00:43 +0800
Subject: [PATCH] 优化生产记录状态，使用完工标记作为产品完工的判断，不使用状态 从工单中解绑正在生产的条码时，同步更新工单池中同一工单的工单条码状态
---
Tiger.Business.MES/Transaction/PackingNode.cs | 85 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 81 insertions(+), 4 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index 056f873..7a85ee8 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -304,7 +304,7 @@
return woStatus;
}
- var wipSNs = Biz.Db.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().Where(q => q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN).Where(q => q.STATUS < MES_WIP_DATA.STATUSs.Finished.GetValue()).ToList();
+ var wipSNs = Biz.Db.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().Where(q => q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN).Where(q => q.FINISHED_FLAG != "Y").ToList();
if (wipSNs.IsNullOrEmpty())
{
var wipSN = new MES_WIP_DATA()
@@ -424,7 +424,7 @@
{
var woSN = woSNs.First(q => q.WIP_ID == wipSN.ID);
woSN.STATUS = BIZ_MES_WO_SN.STATUSs.Finished.GetValue();
- wipSN.STATUS = MES_WIP_DATA.STATUSs.Finished.GetValue();
+ wipSN.STATUS = MES_WIP_DATA.STATUSs.Output.GetValue();
wipSN.OUTLINE_DATE = DateTime.Now;
}
//濡傛灉鏈夋彁浜や笉鑹�
@@ -470,8 +470,16 @@
OBA_BATCH = wipSN.OBA_BATCH,
LOCK_BATCH = wipSN.LOCK_BATCH,
};
+ wipSN.Defects.Add(defect);
CurDefects.Add(defect);
}
+ }
+
+ //浜у搧琚垽鏂笉鑹悗涓嬬嚎锛屽苟浠庡伐鍗曚腑绉婚櫎姝ｅ湪鐢熶骇鐨勬潯鐮�
+ if (CurDefects.Any() && curNodeSetting.IF_DFT_OFFLINE == "Y")
+ {
+ woStatus.Data.ShortMsg = new("浜у搧涓嬬嚎", ShortMessage.Types.Error);
+ return OfflineIfDefect(action, wipSNs, input.Locale);
}
//宸ュ崟寮�宸�
@@ -650,7 +658,7 @@
//鏉＄爜瀹屽伐
foreach (var wipSN in CurWipSNs)
{
- wipSN.STATUS = MES_WIP_DATA.STATUSs.Finished.GetValue();
+ wipSN.FINISHED_FLAG = "Y";
wipSN.NODE_ID = curNode.ID;
wipSN.NODE_NAME = curNode.NODE_NAME;
wipSN.OPER_CODE = curNode.OPER_CODE;
@@ -699,7 +707,7 @@
SaveStepsCommitActionToDB(endAction);
//淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭�
- CurOperInfo(locale).InputQty += CurWipSNs.Count;
+ operInfo.InputQty += CurWipSNs.Count;
action.Data.Data = new PackingActionOutput() { PkgInfo = curPkg };
action.Data.OperInfo = operInfo;
action.Data.ShortMsg = new(CurWipSNs.Any(q => q.DFT_FLAG == "Y") ? "涓嶈壇杩囩珯" : "鑹搧杩囩珯", ShortMessage.Types.Success);
@@ -719,6 +727,75 @@
}
/// <summary>
+ /// 浜у搧琚垽鏂笉鑹悗涓嬬嚎
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ public ApiAction<SubmitOutput> OfflineIfDefect(ApiAction<SubmitOutput> action, List<MES_WIP_DATA> wipSNs, string locale)
+ {
+ var operInfo = SetOperNodeInfo(CurOperInfo(locale));
+ operInfo.CurNode = wipSNs.FirstOrDefault()?.NODE_NAME;
+ operInfo.NextNode = "涓嬬嚎閫�搴�";
+
+ //鏇存柊宸ュ崟鏉＄爜鏄庣粏淇℃伅
+ var woSNs = CurBatch.WoSNs.Where(q => wipSNs.Any(w => q.WIP_ID == w.ID)).ToList();
+ foreach (var woSN in woSNs)
+ {
+ woSN.STATUS = BIZ_MES_WO_SN.STATUSs.Offline.GetValue();
+ }
+
+ //鏉＄爜涓嬬嚎
+ foreach (var wipSN in wipSNs)
+ {
+ wipSN.STATUS = MES_WIP_DATA.STATUSs.Offline.GetValue();
+ wipSN.UNBIND_FLAG = "Y";
+ }
+
+ var wipHiss = new List<MES_WIP_HIS>();
+ foreach (var wipSN in wipSNs)
+ {
+ var his = new MES_WIP_HIS(wipSN, $"宸ュ崟[{wipSN.WORK_ORDER}]鏉＄爜[{wipSN.SN}]鍦ㄥ矖浣峓{wipSN.POST_CODE}]宸ュ簭[{wipSN.NODE_NAME}]鍥犱笉鑹痆{wipSN.Defects.FirstOrDefault()?.DFT_NAME}]涓嬬嚎锛圱ransId锛� {TransID} 锛�");
+ wipSN.History.Add(his);
+ wipHiss.Add(his);
+ }
+
+ //鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
+ var _woSns = woSNs.Clone();
+ var _wipSns = wipSNs.Clone();
+ var _wipHiss = wipHiss.Clone();
+ var _defect = CurDefects.Clone();
+ //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
+ var db = GetCommitDB();
+ //淇濆瓨鏁版嵁搴�
+ var dbTran = db.UseTran(() =>
+ {
+ //鏁版嵁淇濆瓨閫昏緫
+ db.Storageable(_woSns, UserCode).ExecuteCommand();
+ db.Storageable(_wipSns, UserCode).ExecuteCommand();
+ db.Storageable(_wipHiss, UserCode).ExecuteCommand();
+ db.Storageable(_defect, UserCode).ExecuteCommand();
+ });
+ if (!dbTran.IsSuccess)
+ {
+ //鎶涘嚭寮傚父
+ throw dbTran.ErrorException;
+ }
+
+ //浠庡伐鍗曚腑绉婚櫎姝ｅ湪鐢熶骇鐨勬潯鐮�
+ CurBatch.RemoveWipSn(wipSNs, UserCode);
+
+ //淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭�
+ action.Data.OperInfo = operInfo;
+ action.Data.ShortMsg = new("涓嬬嚎閫�搴�", ShortMessage.Types.Warning);
+ //action.LocaleMsg = new($"宸ュ崟[0]鐨勬潯鐮乕1]鍦ㄥ矖浣峓2]宸ュ簭[3]鍥犱笉鑹痆4]涓嬬嚎锛岀姸鎬乕5]");
+ action.LocaleMsg = new("MES.Transaction.TestNode.OfflineIfDefect", wipSNs.First().WORK_ORDER, CurSN, wipSNs.First().POST_CODE, wipSNs.First().NODE_NAME, wipSNs.First().Defects.FirstOrDefault()?.DFT_NAME, wipSNs.First().STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
+
+ //閲嶇疆宸ュ簭
+ ResetNode();
+ return action;
+ }
+
+ /// <summary>
/// 鍖呰宸ュ簭锛氭墜鍔ㄧ粨鏉熷寘瑁�
/// </summary>
/// <returns></returns>
--
Gitblit v1.9.3