From be19880a15155f93728dc4a9de0983b76b7e0319 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 09 十月 2024 17:16:15 +0800
Subject: [PATCH] 增加打印日志实体

---
 Tiger.Business.MES/Transaction/Position.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index ad4824e..0ab06c3 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -551,7 +551,7 @@
                                 case "GetCardQR":
                                     return action is PackingAction ? GetCardCode(lvars, action as PackingAction) : "";
                                 case "GetDescription":
-                                    return WorkBatch.Product.ITEM_DESC;
+                                    return WorkBatch.Product.ExtInfo.Packaging; //WorkBatch.Product.ITEM_DESC;
                                 case "GetPAndO":
                                     return WorkBatch.WO.SALES_CONTRACT;
                                 case "GetLTD":
@@ -613,7 +613,7 @@
                             switch (pv.VAR_METHOD)
                             {
                                 case "GetCartonGenerate":
-                                    return Biz.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate($"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
+                                    return Biz.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() ?? "";
                                 default:
@@ -679,7 +679,7 @@
         /// <returns></returns>
         private string GetCardOrBoxQR(string code, List<BAS_LABEL_VAR> lvars, PackingAction action)
         {
-            var itemCode = WorkBatch.Product.CUST_PROD_CODE;
+            var itemCode = WorkBatch.Product.ITEM_CODE;
             var wo = WorkBatch.Batch.ORDER_NO;
             var snList = string.Join("\r\n", action.GetMinPackageList(action.CurPkg.Item).Select(q => q.SN));
             if (snList.IsNullOrEmpty()) { snList = $"{CurSN}"; }

--
Gitblit v1.9.3