From 947e034b871d10522b1046f6acecad6b405276c0 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 29 十月 2024 20:40:35 +0800
Subject: [PATCH] 优化了一些已知问题
---
Tiger.Business.MES/Transaction/Position.cs | 6 +++---
Tiger.Business.MES/WorkAction/PackingAction.cs | 21 ---------------------
Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs | 21 +++++++++++++++++++++
3 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 415cecb..a33dc0a 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -618,7 +618,7 @@
var _orderAction = curAction is PackingAction ? curAction as PackingAction : null;
if (_orderAction != null)
{
- var snList = _orderAction.GetMinPackageList(_orderAction.CurPkg.Item).Select(q => q.FLOW_SN).ToList();
+ var snList = _orderAction.CurPkg.Item.GetMinPackageList().Select(q => q.FLOW_SN).ToList();
if (!snList.Any())
{
snList.Add(_orderAction.CurPkg.CustSN.FLOW_SN);
@@ -722,7 +722,7 @@
}
else
{
- list = action.GetMinPackageList(action.CurPkg.Item).Select(q => q.SN).ToList();
+ list = action.CurPkg.Item.GetMinPackageList().Select(q => q.SN).ToList();
}
return list;
}
@@ -759,7 +759,7 @@
/// <returns></returns>
private string GetCardOrBoxQR(string code, List<BAS_LABEL_VAR> lvars, PackingAction action)
{
- var minPkgList = action.GetMinPackageList(action.CurPkg.Item).Select(q => q.SN);
+ var minPkgList = action.CurPkg.Item.GetMinPackageList().Select(q => q.SN);
var wo = WorkBatch.Batch.ORDER_NO;
var snList = string.Join("\r\n", minPkgList);
if (snList.IsNullOrEmpty()) { snList = $"{CurSN}"; }
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index 28e0046..6b1447e 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -786,27 +786,6 @@
return action;
}
- public List<MES_WIP_PKG> GetMinPackageList(WipPkgItem parent)
- {
- List<MES_WIP_PKG> list = new();
- if (parent.Items.Any())
- {
- foreach (var item in parent.Items)
- {
- item.Package.PARENT_SN = parent.Package?.SN;
- list.AddRange(GetMinPackageList(item));
- }
- }
- else
- {
- if (!parent.Package.IsNullOrEmpty())
- {
- list.Add(parent.Package);
- }
- }
- return list;
- }
-
public ApiAction<SubmitOutput> CompletePkg()
{
var action = new ApiAction<SubmitOutput>(new SubmitOutput());
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
index 010d93b..3eb7342 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
@@ -197,6 +197,27 @@
public bool IsFinished { get; set; } = false;
public List<WipPkgItem> Items { get; set; } = new List<WipPkgItem>();
public int TotalQty => Items.Any() ? Items.Sum(q => q.TotalQty) : 1;
+
+ public List<MES_WIP_PKG> GetMinPackageList()
+ {
+ var list = new List<MES_WIP_PKG>();
+ if (Items.Any())
+ {
+ foreach (var item in Items)
+ {
+ item.Package.PARENT_SN = Package?.SN;
+ list.AddRange(item.GetMinPackageList());
+ }
+ }
+ else
+ {
+ if (Package != null)
+ {
+ list.Add(Package);
+ }
+ }
+ return list;
+ }
}
/// <summary>
--
Gitblit v1.9.3