From 35afcfe07fef52f74a2079fdb5977a87f88ddbb6 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 17 十二月 2024 20:40:47 +0800
Subject: [PATCH] 提交前检查是否岗位、工单和不良代码
---
Tiger.Business.MES/Transaction/TestNode.cs | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/TestNode.cs b/Tiger.Business.MES/Transaction/TestNode.cs
index bf0fe21..d745dd0 100644
--- a/Tiger.Business.MES/Transaction/TestNode.cs
+++ b/Tiger.Business.MES/Transaction/TestNode.cs
@@ -37,7 +37,7 @@
//宸ユ鍒楄〃涓虹┖鎴栬�呭伐搴忚妭鐐瑰伐姝ユ湁鏈畬鎴愭椂锛屼紭鍏堝畬鎴愬伐搴忚妭鐐瑰伐姝�
if (Steps.IsNullOrEmpty() || !IsFinishNodeSteps)
{
- var wosns = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER && q.BATCH_NO == s.BATCH_NO))
+ var wosns = MainDB.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER && q.BATCH_NO == s.BATCH_NO))
.ByAuth(input.AuthOption)//.Where((q, s) => s.STATUS < BIZ_MES_WO_SN.STATUSs.Finished.GetValue())
.Where((q, s) => s.SN == input.SN || s.FLOW_SN == input.SN || s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList();
@@ -100,7 +100,7 @@
action.Data.OperInfo = new();
action.IsSuccessed = result.IsSuccessed;
action.LocaleMsg = result.LocaleMsg;
- return action;
+ return SetOutPutMqttMsg(action, input.Locale);
}
}
//鏇存柊CurBatch
@@ -216,10 +216,11 @@
{
action.Data.ShortMsg = new("宸ュ簭寮傚父", ShortMessage.Types.Error);
action.Data.OperInfo = CurOperInfo(input.Locale);
+ ResetNode();
//action.CatchExceptionWithLog(ex, $"娴嬭瘯宸ュ簭锛氭彁浜ゆ搷浣滄暟鎹紓甯�");
action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.TestNode.SubmitException"));
}
- return action;
+ return SetOutPutMqttMsg(action, input.Locale);
}
/// <summary>
@@ -257,7 +258,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 = MainDB.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()
@@ -353,6 +354,7 @@
wipSN.POST_CODE = CurPosition.POST_CODE;
wipSN.OPER_CODE = curNode.OPER_CODE;
wipSN.SEGMENT = curNode.SEGMENT;
+ wipSN.UNBIND_FLAG = "N";
wipSN.OPERATION_TIME = DateTime.Now;
var curShiftPeriod = GetShiftPeriodForNow();
if (!curShiftPeriod.IsNullOrEmpty())
@@ -374,7 +376,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;
}
//濡傛灉鏈夋彁浜や笉鑹�
@@ -602,7 +604,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;
--
Gitblit v1.9.3