增加送货单清点事务

Rodney Chen

2025-03-10 40df5d91f800bb8b7be2638c13b4f9292d461221

 Tiger.Business.MES/Transaction/Position.cs

@@ -14,6 +14,8 @@
using System.Globalization;
using Tiger.Business.MES.WorkAction;
using System.Collections;
using Tiger.IBusiness.MES.WorkAction;
using Dm.parser;

namespace Tiger.Business.MES.Transaction
{
@@ -28,22 +30,23 @@
            UserCode = userCode;
            ApiHost = apiHost;
            PostCode = postCode;
            _MainDB = Biz.Db;

            CurPosition = Biz.Db.Queryable<MES_POSITION>().Where(q => q.POST_CODE == postCode).First();
            CurPosition = MainDB.Queryable<MES_POSITION>().Where(q => q.POST_CODE == postCode).First();
            //if (CurPosition.IsNullOrEmpty()) throw new InvalidDataException($"MES.Transaction.Position.PositionNotExistsException", new Exception($"{postCode}|"));
            if (CurPosition.IsNullOrEmpty()) throw new InvalidDataException($"岗位[{postCode}]不存在，请提交正确的岗位代码", new Exception($"{postCode}|"));
            CurLine = Biz.Db.Queryable<MES_LINE>().Where(q => q.LINE_CODE == CurPosition.LINE_CODE).First();
            CurLine = MainDB.Queryable<MES_LINE>().Where(q => q.LINE_CODE == CurPosition.LINE_CODE).First();
            //if (CurLine.IsNullOrEmpty()) throw new InvalidDataException($"MES.Transaction.Position.LineNotExistsException", new Exception($"{postCode}|{CurPosition.LINE_CODE}"));
            if (CurLine.IsNullOrEmpty()) throw new InvalidDataException($"岗位[{postCode}]所属的产线[{CurPosition.LINE_CODE}]不存在，请先设置所属产线", new Exception($"{postCode}|{CurPosition.LINE_CODE}"));
            CurWorkshop = Biz.Db.Queryable<MES_WORKSHOP>().Where(q => q.WS_CODE == CurLine.WS_CODE).First();
            CurWorkshop = MainDB.Queryable<MES_WORKSHOP>().Where(q => q.WS_CODE == CurLine.WS_CODE).First();
            //if (CurWorkshop.IsNullOrEmpty()) throw new InvalidDataException($"MES.Transaction.Position.WorkshopNotExistsException", new Exception($"{postCode}|{CurLine.WS_CODE}"));
            if (CurWorkshop.IsNullOrEmpty()) throw new InvalidDataException($"岗位[{postCode}]所属的车间[{CurLine.WS_CODE}]不存在，请先设置所属车间", new Exception($"{postCode}|{CurLine.WS_CODE}"));
            CurFactory = Biz.Db.Queryable<MES_FACTORY>().Where(q => q.FTY_CODE == CurWorkshop.FTY_CODE).First();
            CurFactory = MainDB.Queryable<MES_FACTORY>().Where(q => q.FTY_CODE == CurWorkshop.FTY_CODE).First();
            //if (CurFactory.IsNullOrEmpty()) throw new InvalidDataException($"MES.Transaction.Position.FactoryNotExistsException", new Exception($"{postCode}|{CurWorkshop.FTY_CODE}"));
            if (CurFactory.IsNullOrEmpty()) throw new InvalidDataException($"岗位[{postCode}]所属的工厂[{CurWorkshop.FTY_CODE}]不存在，请先设置所属工厂", new Exception($"{postCode}|{CurWorkshop.FTY_CODE}"));

            //加载当前产线的班制
            CurShiftSys = Biz.Db.Queryable<MES_SHIFT_SYS>().Where(q => q.SFTS_CODE == CurLine.SFTS_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Shifts).First();
            CurShiftSys = MainDB.Queryable<MES_SHIFT_SYS>().Where(q => q.SFTS_CODE == CurLine.SFTS_CODE).IncludesAllFirstLayer().IncludesAllSecondLayer(q => q.Shifts).First();

            return this;
        }
