From 976d3ae1547b896cc5c7875408c09616d5c2ee55 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 26 十一月 2024 20:51:17 +0800
Subject: [PATCH] 箱数更新
---
Tiger.Business.MES/Transaction/Position.cs | 126 +++++++++++++++++++++++++++++------------
1 files changed, 88 insertions(+), 38 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index fa372a2..6bc6cc8 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -514,6 +514,11 @@
/// <returns></returns>
public BAS_LABEL_TEMP SetLabelVariables(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_TEMP label, IWorkAction action)
{
+ return SetLabelVariables(labelPVs, label, action, null);
+ }
+
+ public BAS_LABEL_TEMP SetLabelVariables(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_TEMP label, IWorkAction action, WipPkg? CurPkg)
+ {
foreach (var item in label.Variables.OrderBy(q => q.VAR_TYPE == BAS_LABEL_VAR.VAR_TYPEs.BarcodeGenerate.GetValue() ? 0 : 1))
{
switch (item.VAR_TYPE.GetEnum<BAS_LABEL_VAR.VAR_TYPEs>())
@@ -522,7 +527,7 @@
item.Value = item.VAR_VALUE;
break;
case BAS_LABEL_VAR.VAR_TYPEs.ProcessVariable:
- item.Value = GetPrintProcessValue(labelPVs, item, label.Variables, action);
+ item.Value = GetPrintProcessValue(labelPVs, item, label.Variables, action, CurPkg);
break;
case BAS_LABEL_VAR.VAR_TYPEs.DateVariable:
item.Value = DateTime.Now.ToString(item.VAR_VALUE);
@@ -545,7 +550,7 @@
/// <param name="labelPVs">杩囩▼鍙橀噺鍒楄〃</param>
/// <param name="lv">鏍囩妯℃澘鍙橀噺</param>
/// <returns></returns>
- public string GetPrintProcessValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv, List<BAS_LABEL_VAR> lvars, IWorkAction curAction)
+ public string GetPrintProcessValue(List<BAS_LABEL_PV> labelPVs, BAS_LABEL_VAR lv, List<BAS_LABEL_VAR> lvars, IWorkAction curAction, WipPkg? CurPkg)
{
var pv = labelPVs.FirstOrDefault(q => q.VAR_CODE == lv.VAR_VALUE);
if (!pv.IsNullOrEmpty())
@@ -571,15 +576,22 @@
case "GetPackNumber":
return GetLabelVarWo(lv, WorkBatch.WO.ORDER_NO);
case "GetBoxQR":
- return GetCardOrBoxQR(GetBoxCode(), curAction);
+ return GetCardOrBoxQR(GetBoxCode(), curAction, CurPkg);
case "GetCardQR":
- return GetCardOrBoxQR("", curAction);
+ return GetCardOrBoxQR("", curAction, CurPkg);
case "GetCardSN":
List<string> minPkgList = new List<string>();
- var _pkaction = curAction is PackingAction ? curAction as PackingAction : null;
- if (_pkaction != null)
+ if (!CurPkg.IsNullOrEmpty())
{
- minPkgList = GetMinPkgList(_pkaction);
+ minPkgList = CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
+ }
+ else
+ {
+ var _pkaction = curAction is PackingAction ? curAction as PackingAction : null;
+ if (!_pkaction.IsNullOrEmpty())
+ {
+ minPkgList = GetMinPkgList(_pkaction);
+ }
}
return string.Join("\r\n", minPkgList);
case "GetDescription":
@@ -592,23 +604,37 @@
return GetLabelVarWo(lv, WorkBatch.WO.Customer?.CUST_NAME_CN);
case "GetHWDate":
List<string> list = new List<string>();
- var _action = curAction is PackingAction ? curAction as PackingAction : null;
- if (_action != null)
+ if (!CurPkg.IsNullOrEmpty())
{
- list = GetMinPkgList(_action);
+ list = CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
+ }
+ else
+ {
+ var _action = curAction is PackingAction ? curAction as PackingAction : null;
+ if (_action != null)
+ {
+ list = _action.CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
+ }
}
return GetHuaWeiWeek(WorkBatch.Batch.ORDER_NO, list);
case "GetQty":
List<string> qtylist = new List<string>();
- if (curAction is PackingAction)
+ if (!CurPkg.IsNullOrEmpty())
{
- qtylist = GetMinPkgList(curAction as PackingAction);
+ qtylist = CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
}
- if (curAction is PrintInStoreLabel)
+ else
{
- qtylist = (curAction as PrintInStoreLabel).CurPkg.Item.GetMinPackageList().Select(q => q.SN).ToList();
+ if (curAction is PackingAction)
+ {
+ qtylist = (curAction as PackingAction).CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
+ }
+ if (curAction is PrintInStoreLabel)
+ {
+ qtylist = (curAction as PrintInStoreLabel).CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
+ }
}
- return $"{qtylist.Count}PCS";
+ return $"{qtylist.Count}";
case "GetModel":
return GetLabelVarWo(lv, WorkBatch.Product.ExtInfo?.Model);
case "GetInput":
@@ -624,17 +650,24 @@
case "GetLOTNO":
string _lotnos = "";
var _orderAction = curAction is PackingAction ? curAction as PackingAction : null;
- if (_orderAction != null)
+ if (!CurPkg.IsNullOrEmpty())
{
- var snList = _orderAction.CurPkg.Item.GetMinPackageList().Select(q => q.FLOW_SN).ToList();
- if (!snList.Any())
+ qtylist = CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
+ }
+ else
+ {
+ if (_orderAction != null)
{
- snList.Add(_orderAction.CurPkg.CustSN.FLOW_SN);
+ var snList = _orderAction.CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
+ if (!snList.Any())
+ {
+ snList.Add(_orderAction.CurPkg.CustSN?.FLOW_SN);
+ }
+ _lotnos = string.Join(",", Biz.Db.Queryable<MES_CUST_SN>()
+ .Where((q) => snList.Contains(q.FLOW_SN))
+ .Select((q) => q.WORK_ORDER).Distinct().ToList());
+ return _lotnos;
}
- _lotnos = string.Join(",", Biz.Db.Queryable<MES_CUST_SN>()
- .Where((q) => snList.Contains(q.FLOW_SN))
- .Select((q) => q.WORK_ORDER).Distinct().ToList());
- return _lotnos;
}
return "";
case "GetNOTES":
@@ -642,9 +675,14 @@
case "GetXH":
return "";
case "GetCardNo":
- return "";
+ return $"{Context["CurWaitShipmentCarton"].ToInt32() + 1}";
case "GetCardTotal":
- return "";
+ var total = "";
+ var _curaction = curAction is PackingAction ? curAction as PackingAction : null;
+ if (!_curaction.IsNullOrEmpty()) {
+ total = $"{Math.Ceiling(Context["CurShipQty"].ToDecimal()/_curaction.PkgRule.GetTotalQty().ToDecimal())}";
+ }
+ return total;
case "GetModelSpec": //Model+绌烘牸+SPEC,
return GetLabelVarWo(lv, $"{WorkBatch.Product.ExtInfo?.Model} {WorkBatch.Product.SPEC}");
case "GetDATE":
@@ -760,27 +798,39 @@
/// <param name="lvars"></param>
/// <param name="action"></param>
/// <returns></returns>
- private string GetCardOrBoxQR(string code, IWorkAction action)
+ private string GetCardOrBoxQR(string code, IWorkAction action, WipPkg? CurPkg)
{
List<string> minPkgList = new List<string>();
var itemCode = "";
double weight = 0;
var unit = "";
- if (action is PackingAction)
+ if (!CurPkg.IsNullOrEmpty())
{
- var pkg = action as PackingAction;
- minPkgList = pkg.CurPkg.Item.GetMinPackageList().Select(q => q.SN).ToList();
- itemCode = pkg.CurPkg.CustSN?.ITEM_CODE;
- weight = pkg.CurPkg.WeightInfo.Weight;
- unit = pkg.CurPkg.WeightInfo.Unit?.ToUpper() ?? "kg";
+ minPkgList = CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
+ itemCode = CurPkg.CustSN?.ITEM_CODE;
+ weight = CurPkg.WeightInfo.Weight;
+ unit = CurPkg.WeightInfo.Unit?.ToUpper() ?? "kg";
}
- if (action is PrintInStoreLabel)
+ else
{
- var print = action as PrintInStoreLabel;
- minPkgList = print.CurPkg.Item.GetMinPackageList().Select(q => q.SN).ToList();
- itemCode = print.CurPkg.CustSN?.ITEM_CODE;
- weight = print.CurPkg.WeightInfo.Weight;
- unit = print.CurPkg.WeightInfo.Unit?.ToUpper() ?? "kg";
+ if (action is PackingAction)
+ {
+ var pkg = action as PackingAction;
+ //minPkgList = pkg.CurPkg.Item.GetMinPackageList().Select(q => q.SN).ToList();
+ minPkgList = pkg.CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
+ itemCode = pkg.CurPkg.CustSN?.ITEM_CODE;
+ weight = pkg.CurPkg.WeightInfo.Weight;
+ unit = pkg.CurPkg.WeightInfo.Unit?.ToUpper() ?? "kg";
+ }
+ if (action is PrintInStoreLabel)
+ {
+ var print = action as PrintInStoreLabel;
+ //minPkgList = print.CurPkg.Item.GetMinPackageList().Select(q => q.SN).ToList();
+ minPkgList = print.CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
+ itemCode = print.CurPkg.CustSN?.ITEM_CODE;
+ weight = print.CurPkg.WeightInfo.Weight;
+ unit = print.CurPkg.WeightInfo.Unit?.ToUpper() ?? "kg";
+ }
}
var wo = WorkBatch.Batch.ORDER_NO;
var snList = string.Join("\r\n", minPkgList);
--
Gitblit v1.9.3