From 8f190992480f4eddf537788e382ccbcc784b4a76 Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期三, 25 十二月 2024 09:34:17 +0800 Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024 --- Tiger.IBusiness.MES/Transaction/IPosition.cs | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Tiger.IBusiness.MES/Transaction/IPosition.cs b/Tiger.IBusiness.MES/Transaction/IPosition.cs index 00e49f9..75bc542 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; } @@ -71,7 +73,7 @@ /// <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_LABEL_PV> labelPVs, BAS_LABEL_VAR lv, List<BAS_LABEL_VAR> lvars, IWorkAction curAction, WipPkg? CurPkg); /// <summary> /// 鏍规嵁浼犲叆鐨勫寘瑁呭璞¤繑鍥炴墍鏈夌殑鍖呰瀹炰綋鍒楄〃 /// </summary> -- Gitblit v1.9.3