From 67238bdfbeb1f06b9870133c9b9e86c45013fad2 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 11 十月 2024 00:36:52 +0800
Subject: [PATCH] 一些已知更改
---
Tiger.Business.MES/Common/WorkBatch.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Tiger.Business.MES/Common/WorkBatch.cs b/Tiger.Business.MES/Common/WorkBatch.cs
index 72c507a..49b88b1 100644
--- a/Tiger.Business.MES/Common/WorkBatch.cs
+++ b/Tiger.Business.MES/Common/WorkBatch.cs
@@ -127,7 +127,7 @@
var action = new ApiAction<SubmitOutput>(new SubmitOutput(), true);
WO = Biz.Db.Queryable<BIZ_MES_WO>().Where(q => q.ORDER_NO == OrderNo).IncludesAllFirstLayer().First();
- Batch = Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(q => q.ORDER_NO == OrderNo && q.ACT_LINE == LineCode).First();
+ Batch = Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(q => q.BATCH_NO == Batch.BATCH_NO).First();
//宸ュ崟鎵规鐘舵�佷笉鏄凡涓嬪彂鎴栬�呯敓浜т腑锛屽垯涓嶅厑璁哥敓浜�
if (Batch.STATUS != BIZ_MES_WO_BATCH.STATUSs.Release.GetValue() && Batch.STATUS != BIZ_MES_WO_BATCH.STATUSs.Working.GetValue())
{
@@ -248,7 +248,7 @@
/// <returns></returns>
public MES_WO_OPER GetNodeSetting(MES_WO_NODE node)
{
- return NodeSets.FirstOrDefault(q => q.NODE_ID == node.ID);
+ return NodeSets.FirstOrDefault(q => q.NODE_ID == node?.ID);
}
/// <summary>
--
Gitblit v1.9.3