增加公布提示信息和状态

Rodney Chen

2024-09-04 0116b5d2ed16a0825da9e7474fc786ee06b2d60c

 Tiger.Business.MES/WorkAction/PackingAction.cs

@@ -9,6 +9,8 @@
using Tiger.IBusiness.MES.WorkAction;
using Tiger.Model;
using Tiger.Model.Entitys.MES.Position;
using static Tiger.Model.WMS_ITEM_PKG;
using Tiger.Model.Minsun;

namespace Tiger.Business.MES.WorkAction
{
@@ -23,6 +25,7 @@
        public MES_WO_ACTION Setting { get; set; }
        #endregion
        public BAS_PKG_RULE PkgRule { get; set; }
        public BAS_PKG_PROD PkgProd { get; set; }
        public WipPkg CurPkg { get; set; }
        public WipPkgItem CurPkgItem { get; set; }
        public PackingActionOutput CurCmd { get; set; }
@@ -30,6 +33,7 @@
        public Dictionary<int, BAS_LABEL_TEMP> LabelDic { get; set; }    = new();
        public List<BAS_LABEL_PV> LabelPV { get; set; } = new();
        public int FinishLevel = 0;
        public bool NeedWeighing { get; set; } = false;
        #endregion Propertys & Variables

        #region Functions
@@ -62,6 +66,11 @@
                var label = code.LABEL_CODE.IsNullOrEmpty() ? null : Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == code.LABEL_CODE).IncludesAllFirstLayer().First();
                LabelDic.Add(code.PKG_LEVEL, label);
            }
            LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList();
            //获取是否包装完后需要称重
            NeedWeighing = Setting.OPTION_2 == "Y";
            //获取包装规则的称重范围
            PkgProd = Biz.Db.Queryable<BAS_PKG_PROD>().Where(q => q.PKG_RULE_ID == PkgRule.ID && q.ITEM_CODE == CurPosition.WorkBatch.WO.ITEM_CODE).First();
            //如果工序上下文中没有包装记录则新建一个，有则获取当前的包装记录
            if (CurPosition.Context.ContainsKey("CurPackage") && !CurPosition.Context["CurPackage"].IsNullOrEmpty())
            {
@@ -168,7 +177,10 @@
                data.PrintLable = LabelDic[min.PKG_LEVEL];
                CurCmd = data;
                PrintTimes++;
                CurStep.Message = Biz.L("打印标签");
                CurStep.Status = StepStatus.Normal;
                action.Data.Data = data;
                action.Data.ShortMsg = new("打印标签", ShortMessage.Types.Normal);
                //action.LocaleMsg = new Locale($"开始第{PrintTimes}次打印第{min.PKG_LEVEL}层包装[{min.PkgType.PKG_NAME}]的标签[{LabelDic[min.PKG_LEVEL]?.LABEL_CODE}: {LabelDic[min.PKG_LEVEL].LABEL_NAME}]");
                action.LocaleMsg = new Locale("MES.WorkAction.PackingAction.BeginPrint", PrintTimes, min.PKG_LEVEL, min.PkgType.PKG_NAME, LabelDic[min.PKG_LEVEL]?.LABEL_CODE, LabelDic[min.PKG_LEVEL].LABEL_NAME);
            }