@@ -62,6 +65,7 @@
        public WorkBatch CurBatch { get; set; }
        public IWorkBatch WorkBatch => CurBatch;
        public List<MES_WIP_DATA> CurWipSNs { get; set; } = new();
        public List<MES_WIP_DATA> LastWipSNs { get; set; } = new();
        public string CurSN => (CurWipSNs.Any() ? (CurWipSNs.First().TRAY_SN.IsNullOrEmpty() ? CurWipSNs.First().SN : CurWipSNs.First().TRAY_SN) : "");
        public List<MES_WIP_HIS> CurWipSNHiss { get; set; } = new();
        public List<MES_WIP_DFT> CurDefects { get; set; } = new();
@@ -72,6 +76,8 @@
        public bool IsFinishNodeSteps => !Steps.Any(q => q.NodeType == IWorkStep.NodeTypes.Node && !q.IsFinished);
        public bool IsFinishAllSteps => Steps.Any() && !Steps.Any(q => !q.IsFinished);
        //public int CurStep => Steps.Where(q => !q.IsFinished).OrderBy(q => q.Sequence).FirstOrDefault()?.Sequence ?? 0;
        private DbClient _MainDB;
        public DbClient MainDB => _MainDB;
        private DbClient CommitDB;
        /// <summary>
        /// 是否需要临时存储数据库提交操作，待需要的时候再提交
@@ -104,7 +110,7 @@
            {
                if (!WoContext.ExistsBatch(input.OrderNo, CurLine.LINE_CODE, batchNo, true))
                {
                    var wo = await Biz.Db.Queryable<BIZ_MES_WO>().ByAuth(input.AuthOption).Where(q => q.ORDER_NO == input.OrderNo).FirstAsync();
                    var wo = await MainDB.Queryable<BIZ_MES_WO>().ByAuth(input.AuthOption).Where(q => q.ORDER_NO == input.OrderNo).FirstAsync();
                    //验证明细是否正确
                    if (wo.IsNullOrEmpty())
                    {
@@ -117,10 +123,10 @@
                    {
                        action.IsSuccessed = false;
                        //action.LocaleMsg = new($"工单[{0}]状态[{1}]不能生产");
                        action.LocaleMsg = new("MES.Transaction.Position.SelectOrder.StatusException", input.OrderNo, wo.STATUS.GetEnum<BIZ_MES_WO.STATUSs>().GetName());
                        action.LocaleMsg = new("MES.Transaction.Position.SelectOrder.StatusException", input.OrderNo, wo.STATUS.GetEnumDesc<BIZ_MES_WO.STATUSs>());
                        return action;
                    }
                    var batch = await Biz.Db.Queryable<BIZ_MES_WO_BATCH>().ByAuth(input.AuthOption)
                    var batch = await MainDB.Queryable<BIZ_MES_WO_BATCH>().ByAuth(input.AuthOption)
                        .Where(q => q.ORDER_NO == input.OrderNo && q.ACT_LINE == CurLine.LINE_CODE)
                        .WhereIF(!batchNo.IsNullOrEmpty(), q => q.BATCH_NO == batchNo)
                        .OrderBy(q => q.STATUS).FirstAsync();
@@ -135,11 +141,11 @@
                    {
                        action.IsSuccessed = false;
                        //action.LocaleMsg = new($"工单[{0}]批次[1]状态[{2}]不能生产");
                        action.LocaleMsg = new("MES.Transaction.Position.SelectOrder.BatchStatusException", input.OrderNo, batch.BATCH_NO, batch.STATUS.GetEnum<BIZ_MES_WO_BATCH.STATUSs>().GetName());
                        action.LocaleMsg = new("MES.Transaction.Position.SelectOrder.BatchStatusException", input.OrderNo, batch.BATCH_NO, batch.STATUS.GetEnumDesc<BIZ_MES_WO_BATCH.STATUSs>());
                        return action;
                    }
                    var wb = new WorkBatch(input.OrderNo).Init(CurLine.LINE_CODE);
                    WoContext.WoBatchDic.Add(wb.Batch.BATCH_NO, wb);
                    var wb = WoContext.Add(input.OrderNo, CurLine.LINE_CODE);
                    batchNo = wb.Batch.BATCH_NO;
                }
                CurBatch = WoContext.GetBatch(input.OrderNo, CurLine.LINE_CODE, batchNo);
                if (!OperInfoDic.ContainsKey(CurBatch.Batch.BATCH_NO))
@@ -238,6 +244,62 @@
                info.NextNode = "   —   ";
            }
            return info;
        }

        /// <summary>
        /// 设置当前条码的工序信息
        /// </summary>
        public ApiAction<SubmitOutput> SetOutPutMqttMsg(ApiAction<SubmitOutput> action, string locale = null)
        {
            MQTT.Message msg = new()
            {
                IsSuccessed = action.IsSuccessed,
                Content = Biz.T(action.LocaleMsg, locale),
            };
            switch (action.Status)
            {
                case ApiAction.StatusCodes.Success:
                    msg.Voice = MQTT.Voice.Success;
                    msg.Color = "#FF1E90FF";
                    break;
                case ApiAction.StatusCodes.Warning:
                    msg.Voice = MQTT.Voice.Warning;
                    msg.Color = "#FFB8860B";
                    break;
                case ApiAction.StatusCodes.Error:
                case ApiAction.StatusCodes.Failed:
                    msg.Voice = MQTT.Voice.Fail;
                    msg.Color = "#FFFF0000";
                    break;
                case ApiAction.StatusCodes.Exception:
                    msg.Voice = MQTT.Voice.Fail;
                    msg.Color = "#FF8B0000";
                    break;
                case ApiAction.StatusCodes.Normal:
                case ApiAction.StatusCodes.NeedConfrim:
                case ApiAction.StatusCodes.Confrimed:
                default:
                    msg.Voice = MQTT.Voice.Silent;
                    msg.Color = "#FF000000";
                    break;
            }
            if (action.Data.IsFinished && action.IsSuccessed)
            {
                msg.Voice = MQTT.Voice.Pass;
                msg.Color = "#FF228B22";
            }
            else if (!action.IsSuccessed)
            {
                msg.Voice = MQTT.Voice.Fail;
                msg.Color = "#FFFF0000";
            }
            else
            {
                msg.Voice = MQTT.Voice.Silent;
                msg.Color = "#FF000000";
            }
            action.Data.MqttMsg = msg;
            return action;
        }

        /// <summary>
