From 0c1d01d8019401b7ee0ed7839117fe755d83bdff Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 27 九月 2024 15:33:21 +0800
Subject: [PATCH] GetHWDate再更新
---
Tiger.Business.MES/Transaction/Position.cs | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 8db2148..63e0a2a 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -509,13 +509,13 @@
case "GetSN":
return CurSN;
case "GetBAS_ITEM":
- return WorkBatch.Product.ITEM_CODE;
+ return WorkBatch.Product.CUST_PROD_CODE;
case "GetCustomer":
return WorkBatch.Batch.ToJson();
case "GetBoxQR":
return action is PackingAction ? GetBoxCode(lvars, action as PackingAction) : "";
case "GetCardQR":
- return action is PackingAction? GetCardCode(lvars, action as PackingAction) : "";
+ return action is PackingAction ? GetCardCode(lvars, action as PackingAction) : "";
case "GetDescription":
return WorkBatch.Product.ITEM_DESC;
case "GetPAndO":
@@ -523,7 +523,17 @@
case "GetLTD":
return WorkBatch.Batch.Customer.SHORT_NAME;
case "GetHWDate":
- return WorkBatch.Batch.ToJson();
+ List<string> list = new List<string>();
+ var _action = action is PackingAction ? action as PackingAction : null;
+ if (_action.CurPkg.Item.PKG_LEVEL == 1)
+ {
+ list.Add(CurSN);
+ }
+ else
+ {
+ list = _action != null ? _action.GetMinPackageList(_action.CurPkg.Item).Select(q => q.SN).ToList() : new List<string>();
+ }
+ return GetHuaWeiWeek(WorkBatch.Batch.ORDER_NO, list);
case "GetModel":
return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Model);
case "GetInput":
--
Gitblit v1.9.3