@@ -193,21 +205,39 @@
                case "Scan":
                    if (CurCmd.IsNullOrEmpty() || CurCmd.ExecCode == "Scan" || (CurCmd.ExecCode == "Print" && CurCmd.PkgLevel == pInput.PkgLevel))
                    {
                        //客户端扫描成功
                        if (pInput.IsFinish)
                        {
                            CurCmd = null;
                            PrintTimes = 0;
                            action = SavePkgData(input, action);
                        }
                        //客户端扫描失败
                        else
                        if (!pInput.IsFinish || pInput.PkgSN.IsNullOrEmpty())
                        {
                            var dtl = PkgRule.Details.First(q => q.PKG_LEVEL == pInput.PkgLevel);
                            CurStep.Message = Biz.L("扫描错误");
                            CurStep.Status = StepStatus.Error;
                            action.Data.ShortMsg = new("扫描错误", ShortMessage.Types.Error);
                            action.IsSuccessed = false;
                            //action.LocaleMsg = new($"条码扫描失败，请重新扫描第{dtl.PKG_LEVEL}层包装[{dtl.PkgType.PKG_NAME}]的标签条码");
                            action.LocaleMsg = new("MES.WorkAction.PackingAction.ScanFail", dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
                            return action;
                        }
                        //验证当前包装条码是否已经被扫描过
                        if (GetPackageList(CurPkg.Item).Any(q => q.SN == pInput.PkgSN))
                        {
                            var dtl = PkgRule.Details.First(q => q.PKG_LEVEL == pInput.PkgLevel);
                            CurStep.Message = Biz.L("扫描错误");
                            CurStep.Status = StepStatus.Error;
                            action.Data.ShortMsg = new("扫描错误", ShortMessage.Types.Error);
                            action.IsSuccessed = false;
                            //action.LocaleMsg = new($"条码[{pInput.PkgSN}]无需重复扫描，请扫描第{dtl.PKG_LEVEL}层包装[{dtl.PkgType.PKG_NAME}]的标签条码");
                            action.LocaleMsg = new("MES.WorkAction.PackingAction.ScanRepeat", pInput.PkgSN, dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
                            return action;
                        }
                        //客户端扫描成功
                        CurCmd = null;
                        PrintTimes = 0;
                        action = SavePkgData(input, action);
                        if (action.IsSuccessed)
                        {
                            CurStep.Message = Biz.L("扫描成功");
                            CurStep.Status = StepStatus.Success;
                            action.Data.ShortMsg = new("扫描成功", ShortMessage.Types.Success);
                        }
                    }
                    break;
@@ -225,7 +255,10 @@
                            data.ExecCode = "Scan";
                            data.PkgLevel = dtl.PKG_LEVEL;
                            CurCmd = data;
                            CurStep.Message = Biz.L("扫描标签");
                            CurStep.Status = StepStatus.Normal;
                            action.Data.Data = data;
                            action.Data.ShortMsg = new("扫描标签", ShortMessage.Types.Normal);
                            //action.LocaleMsg = new($"请扫描第{dtl.PKG_LEVEL}层包装[{dtl.PkgType.PKG_NAME}]的标签条码");
                            action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseScanLabel", dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
                        } 
@@ -236,7 +269,10 @@
                            if (PrintTimes < 3 && !CurCmd.IsNullOrEmpty())
                            {
                                PrintTimes++;
                                CurStep.Message = Biz.L("重新打印");
                                CurStep.Status = StepStatus.Normal;
                                action.Data.Data = CurCmd;
                                action.Data.ShortMsg = new("重新打印", ShortMessage.Types.Normal);
                                //action.LocaleMsg = new Locale($"开始{PrintTimes}次打印第{dtl.PKG_LEVEL}层包装[{dtl.PkgType.PKG_NAME}]的标签[{LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE}: {LabelDic[dtl.PKG_LEVEL].LABEL_NAME}]");
                                action.LocaleMsg = new Locale("MES.WorkAction.PackingAction.BeginPrint", PrintTimes, dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME, LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE, LabelDic[dtl.PKG_LEVEL].LABEL_NAME);
                            }
@@ -244,11 +280,98 @@
                            {
                                CurCmd = null;
                                PrintTimes = 0;
                                CurStep.Message = Biz.L("打印失败");
                                CurStep.Status = StepStatus.Error;
                                action.Data.ShortMsg = new("打印失败", ShortMessage.Types.Failed);
                                action.IsSuccessed = false;
                                //action.LocaleMsg = new($"尝试第{PrintTimes}次打印第{dtl.PKG_LEVEL}层包装[{dtl.PkgType.PKG_NAME}]的标签[{LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE}: {LabelDic[dtl.PKG_LEVEL].LABEL_NAME}]失败，工序已重置，请重新扫描进站产品条码");
                                action.LocaleMsg = new("MES.WorkAction.PackingAction.PrintFail3Times", PrintTimes, dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME, LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE, LabelDic[dtl.PKG_LEVEL].LABEL_NAME);
                                CurPosition.ResetNode();
                            }
                        }
                    }
                    break;
                // Weighing：称重，完成包装后对整个包装成称重
                case "Weighing":
                    if (CurCmd.ExecCode == "Weighing")
                    {
                        if (!pInput.WeightInfo.IsNullOrEmpty() && pInput.WeightInfo.Weight > 0)
                        {
                            //验证重量数据是否符合设置好的重量范围
                            if (!PkgProd.IsNullOrEmpty() && (pInput.WeightInfo.Weight < PkgProd.MIN_WEIGHT || PkgProd.MIN_WEIGHT < pInput.WeightInfo.Weight))
                            {
                                action.IsSuccessed = false;
                                CurStep.Message = Biz.L("重量超限");
                                CurStep.Status = StepStatus.Error;
                                action.Data.Data = CurCmd;
                                action.Data.ShortMsg = new("重量超限", ShortMessage.Types.Failed);
                                //action.LocaleMsg = new($"外包装重量[{0}]超出产品[{1}]在包装规则[{2}]中的预设范围[{3} - {4}]，请处理后重新上称称重");
                                action.LocaleMsg = new("MES.WorkAction.PackingAction.PackageOverWeight", pInput.WeightInfo.Weight + pInput.WeightInfo.Unit.IsNullOrEmpty("", " " + pInput.WeightInfo.Unit), CurPosition.WorkBatch.WO.ITEM_CODE, PkgRule.RULE_NAME, PkgProd.MIN_WEIGHT + PkgProd.MIN_UNIT.IsNullOrEmpty("", " " + PkgProd.MIN_UNIT), PkgProd.MAX_WEIGHT + PkgProd.MAX_UNIT.IsNullOrEmpty("", " " + PkgProd.MAX_UNIT));
                                return action;
                            }

                            CurCmd = null;
                            PrintTimes = 0;
                            CurPkg.WeightInfo.Weight = pInput.WeightInfo.Weight;
                            CurPkg.WeightInfo.Unit = pInput.WeightInfo.Unit;
                            NeedWeighing = false;

                            //称重成功，继续行为
                            var dtl = PkgRule.Details.FirstOrDefault(q => q.PKG_LEVEL == FinishLevel + 1);
                            //最外层包装已处理完成则直接结束行为
                            if (CurPkg.Item.PKG_LEVEL == FinishLevel)
                            {
                                action = End(input);
                            }
                            //最外层包装未打印扫描则继续
                            else
                            {
                                //如果为空则不需要打印
                                if (LabelDic[dtl.PKG_LEVEL].IsNullOrEmpty())
                               {
                                   var data = new PackingActionOutput() { PkgInfo = CurPkg };
                                   data.ExecCode = "Scan";
                                   data.PkgLevel = dtl.PKG_LEVEL;
                                   CurCmd = data;
                                    CurStep.Message = Biz.L("扫描标签");
                                    CurStep.Status = StepStatus.Normal;
                                    action.Data.Data = data;
                                   action.Data.ShortMsg = new("扫描标签", ShortMessage.Types.Normal);
                                   //action.LocaleMsg = new($"请扫描第{dtl.PKG_LEVEL}层包装[{dtl.PkgType.PKG_NAME}]的标签条码");
                                   action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseScanLabel", dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
                               }
                               else
                               {
                                   //设置打印变量值
                                   LabelDic[dtl.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[dtl.PKG_LEVEL]);
	
                                   var data = new PackingActionOutput() { PkgInfo = CurPkg };
                                   data.ExecCode = "Print";
                                   data.PkgLevel = dtl.PKG_LEVEL;
                                   data.PrintLable = LabelDic[dtl.PKG_LEVEL];
                                   CurCmd = data;
                                   PrintTimes++;
                                    CurStep.Message = Biz.L("打印标签");
                                    CurStep.Status = StepStatus.Normal;
                                    action.Data.Data = data;
                                   action.Data.ShortMsg = new("打印标签", ShortMessage.Types.Normal);
                                   //action.LocaleMsg = new Locale($"开始第{PrintTimes}次打印第{dtl.PKG_LEVEL}层包装[{dtl.PkgType.PKG_NAME}]的标签[{LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE}: {LabelDic[dtl.PKG_LEVEL].LABEL_NAME}]");
                                   action.LocaleMsg = new Locale("MES.WorkAction.PackingAction.BeginPrint", PrintTimes, dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME, LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE, LabelDic[dtl.PKG_LEVEL].LABEL_NAME);
                               }
                            }
                            
                            
                        }
                        else
                        {
                            action.IsSuccessed = false;
                            CurStep.Message = Biz.L("称重失败");
                            CurStep.Status = StepStatus.Error;
                            action.Data.Data = CurCmd;
                            action.Data.ShortMsg = new("称重失败", ShortMessage.Types.Failed);
                            //action.LocaleMsg = new($"外包装称重数据异常，请重新上称称重");
                            action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseWeighingAgain");
                            return action;
                        }
                    }
                    break;
