From 2e2033964d99196d94b0abd9f3364b9b2387b324 Mon Sep 17 00:00:00 2001 From: Ben Lin <maobin001@msn.com> Date: 星期四, 02 一月 2025 23:28:23 +0800 Subject: [PATCH] 优化 ImportWoPlan.cs 代码逻辑,减少冗余并增加状态处理 --- Tiger.IBusiness.MES/Transaction/IPosition.cs | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Tiger.IBusiness.MES/Transaction/IPosition.cs b/Tiger.IBusiness.MES/Transaction/IPosition.cs index c6edc37..966a648 100644 --- a/Tiger.IBusiness.MES/Transaction/IPosition.cs +++ b/Tiger.IBusiness.MES/Transaction/IPosition.cs @@ -12,6 +12,7 @@ public interface IPosition : IMESTransaction { #region Propertys & Variables + public DbClient MainDB { get; } public string UserCode { get; set; } public string PostCode { get; set; } public MES_FACTORY CurFactory { get; set; } @@ -20,6 +21,7 @@ public MES_POSITION CurPosition { get; set; } public IWorkBatch WorkBatch { get; } public List<MES_WIP_DATA> CurWipSNs { get; set; } + public List<MES_WIP_DATA> LastWipSNs { get; set; } public string CurSN { get; } public List<MES_WIP_HIS> CurWipSNHiss { get; set; } public Dictionary<string, object> Context { get; set; } @@ -64,20 +66,27 @@ /// <param name="labelPVs">杩囩▼鍙橀噺鍒楄〃</param> /// <param name="label">鏍囩妯℃澘</param> /// <returns></returns> - public BAS_LABEL_TEMP SetLabelVariables(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_TEMP label, IWorkAction action); + public BAS_LABEL_TEMP SetLabelVariables(List<BAS_PROCESS_VAR> labelPVs, BAS_LABEL_TEMP label, IWorkAction action); /// <summary> /// 鑾峰彇鎵撳嵃鏍囩妯℃澘杩囩▼鍙橀噺鍊� /// </summary> /// <param name="labelPVs">杩囩▼鍙橀噺鍒楄〃</param> /// <param name="lv">鏍囩妯℃澘鍙橀噺</param> /// <returns></returns> - public string GetPrintProcessValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv, List<BAS_LABEL_VAR> lvars, IWorkAction action); + public string GetPrintProcessValue(List<BAS_PROCESS_VAR> labelPVs, BAS_LABEL_VAR lv, List<BAS_LABEL_VAR> lvars, IWorkAction curAction, WipPkg? CurPkg); /// <summary> /// 鏍规嵁浼犲叆鐨勫寘瑁呭璞¤繑鍥炴墍鏈夌殑鍖呰瀹炰綋鍒楄〃 /// </summary> /// <param name="parent"></param> /// <returns></returns> public List<MES_WIP_PKG> GetPackageList(WipPkgItem parent); + /// <summary> + /// 鑾峰彇鏍规嵁鏉$爜瑙勫垯鐢熸垚鏉$爜 + /// </summary> + /// <param name="ruleCode"></param> + /// <param name="curAction"></param> + /// <returns></returns> + public string GenerateSN(string ruleCode, IWorkAction curAction); #endregion Functions } } -- Gitblit v1.9.3