增加上料行为

Rodney Chen

2024-08-03 fdd3e9c598b0a53a6eb84321f5c95a0862b1a673

增加上料行为

 Tiger.Api/Language.db

Binary files differ

 Tiger.Business.MES/WorkAction/Assembly.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,293 @@
using Rhea.Common;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using Tiger.IBusiness;
using Tiger.IBusiness.MES.WorkAction;
using Tiger.Model;
using Tiger.Model.Entitys.MES.Position;

namespace Tiger.Business.MES.WorkAction
{
    public class Assembly : IAssembly
    {
        #region Propertys & Variables
        #region å›ºå®šå†™æ³•ï¼Œå·¥åºä¸­çš„必要信息
        public bool IsFinished { get; set; } = false;
        public IWorkStep CurStep { get; set; }
        public IPosition CurPosition { get; set; }
        public MES_WO_NODE_ACT NodeAct { get; set; }
        public MES_WO_ACTION Setting { get; set; }
        #endregion
        public List<BAS_PROD_BOM> Boms { get; set; } = new();
        public Dictionary<string, List<BAS_ITEM>> SubItemDic { get; set; } = new();
        public AssemblyInfo CurAssembly { get; set; } = new();
        #endregion Propertys & Variables

        #region Functions
        /// <summary>
        /// åˆå§‹åŒ–工序行为
        /// </summary>
        /// <returns></returns>
        public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
        {
            #region å›ºå®šå†™æ³•ï¼Œç»™é»˜è®¤å˜é‡èµ‹å€¼
            CurStep = curStep;
            CurPosition = position;
            NodeAct = nodeAct;
            Setting = setting;
            #endregion

            //获取产品BOM
            Boms = Biz.Db.Queryable<BAS_PROD_BOM>().Where(q => q.PROD_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).ToList();
            //获取上料物料
            var assyList = new List<AssemblySetting>();
            try
            {
                assyList = setting.ITEM_CODE.JsonToObject<List<AssemblySetting>>();
            }
            catch (System.Exception ex)
            {
                var codeList = setting.ITEM_CODE.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries);
                foreach (var code in codeList)
                {
                    assyList.Add(new(){ ItemCode = code });
                }
            }
            var codes = assyList.Select(q => q.ItemCode).ToList();
            var items = Biz.Db.Queryable<BAS_ITEM>().Where(q => codes.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
            //获取上料物料的替代料
            foreach (var assy in assyList)
            {
                var info = items.FirstOrDefault(q => q.ITEM_CODE == assy.ItemCode);
                if (!info.IsNullOrEmpty())
                {
                    var item = new AssemblyItem { 
                        ItemInfo = info,  
                        RuleCode = assy.RuleCode,
                        LoadQty = assy.Qty,
                    };
                    var bom = Boms.FirstOrDefault(q => q.ITEM_CODE == assy.ItemCode);
                    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();
                        if (!SubItemDic.ContainsKey(assy.ItemCode))
                        {
                            SubItemDic.Add(assy.ItemCode, surItems);
                        }
                    }
                    CurAssembly.Items.Add(item);
                }
            }
        }

        /// <summary>
        /// èŽ·å–行为开始的提示信息
        /// </summary>
        /// <returns></returns>
        public Locale GetBeginMsg()
        {
            var msg = new Locale("MES.WorkAction.Assembly.BeginMsg", string.Join("，", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})")));
            //var msg = new Locale($"请扫描以下需要上料的物料条码：{string.Join("，", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}");
            return msg;
        }

        /// <summary>
        /// å°è¯•å¼€å§‹æ‰§è¡Œå·¥åºè¡Œä¸º
        /// </summary>
        /// <returns></returns>
        public ApiAction<SubmitOutput> TryBegin(SubmitInput input)
        {
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());

            if (input.SN != CurPosition.CurWipSN.SN)
            {
                action = SaveAssembly(input, action);
                return action;
            }