@@ -258,7 +381,24 @@
                    {
                        CurCmd = null;
                        PrintTimes = 0;
                        action = End();
                        //打印后称重
                        if (NeedWeighing)
                        {
                            var data = new PackingActionOutput() { PkgInfo = CurPkg };
                            data.ExecCode = "Weighing";
                            data.PkgLevel = CurPkgItem.PKG_LEVEL;
                            CurCmd = data;
                            CurStep.Message = Biz.L("包装成功");
                            CurStep.Status = StepStatus.Success;
                            action.Data.Data = data;
                            action.Data.ShortMsg = new("包装成功", ShortMessage.Types.Success);
                            //action.LocaleMsg = new($"请把包装[{CurPkgItem.Package.SN}]上称称重");
                            action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseWeighing", CurPkgItem.Package.SN);
                        }
                        else
                        {
                            action = End(input);
                        }
                    }
                    break;
                // 手动结束包装，保存暂存的包装数据
@@ -284,7 +424,10 @@
                            data.ExecCode = "Scan";
                            data.PkgLevel = dtl.PKG_LEVEL;
                            CurCmd = data;
                            CurStep.Message = Biz.L("扫描标签");
                            CurStep.Status = StepStatus.Normal;
                            action.Data.Data = data;
                            action.Data.ShortMsg = new("扫描标签", ShortMessage.Types.Normal);
                            //action.LocaleMsg = new($"请扫描第{dtl.PKG_LEVEL}层包装[{dtl.PkgType.PKG_NAME}]的标签条码");
                            action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseScanLabel", dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
                        }
