白盒、箱条码生成更新

Ben Lin

2024-09-29 23d5fc6ea22d8acef338bf70c8c5399d5cdff0bd

白盒、箱条码生成更新

 Tiger.Business.MES/Transaction/Position.cs

@@ -511,7 +511,7 @@
                                case "GetBAS_ITEM":
                                    return WorkBatch.Product.CUST_PROD_CODE;
                                case "GetCustomer":
                                    return WorkBatch.Batch.ToJson();
                                    return WorkBatch.Batch.Customer.ToJson();
                                case "GetBoxQR":
                                    return action is PackingAction ? GetBoxCode(lvars, action as PackingAction) : "";
                                case "GetCardQR":
@@ -620,7 +620,8 @@
        /// <returns></returns>
        private string GetBoxCode(List<BAS_LABEL_VAR> lvars, PackingAction action)
        {
            return GetCardOrBoxQR(CurSN, lvars, action);
            var boxCode = Biz.CodeRule["WhiteBoxNo"]?.Generate("W", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
            return GetCardOrBoxQR(boxCode, lvars, action);
        }

        /// <summary>
@@ -631,7 +632,7 @@
        /// <returns></returns>
        private string GetCardCode(List<BAS_LABEL_VAR> lvars, PackingAction action)
        {
            var cardCode = lvars.First(q=>q.VAR_NAME == "CardQR").Value;
            var cardCode = Biz.CodeRule["CartonNo"]?.Generate("B", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "" ;
            return GetCardOrBoxQR(cardCode, lvars, action);
        }


 Tiger.Business.MES/iERP/U9C_MES.cs

@@ -184,6 +184,7 @@
                            SERIAL_NO = di["MoSerial"] == null ? "" : di["MoSerial"].ToString(),
                            SN_PREFIX = di["InBarHead"] == null ? "" : di["InBarHead"].ToString(),
                            CUST_PREFIX = di["OutBarHead"] == null ? "" : di["OutBarHead"].ToString(),
                            SALES_CONTRACT = di["Contracts"] == null ? "" : di["Contracts"].ToString(),
                        };
                        if (!Biz.Db.Queryable<BIZ_MES_WO>().Any(x => x.ORDER_NO == woItem.ORDER_NO && (x.STATUS > 0 || x.ROUTE_STATUS > 0)))
                        {