            //如果返回成功则认为当前行为可以开始执行，否则返回失败
            action.IsSuccessed = false;
            return action;
        }

        /// <summary>
        /// å·¥åºè¡Œä¸ºæäº¤æ•°æ®
        /// </summary>
        /// <returns></returns>
        public ApiAction<SubmitOutput> Submit(SubmitInput input)
        {
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());

            action = SaveAssembly(input, action);
            //上料数据保存失败
            if (!action.IsSuccessed)
            {
                //如果行为设置为出错需要重置工序操作
                if (NodeAct.NEED_RESET == "Y")
                {
                    CurPosition.ResetNode();
                }
            }
            return action;
        }

        public ApiAction<SubmitOutput> SaveAssembly(SubmitInput input, ApiAction<SubmitOutput> action)
        {
            try
            {
                foreach (var item in CurAssembly.Items.Where(q => !q.IsFinished))
                {
                    var isOK = true;
                    //根据条码规则验证上料是否正确
                    if (!item.RuleCode.IsNullOrEmpty())
                    {
                        if (!Biz.CodeRule[item.RuleCode].IsNullOrEmpty())
                        {
                            var result = Biz.CodeRule[item.RuleCode].Verify(input.SN);
                            if (!result.IsSuccessed)
                            {
                                isOK = false;
                            }
                        }
                        //不存在条码规则，则判断是否有自定义规则，没有则返回失败
                        else
                        {
                            switch (item.RuleCode)
                            {
                                case "自行验证":
                                    break;
                                default:
                                    isOK = false;
                                    break;
                            }
                        }
                    }
                    //验证通过则保存上料信息
                    if (isOK)
                    {
                        var record = new MES_WIP_ASSY()
                        {
                            AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                            AUTH_PROD = CurPosition.CurLine.LINE_CODE,
                            SN = input.SN,
                            PROD_SN = CurPosition.CurWipSN.SN,
                            ITEM_CODE = item.ItemInfo.ITEM_CODE,
                            QTY = 1,
                            UNIT = item.ItemInfo.UNIT,
                            WORK_ORDER = CurPosition.CurWipSN.WORK_ORDER,
                            BATCH_NO = CurPosition.CurWipSN.BATCH_NO,
                            ROT_CODE = CurPosition.CurWipSN.ROT_CODE,
                            NODE_ID = CurPosition.CurWipSN.NODE_ID,
                            NODE_NAME = CurPosition.CurWipSN.NODE_NAME,
                            FTY_CODE = CurPosition.CurWipSN.FTY_CODE,
                            WS_CODE = CurPosition.CurWipSN.WS_CODE,
                            LINE_CODE = CurPosition.CurWipSN.LINE_CODE,
                            POST_CODE = CurPosition.CurWipSN.POST_CODE,
                            OPER_CODE = CurPosition.CurWipSN.OPER_CODE,
                            SEGMENT = CurPosition.CurWipSN.SEGMENT,
                        };
                        item.Records.Add(record);
                        if (item.Records.Sum(q => q.QTY) >= item.LoadQty)
                        {
                            item.IsFinished = true;
                        }

                        action.IsSuccessed = true;
                        action.Data.Data = CurAssembly;
                        action.LocaleMsg = new Locale($"扫描物料[{item.ItemInfo.ITEM_NAME}({item.ItemInfo.ITEM_CODE})的条码[{input.SN}]成功，请继续上料");
                        action.LocaleMsg = new Locale("MES.WorkAction.Assembly.LoadSuccess", item.ItemInfo.ITEM_NAME, item.ItemInfo.ITEM_CODE);

                        //上料完成
                        if (CurAssembly.IsFinished)
                        {
                            action = End();
                        }
                        return action;
                    }
                }
                //都没有物料验证通过，则返回错误信息
                action.IsSuccessed = false;
                //action.LocaleMsg = new($"条码[{input.SN}]验证失败，不是以下物料的条码：{string.Join("，", CurAssembly.Items.Where(q => !q.IsFinished).Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}");
                action.LocaleMsg = new("MES.WorkAction.Assembly.LoadFail", input.SN, string.Join("，", CurAssembly.Items.Where(q => !q.IsFinished).Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})")));
            }
            catch (System.Exception ex)
            {
                action.CatchExceptionWithLog(ex, $"上料行为：验证条码[{input.SN}]并保存数据失败");
                action.IsSuccessed = false;
                action.LocaleMsg = new($"验证条码[{input.SN}]并保存数据失败，工序已重置，请重新扫描进站产品条码");
                action.LocaleMsg = new("MES.WorkAction.Assembly.SaveAssemblyException", input.SN);
                CurPosition.ResetNode();
            }
            return action;
        }

        /// <summary>
        /// ç»“束执行工序行为
        /// </summary>
        /// <returns></returns>
        public ApiAction<SubmitOutput> End()
        {
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());

            //记录行为操作记录
            var wipAct = new MES_WIP_ACT()
            {
                AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                AUTH_PROD = CurPosition.CurLine.LINE_CODE,
                HIS_ID = CurPosition.CurWipSNHis.ID,
                SN = CurPosition.CurWipSN.SN,
                STATUS = CurPosition.CurWipSN.STATUS,
                ITEM_CODE = CurPosition.CurWipSN.ITEM_CODE,
                WORK_ORDER = CurPosition.CurWipSN.WORK_ORDER,
                BATCH_NO = CurPosition.CurWipSN.BATCH_NO,
                ROT_CODE = CurPosition.CurWipSN.ROT_CODE,
                NODE_ID = CurPosition.CurWipSN.NODE_ID,
                NODE_NAME = CurPosition.CurWipSN.NODE_NAME,
                ACT_ID = NodeAct.ID,
                ACT_NAME = NodeAct.ACT_NAME,
                FTY_CODE = CurPosition.CurWipSN.FTY_CODE,
                WS_CODE = CurPosition.CurWipSN.WS_CODE,
                LINE_CODE = CurPosition.CurWipSN.LINE_CODE,
                POST_CODE = CurPosition.CurWipSN.POST_CODE,
                OPER_CODE = CurPosition.CurWipSN.OPER_CODE,
                SEGMENT = CurPosition.CurWipSN.SEGMENT,
                TRAY_SN = CurPosition.CurWipSN.TRAY_SN,
                OPERATION_TIME = DateTime.Now,
                SFTS_CODE = CurPosition.CurWipSN.SFTS_CODE,
                SFT_CODE = CurPosition.CurWipSN.SFT_CODE,
                PRD_CODE = CurPosition.CurWipSN.PRD_CODE,
                ACT_TYPE = NodeAct.ACT_TYPE,
                ACT_SN = CurPosition.CurWipSN.SN,
                ACT_VALUE_1 = CurAssembly.ToJson(),
                ACT_RESULT = "Y",
                TRACE_INFO = $"以下物料上料完成：{string.Join(",", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}",
            };
            var records = new List<MES_WIP_ASSY>();
            foreach (var item in CurAssembly.Items)
            {
                records.AddRange(item.Records);
            }

            //保存数据
            CurStep.DBSubmitAction = () =>
            {
                var db = CurPosition.GetCommitDB();
                db.Storageable(wipAct, CurPosition.UserCode).ExecuteCommand();
                db.Insertable(records, CurPosition.UserCode).ExecuteCommand();
            };

            IsFinished = true;
            //action.LocaleMsg = new($"以下物料上料完成：{string.Join("，", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}");
            action.LocaleMsg = new("MES.WorkAction.Assembly.LoadFinish", string.Join("，", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})")));
            return action;
        }

        #endregion Functions
    }
}

 Tiger.Business.MES/WorkAction/IPQC.cs

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


 Tiger.Business.MES/WorkAction/PackingAction.cs

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


 Tiger.Business.MES/WorkAction/PrintLabel.cs