@@ -299,7 +442,10 @@
                            data.PrintLable = LabelDic[dtl.PKG_LEVEL];
                            CurCmd = data;
                            PrintTimes++;
                            CurStep.Message = Biz.L("打印标签");
                            CurStep.Status = StepStatus.Normal;
                            action.Data.Data = data;
                            action.Data.ShortMsg = new("打印标签", ShortMessage.Types.Normal);
                            //action.LocaleMsg = new Locale($"开始第{PrintTimes}次打印第{min.PKG_LEVEL}层包装[{min.PkgType.PKG_NAME}]的标签[{LabelDic[min.PKG_LEVEL]?.LABEL_CODE}: {LabelDic[min.PKG_LEVEL].LABEL_NAME}]");
                            action.LocaleMsg = new Locale("MES.WorkAction.PackingAction.BeginPrint", PrintTimes, dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME, LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE, LabelDic[dtl.PKG_LEVEL].LABEL_NAME);
                        }
@@ -338,28 +484,30 @@
                        PKG_QTY = dtl.PKG_QTY,
                        LABEL_CODE = LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE,
                        IsFinished = true,
                        Package = new()
                        {
                            AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                            AUTH_PROD = CurPosition.CurLine.LINE_CODE,
                            SN = pInput.PkgSN,
                            PKG_TYPE = dtl.PkgType.PKG_NAME,
                            ITEM_CODE = CurPosition.CurWipSNs.First().ITEM_CODE,
                            QTY = CurPosition.CurWipSNs.First().QTY,
                            UNIT = dtl.PkgType.PKG_NAME,
                            WORK_ORDER = CurPosition.CurWipSNs.First().WORK_ORDER,
                            BATCH_NO = CurPosition.CurWipSNs.First().BATCH_NO,
                            ROT_CODE = CurPosition.CurWipSNs.First().ROT_CODE,
                            NODE_ID = CurPosition.CurWipSNs.First().NODE_ID,
                            NODE_NAME = CurPosition.CurWipSNs.First().NODE_NAME,
                            FTY_CODE = CurPosition.CurWipSNs.First().FTY_CODE,
                            WS_CODE = CurPosition.CurWipSNs.First().WS_CODE,
                            LINE_CODE = CurPosition.CurWipSNs.First().LINE_CODE,
                            POST_CODE = CurPosition.CurWipSNs.First().POST_CODE,
                            OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE,
                            SEGMENT = CurPosition.CurWipSNs.First().SEGMENT,
                        }
                    };

                    CurPkgItem.Package = Biz.Db.Queryable<MES_WIP_PKG>().Where(q => q.SN == pInput.PkgSN && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).First() ?? new()
                    {
                        AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                        AUTH_PROD = CurPosition.CurLine.LINE_CODE,
                        SN = pInput.PkgSN,
                    };
                    CurPkgItem.Package.WIP_ID = CurPosition.CurWipSNs.Count == 1 ? CurPosition.CurWipSNs.First().ID : null;
                    CurPkgItem.Package.PKG_TYPE = dtl.PkgType.PKG_NAME;
                    CurPkgItem.Package.ITEM_CODE = CurPosition.CurWipSNs.First().ITEM_CODE;
                    CurPkgItem.Package.QTY = CurPosition.CurWipSNs.First().QTY;
                    CurPkgItem.Package.UNIT = dtl.PkgType.PKG_NAME;
                    CurPkgItem.Package.WORK_ORDER = CurPosition.CurWipSNs.First().WORK_ORDER;
                    CurPkgItem.Package.BATCH_NO = CurPosition.CurWipSNs.First().BATCH_NO;
                    CurPkgItem.Package.ROT_CODE = CurPosition.CurWipSNs.First().ROT_CODE;
                    CurPkgItem.Package.NODE_ID = CurPosition.CurWipSNs.First().NODE_ID;
                    CurPkgItem.Package.NODE_NAME = CurPosition.CurWipSNs.First().NODE_NAME;
                    CurPkgItem.Package.FTY_CODE = CurPosition.CurWipSNs.First().FTY_CODE;
                    CurPkgItem.Package.WS_CODE = CurPosition.CurWipSNs.First().WS_CODE;
                    CurPkgItem.Package.LINE_CODE = CurPosition.CurWipSNs.First().LINE_CODE;
                    CurPkgItem.Package.POST_CODE = CurPosition.CurWipSNs.First().POST_CODE;
                    CurPkgItem.Package.OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE;
                    CurPkgItem.Package.SEGMENT = CurPosition.CurWipSNs.First().SEGMENT;
                    FinishLevel++;
                    action = SavePkgData(input, action);
                }
