From 0c724878e66cac2639811ac2e88f553fc17cc72b Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 05 十一月 2024 01:17:02 +0800
Subject: [PATCH] 重投更新
---
Tiger.Business.MES/Transaction/YadaPacking.cs | 43 +++++++++-----
Tiger.Business.MES/Transaction/CollectNode.cs | 40 ++++++++----
Tiger.Business.MES/Transaction/PackingNode.cs | 42 +++++++++----
Tiger.Business.MES/Transaction/Position.cs | 1
Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs | 2
Tiger.Business.MES/Common/WoContext.cs | 5 +
Tiger.Business.MES/Transaction/TestNode.cs | 41 +++++++++----
7 files changed, 114 insertions(+), 60 deletions(-)
diff --git a/Tiger.Business.MES/Common/WoContext.cs b/Tiger.Business.MES/Common/WoContext.cs
index 0cb1963..be617d9 100644
--- a/Tiger.Business.MES/Common/WoContext.cs
+++ b/Tiger.Business.MES/Common/WoContext.cs
@@ -31,11 +31,12 @@
/// <param name="workorder"></param>
/// <param name="lineCode"></param>
/// <returns></returns>
- public static WorkBatch GetBatch(string workorder, string lineCode, string batchNo = "")
+ public static WorkBatch GetBatch(string workorder, string lineCode, string batchNo = "", bool canDoWork = true)
{
if (ExistsBatch(workorder, lineCode, batchNo))
{
- return WoBatchDic.FirstOrDefault(q => !q.Value.Batch.IsNullOrEmpty() && q.Value.Batch.ORDER_NO == workorder && q.Value.Batch.ACT_LINE == lineCode && (batchNo.IsNullOrEmpty() || q.Value.Batch.BATCH_NO == batchNo)).Value;
+ return WoBatchDic.WhereIF(canDoWork, q => q.Value.Batch.STATUS == BIZ_MES_WO_BATCH.STATUSs.Release.GetValue() || q.Value.Batch.STATUS == BIZ_MES_WO_BATCH.STATUSs.Working.GetValue())
+ .FirstOrDefault(q => !q.Value.Batch.IsNullOrEmpty() && q.Value.Batch.ORDER_NO == workorder && q.Value.Batch.ACT_LINE == lineCode && (batchNo.IsNullOrEmpty() || q.Value.Batch.BATCH_NO == batchNo)).Value;
}
return null;
}
diff --git a/Tiger.Business.MES/Transaction/CollectNode.cs b/Tiger.Business.MES/Transaction/CollectNode.cs
index 70534f5..30f4805 100644
--- a/Tiger.Business.MES/Transaction/CollectNode.cs
+++ b/Tiger.Business.MES/Transaction/CollectNode.cs
@@ -43,32 +43,44 @@
//宸ユ鍒楄〃涓虹┖鎴栬�呭伐搴忚妭鐐瑰伐姝ユ湁鏈畬鎴愭椂锛屼紭鍏堝畬鎴愬伐搴忚妭鐐瑰伐姝�
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))
+ .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();
//鍏堝垽鏂綋鍓嶅伐鍗曚笉涓虹┖涓斿綋鍓嶅矖浣嶅湪褰撳墠宸ュ崟鏄笉鏄绔欙紝濡傛灉鏄垯涓嶅厑璁稿彉鏇村綋鍓嶅伐鍗曪紝灏濊瘯鎶婃潯鐮佺粦瀹氬埌褰撳墠宸ュ崟
if (!CurBatch.IsNullOrEmpty() && CurBatch.IsFirstNode(PostCode))
{
//鏇存柊CurBatch
CurBatch?.Update();
- //鎻愪氦鏁版嵁
- action = NodeSubmit(action, input);
- //鏇存柊宸ュ簭淇℃伅
- if (!action.IsSuccessed)
+
+ var wosn = wosns.FirstOrDefault(q => q.Batch.ORDER_NO == CurBatch.WO.ORDER_NO && (q.SN.STATUS == BIZ_MES_WO_SN.STATUSs.Finished.GetValue() || q.SN.STATUS == BIZ_MES_WO_SN.STATUSs.Scrap.GetValue()));
+ if (!wosn.IsNullOrEmpty())
{
- var info = WoContext.GetSnOperInfo(input.SN).Data;
- info.InputQty = CurOperInfo(input.Locale).InputQty;
- action.Data.OperInfo = info;
+ action.Data.ShortMsg = new($"浜у搧{wosn.SN.STATUS.GetEnumDesc<BIZ_MES_WO_SN.STATUSs>()}", ShortMessage.Types.Error);
+ action.Data.OperInfo = new();
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"杩涚珯鎵弿閿欒锛屾潯鐮乕{0}]{1}", input.SN);
+ action.LocaleMsg = new("MES.Transaction.CollectNode.Submit.SnStatusError", input.SN, wosn.SN.STATUS.GetEnumDesc<BIZ_MES_WO_SN.STATUSs>());
}
- else if (Steps.Any() && !IsFinishAllSteps)
+ else
{
- action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));
+ //鎻愪氦鏁版嵁
+ action = NodeSubmit(action, input);
+ //鏇存柊宸ュ簭淇℃伅
+ if (!action.IsSuccessed)
+ {
+ var info = WoContext.GetSnOperInfo(input.SN).Data;
+ info.InputQty = CurOperInfo(input.Locale).InputQty;
+ action.Data.OperInfo = info;
+ }
+ else if (Steps.Any() && !IsFinishAllSteps)
+ {
+ action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));
+ }
}
}
//褰撳墠宀椾綅鍦ㄥ綋鍓嶅伐鍗曚笉鏄绔欙紝鍒欐煡鎵炬潯鐮佸凡缁戝畾鐨勫伐鍗曞綋浣滃綋鍓嶅伐鍗�
else
{
- 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))
- .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();
-
//鏌ユ壘鍒版潯鐮佸凡缁戝畾鐨勫伐鍗�
if (wosns.Any(q => q.SN.STATUS < BIZ_MES_WO_SN.STATUSs.Finished.GetValue()))
{
@@ -250,7 +262,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).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.STATUS < MES_WIP_DATA.STATUSs.Finished.GetValue()).ToList();
if (wipSNs.IsNullOrEmpty())
{
var wipSN = new MES_WIP_DATA()
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index fd01834..056f873 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -65,32 +65,46 @@
//宸ユ鍒楄〃涓虹┖鎴栬�呭伐搴忚妭鐐瑰伐姝ユ湁鏈畬鎴愭椂锛屼紭鍏堝畬鎴愬伐搴忚妭鐐瑰伐姝�
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))
+ .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();
+
//鍏堝垽鏂綋鍓嶅伐鍗曚笉涓虹┖涓斿綋鍓嶅矖浣嶅湪褰撳墠宸ュ崟鏄笉鏄绔欙紝濡傛灉鏄垯涓嶅厑璁稿彉鏇村綋鍓嶅伐鍗曪紝灏濊瘯鎶婃潯鐮佺粦瀹氬埌褰撳墠宸ュ崟
if (!CurBatch.IsNullOrEmpty() && CurBatch.IsFirstNode(PostCode))
{
//鏇存柊CurBatch
CurBatch?.Update();
- //鎻愪氦鏁版嵁
- action = NodeSubmit(action, input);
- //鏇存柊宸ュ簭淇℃伅
- if (!action.IsSuccessed)
+
+ var wosn = wosns.FirstOrDefault(q => q.Batch.ORDER_NO == CurBatch.WO.ORDER_NO && (q.SN.STATUS == BIZ_MES_WO_SN.STATUSs.Finished.GetValue() || q.SN.STATUS == BIZ_MES_WO_SN.STATUSs.Scrap.GetValue()));
+ if (!wosn.IsNullOrEmpty())
{
- var info = WoContext.GetSnOperInfo(input.SN).Data;
- info.InputQty = CurOperInfo(input.Locale).InputQty;
- action.Data.OperInfo = info;
+ action.Data.ShortMsg = new($"浜у搧{wosn.SN.STATUS.GetEnumDesc<BIZ_MES_WO_SN.STATUSs>()}", ShortMessage.Types.Error);
+ action.Data.OperInfo = new();
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"杩涚珯鎵弿閿欒锛屾潯鐮乕{0}]{1}", input.SN);
+ action.LocaleMsg = new("MES.Transaction.CollectNode.Submit.SnStatusError", input.SN, wosn.SN.STATUS.GetEnumDesc<BIZ_MES_WO_SN.STATUSs>());
}
- else if (Steps.Any() && !IsFinishAllSteps)
+ else
{
- action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));
+ //鎻愪氦鏁版嵁
+ action = NodeSubmit(action, input);
+ //鏇存柊宸ュ簭淇℃伅
+ if (!action.IsSuccessed)
+ {
+ var info = WoContext.GetSnOperInfo(input.SN).Data;
+ info.InputQty = CurOperInfo(input.Locale).InputQty;
+ action.Data.OperInfo = info;
+ }
+ else if (Steps.Any() && !IsFinishAllSteps)
+ {
+ action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));
+ }
}
}
//褰撳墠宀椾綅鍦ㄥ綋鍓嶅伐鍗曚笉鏄绔欙紝鍒欐煡鎵炬潯鐮佸凡缁戝畾鐨勫伐鍗曞綋浣滃綋鍓嶅伐鍗�
else
{
- 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))
- .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();
-
//鏌ユ壘鍒版潯鐮佸凡缁戝畾鐨勫伐鍗�
if (wosns.Any(q => q.SN.STATUS < BIZ_MES_WO_SN.STATUSs.Finished.GetValue()))
{
@@ -290,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).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.STATUS < MES_WIP_DATA.STATUSs.Finished.GetValue()).ToList();
if (wipSNs.IsNullOrEmpty())
{
var wipSN = new MES_WIP_DATA()
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index ccb961a..fa372a2 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -143,6 +143,7 @@
}
var wb = new WorkBatch(input.OrderNo).Init(CurLine.LINE_CODE);
WoContext.WoBatchDic.Add(wb.Batch.BATCH_NO, wb);
+ batchNo = wb.Batch.BATCH_NO;
}
CurBatch = WoContext.GetBatch(input.OrderNo, CurLine.LINE_CODE, batchNo);
if (!OperInfoDic.ContainsKey(CurBatch.Batch.BATCH_NO))
diff --git a/Tiger.Business.MES/Transaction/TestNode.cs b/Tiger.Business.MES/Transaction/TestNode.cs
index d334a8d..bf0fe21 100644
--- a/Tiger.Business.MES/Transaction/TestNode.cs
+++ b/Tiger.Business.MES/Transaction/TestNode.cs
@@ -37,32 +37,45 @@
//宸ユ鍒楄〃涓虹┖鎴栬�呭伐搴忚妭鐐瑰伐姝ユ湁鏈畬鎴愭椂锛屼紭鍏堝畬鎴愬伐搴忚妭鐐瑰伐姝�
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))
+ .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();
+
//鍏堝垽鏂綋鍓嶅伐鍗曚笉涓虹┖涓斿綋鍓嶅矖浣嶅湪褰撳墠宸ュ崟鏄笉鏄绔欙紝濡傛灉鏄垯涓嶅厑璁稿彉鏇村綋鍓嶅伐鍗曪紝灏濊瘯鎶婃潯鐮佺粦瀹氬埌褰撳墠宸ュ崟
if (!CurBatch.IsNullOrEmpty() && CurBatch.IsFirstNode(PostCode))
{
//鏇存柊CurBatch
CurBatch?.Update();
- //鎻愪氦鏁版嵁
- action = NodeSubmit(action, input);
- //鏇存柊宸ュ簭淇℃伅
- if (!action.IsSuccessed)
+
+ var wosn = wosns.FirstOrDefault(q => q.Batch.ORDER_NO == CurBatch.WO.ORDER_NO && (q.SN.STATUS == BIZ_MES_WO_SN.STATUSs.Finished.GetValue() || q.SN.STATUS == BIZ_MES_WO_SN.STATUSs.Scrap.GetValue()));
+ if (!wosn.IsNullOrEmpty())
{
- var info = WoContext.GetSnOperInfo(input.SN).Data;
- info.InputQty = CurOperInfo(input.Locale).InputQty;
- action.Data.OperInfo = info;
+ action.Data.ShortMsg = new($"浜у搧{wosn.SN.STATUS.GetEnumDesc<BIZ_MES_WO_SN.STATUSs>()}", ShortMessage.Types.Error);
+ action.Data.OperInfo = new();
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"杩涚珯鎵弿閿欒锛屾潯鐮乕{0}]{1}", input.SN);
+ action.LocaleMsg = new("MES.Transaction.CollectNode.Submit.SnStatusError", input.SN, wosn.SN.STATUS.GetEnumDesc<BIZ_MES_WO_SN.STATUSs>());
}
- else if (Steps.Any() && !IsFinishAllSteps)
+ else
{
- action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));
+ //鎻愪氦鏁版嵁
+ action = NodeSubmit(action, input);
+ //鏇存柊宸ュ簭淇℃伅
+ if (!action.IsSuccessed)
+ {
+ var info = WoContext.GetSnOperInfo(input.SN).Data;
+ info.InputQty = CurOperInfo(input.Locale).InputQty;
+ action.Data.OperInfo = info;
+ }
+ else if (Steps.Any() && !IsFinishAllSteps)
+ {
+ action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));
+ }
}
}
//褰撳墠宀椾綅鍦ㄥ綋鍓嶅伐鍗曚笉鏄绔欙紝鍒欐煡鎵炬潯鐮佸凡缁戝畾鐨勫伐鍗曞綋浣滃綋鍓嶅伐鍗�
else
{
- 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))
- .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();
-
//鏌ユ壘鍒版潯鐮佸凡缁戝畾鐨勫伐鍗�
if (wosns.Any(q => q.SN.STATUS < BIZ_MES_WO_SN.STATUSs.Finished.GetValue()))
{
@@ -244,7 +257,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).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.STATUS < MES_WIP_DATA.STATUSs.Finished.GetValue()).ToList();
if (wipSNs.IsNullOrEmpty())
{
var wipSN = new MES_WIP_DATA()
diff --git a/Tiger.Business.MES/Transaction/YadaPacking.cs b/Tiger.Business.MES/Transaction/YadaPacking.cs
index 360084e..e1fef5d 100644
--- a/Tiger.Business.MES/Transaction/YadaPacking.cs
+++ b/Tiger.Business.MES/Transaction/YadaPacking.cs
@@ -79,33 +79,46 @@
{
//宸ユ鍒楄〃涓虹┖鎴栬�呭伐搴忚妭鐐瑰伐姝ユ湁鏈畬鎴愭椂锛屼紭鍏堝畬鎴愬伐搴忚妭鐐瑰伐姝�
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))
+ .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();
+
//鍏堝垽鏂綋鍓嶅伐鍗曚笉涓虹┖涓斿綋鍓嶅矖浣嶅湪褰撳墠宸ュ崟鏄笉鏄绔欙紝濡傛灉鏄垯涓嶅厑璁稿彉鏇村綋鍓嶅伐鍗曪紝灏濊瘯鎶婃潯鐮佺粦瀹氬埌褰撳墠宸ュ崟
if (!CurBatch.IsNullOrEmpty() && CurBatch.IsFirstNode(PostCode))
{
//鏇存柊CurBatch
CurBatch?.Update();
- //鎻愪氦鏁版嵁
- action = NodeSubmit(action, input);
- //鏇存柊宸ュ簭淇℃伅
- if (!action.IsSuccessed)
+
+ var wosn = wosns.FirstOrDefault(q => q.Batch.ORDER_NO == CurBatch.WO.ORDER_NO && (q.SN.STATUS == BIZ_MES_WO_SN.STATUSs.Finished.GetValue() || q.SN.STATUS == BIZ_MES_WO_SN.STATUSs.Scrap.GetValue()));
+ if (!wosn.IsNullOrEmpty())
{
- var info = WoContext.GetSnOperInfo(input.SN).Data;
- info.InputQty = CurOperInfo(input.Locale).InputQty;
- action.Data.OperInfo = info;
+ action.Data.ShortMsg = new($"浜у搧{wosn.SN.STATUS.GetEnumDesc<BIZ_MES_WO_SN.STATUSs>()}", ShortMessage.Types.Error);
+ action.Data.OperInfo = new();
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"杩涚珯鎵弿閿欒锛屾潯鐮乕{0}]{1}", input.SN);
+ action.LocaleMsg = new("MES.Transaction.CollectNode.Submit.SnStatusError", input.SN, wosn.SN.STATUS.GetEnumDesc<BIZ_MES_WO_SN.STATUSs>());
}
- else if (Steps.Any() && !IsFinishAllSteps)
+ else
{
- action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));
+ //鎻愪氦鏁版嵁
+ action = NodeSubmit(action, input);
+ //鏇存柊宸ュ簭淇℃伅
+ if (!action.IsSuccessed)
+ {
+ var info = WoContext.GetSnOperInfo(input.SN).Data;
+ info.InputQty = CurOperInfo(input.Locale).InputQty;
+ action.Data.OperInfo = info;
+ }
+ else if (Steps.Any() && !IsFinishAllSteps)
+ {
+ action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));
+ }
}
}
//褰撳墠宀椾綅鍦ㄥ綋鍓嶅伐鍗曚笉鏄绔欙紝鍒欐煡鎵炬潯鐮佸凡缁戝畾鐨勫伐鍗曞綋浣滃綋鍓嶅伐鍗�
else
{
- 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))
- .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();
-
//鏌ユ壘鍒版潯鐮佸凡缁戝畾鐨勫伐鍗�
if (wosns.Any(q => q.SN.STATUS < BIZ_MES_WO_SN.STATUSs.Finished.GetValue()))
{
@@ -305,7 +318,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).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.STATUS < MES_WIP_DATA.STATUSs.Finished.GetValue()).ToList();
if (wipSNs.IsNullOrEmpty())
{
var wipSN = new MES_WIP_DATA()
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
index caa05ca..1a8fb1e 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
@@ -263,7 +263,7 @@
[Navigate(NavigateType.OneToMany, nameof(MES_WIP_HIS.WIP_ID), nameof(ID), "GHOST_ROW = 0")]//ClassA琛ㄤ腑鐨凪ES_WIP_DATAId
public List<MES_WIP_HIS> _History { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
[SugarColumn(IsIgnore = true)]
- public List<MES_WIP_HIS> History => _History.Where(q => q.UNBIND_FLAG != "Y").ToList() ?? new List<MES_WIP_HIS>();
+ public List<MES_WIP_HIS> History => _History?.Any(q => q.UNBIND_FLAG == "Y") == true ? (_History = _History?.Where(q => q.UNBIND_FLAG != "Y").ToList()) : (_History ?? new List<MES_WIP_HIS>());
[Navigate(NavigateType.OneToMany, nameof(MES_WIP_DFT.WIP_ID), nameof(ID), "GHOST_ROW = 0")]//ClassA琛ㄤ腑鐨凪ES_WIP_DATAId
public List<MES_WIP_DFT> _Defects { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
[SugarColumn(IsIgnore = true)]
--
Gitblit v1.9.3