@@ -1,5 +1,4 @@
using MailKit.Search;
using Rhea.Common;
using Rhea.Common;
using SqlSugar;
using System;
using System.Collections.Generic;
@@ -7,6 +6,7 @@
using System.Text;
using System.Threading.Tasks;
using Tiger.IBusiness;
using Tiger.IBusiness.MES.WorkAction;
using Tiger.Model;
using Tiger.Model.Entitys.MES.Position;


 Tiger.Business.MES/WorkAction/WipExtInfo.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,293 @@
using Rhea.Common;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Tiger.IBusiness;
using Tiger.IBusiness.MES.WorkAction;
using Tiger.Model;
using Tiger.Model.Entitys.MES.Position;

namespace Tiger.Business.MES.WorkAction
{
    public class WipExtInfo : IWipExtInfo
    {
        #region Propertys & Variables
        #region å›ºå®šå†™æ³•ï¼Œå·¥åºä¸­çš„必要信息
        public bool IsFinished { get; set; } = false;
        public IWorkStep CurStep { get; set; }
        public IPosition CurPosition { get; set; }
        public MES_WO_NODE_ACT NodeAct { get; set; }
        public MES_WO_ACTION Setting { get; set; }
        #endregion
        public List<BAS_PROD_BOM> Boms { get; set; } = new();
        public Dictionary<string, List<BAS_ITEM>> SubItemDic { get; set; } = new();
        public AssemblyInfo CurAssembly { get; set; } = new();
        #endregion Propertys & Variables

