From 422ca5b2fb6f9270ae0067a1c0dc9a02b84b9d67 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 19 三月 2025 01:19:39 +0800
Subject: [PATCH] 优化了一些已知问题
---
Tiger.Business.MES/WorkAction/ThreeInOne.cs | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/ThreeInOne.cs b/Tiger.Business.MES/WorkAction/ThreeInOne.cs
index abcb818..31b39e4 100644
--- a/Tiger.Business.MES/WorkAction/ThreeInOne.cs
+++ b/Tiger.Business.MES/WorkAction/ThreeInOne.cs
@@ -27,7 +27,7 @@
public MES_CUST_SN FlowCSN { get; set; }
public MES_CUST_SN CustCSN { get; set; }
public BAS_LABEL_TEMP Label { get; set; }
- public List<BAS_LABEL_PV> LabelPV { get; set; }
+ public List<BAS_PROCESS_VAR> LabelPV { get; set; }
public List<mes_MOPickList> MoPickList { get; set; }
public BAS_ITEM_CUST CustInfo { get; set; }
#endregion Propertys & Variables
@@ -49,7 +49,7 @@
//鑾峰彇鎵撳嵃妯℃澘
Label = MainDB.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == setting.LABEL_CODE).IncludesAllFirstLayer().First();
- LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();
+ LabelPV = MainDB.Queryable<BAS_PROCESS_VAR>().ToList();
//鑾峰彇褰撳墠浜у搧鍦ㄥ綋鍓嶅鎴风殑鍏崇郴
CustInfo = MainDB.Queryable<BAS_ITEM_CUST>().Where(q => q.ITEM_ID == CurPosition.WorkBatch.WO.ItemInfo.ID && q.CUST_CODE == CurPosition.WorkBatch.WO.CUST_CODE).First();
@@ -297,9 +297,9 @@
action.LocaleMsg = new("MES.WorkAction.ThreeInOne.NotSameCustomer", CustCSN.CUST_SN, CustCSN.CUST_CODE, CurPosition.WorkBatch.WO.CUST_CODE);
}
//楠岃瘉浜у搧瀹㈡埛鏍囩鏉＄爜瑙勫垯
- if (isOK && !CustInfo.IsNullOrEmpty() && !CustInfo.RULE_CODE.IsNullOrEmpty() && !Biz.CodeRule[CustInfo.RULE_CODE].IsNullOrEmpty())
+ if (isOK && !CustInfo.IsNullOrEmpty() && !CustInfo.RULE_CODE.IsNullOrEmpty() && !Cache.CodeRule[CustInfo.RULE_CODE].IsNullOrEmpty())
{
- var result = Biz.CodeRule[CustInfo.RULE_CODE].Verify(CustCSN.CUST_SN);
+ var result = Cache.CodeRule[CustInfo.RULE_CODE].Verify(CustCSN.CUST_SN);
if (!result.IsSuccessed)
{
CurStep.SetStatusMessage(StepStatus.Error, Biz.L("璇锋壂鎻忔纭殑瀹㈡埛鏍囩"));
@@ -342,6 +342,7 @@
//璁板綍琛屼负鎿嶄綔璁板綍
var wipActs = new List<MES_WIP_ACT>();
+ var wipVars = new List<MES_WIP_ACT_VAR>();
var woSns = new List<BIZ_MES_WO_SN>();
var snHiss = new List<MES_WIP_HIS>();
foreach (var wipSn in CurPosition.CurWipSNs)
@@ -391,11 +392,55 @@
ACT_SN = wipSn.SN,
ACT_VALUE_1 = Label?.LABEL_CODE,
ACT_VALUE_2 = Label?.Variables.ToJson(),
+ ACT_VAR_DIC = CurStep.ActionDic.ToJson(),
ACT_RESULT = "Y",
ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(),
TRACE_INFO = $"鍘傚唴鏉＄爜[{FlowCSN.FLOW_SN}]缁戝畾瀹㈡埛鏉＄爜[{FlowCSN.CUST_SN}]鎴愬姛",
};
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,
+ PROCESS_VAR = item.PROCESS_VAR,
+ INPUT_VALUE = CurStep.ActionDic.GetOrDefault(item.VAR_CODE),
+ TRACE_INFO = CurStep.ActionDic.ToJson(),
+ };
+ wipVars.Add(wipVar);
+ }
}
//鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
@@ -403,6 +448,7 @@
var _snHiss = snHiss.Clone();
var _woSns = woSns.Clone();
var _wipActs = wipActs.Clone();
+ var _wipVars = wipVars.Clone();
var _FlowCSN = FlowCSN.Clone();
var _CustCSN = CustCSN.Clone();
//淇濆瓨鏁版嵁
@@ -413,6 +459,7 @@
db.Storageable(_snHiss, CurPosition.UserCode).ExecuteCommand();
db.Storageable(_woSns, CurPosition.UserCode).ExecuteCommand();
db.Storageable(_wipActs, CurPosition.UserCode).ExecuteCommand();
+ db.Storageable(_wipVars, CurPosition.UserCode).ExecuteCommand();
db.Storageable(_FlowCSN, CurPosition.UserCode).ExecuteCommand();
if (!_CustCSN.IsNullOrEmpty())
{
--
Gitblit v1.9.3