From 545bc1c267a939cf3259afcda1ba60feedd7e7eb Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 11 十月 2024 20:15:25 +0800
Subject: [PATCH] 更新工序自动更新工单状态
---
Tiger.Business.MES/Transaction/TestNode.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/TestNode.cs b/Tiger.Business.MES/Transaction/TestNode.cs
index 249004b..e276ea0 100644
--- a/Tiger.Business.MES/Transaction/TestNode.cs
+++ b/Tiger.Business.MES/Transaction/TestNode.cs
@@ -66,7 +66,7 @@
//褰撳墠宀椾綅鍦ㄥ綋鍓嶅伐鍗曚笉鏄绔欙紝鍒欐煡鎵炬潯鐮佸凡缁戝畾鐨勫伐鍗曞綋浣滃綋鍓嶅伐鍗�
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))
+ 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();
@@ -86,7 +86,7 @@
if (CurBatch?.Batch?.ORDER_NO != wosns.First().Batch.ORDER_NO)
{
//鏉＄爜宸茬粦瀹氱殑宸ュ崟涓嶇瓑浜庡綋鍓嶅伐鍗曞垯閲嶆柊閫夋嫨宸ュ崟
- var result = await SelectOrder(new() { AuthOption = input.AuthOption, OrderNo = wosns.First().Batch.ORDER_NO });
+ var result = await SelectOrder(new() { AuthOption = input.AuthOption, OrderNo = wosns.First().Batch.ORDER_NO }, wosns.First().Batch.BATCH_NO);
if (!result.IsSuccessed)
{
action.Data.ShortMsg = new("宸ュ崟寮傚父", ShortMessage.Types.Error);
@@ -293,7 +293,7 @@
//缁戝畾鏉＄爜鍒板伐鍗�
foreach (var wipSN in wipSNs)
{
- if (!CurBatch.WoSNs.Any(q => q.SN == wipSN.SN))
+ if (!CurBatch.WoSNs.Any(q => q.WIP_ID == wipSN.ID))
{
CurBatch.WoSNs.Add(new()
{
@@ -308,7 +308,7 @@
}
//鏇存柊宸ュ崟鏉＄爜鏄庣粏淇℃伅
- var woSNs = CurBatch.WoSNs.Where(q => wipSNs.Any(w => q.SN == w.SN)).ToList();
+ var woSNs = CurBatch.WoSNs.Where(q => wipSNs.Any(w => q.WIP_ID == w.ID)).ToList();
foreach (var woSN in woSNs)
{
woSN.AUTH_ORG = CurBatch.WO.AUTH_ORG;
@@ -342,7 +342,7 @@
//濡傛灉鏄姇鍏ョ珯
if (curNodeSetting.IS_INPUT == "Y")
{
- var woSN = woSNs.First(q => q.SN == wipSN.SN);
+ var woSN = woSNs.First(q => q.WIP_ID == wipSN.ID);
woSN.STATUS = BIZ_MES_WO_SN.STATUSs.Inputed.GetValue();
wipSN.STATUS = MES_WIP_DATA.STATUSs.Input.GetValue();
wipSN.INLINE_DATE = DateTime.Now;
@@ -350,7 +350,7 @@
//濡傛灉鏄骇鍑虹珯
if (curNodeSetting.IS_OUTPUT == "Y")
{
- var woSN = woSNs.First(q => q.SN == wipSN.SN);
+ 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.OUTLINE_DATE = DateTime.Now;
--
Gitblit v1.9.3