From c4822304dbf523bcbecfbf6e25493ded56540c93 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 10 十月 2024 16:00:35 +0800
Subject: [PATCH] 获取模板变量值的一些更改
---
Tiger.Business.MES/Transaction/Position.cs | 57 ++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 11 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 0ab06c3..cf98edc 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -13,6 +13,7 @@
using Tiger.Model.Entitys.MES.Position;
using System.Globalization;
using Tiger.Business.MES.WorkAction;
+using System.Collections;
namespace Tiger.Business.MES.Transaction
{
@@ -550,8 +551,18 @@
return action is PackingAction ? GetBoxCode(lvars, action as PackingAction) : "";
case "GetCardQR":
return action is PackingAction ? GetCardCode(lvars, action as PackingAction) : "";
+ case "GetCardSN":
+ List<string> minPkgList = new List<string>();
+ var _pkaction = action is PackingAction ? action as PackingAction : null;
+ if (_pkaction != null)
+ {
+ minPkgList = GetMinPkgList(_pkaction);
+ }
+ return string.Join("\r\n", minPkgList);
case "GetDescription":
- return WorkBatch.Product.ExtInfo.Packaging; //WorkBatch.Product.ITEM_DESC;
+ return WorkBatch.Product.ITEM_DESC;
+ case "GetFengZ":
+ return WorkBatch.Product.ExtInfo.Packaging;
case "GetPAndO":
return WorkBatch.WO.SALES_CONTRACT;
case "GetLTD":
@@ -559,15 +570,19 @@
case "GetHWDate":
List<string> list = new List<string>();
var _action = action is PackingAction ? action as PackingAction : null;
- if (_action.CurPkg.Item.PKG_LEVEL == 1)
+ if (_action!=null)
{
- list.Add(CurSN);
- }
- else
- {
- list = _action != null ? _action.GetMinPackageList(_action.CurPkg.Item).Select(q => q.SN).ToList() : new List<string>();
+ list = GetMinPkgList(_action);
}
return GetHuaWeiWeek(WorkBatch.Batch.ORDER_NO, list);
+ case "GetQty":
+ List<string> qtylist = new List<string>();
+ var _qtyAction = action is PackingAction ? action as PackingAction : null;
+ if (_qtyAction != null)
+ {
+ qtylist = GetMinPkgList(_qtyAction);
+ }
+ return $"{qtylist.Count}PCS";
case "GetModel":
return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo.Model);
case "GetInput":
@@ -648,6 +663,24 @@
}
/// <summary>
+ /// 鑾峰彇鏈�灏忓寘瑁呮潯鐮佸垪琛�
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ private List<string> GetMinPkgList(PackingAction action) {
+ List<string> list = new List<string>();
+ if (action.CurPkg.Item.PKG_LEVEL == 1)
+ {
+ list.Add(CurSN);
+ }
+ else
+ {
+ list = action.GetMinPackageList(action.CurPkg.Item).Select(q => q.SN).ToList();
+ }
+ return list;
+ }
+
+ /// <summary>
/// 鑾峰彇鐧界洅鏉＄爜
/// </summary>
/// <param name="action"></param>
@@ -679,10 +712,12 @@
/// <returns></returns>
private string GetCardOrBoxQR(string code, List<BAS_LABEL_VAR> lvars, PackingAction action)
{
- var itemCode = WorkBatch.Product.ITEM_CODE;
+ var minPkgList = action.GetMinPackageList(action.CurPkg.Item).Select(q => q.SN);
var wo = WorkBatch.Batch.ORDER_NO;
- var snList = string.Join("\r\n", action.GetMinPackageList(action.CurPkg.Item).Select(q => q.SN));
+ var snList = string.Join("\r\n", minPkgList);
if (snList.IsNullOrEmpty()) { snList = $"{CurSN}"; }
+ var _sn = minPkgList.FirstOrDefault() ?? CurSN;
+ var itemCode = Biz.Db.Queryable<MES_CUST_SN>().Where(q => q.FLOW_SN == _sn || q.CUST_CODE == _sn).First()?.ITEM_CODE;
var weight = action.CurPkg.WeightInfo.Weight;
var unit = action.CurPkg.WeightInfo.Unit.ToUpper();
var model = WorkBatch.Product.ExtInfo.Model;
@@ -733,9 +768,9 @@
case 1:
return weeks.First();
case 2:
- return string.Join("/", weeks.Select(q => q + $"({dic.Count(d => d.Value == q)})"));
+ return string.Join("銆�", weeks.Select(q => q + $"({dic.Count(d => d.Value == q)}PCS)"));
default:
- return string.Join("/", weeks.Take(2)) + " (+)";
+ return string.Join("銆�", weeks.Take(2)) + " (+)";
}
}
#endregion
--
Gitblit v1.9.3