更新箱号，获取箱号

Ben Lin

2024-11-03 8745fb2b4824979aad955a9835decdb849fe278d

 Tiger.Business.MES/Transaction/Position.cs

@@ -15,6 +15,7 @@
using Tiger.Business.MES.WorkAction;
using System.Collections;
using Tiger.IBusiness.MES.WorkAction;
using Dm.parser;

namespace Tiger.Business.MES.Transaction
{
@@ -556,6 +557,8 @@
                            {
                                case "GetSN":
                                    return CurSN;
                                case "GetItemCode":
                                    return GetLabelVarWo(lv, WorkBatch.Product.ITEM_CODE);
                                case "GetBAS_ITEM":
                                    return GetLabelVarWo(lv, WorkBatch.Product.CUST_PROD_CODE);
                                case "GetItemName":
@@ -567,9 +570,9 @@
                                case "GetPackNumber":
                                    return GetLabelVarWo(lv, WorkBatch.WO.ORDER_NO);
                                case "GetBoxQR":
                                    return GetCardOrBoxQR(GetBoxCode(lvars), curAction);
                                    return GetCardOrBoxQR(GetBoxCode(), curAction);
                                case "GetCardQR":
                                    return GetCardOrBoxQR(GetCardCode(lvars), curAction);
                                    return GetCardOrBoxQR("", curAction);
                                case "GetCardSN":
                                    List<string> minPkgList = new List<string>();
                                    var _pkaction = curAction is PackingAction ? curAction as PackingAction : null;
@@ -636,7 +639,7 @@
                                case "GetNOTES":
                                    return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Remark); 
                                case "GetXH":
                                    return GetCardCode(lvars);
                                    return "";
                                case "GetCardNo":
                                    return "";
                                case "GetCardTotal":
@@ -734,9 +737,8 @@
        /// <summary>
        /// 获取白盒条码
        /// </summary>
        /// <param name="action"></param>
        /// <returns></returns>
        private string GetBoxCode(List<BAS_LABEL_VAR> lvars)
        private string GetBoxCode()
        {
            return Biz.CodeRule["WhiteBoxNo"]?.Generate("W", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
        }
@@ -744,10 +746,8 @@
        /// <summary>
        /// 获取箱条码
        /// </summary>
        /// <param name="lvars"></param>
        /// <param name="action"></param>
        /// <returns></returns>
        private string GetCardCode(List<BAS_LABEL_VAR> lvars)
        private string GetCardCode()
        {
            return Biz.CodeRule["CartonNo"]?.Generate("B", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
        }