Merge branch 'master' into master_ben

Ben Lin

2024-10-27 582d7ab9eb6879f4b5f3e1b1b7d162f3d53a0e39

 Tiger.IBusiness.MES/Transaction/IPosition.cs

@@ -5,6 +5,7 @@
using System.Text;
using System.Threading.Tasks;
using Tiger.Model;
using Tiger.Model.Entitys.MES.Position;

namespace Tiger.IBusiness
{
@@ -19,6 +20,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,6 +73,19 @@
        /// <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);
        /// <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
    }
}