        #region Functions
        /// <summary>
        /// åˆå§‹åŒ–工序行为
        /// </summary>
        /// <returns></returns>
        public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
        {
            #region å›ºå®šå†™æ³•ï¼Œç»™é»˜è®¤å˜é‡èµ‹å€¼
            CurStep = curStep;
            CurPosition = position;
            NodeAct = nodeAct;
            Setting = setting;
            #endregion

            //获取产品BOM
            Boms = Biz.Db.Queryable<BAS_PROD_BOM>().Where(q => q.PROD_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).ToList();
            //获取上料物料
            var assyList = new List<AssemblySetting>();
            try
            {
                assyList = setting.ITEM_CODE.JsonToObject<List<AssemblySetting>>();
            }
            catch (System.Exception ex)
            {
                var codeList = setting.ITEM_CODE.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries);
                foreach (var code in codeList)
                {
                    assyList.Add(new() { ItemCode = code });
                }
            }
            var codes = assyList.Select(q => q.ItemCode).ToList();
            var items = Biz.Db.Queryable<BAS_ITEM>().Where(q => codes.Contains(q.ITEM_CODE) && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).ToList();
            //获取上料物料的替代料
            foreach (var assy in assyList)
            {
                var info = items.FirstOrDefault(q => q.ITEM_CODE == assy.ItemCode);
                if (!info.IsNullOrEmpty())
                {
                    var item = new AssemblyItem
                    {
                        ItemInfo = info,
                        RuleCode = assy.RuleCode,
                        LoadQty = assy.Qty,
                    };
                    var bom = Boms.FirstOrDefault(q => q.ITEM_CODE == assy.ItemCode);
                    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();
                        if (!SubItemDic.ContainsKey(assy.ItemCode))
                        {
                            SubItemDic.Add(assy.ItemCode, surItems);
                        }
                    }
                    CurAssembly.Items.Add(item);
                }
            }
        }

        /// <summary>
        /// èŽ·å–行为开始的提示信息
        /// </summary>
        /// <returns></returns>
        public Locale GetBeginMsg()
        {
            var msg = new Locale("MES.WorkAction.WipExtInfo.BeginMsg", string.Join("，", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})")));
            //var msg = new Locale($"请扫描以下需要上料的物料条码：{string.Join("，", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}");
            return msg;
        }

        /// <summary>
        /// å°è¯•å¼€å§‹æ‰§è¡Œå·¥åºè¡Œä¸º
        /// </summary>
        /// <returns></returns>
        public ApiAction<SubmitOutput> TryBegin(SubmitInput input)
        {
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());

            if (input.SN != CurPosition.CurWipSN.SN)
            {
                action = SaveAssembly(input, action);
                return action;
            }

            //如果返回成功则认为当前行为可以开始执行，否则返回失败
            action.IsSuccessed = false;
            return action;
        }

        /// <summary>
        /// å·¥åºè¡Œä¸ºæäº¤æ•°æ®
        /// </summary>
        /// <returns></returns>
        public ApiAction<SubmitOutput> Submit(SubmitInput input)
        {
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());

            action = SaveAssembly(input, action);
            //上料数据保存失败
            if (!action.IsSuccessed)
            {
                //如果行为设置为出错需要重置工序操作
                if (NodeAct.NEED_RESET == "Y")
                {
                    CurPosition.ResetNode();
                }
            }
            return action;
        }

        public ApiAction<SubmitOutput> SaveAssembly(SubmitInput input, ApiAction<SubmitOutput> action)
        {
            try
            {
                foreach (var item in CurAssembly.Items.Where(q => !q.IsFinished))
                {
                    var isOK = true;
                    //根据条码规则验证上料是否正确
                    if (!item.RuleCode.IsNullOrEmpty())
                    {
                        if (!Biz.CodeRule[item.RuleCode].IsNullOrEmpty())
                        {
                            var result = Biz.CodeRule[item.RuleCode].Verify(input.SN);
                            if (!result.IsSuccessed)
                            {
                                isOK = false;
                            }
                        }
                        //不存在条码规则，则判断是否有自定义规则，没有则返回失败
                        else
                        {
                            switch (item.RuleCode)
                            {
                                case "自行验证":
                                    break;
                                default:
                                    isOK = false;
                                    break;
                            }
                        }
                    }
                    //验证通过则保存上料信息
                    if (isOK)
                    {
                        var record = new MES_WIP_ASSY()
                        {
                            AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                            AUTH_PROD = CurPosition.CurLine.LINE_CODE,
                            SN = input.SN,
                            PROD_SN = CurPosition.CurWipSN.SN,
                            ITEM_CODE = item.ItemInfo.ITEM_CODE,
                            QTY = 1,
                            UNIT = item.ItemInfo.UNIT,
                            WORK_ORDER = CurPosition.CurWipSN.WORK_ORDER,
                            BATCH_NO = CurPosition.CurWipSN.BATCH_NO,
                            ROT_CODE = CurPosition.CurWipSN.ROT_CODE,
                            NODE_ID = CurPosition.CurWipSN.NODE_ID,
                            NODE_NAME = CurPosition.CurWipSN.NODE_NAME,
                            FTY_CODE = CurPosition.CurWipSN.FTY_CODE,
                            WS_CODE = CurPosition.CurWipSN.WS_CODE,
                            LINE_CODE = CurPosition.CurWipSN.LINE_CODE,
                            POST_CODE = CurPosition.CurWipSN.POST_CODE,
                            OPER_CODE = CurPosition.CurWipSN.OPER_CODE,
                            SEGMENT = CurPosition.CurWipSN.SEGMENT,
                        };
                        item.Records.Add(record);
                        if (item.Records.Sum(q => q.QTY) >= item.LoadQty)
                        {
                            item.IsFinished = true;
                        }

                        action.IsSuccessed = true;
                        action.Data.Data = CurAssembly;
                        action.LocaleMsg = new Locale($"扫描物料[{item.ItemInfo.ITEM_NAME}({item.ItemInfo.ITEM_CODE})的条码[{input.SN}]成功，请继续上料");
                        action.LocaleMsg = new Locale("MES.WorkAction.WipExtInfo.LoadSuccess", item.ItemInfo.ITEM_NAME, item.ItemInfo.ITEM_CODE);

                        //上料完成
                        if (CurAssembly.IsFinished)
                        {
                            action = End();
                        }
                        return action;
                    }
                }
                //都没有物料验证通过，则返回错误信息
                action.IsSuccessed = false;
                //action.LocaleMsg = new($"条码[{input.SN}]验证失败，不是以下物料的条码：{string.Join("，", CurAssembly.Items.Where(q => !q.IsFinished).Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}");
                action.LocaleMsg = new("MES.WorkAction.WipExtInfo.LoadFail", input.SN, string.Join("，", CurAssembly.Items.Where(q => !q.IsFinished).Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})")));
            }
            catch (System.Exception ex)
            {
                action.CatchExceptionWithLog(ex, $"上料行为：验证条码[{input.SN}]并保存数据失败");
                action.IsSuccessed = false;
                action.LocaleMsg = new($"验证条码[{input.SN}]并保存数据失败，工序已重置，请重新扫描进站产品条码");
                action.LocaleMsg = new("MES.WorkAction.WipExtInfo.SaveAssemblyException", input.SN);
                CurPosition.ResetNode();
            }
            return action;
        }

        /// <summary>
        /// ç»“束执行工序行为
        /// </summary>
        /// <returns></returns>
        public ApiAction<SubmitOutput> End()
        {
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());

            //记录行为操作记录
            var wipAct = new MES_WIP_ACT()
            {
                AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                AUTH_PROD = CurPosition.CurLine.LINE_CODE,
                HIS_ID = CurPosition.CurWipSNHis.ID,
                SN = CurPosition.CurWipSN.SN,
                STATUS = CurPosition.CurWipSN.STATUS,
                ITEM_CODE = CurPosition.CurWipSN.ITEM_CODE,
                WORK_ORDER = CurPosition.CurWipSN.WORK_ORDER,
                BATCH_NO = CurPosition.CurWipSN.BATCH_NO,
                ROT_CODE = CurPosition.CurWipSN.ROT_CODE,
                NODE_ID = CurPosition.CurWipSN.NODE_ID,
                NODE_NAME = CurPosition.CurWipSN.NODE_NAME,
                ACT_ID = NodeAct.ID,
                ACT_NAME = NodeAct.ACT_NAME,
                FTY_CODE = CurPosition.CurWipSN.FTY_CODE,
                WS_CODE = CurPosition.CurWipSN.WS_CODE,
                LINE_CODE = CurPosition.CurWipSN.LINE_CODE,
                POST_CODE = CurPosition.CurWipSN.POST_CODE,
                OPER_CODE = CurPosition.CurWipSN.OPER_CODE,
                SEGMENT = CurPosition.CurWipSN.SEGMENT,
                TRAY_SN = CurPosition.CurWipSN.TRAY_SN,
                OPERATION_TIME = DateTime.Now,
                SFTS_CODE = CurPosition.CurWipSN.SFTS_CODE,
                SFT_CODE = CurPosition.CurWipSN.SFT_CODE,
                PRD_CODE = CurPosition.CurWipSN.PRD_CODE,
                ACT_TYPE = NodeAct.ACT_TYPE,
                ACT_SN = CurPosition.CurWipSN.SN,
                ACT_VALUE_1 = CurAssembly.ToJson(),
                ACT_RESULT = "Y",
                TRACE_INFO = $"以下物料上料完成：{string.Join(",", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}",
            };
            var records = new List<MES_WIP_ASSY>();
            foreach (var item in CurAssembly.Items)
            {
                records.AddRange(item.Records);
            }

            //保存数据
            CurStep.DBSubmitAction = () =>
            {
                var db = CurPosition.GetCommitDB();
                db.Storageable(wipAct, CurPosition.UserCode).ExecuteCommand();
                db.Insertable(records, CurPosition.UserCode).ExecuteCommand();
            };

            IsFinished = true;
            //action.LocaleMsg = new($"以下物料上料完成：{string.Join("，", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})"))}");
            action.LocaleMsg = new("MES.WorkAction.WipExtInfo.LoadFinish", string.Join("，", CurAssembly.Items.Select(q => $"{q.ItemInfo.ITEM_NAME}({q.ItemInfo.ITEM_CODE})")));
            return action;
        }

        #endregion Functions
    }
}

 Tiger.IBusiness/MES/WorkAction/IAssembly.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