@@ -401,7 +549,7 @@
                        //最外层包装已经完成包装，保存包装数据到数据库
                        else
                        {
                            action = SaveToDB();
                            action = CompletePkg();
                        }
                    }
                    //当前处理的包装层级已经处理完，继续往上保存
@@ -438,42 +586,68 @@
                        //添加明细后判断当前包装层级的明细数量是否等于包装数量，若相等则标记当前包装层级为完成并尝试打印标签
                        if (CurPkgItem.Items.Count(q => q.IsFinished) == CurPkgItem.PKG_QTY || CurStep.IsNullOrEmpty())
                        {
                            //行为设定的OPTION_1-9是包装不同层级的标签模板代码，如果为空则不需要打印
                            if (LabelDic[dtl.PKG_LEVEL].IsNullOrEmpty())
                            //打印前称重：如果当前的包装明细的上一层包装对象是最外层包装且需要称重时，先称重，合格后在发印或者扫描最外层包装标签
                            if (CurPkgItem.PKG_LEVEL == CurPkg.Item.PKG_LEVEL && NeedWeighing)
                            {
                                var data = new PackingActionOutput() { PkgInfo = CurPkg };
                                data.ExecCode = "Scan";
                                data.PkgLevel = dtl.PKG_LEVEL;
                                data.ExecCode = "Weighing";
                                data.PkgLevel = CurPkgItem.PKG_LEVEL;
                                CurCmd = data;
                                CurStep.Message = Biz.L("上称称重");
                                CurStep.Status = StepStatus.Normal;
                                action.Data.Data = data;
                                //action.LocaleMsg = new($"请扫描第{dtl.PKG_LEVEL}层包装[{dtl.PkgType.PKG_NAME}]的标签条码");
                                action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseScanLabel", dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
                            }
                                action.Data.ShortMsg = new("上称称重", ShortMessage.Types.Success);
                                //action.LocaleMsg = new($"请把外包装上称称重");
                                action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseWeighing");
                            } 
                            else
                            {
                                //设置打印变量值
                                LabelDic[dtl.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[dtl.PKG_LEVEL]);

                                var data = new PackingActionOutput() { PkgInfo = CurPkg };
                                data.ExecCode = "Print";
                                data.PkgLevel = dtl.PKG_LEVEL;
                                data.PrintLable = LabelDic[dtl.PKG_LEVEL];
                                CurCmd = data;
                                PrintTimes++;
                                action.Data.Data = data;
                                //action.LocaleMsg = new Locale($"开始第{PrintTimes}次打印第{dtl.PKG_LEVEL}层包装[{dtl.PkgType.PKG_NAME}]的标签[{LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE}: {LabelDic[dtl.PKG_LEVEL].LABEL_NAME}]");
                                action.LocaleMsg = new Locale("MES.WorkAction.PackingAction.BeginPrint", PrintTimes, dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME, LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE, LabelDic[dtl.PKG_LEVEL].LABEL_NAME);                
                               //如果为空则不需要打印
                               if (LabelDic[dtl.PKG_LEVEL].IsNullOrEmpty())
                               {
                                   var data = new PackingActionOutput() { PkgInfo = CurPkg };
                                   data.ExecCode = "Scan";
                                   data.PkgLevel = dtl.PKG_LEVEL;
                                   CurCmd = data;
                                    CurStep.Message = Biz.L("扫描标签");
                                    CurStep.Status = StepStatus.Normal;
                                    action.Data.Data = data;
                                    action.Data.ShortMsg = new("扫描标签", ShortMessage.Types.Normal);
                                    //action.LocaleMsg = new($"请扫描第{dtl.PKG_LEVEL}层包装[{dtl.PkgType.PKG_NAME}]的标签条码");
                                    action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseScanLabel", dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
                               }
                               else
                               {
                                   //设置打印变量值
                                   LabelDic[dtl.PKG_LEVEL] = CurPosition.SetLabelVariables(LabelPV, LabelDic[dtl.PKG_LEVEL]);
	
                                   var data = new PackingActionOutput() { PkgInfo = CurPkg };
                                   data.ExecCode = "Print";
                                   data.PkgLevel = dtl.PKG_LEVEL;
                                   data.PrintLable = LabelDic[dtl.PKG_LEVEL];
                                   CurCmd = data;
                                   PrintTimes++;
                                    CurStep.Message = Biz.L("打印标签");
                                    CurStep.Status = StepStatus.Normal;
                                    action.Data.Data = data;
                                    action.Data.ShortMsg = new("打印标签", ShortMessage.Types.Normal);
                                    //action.LocaleMsg = new Locale($"开始第{PrintTimes}次打印第{dtl.PKG_LEVEL}层包装[{dtl.PkgType.PKG_NAME}]的标签[{LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE}: {LabelDic[dtl.PKG_LEVEL].LABEL_NAME}]");
                                    action.LocaleMsg = new Locale("MES.WorkAction.PackingAction.BeginPrint", PrintTimes, dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME, LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE, LabelDic[dtl.PKG_LEVEL].LABEL_NAME);                
                               }
                            }
                        }
                        //当前包装层级的明细数量未达到包装数量，则完成本次扫描，等待下个产品进站
                        else
                        {
                            action = End();
                            action = End(input);
                        }
                    }
                    //数据异常
                    else
                    {
                        CurStep.Message = Biz.L("包装错误");
                        CurStep.Status = StepStatus.Error;
                        action.Data.ShortMsg = new("包装错误", ShortMessage.Types.Error);
                        var pdtl = PkgRule.Details.First(q => q.PKG_LEVEL == pInput.PkgLevel);
                        action.IsSuccessed = false;
                        //action.LocaleMsg = new($"客户端提交的包装层级[{pdtl.PKG_LEVEL}]({pdtl.PkgType.PKG_NAME})数据不是正在处理的包装层级[{dtl.PKG_LEVEL}]({dtl.PkgType.PKG_NAME})，工序已重置，请重新扫描进站产品条码");
@@ -484,6 +658,9 @@
            }
            catch (System.Exception ex)
            {
                CurStep.Message = Biz.L("包装异常");
                CurStep.Status = StepStatus.Error;
                action.Data.ShortMsg = new("包装异常", ShortMessage.Types.Exception);
                var dtl = PkgRule.Details.First(q => q.PKG_LEVEL == pInput.PkgLevel);
                action.CatchExceptionWithLog(ex, $"包装行为：扫描第{dtl.PKG_LEVEL}层包装[{dtl.PkgType.PKG_NAME}]的标签条码[{input.SN}]后保存数据失败");
                action.IsSuccessed = false;
@@ -496,45 +673,39 @@

        private List<MES_WIP_PKG> GetPackageList(WipPkgItem parent)
        {
            List<MES_WIP_PKG> list = new() { parent.Package };
            List<MES_WIP_PKG> list = new();
            if (!parent.Package.IsNullOrEmpty())
            {
                list.Add(parent.Package);
            }
            foreach (var item in parent.Items)
            {
                item.Package.PARENT_SN = parent.Package.SN;
                item.Package.PARENT_SN = parent.Package?.SN;
                list.AddRange(GetPackageList(item));
            }
            return list;
        }

        public ApiAction<SubmitOutput> SaveToDB()
        public ApiAction<SubmitOutput> CompletePkg()
        {
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());

            var pkgList = GetPackageList(CurPkg.Item);

            //保存数据库
            var db = Biz.Db;
            var dbTran = db.UseTran(() =>
            {
                db.Insertable(pkgList, CurPosition.UserCode).ExecuteCommand();
            });
            if (!dbTran.IsSuccess)
            {
                throw dbTran.ErrorException;
            }

            var data = new PackingActionOutput() { PkgInfo = CurPkg };
            data.ExecCode = "Complete";
            data.PkgLevel = CurPkg.Item.PKG_LEVEL;
            CurCmd = data;
            CurStep.Message = Biz.L("保存包装数据");
            CurStep.Status = StepStatus.Normal;
            action.Data.Data = data;
            action.Data.ShortMsg = new("保存包装数据", ShortMessage.Types.Normal);
            //action.LocaleMsg = new($"第{CurPkg.Item.PKG_LEVEL}层包装[{CurPkg.Item.PKG_NAME}]已经全部完成，保存包装数据");
            action.LocaleMsg = new("MES.WorkAction.PackingAction.PackageComplete", CurPkg.Item.PKG_LEVEL, CurPkg.Item.PKG_NAME);

            //手动结束包装则标记行为完成
            if (CurStep.IsNullOrEmpty())
            {
                IsFinished = true;
            }
            //if (CurStep.IsNullOrEmpty())
            //{
            //    IsFinished = true;
            //}

            return action;
        }