@@ -438,8 +500,8 @@
                    {
                        DBCommitList.Add("AppendSaveAction", new List<Action>());
                    }
                    var commitList = DBCommitList["AppendSaveAction"];
                    commitList.Add(appendToSave);
                    var appendList = DBCommitList["AppendSaveAction"];
                    appendList.Add(appendToSave);
                }
            }

@@ -479,6 +541,9 @@
                    throw dbTran.ErrorException;
                }
            }
            //记录最后成功过站的条码
            LastWipSNs.Clear();
            LastWipSNs.AddRange(CurWipSNs);
        }

        protected void DoSaveToDB()
@@ -505,7 +570,12 @@
        /// <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)
        {
            return SetLabelVariables(labelPVs, label, action, null);
        }

        public BAS_LABEL_TEMP SetLabelVariables(List<BAS_PROCESS_VAR> labelPVs, BAS_LABEL_TEMP label, IWorkAction action, WipPkg? CurPkg)
        {
            foreach (var item in label.Variables.OrderBy(q => q.VAR_TYPE == BAS_LABEL_VAR.VAR_TYPEs.BarcodeGenerate.GetValue() ? 0 : 1))
            {
@@ -515,7 +585,7 @@
                        item.Value = item.VAR_VALUE;
                        break;
                    case BAS_LABEL_VAR.VAR_TYPEs.ProcessVariable:
                        item.Value = GetPrintProcessValue(labelPVs, item, label.Variables, action);
                        item.Value = GetPrintProcessValue(labelPVs, item, label.Variables, action, CurPkg);
                        break;
                    case BAS_LABEL_VAR.VAR_TYPEs.DateVariable:
                        item.Value = DateTime.Now.ToString(item.VAR_VALUE);
@@ -538,61 +608,99 @@
        /// <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)
        {
            var pv = labelPVs.FirstOrDefault(q => q.VAR_CODE == lv.VAR_VALUE);
            if (!pv.IsNullOrEmpty())
            {
                switch (pv.VAR_TYPE.GetEnum<BAS_LABEL_PV.VAR_TYPEs>())
                switch (pv.VAR_TYPE.GetEnum<BAS_PROCESS_VAR.VAR_TYPEs>())
                {
                    case BAS_LABEL_PV.VAR_TYPEs.ServerMethod:
                    case BAS_PROCESS_VAR.VAR_TYPEs.ServerMethod:
                        {
                            switch (pv.VAR_METHOD)
                            {
                                case "GetSN":
                                    return CurSN;
                                case "GetItemCode":
                                    return GetLabelVarWo(lv, WorkBatch.Product.ITEM_CODE);
                                case "GetBAS_ITEM":
                                    return WorkBatch.Product.CUST_PROD_CODE;
                                    return GetLabelVarWo(lv, WorkBatch.Product.CUST_PROD_CODE);
                                case "GetItemName":
                                    return WorkBatch.Product.ITEM_NAME;
                                    return GetLabelVarWo(lv, WorkBatch.Product.ITEM_NAME);
                                case "GetCustomer":
                                    return WorkBatch.Batch.Customer.ToJson();
                                    return GetLabelVarWo(lv, WorkBatch.Batch.Customer.ToJson());
                                case "GetSalesOrder":
                                    return GetLabelVarWo(lv, WorkBatch.WO.SALES_ORDER);
                                case "GetPackNumber":
                                    return GetLabelVarWo(lv, WorkBatch.WO.ORDER_NO);
                                case "GetBoxQR":
                                    return action is PackingAction ? GetBoxCode(lvars, action as PackingAction) : "";
                                    return GetCardOrBoxQR(GetBoxCode(), curAction, CurPkg);
                                case "GetCardQR":
                                    return action is PackingAction ? GetCardOrBoxQR(GetCardCode(lvars), lvars, action as PackingAction) : "";
                                    return GetCardOrBoxQR("", curAction, CurPkg);
                                case "GetCardSN":
                                    List<string> minPkgList = new List<string>();
                                    var _pkaction = action is PackingAction ? action as PackingAction : null;
                                    if (_pkaction != null)
                                    if (!CurPkg.IsNullOrEmpty())
                                    {
                                        minPkgList = GetMinPkgList(_pkaction);
                                        minPkgList = CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
                                    }
                                    else
                                    {
                                        var _pkaction = curAction is PackingAction ? curAction as PackingAction : null;
                                        if (!_pkaction.IsNullOrEmpty())
                                        {
                                            minPkgList = GetMinPkgList(_pkaction);
                                        }
                                        if (curAction is PrintInStoreLabel)
                                        {
                                            minPkgList = (curAction as PrintInStoreLabel).CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
                                        }
                                    }
                                    return string.Join("\r\n", minPkgList);
                                case "GetDescription":
                                    return WorkBatch.Product.ITEM_DESC;
                                    return GetLabelVarWo(lv, WorkBatch.Product.ITEM_DESC);
                                case "GetFengZ":
                                    return WorkBatch.Product.ExtInfo.Packaging;
                                    return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Packaging);
                                case "GetPAndO":
                                    return WorkBatch.WO.SALES_CONTRACT;
                                    return GetLabelVarWo(lv, WorkBatch.WO.SALES_CONTRACT);
                                case "GetLTD":
                                    return WorkBatch.Batch.Customer.CUST_NAME_CN;
                                    return GetLabelVarWo(lv, WorkBatch.WO.Customer?.CUST_NAME_CN);
                                case "GetHWDate":
                                    List<string> list = new List<string>();
                                    var _action = action is PackingAction ? action as PackingAction : null;
                                    if (_action != null)
                                    if (!CurPkg.IsNullOrEmpty())
                                    {
                                        list = GetMinPkgList(_action);
                                        list = CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
                                    }
                                    else
                                    {
                                        var _action = curAction is PackingAction ? curAction as PackingAction : null;
                                        if (_action != null)
                                        {
                                            list = _action.CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
                                        }
                                        if (curAction is PrintInStoreLabel)
                                        {
                                            list = (curAction as PrintInStoreLabel).CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
                                        }
                                    }
                                    return GetHuaWeiWeek(WorkBatch.Batch.ORDER_NO, list);
                                case "GetQty":
                                    List<string> qtylist = new List<string>();
                                    var _qtyAction = action is PackingAction ? action as PackingAction : null;
                                    if (_qtyAction != null)
                                    if (!CurPkg.IsNullOrEmpty())
                                    {
                                        qtylist = GetMinPkgList(_qtyAction);
                                        qtylist = CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
                                    }
                                    return $"{qtylist.Count}PCS";
                                    else
                                    {
                                        if (curAction is PackingAction)
                                        {
                                            qtylist = (curAction as PackingAction).CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
                                        }
                                        if (curAction is PrintInStoreLabel)
                                        {
                                            qtylist = (curAction as PrintInStoreLabel).CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
                                        }
                                    }
                                    return $"{qtylist.Count}";
                                case "GetModel":
                                    return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Model);
                                case "GetInput":
@@ -606,34 +714,54 @@
                                case "GetVarByWo":
                                    return GetLabelVarWo(lv, "");
                                case "GetLOTNO":
                                    var _orderAction = action is PackingAction ? action as PackingAction : null;
                                    if (_orderAction != null)
                                    List<string> snList = new List<string>();
                                    string _lotnos = "";
                                    var _orderAction = curAction is PackingAction ? curAction as PackingAction : null;
                                    if (!CurPkg.IsNullOrEmpty())
                                    {
                                        var snList = _orderAction.GetMinPackageList(_orderAction.CurPkg.Item).Select(q => q.FLOW_SN);
                                        return string.Join(",", Biz.Db.Queryable<MES_CUST_SN>()
                                                .Where((q) => snList.Contains(q.FLOW_SN))
                                                .Select((q) => q.WORK_ORDER).Distinct());
                                        snList = CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
                                    }
                                    return "";
                                    else
                                    {
                                        if (_orderAction != null)
                                        {
                                            snList = _orderAction.CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
                                            snList.Add(_orderAction.CurPkg.CustSN?.FLOW_SN);
                                        }
                                        if (curAction is PrintInStoreLabel)
                                        {
                                            snList = (curAction as PrintInStoreLabel).CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
                                            snList.Add((curAction as PrintInStoreLabel).CurPkg.CustSN?.FLOW_SN);
                                        }
                                    }
                                    _lotnos = string.Join(",", MainDB.Queryable<MES_CUST_SN>()
                                        .Where((q) => snList.Contains(q.FLOW_SN))
                                        .Select((q) => q.WORK_ORDER).Distinct().ToList());
                                    return _lotnos;
                                case "GetNOTES":
                                    return WorkBatch.Product.ExtInfo?.Remark;
                                    return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Remark);
                                case "GetXH":
                                    return GetCardCode(lvars);
                                    return "";
                                case "GetCardNo":
                                    return "";
                                    return $"{Context.GetOrDefault("CurWaitShipmentCarton").ToInt32() + 1}";
                                case "GetCardTotal":
                                    return "";
                                    var total = "";
                                    var _curaction = curAction is PackingAction ? curAction as PackingAction : null;
                                    if (!_curaction.IsNullOrEmpty()) {
                                        total = $"{Math.Ceiling(Context.GetOrDefault("CurShipQty").ToDecimal()/_curaction.PkgRule.GetTotalQty().ToDecimal())}";
                                    }
                                    return total;
                                case "GetModelSpec": //Model+空格+SPEC,
                                    return $"{WorkBatch.Product.ExtInfo?.Model} {WorkBatch.Product.SPEC}";
                                    return GetLabelVarWo(lv, $"{WorkBatch.Product.ExtInfo?.Model} {WorkBatch.Product.SPEC}");
                                case "GetDATE":
                                    return $"{DateTime.Now.ToString("yyyy/MM/dd")}";
                                    return GetLabelVarWo(lv, $"{DateTime.Now.ToString("yyyy/MM/dd")}");
                                default:
                                    return "";
                            }
                        }
                    case BAS_LABEL_PV.VAR_TYPEs.WebApi:
                    case BAS_PROCESS_VAR.VAR_TYPEs.WebApi:
                        break;
                    case BAS_LABEL_PV.VAR_TYPEs.StoredProcedure:
                    case BAS_PROCESS_VAR.VAR_TYPEs.StoredProcedure:
                        break;
                    default:
                        break;
@@ -648,21 +776,21 @@
        /// <param name="labelPVs"></param>
        /// <param name="lv"></param>
        /// <returns></returns>
        public string GetGeneratePValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv)
        public string GetGeneratePValue(List<BAS_PROCESS_VAR> labelPVs, BAS_LABEL_VAR lv)
        {
            var pv = labelPVs.FirstOrDefault(q => q.VAR_CODE == lv.VAR_VALUE);
            if (!pv.IsNullOrEmpty())
            {
                switch (pv.VAR_TYPE.GetEnum<BAS_LABEL_PV.VAR_TYPEs>())
                switch (pv.VAR_TYPE.GetEnum<BAS_PROCESS_VAR.VAR_TYPEs>())
                {
                    case BAS_LABEL_PV.VAR_TYPEs.BarcodeGenerate:
                    case BAS_PROCESS_VAR.VAR_TYPEs.BarcodeGenerate:
                        {
                            switch (pv.VAR_METHOD)
                            {
                                case "GetCartonGenerate":
                                    return Biz.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate("B", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
                                    return Cache.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate("B", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
                                case "GetHW21SNGenerate":
                                    return Biz.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate("SN:", "05").Data.ToString() ?? "";
                                    return Cache.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate("SN:", "05").Data.ToString() ?? "";
                                default:
                                    return "";
                            }
@@ -682,14 +810,14 @@
        private string GetLabelVarWo(BAS_LABEL_VAR lv, string value)
        {
            string result = "";
            var labelVarwos = Biz.Db.Queryable<BAS_LABEL_VAR_WO>().Where(x => x.LABEL_ID == lv.LABEL_ID && x.VAR_NAME == lv.VAR_NAME).ToList();
            var labelVarwos = MainDB.Queryable<BAS_LABEL_VAR_WO>().Where(x => x.LABEL_ID == lv.LABEL_ID && x.VAR_NAME == lv.VAR_NAME).ToList();
            if (labelVarwos.Any(q => q.WORK_ORDER == WorkBatch.Batch.ORDER_NO))
            {
                result = labelVarwos.First(q => q.WORK_ORDER == WorkBatch.Batch.ORDER_NO).VAR_VALUE;
            }
            else
            {
                result = value.IsNullOrEmpty() ? (labelVarwos.Count > 0 ? labelVarwos.First().DEFAULT_VALUE : "") : value;
                result = value.IsNullOrEmpty() ? (labelVarwos.Count > 0 ? labelVarwos.First(q => q.WORK_ORDER.IsNullOrEmpty()).DEFAULT_VALUE : "") : value;
            }
            return result;
        }
@@ -702,13 +830,13 @@
        private List<string> GetMinPkgList(PackingAction action)
        {
            List<string> list = new List<string>();
            if (action.CurPkg.Item.PKG_LEVEL == 1)
            if (action.CurPkg.IsNullOrEmpty())
            {
                list.Add(CurSN);
            }
            else
            {
                list = action.GetMinPackageList(action.CurPkg.Item).Select(q => q.SN).ToList();
                list = action.CurPkg.Item.GetMinPackageList().Select(q => q.SN).ToList();
            }
            return list;
        }
@@ -716,24 +844,19 @@
        /// <summary>
        /// 获取白盒条码
        /// </summary>
        /// <param name="action"></param>
        /// <returns></returns>
        private string GetBoxCode(List<BAS_LABEL_VAR> lvars, PackingAction action)
        private string GetBoxCode()
        {
            var boxCode = Biz.CodeRule["WhiteBoxNo"]?.Generate("W", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
            return GetCardOrBoxQR(boxCode, lvars, action);
            return Cache.CodeRule["WhiteBoxNo"]?.Generate("W", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
        }

        /// <summary>
        /// 获取箱条码
        /// </summary>
        /// <param name="lvars"></param>
        /// <param name="action"></param>
        /// <returns></returns>
        private string GetCardCode(List<BAS_LABEL_VAR> lvars)
        private string GetCardCode()
        {
            var cardCode = Biz.CodeRule["CartonNo"]?.Generate("B", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
            return cardCode;
            return Cache.CodeRule["CartonNo"]?.Generate("B", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
        }

        /// <summary>
@@ -743,22 +866,50 @@
        /// <param name="lvars"></param>
        /// <param name="action"></param>
        /// <returns></returns>
        private string GetCardOrBoxQR(string code, List<BAS_LABEL_VAR> lvars, PackingAction action)
        private string GetCardOrBoxQR(string code, IWorkAction action, WipPkg? CurPkg)
        {
            var minPkgList = action.GetMinPackageList(action.CurPkg.Item).Select(q => q.SN);
            List<string> minPkgList = new List<string>();
            var itemCode = "";
            double weight = 0;
            var unit = "";
            if (!CurPkg.IsNullOrEmpty())
            {
                minPkgList = CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
                itemCode = CurPkg.CustSN?.ITEM_CODE;
                weight = CurPkg.WeightInfo.Weight;
                unit = CurPkg.WeightInfo.Unit?.ToUpper() ?? "kg";
            }
            else
            {
                if (action is PackingAction)
                {
                    var pkg = action as PackingAction;
                    //minPkgList = pkg.CurPkg.Item.GetMinPackageList().Select(q => q.SN).ToList();
                    minPkgList = pkg.CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
                    itemCode = pkg.CurPkg.CustSN?.ITEM_CODE;
                    weight = pkg.CurPkg.WeightInfo.Weight;
                    unit = pkg.CurPkg.WeightInfo.Unit?.ToUpper() ?? "kg";
                }
                if (action is PrintInStoreLabel)
                {
                    var print = action as PrintInStoreLabel;
                    //minPkgList = print.CurPkg.Item.GetMinPackageList().Select(q => q.SN).ToList();
                    minPkgList = print.CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
                    itemCode = print.CurPkg.CustSN?.ITEM_CODE;
                    weight = print.CurPkg.WeightInfo.Weight;
                    unit = print.CurPkg.WeightInfo.Unit?.ToUpper() ?? "kg";
                }
            }
            var wo = WorkBatch.Batch.ORDER_NO;
            var snList = string.Join("\r\n", minPkgList);
            if (snList.IsNullOrEmpty()) { snList = $"{CurSN}"; }
            var itemCode = action.CurPkg.CustSN?.ITEM_CODE;
            var weight = action.CurPkg.WeightInfo.Weight;
            var unit = action.CurPkg.WeightInfo.Unit.ToUpper();
            var model = WorkBatch.Product.ExtInfo.Model;
            var Input = WorkBatch.Product.ExtInfo.Input;
            var OutPut = WorkBatch.Product.ExtInfo.OutPut;
            var Power = WorkBatch.Product.ExtInfo.Power;
            var Accuracy = WorkBatch.Product.ExtInfo.Accuracy;
            var Display = WorkBatch.Product.ExtInfo.Display;
            var Remark = WorkBatch.Product.ExtInfo.Remark;
            var model = WorkBatch.Product.ExtInfo?.Model;
            var Input = WorkBatch.Product.ExtInfo?.Input;
            var OutPut = WorkBatch.Product.ExtInfo?.OutPut;
            var Power = WorkBatch.Product.ExtInfo?.Power;
            var Accuracy = WorkBatch.Product.ExtInfo?.Accuracy;
            var Display = WorkBatch.Product.ExtInfo?.Display;
            var Remark = WorkBatch.Product.ExtInfo?.Remark;

            return $"{code}|{itemCode}|{wo}|\r\n{snList}|{weight}{unit}|型号:{model},输入:{Input},显示:{Display},输出:{OutPut},电源:{Power},精度:{Accuracy},备注:{Remark}";
        }
@@ -771,7 +922,7 @@
        private string GetHuaWeiWeek(string pkgOrder, List<string> snList)
        {
            Dictionary<string, string> dic = new();
            var snOrder = Biz.Db.Queryable<MES_CUST_SN, BIZ_MES_WO>((q, w) => new JoinQueryInfos(JoinType.Left, q.WORK_ORDER == w.ORDER_NO))
            var snOrder = MainDB.Queryable<MES_CUST_SN, BIZ_MES_WO>((q, w) => new JoinQueryInfos(JoinType.Left, q.WORK_ORDER == w.ORDER_NO))
                                            .Where((q, w) => q.PKG_ORDER == pkgOrder && (snList.Contains(q.FLOW_SN) || snList.Contains(q.CUST_SN)))
                                           .Select((q, w) => new { q.PKG_ORDER, q.WORK_ORDER, w.ACT_START_TIME, w.PLAN_START_TIME, q.FLOW_SN, q.CUST_SN }).ToList();
            foreach (var sn in snList)
@@ -806,6 +957,31 @@
            }
        }
        #endregion
        #region 条码规则方法
        /// <summary>
        /// 获取根据条码规则生成条码
        /// </summary>
        /// <param name="ruleCode"></param>
        /// <param name="curAction"></param>
        /// <returns></returns>
        public string GenerateSN(string ruleCode, IWorkAction curAction)
        {
            var rule = Cache.CodeRule[ruleCode ?? ""];
            if (!rule.IsNullOrEmpty())
            {
                switch (rule.RULE_CODE)
                {
                    case "WhiteBoxNo":
                        return rule.Generate("W", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
                    case "CartonNo":
                        return rule.Generate("B", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
                    default:
                        return rule.Generate().Data.ToString() ?? "";
                }
            }
            return "";
        }
        #endregion
        #region 包装专用方法
        /// <summary>
        /// 根据传入的包装对象返回所有的包装实体列表