using Newtonsoft.Json;
using Rhea.Common;
using System;
using Tiger.Model;

namespace Tiger.IBusiness.MES.WorkAction
{
    public interface IAssembly : IWorkAction
    {

    }
}

 Tiger.IBusiness/MES/WorkAction/IIPQC.cs

@@ -3,7 +3,7 @@
using System;
using Tiger.Model;

namespace Tiger.IBusiness
namespace Tiger.IBusiness.MES.WorkAction
{
    public interface IIPQC : IWorkAction
    {

 Tiger.IBusiness/MES/WorkAction/IPackingAction.cs

@@ -4,7 +4,7 @@
using Tiger.Model;
using Tiger.Model.Entitys.MES.Position;

namespace Tiger.IBusiness
namespace Tiger.IBusiness.MES.WorkAction
{
    public interface IPackingAction : IWorkAction
    {

 Tiger.IBusiness/MES/WorkAction/IPrintLabel.cs

@@ -3,7 +3,7 @@
using System;
using Tiger.Model;

namespace Tiger.IBusiness
namespace Tiger.IBusiness.MES.WorkAction
{
    public interface IPrintLabel : IWorkAction
    {

 Tiger.IBusiness/MES/WorkAction/IWipExtInfo.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
using Newtonsoft.Json;
using Rhea.Common;
using System;
using Tiger.Model;

namespace Tiger.IBusiness.MES.WorkAction
{
    public interface IWipExtInfo : IWorkAction
    {

    }
}

