From 7bf8f292234bea48fd9318eee9267c6ef19e19ed Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 01 一月 2025 21:57:41 +0800
Subject: [PATCH] 工步增加行为变量字典
---
Tiger.Business.MES/WorkAction/YadaAssembly.cs | 81 +++++++++++++++++++++++++++++++++++++---
1 files changed, 74 insertions(+), 7 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/YadaAssembly.cs b/Tiger.Business.MES/WorkAction/YadaAssembly.cs
index 506c8d8..ed9f13c 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
{
@@ -16,6 +17,7 @@
{
#region Propertys & Variables
#region 鍥哄畾鍐欐硶锛屽伐搴忎腑鐨勫繀瑕佷俊鎭�
+ public DbClient MainDB { get; set; }
public bool IsFinished { get; set; } = false;
public IWorkStep CurStep { get; set; }
public IPosition CurPosition { get; set; }
@@ -24,6 +26,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
@@ -34,6 +37,7 @@
public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
{
#region 鍥哄畾鍐欐硶锛岀粰榛樿鍙橀噺璧嬪��
+ MainDB = position.MainDB;
CurStep = curStep;
CurPosition = position;
NodeAct = nodeAct;
@@ -41,7 +45,7 @@
#endregion
//鑾峰彇浜у搧BOM
- Boms = Biz.Db.Queryable<BAS_PROD_BOM>().Where(q => q.PROD_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).ToList();
+ Boms = MainDB.Queryable<BAS_PROD_BOM>().Where(q => q.PROD_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).ToList();
//鑾峰彇涓婃枡鐗╂枡
var assyList = new List<AssemblySetting>();
try
@@ -57,7 +61,7 @@
}
}
var codes = assyList.Select(q => q.ITEM_CODE).ToList();
- var items = Biz.Db.Queryable<BAS_ITEM>().Where(q => codes.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
+ var items = MainDB.Queryable<BAS_ITEM>().Where(q => codes.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
//鑾峰彇涓婃枡鐗╂枡鐨勬浛浠ｆ枡
foreach (var assy in assyList)
{
@@ -74,7 +78,7 @@
if (!bom.IsNullOrEmpty())
{
var subs = bom.SUB_CODE.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries);
- var surItems = Biz.Db.Queryable<BAS_ITEM>().Where(q => subs.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
+ var surItems = MainDB.Queryable<BAS_ITEM>().Where(q => subs.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
foreach (var sub in surItems)
{
if (!item.SubItems.Any(q => q.ITEM_CODE == sub.ITEM_CODE))
@@ -86,6 +90,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>
@@ -153,9 +162,9 @@
//鏍规嵁鏉＄爜瑙勫垯楠岃瘉涓婃枡鏄惁姝ｇ‘
if (!item.RuleCode.IsNullOrEmpty())
{
- if (!Biz.CodeRule[item.RuleCode].IsNullOrEmpty())
+ if (!Cache.CodeRule[item.RuleCode].IsNullOrEmpty())
{
- var result = Biz.CodeRule[item.RuleCode].Verify(input.SN);
+ var result = Cache.CodeRule[item.RuleCode].Verify(input.SN);
if (!result.IsSuccessed)
{
isOK = false;
@@ -181,9 +190,9 @@
{
if (!subItem.RULE_CODE.IsNullOrEmpty())
{
- if (!Biz.CodeRule[subItem.RULE_CODE].IsNullOrEmpty())
+ if (!Cache.CodeRule[subItem.RULE_CODE].IsNullOrEmpty())
{
- var result = Biz.CodeRule[item.RuleCode].Verify(input.SN);
+ var result = Cache.CodeRule[item.RuleCode].Verify(input.SN);
//鍙鏈変竴涓浛浠ｆ枡閫氳繃楠岃瘉鍒欏彲浠ヤ笂鏂�
if (result.IsSuccessed)
{
@@ -195,6 +204,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 (MainDB.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;
+ // }
+ //}
//楠岃瘉閫氳繃鍒欎繚瀛樹笂鏂欎俊鎭�
if (isOK)
{
@@ -312,6 +332,7 @@
//璁板綍琛屼负鎿嶄綔璁板綍
var wipActs = new List<MES_WIP_ACT>();
+ var wipVars = new List<MES_WIP_ACT_VAR>();
foreach (var wipSn in CurPosition.CurWipSNs)
{
var wipAct = new MES_WIP_ACT()
@@ -348,15 +369,60 @@
ACT_TYPE = NodeAct.ACT_TYPE,
ACT_SN = wipSn.SN,
ACT_VALUE_1 = CurAssembly.ToJson(),
+ ACT_VAR_DIC = CurStep.ActionDic.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);
+ foreach (var item in NodeAct.Variables)
+ {
+ var wipVar = new MES_WIP_ACT_VAR()
+ {
+ AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
+ AUTH_PROD = CurPosition.CurLine.LINE_CODE,
+ HIS_ID = CurPosition.CurWipSNHiss.First(q => q.SN == wipSn.SN).ID,
+ WIP_ID = wipSn.ID,
+ SN = wipSn.SN,
+ ITEM_CODE = wipSn.ITEM_CODE,
+ WORK_ORDER = wipSn.WORK_ORDER,
+ BATCH_NO = wipSn.BATCH_NO,
+ CUST_CODE = CurPosition.WorkBatch.WO.CUST_CODE,
+ ROT_CODE = wipSn.ROT_CODE,
+ NODE_ID = wipSn.NODE_ID,
+ NODE_NAME = wipSn.NODE_NAME,
+ ACT_ID = NodeAct.ID,
+ ACT_NAME = NodeAct.ACT_NAME,
+ FTY_CODE = wipSn.FTY_CODE,
+ WS_CODE = wipSn.WS_CODE,
+ LINE_CODE = wipSn.LINE_CODE,
+ POST_CODE = wipSn.POST_CODE,
+ OPER_CODE = wipSn.OPER_CODE,
+ SEGMENT = wipSn.SEGMENT,
+ FLOW_SN = wipSn.FLOW_SN,
+ TRAY_SN = wipSn.TRAY_SN,
+ INNER_SN = wipSn.INNER_SN,
+ CARTON_SN = wipSn.CARTON_SN,
+ PALLET_SN = wipSn.PALLET_SN,
+ OPERATION_TIME = DateTime.Now,
+ SFTS_CODE = wipSn.SFTS_CODE,
+ SFT_CODE = wipSn.SFT_CODE,
+ PRD_CODE = wipSn.PRD_CODE,
+ VAR_CODE = item.VAR_CODE,
+ VAR_NAME = item.VAR_NAME,
+ VAR_CONTROL = item.VAR_CONTROL,
+ VALUE_TYPE = item.VALUE_TYPE,
+ INPUT_VALUE = CurStep.ActionDic.GetOrDefault(item.VAR_CODE),
+ TRACE_INFO = CurStep.ActionDic.ToJson(),
+ };
+ wipVars.Add(wipVar);
+ }
}
//鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
var _wipActs = wipActs.Clone();
+ var _wipVars = wipVars.Clone();
//鏁寸悊涓婃枡璁板綍
var _records = new List<MES_WIP_ASSY>();
foreach (var item in CurAssembly.Items)
@@ -368,6 +434,7 @@
{
var db = CurPosition.GetCommitDB();
db.Storageable(_wipActs, CurPosition.UserCode).ExecuteCommand();
+ db.Storageable(_wipVars, CurPosition.UserCode).ExecuteCommand();
db.Insertable(_records, CurPosition.UserCode).ExecuteCommand();
};
--
Gitblit v1.9.3