From d7993bd9928d605be845cad5620d20a9b16b2302 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 16 十月 2024 15:23:53 +0800
Subject: [PATCH] 一些更改
---
Tiger.Business.MES/WorkAction/YadaAssembly.cs | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/YadaAssembly.cs b/Tiger.Business.MES/WorkAction/YadaAssembly.cs
index 506c8d8..3168265 100644
--- a/Tiger.Business.MES/WorkAction/YadaAssembly.cs
+++ b/Tiger.Business.MES/WorkAction/YadaAssembly.cs
@@ -9,6 +9,7 @@
using Tiger.IBusiness.MES.WorkAction;
using Tiger.Model;
using Tiger.Model.Entitys.MES.Position;
+using Tiger.Model.MES.Yada;
namespace Tiger.Business.MES.WorkAction
{
@@ -24,6 +25,7 @@
#endregion
public List<BAS_PROD_BOM> Boms { get; set; } = new();
public AssemblyInfo CurAssembly { get; set; } = new();
+ public List<mes_MOPickList> MoPickList { get; set; }
#endregion Propertys & Variables
#region Functions
@@ -86,6 +88,11 @@
CurAssembly.Items.Add(item);
}
}
+ //鑾峰彇宸ュ崟澶囨枡淇℃伅
+ MoPickList = Biz.DataSource["YadaU9C"].Client.Queryable<mes_MOPickList>().Where(q => q.MoDocNo == CurPosition.WorkBatch.WO.ORDER_NO).ToList();
+
+ CurStep.Message = Biz.L("鎵弿涓婃枡鐗╂枡");
+ CurStep.Status = StepStatus.Normal;
}
/// <summary>
@@ -193,6 +200,17 @@
}
}
}
+ }
+ }
+ //濡傛灉褰撳墠鐗╂枡瀛樺湪澶囨枡琛ㄤ腑瀛樺湪鎺ㄨ崘鎵规锛屽垯涓婃枡鐗╂枡蹇呴』灞炰簬鍏舵帹鑽愭壒娆＄殑鐗╂枡
+ var suggest = MoPickList.Where(q => q.Code == item.ItemInfo.ITEM_CODE && !q.SuggestedBatch.IsNullOrEmpty()).Select(q => q.SuggestedBatch).ToList();
+ if (isOK && suggest.Any())
+ {
+ isOK = false;
+ //鍦ㄦ帹鑽愭壒娆℃墍灞炲伐鍗曠殑鏉＄爜涓瓨鍦�
+ if (Biz.Db.Queryable<BIZ_MES_WO_SN>().Any(q => suggest.Contains(q.WORK_ORDER) && (q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN)))
+ {
+ isOK = true;
}
}
//楠岃瘉閫氳繃鍒欎繚瀛樹笂鏂欎俊鎭�
@@ -349,6 +367,7 @@
ACT_SN = wipSn.SN,
ACT_VALUE_1 = CurAssembly.ToJson(),
ACT_RESULT = "Y",
+ ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(),
TRACE_INFO = $"浠ヤ笅鐗╂枡涓婃枡瀹屾垚锛歿string.Join(",", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}",
};
wipActs.Add(wipAct);
--
Gitblit v1.9.3