 Tiger.Model.Net/Entitys/MES/MES_WIP_ASSY.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,156 @@
using System;
using SqlSugar;
using System.Linq;
using System.ComponentModel;
using System.Collections.Generic;

namespace Tiger.Model
{
    /// <summary>
    /// å®žä½“：生产上料记录
    /// </summary>
    [Description("Primary:ID")]
    [DisplayName("生产上料记录")]
    [Serializable]
    [SugarTable("MES_WIP_ASSY")]
    public class MES_WIP_ASSY : DbEntityWithAuth
    {
        #region æž„造函数
        /// <summary>
        /// å®žä½“：生产上料记录
        /// </summary>
        public MES_WIP_ASSY() {}
        #endregion

        #region å…¬å…±å±žæ€§
        /// <summary>
        /// ç‰©æ–™æ¡ç 
        /// </summary>
        [DisplayName("物料条码")]
        public string SN { get; set; }
        /// <summary>
        /// äº§å“æ¡ç 
        /// </summary>
        [DisplayName("产品条码")]
        public string PROD_SN { get; set; }
        /// <summary>
        /// ç‰©æ–™ç¼–码
        /// </summary>
        [DisplayName("物料编码")]
        public string ITEM_CODE { get; set; }
        /// <summary>
        /// æ•°é‡
        /// </summary>
        [DisplayName("数量")]
        public double QTY { get; set; }
        /// <summary>
        /// å•ä½
        /// </summary>
        [DisplayName("单位")]
        public string UNIT { get; set; }
        /// <summary>
        /// å·¥å•å·
        /// </summary>
        [DisplayName("工单号")]
        public string WORK_ORDER { get; set; }
        /// <summary>
        /// å·¥å•æ‰¹æ¬¡å·
        /// </summary>
        [DisplayName("工单批次号")]
        public string BATCH_NO { get; set; }
        /// <summary>
        /// å·¥è‰ºè·¯çº¿ç¼–码
        /// </summary>
        [DisplayName("工艺路线编码")]
        public string ROT_CODE { get; set; }
        /// <summary>
        /// å·¥è‰ºè·¯çº¿èŠ‚点ID
        /// </summary>
        [DisplayName("工艺路线节点ID")]
        public string NODE_ID { get; set; }
        /// <summary>
        /// å·¥è‰ºè·¯çº¿èŠ‚点名称
        /// </summary>
        [DisplayName("工艺路线节点名称")]
        public string NODE_NAME { get; set; }
        /// <summary>
        /// å·¥åŽ‚编码
        /// </summary>
        [DisplayName("工厂编码")]
        public string FTY_CODE { get; set; }
        /// <summary>
        /// è½¦é—´ç¼–码
        /// </summary>
        [DisplayName("车间编码")]
        public string WS_CODE { get; set; }
        /// <summary>
        /// äº§çº¿ç¼–码
        /// </summary>
        [DisplayName("产线编码")]
        public string LINE_CODE { get; set; }
        /// <summary>
        /// å²—位编码
        /// </summary>
        [DisplayName("岗位编码")]
        public string POST_CODE { get; set; }
        /// <summary>
        /// å·¥åºç¼–码
        /// </summary>
        [DisplayName("工序编码")]
        public string OPER_CODE { get; set; }
        /// <summary>
        /// åŠ å·¥æ®µ
        /// </summary>
        [DisplayName("加工段")]
        public string SEGMENT { get; set; }
        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        [DisplayName("备注")]
        public string REMARK { get; set; }
        /// <summary>
        /// è¿½æº¯ä¿¡æ¯
        /// </summary>
        [DisplayName("追溯信息")]
        public string TRACE_INFO { get; set; }
        #endregion

