From 6984f73c06b8d5ab5da41e16b4ac68dc87716a16 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 17 十月 2024 23:36:18 +0800
Subject: [PATCH] 工单变量优化
---
Tiger.Business.MES/Transaction/Position.cs | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 7059542..5035f38 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -552,15 +552,15 @@
case "GetSN":
return CurSN;
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 WorkBatch.WO.SALES_ORDER;
+ return GetLabelVarWo(lv, WorkBatch.WO.SALES_ORDER);
case "GetPackNumber":
- return WorkBatch.WO.ORDER_NO;
+ return GetLabelVarWo(lv, WorkBatch.WO.ORDER_NO);
case "GetBoxQR":
return action is PackingAction ? GetBoxCode(lvars, action as PackingAction) : "";
case "GetCardQR":
@@ -574,13 +574,13 @@
}
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.WO.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;
@@ -626,7 +626,7 @@
}
return "";
case "GetNOTES":
- return WorkBatch.Product.ExtInfo?.Remark;
+ return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Remark);
case "GetXH":
return GetCardCode(lvars);
case "GetCardNo":
@@ -634,9 +634,9 @@
case "GetCardTotal":
return "";
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 "";
}
@@ -699,7 +699,7 @@
}
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;
}
--
Gitblit v1.9.3