From f2af5cea58ade32013e538c6354bd961ed02cb94 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 17 十月 2024 15:21:11 +0800
Subject: [PATCH] 模板变量更新
---
Tiger.Business.MES/Transaction/Position.cs | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 21362c9..7059542 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -557,6 +557,10 @@
return WorkBatch.Product.ITEM_NAME;
case "GetCustomer":
return WorkBatch.Batch.Customer.ToJson();
+ case "GetSalesOrder":
+ return WorkBatch.WO.SALES_ORDER;
+ case "GetPackNumber":
+ return WorkBatch.WO.ORDER_NO;
case "GetBoxQR":
return action is PackingAction ? GetBoxCode(lvars, action as PackingAction) : "";
case "GetCardQR":
@@ -758,13 +762,13 @@
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}";
}
--
Gitblit v1.9.3