        #region è™šæ‹Ÿå±žæ€§
        /*例子
        [SugarColumn(IsIgnore = true)]
        public string FieldName { get; set; }
        */
        #endregion

        #region å¤–键属性
        /*例子
        //一对一外键导航
        [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_WIP_ASSY类里面的外键ID字段
        public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
        //一对多外键导航
        [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_ASSYId))]//ClassA表中的MES_WIP_ASSYId
        public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
        //多对多外键导航
        [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_ASSYId), nameof(MappingClass.ClassAId))]//注意顺序
        public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
        */
        #endregion

        #region æžšä¸¾å˜é‡
        /*例子
        public enum FieldNames
        {
            [Description("枚举描述0")]
            Enum0,
            [Description("枚举描述1")]
            Enum1,
        }
        */
        #endregion

        #region å…¬å…±æ–¹æ³•

        #endregion

    }//endClass
}

 Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs

@@ -163,4 +163,37 @@
        public List<WipPkgItem> Items { get; set; } = new List<WipPkgItem>();
        
    }

    /// <summary>
    /// ä¸Šæ–™è®¾ç½®
    /// </summary>
    public class AssemblySetting
    {
        public string ItemCode { get; set; }
        public string RuleCode { get; set; } 
        public int Qty { get; set; } 
    }