@@ -543,53 +714,94 @@
        /// 结束执行工序行为
        /// </summary>
        /// <returns></returns>
        public ApiAction<SubmitOutput> End()
        public ApiAction<SubmitOutput> End(SubmitInput input)
        {
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());

            //记录行为操作记录
            var wipActs = new List<MES_WIP_ACT>();
            foreach (var wipSn in CurPosition.CurWipSNs)
            //不是手动结束包装则保存行为操作记录
            if (!CurStep.IsNullOrEmpty())
            {
                var wipAct = new MES_WIP_ACT()
                {
                    AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                    AUTH_PROD = CurPosition.CurLine.LINE_CODE,
                    HIS_ID = CurPosition.CurWipSNHiss.First(q => q.SN == wipSn.SN).ID,
                    SN = wipSn.SN,
                    STATUS = wipSn.STATUS,
                    ITEM_CODE = wipSn.ITEM_CODE,
                    WORK_ORDER = wipSn.WORK_ORDER,
                    BATCH_NO = wipSn.BATCH_NO,
                    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,
                    TRAY_SN = wipSn.TRAY_SN,
                    OPERATION_TIME = DateTime.Now,
                    SFTS_CODE = wipSn.SFTS_CODE,
                    SFT_CODE = wipSn.SFT_CODE,
                    PRD_CODE = wipSn.PRD_CODE,
                    ACT_TYPE = NodeAct.ACT_TYPE,
                    ACT_SN = wipSn.SN,
                    ACT_RESULT = "Y",
                    TRACE_INFO = $"产品条码[{string.Join("，", CurPosition.CurSN)}]包装完成",
                };
                wipActs.Add(wipAct);
               foreach (var wipSn in CurPosition.CurWipSNs)
               {
                   var wipAct = new MES_WIP_ACT()
                   {
                       AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
                       AUTH_PROD = CurPosition.CurLine.LINE_CODE,
                       WIP_ID = wipSn.ID,
                       HIS_ID = CurPosition.CurWipSNHiss.First(q => q.SN == wipSn.SN).ID,
                       SN = wipSn.SN,
                       STATUS = wipSn.STATUS,
                       ITEM_CODE = wipSn.ITEM_CODE,
                       WORK_ORDER = wipSn.WORK_ORDER,
                       BATCH_NO = wipSn.BATCH_NO,
                       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,
                       ACT_TYPE = NodeAct.ACT_TYPE,
                       ACT_SN = wipSn.SN,
                       ACT_RESULT = "Y",
                       TRACE_INFO = $"产品条码[{string.Join("，", CurPosition.CurSN)}]包装完成",
                   };
                   wipActs.Add(wipAct);
               }
            }
            //记录外包装的称重数据
            if (CurPkg.IsFinished)
            {
                CurPkg.Item.Package.WEIGHT = CurPkg.WeightInfo.Weight;
                CurPkg.Item.Package.WEIGHT_UNIT = CurPkg.WeightInfo.Unit;
            }

            //创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值
            var _wipActs = wipActs.Clone();
            var _pkgList = CurPkg.IsFinished ? GetPackageList(CurPkg.Item) : new();
            //保存数据
            CurStep.DBSubmitAction = () =>
            {
                var db = CurPosition.GetCommitDB();
                db.Storageable(wipActs, CurPosition.UserCode).ExecuteCommand();
                if (_wipActs.Any())
                {
                   db.Storageable(_wipActs, CurPosition.UserCode).ExecuteCommand();
                }
                if (_pkgList.Any())
                {
                    db.Storageable(_pkgList, CurPosition.UserCode).ExecuteCommand();
                    foreach (var pkg in _pkgList)
                    {
                        //包装信息保存到在制品信息表
                        db.Updateable<MES_WIP_DATA>()
                            .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
                            .SetColumns(q => q.INNER_SN == q.CARTON_SN)
                            .SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)
                            .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.SN == pkg.SN)
                            .ExecuteCommand();
                        //包装信息保存到工单条码明细表
                        db.Updateable<BIZ_MES_WO_SN>()
                            .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
                            .SetColumns(q => q.OUTER_SN == CurPkg.Item.Package.SN)
                            .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.SN == pkg.SN)
                            .ExecuteCommand();
                    }
                }
            };

            if (CurPkg.IsFinished)
@@ -598,6 +810,8 @@
                CurPosition.NeedTemporaryStoreDBCommitAction = false;
                //删除工序上下文中的包装记录
                CurPosition.Context.Remove("CurPackage");
                //action.LocaleMsg = new($"条码[{CurPkg.Item.Package?.SN}]包装完成");
                action.LocaleMsg = new("MES.WorkAction.PackingAction.PackingSuccess", CurPkg.Item.Package.SN);
            }
            else
            {
@@ -612,11 +826,15 @@
                {
                    CurPosition.Context.Add("CurPackage", CurPkg);
                }
                //action.LocaleMsg = new($"条码[{CurPosition.CurSN}]包装完成");
                action.LocaleMsg = new("MES.WorkAction.PackingAction.PackingSuccess", CurPosition.CurSN);
            }

            IsFinished = true;
            action.LocaleMsg = new($"产品条码[{CurPosition.CurSN}]包装完成");
            action.LocaleMsg = new("MES.WorkAction.PackingAction.PackingSuccess", CurPosition.CurSN);
            CurStep.Message = Biz.L("包装完成");
            CurStep.Status = StepStatus.Finished;
            action.Data.ShortMsg = new("包装完成", ShortMessage.Types.Success);
            
            return action;
        }