From 9f12ec67045443d165eae2670bfb22e17e4186ad Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 26 十一月 2024 21:54:02 +0800
Subject: [PATCH] 优化了一些已知问题
---
Tiger.Business.MES/Transaction/Position.cs | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index c52ef1d..6bc6cc8 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -613,7 +613,7 @@
var _action = curAction is PackingAction ? curAction as PackingAction : null;
if (_action != null)
{
- list = GetMinPkgList(_action);
+ list = _action.CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
}
}
return GetHuaWeiWeek(WorkBatch.Batch.ORDER_NO, list);
@@ -627,7 +627,7 @@
{
if (curAction is PackingAction)
{
- qtylist = GetMinPkgList(curAction as PackingAction);
+ qtylist = (curAction as PackingAction).CurPkg.Item.GetWipSnList().Select(q => q.Value).ToList();
}
if (curAction is PrintInStoreLabel)
{
@@ -675,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":
--
Gitblit v1.9.3