    /// <summary>
    /// ä¸Šæ–™ä¿¡æ¯
    /// </summary>
    public class AssemblyInfo
    {
        public MES_WIP_DATA Product { get; set; }
        public bool IsFinished => !Items.Any(q => !q.IsFinished);
        public List<AssemblyItem> Items { get; set; } = new List<AssemblyItem>();
    }

    /// <summary>
    /// ä¸Šæ–™ä¿¡æ¯æ˜Žç»†
    /// </summary>
    public class AssemblyItem
    {
        public BAS_ITEM ItemInfo { get; set; }
        public string RuleCode { get; set; }
        public int LoadQty { get; set; }
        public List<MES_WIP_ASSY> Records { get; set; } = new List<MES_WIP_ASSY>();
        public bool IsFinished { get; set; } = false;

    }
}

 Tiger.Model.Net/Tiger.Model.Net.csproj

@@ -139,6 +139,7 @@
    <Compile Include="Entitys\MES\MES_SHIFT_PRD.cs" />
    <Compile Include="Entitys\MES\MES_SHIFT_SYS.cs" />
    <Compile Include="Entitys\MES\MES_WIP_ACT.cs" />
    <Compile Include="Entitys\MES\MES_WIP_ASSY.cs" />
    <Compile Include="Entitys\MES\MES_WIP_DATA.cs" />
    <Compile Include="Entitys\MES\MES_WIP_DFT.cs" />
    <Compile Include="Entitys\MES\MES_WIP_EXT.cs" />