From 40aed839db4c9002a54e681c3eb3dcfe889f01c9 Mon Sep 17 00:00:00 2001 From: Ben Lin <maobin001@msn.com> Date: 星期五, 27 九月 2024 14:23:26 +0800 Subject: [PATCH] 模板GetHWDate更新 --- Tiger.Business.MES/Transaction/Position.cs | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs index 8db2148..573b749 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,10 @@ 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; + 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