From 37c4128d884e46d1f50c0a003c34a1749cda5841 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 15 十月 2024 08:45:40 +0800
Subject: [PATCH] 一些已知更改
---
Tiger.Business.MES/Transaction/CollectNode.cs | 2 +-
Tiger.Business.MES/Transaction/PackingNode.cs | 4 ++--
Tiger.Business.MES/WorkAction/PackingAction.cs | 14 ++++++++------
Tiger.Business.MES/Transaction/TestNode.cs | 2 +-
Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs | 2 ++
5 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/CollectNode.cs b/Tiger.Business.MES/Transaction/CollectNode.cs
index 71aafd0..d06f672 100644
--- a/Tiger.Business.MES/Transaction/CollectNode.cs
+++ b/Tiger.Business.MES/Transaction/CollectNode.cs
@@ -57,7 +57,7 @@
info.InputQty = CurOperInfo(input.Locale).InputQty;
action.Data.OperInfo = info;
}
- else if (!IsFinishAllSteps)
+ else if (Steps.Any() && !IsFinishAllSteps)
{
action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));
}
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index 16cd8a8..519fcc8 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -89,7 +89,7 @@
info.InputQty = CurOperInfo(input.Locale).InputQty;
action.Data.OperInfo = info;
}
- else if (!IsFinishAllSteps)
+ else if (Steps.Any() && !IsFinishAllSteps)
{
action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));
}
@@ -676,7 +676,7 @@
db.Storageable(_wipHiss, UserCode).ExecuteCommand();
if (_pkgList.Any())
{
- foreach (var pkg in _pkgList)
+ foreach (var pkg in _pkgList.Where(q => !q.WIP_ID.IsNullOrEmpty()))
{
//鍖呰淇℃伅淇濆瓨鍒扮敓浜ц繃绋嬭褰�
db.Updateable<MES_WIP_HIS>()
diff --git a/Tiger.Business.MES/Transaction/TestNode.cs b/Tiger.Business.MES/Transaction/TestNode.cs
index 3a9b87a..3b95a76 100644
--- a/Tiger.Business.MES/Transaction/TestNode.cs
+++ b/Tiger.Business.MES/Transaction/TestNode.cs
@@ -58,7 +58,7 @@
info.InputQty = CurOperInfo(input.Locale).InputQty;
action.Data.OperInfo = info;
}
- else if (!IsFinishAllSteps)
+ else if (Steps.Any() && !IsFinishAllSteps)
{
action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));
}
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index f01a286..a2058f2 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -82,7 +82,7 @@
IS_MIN_PKG = max.PkgType.IS_MIN_PKG,
PKG_LEVEL = max.PKG_LEVEL,
PKG_QTY = max.PKG_QTY,
- LABEL_CODE = LabelDic[max.PKG_LEVEL]?.LABEL_CODE,
+ LABEL_CODE = LabelDic.Count > max.PKG_LEVEL ? LabelDic[max.PKG_LEVEL]?.LABEL_CODE : null,
}
};
WipPkgItem child = null;
@@ -97,7 +97,7 @@
IS_MIN_PKG = dtl.PkgType.IS_MIN_PKG,
PKG_LEVEL = dtl.PKG_LEVEL,
PKG_QTY = dtl.PKG_QTY,
- LABEL_CODE = LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE,
+ LABEL_CODE = LabelDic.Count > dtl.PKG_LEVEL ? LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE : null,
};
if (!child.IsNullOrEmpty())
{
@@ -556,6 +556,7 @@
CurPkgItem.Package.POST_CODE = CurPosition.CurWipSNs.First().POST_CODE;
CurPkgItem.Package.OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE;
CurPkgItem.Package.SEGMENT = CurPosition.CurWipSNs.First().SEGMENT;
+ CurPkgItem.Package.ACT_ID = NodeAct.ID;
FinishLevel++;
//瀹屾垚鍖呰鐨勫眰绾у皬浜庢渶澶栧眰鍖呰灞傜骇
if (FinishLevel < PkgRule.Details.Max(q => q.PKG_LEVEL))
@@ -617,6 +618,7 @@
POST_CODE = CurPosition.CurWipSNs.First().POST_CODE,
OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE,
SEGMENT = CurPosition.CurWipSNs.First().SEGMENT,
+ ACT_ID = NodeAct.ID,
};
FinishLevel++;
//瀹屾垚鍖呰鐨勫眰绾у皬浜庢渶澶栧眰鍖呰灞傜骇
@@ -866,7 +868,7 @@
if (_pkgList.Any())
{
db.Storageable(_pkgList, CurPosition.UserCode).ExecuteCommand();
- foreach (var pkg in _pkgList)
+ foreach (var pkg in _pkgList.Where(q => !q.WIP_ID.IsNullOrEmpty()))
{
//鍖呰淇℃伅淇濆瓨鍒板湪鍒跺搧淇℃伅琛�
db.Updateable<MES_WIP_DATA>()
@@ -887,7 +889,7 @@
.SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
.SetColumns(q => q.INNER_SN == q.CARTON_SN)
.SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)
- .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.WIP_ID == pkg.WIP_ID && q.NODE_ID == pkg.NODE_ID && q.ACT_ID == NodeAct.ID)
+ .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.WIP_ID == pkg.WIP_ID && q.NODE_ID == pkg.NODE_ID && q.ACT_ID == pkg.ACT_ID)
.ExecuteCommand();
//鍖呰淇℃伅淇濆瓨鍒板伐鍗曟潯鐮佹槑缁嗚〃
db.Updateable<BIZ_MES_WO_SN>()
@@ -914,7 +916,7 @@
if (_pkgList.Any())
{
db.Storageable(_pkgList, CurPosition.UserCode).ExecuteCommand();
- foreach (var pkg in _pkgList)
+ foreach (var pkg in _pkgList.Where(q => !q.WIP_ID.IsNullOrEmpty()))
{
//鍖呰淇℃伅淇濆瓨鍒板湪鍒跺搧淇℃伅琛�
db.Updateable<MES_WIP_DATA>()
@@ -935,7 +937,7 @@
.SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
.SetColumns(q => q.INNER_SN == q.CARTON_SN)
.SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)
- .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.WIP_ID == pkg.WIP_ID && q.NODE_ID == pkg.NODE_ID && q.ACT_ID == NodeAct.ID)
+ .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.WIP_ID == pkg.WIP_ID && q.NODE_ID == pkg.NODE_ID && q.ACT_ID == pkg.ACT_ID)
.ExecuteCommand();
//鍖呰淇℃伅淇濆瓨鍒板伐鍗曟潯鐮佹槑缁嗚〃
db.Updateable<BIZ_MES_WO_SN>()
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs
index a3c6336..18a301d 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs
@@ -140,6 +140,8 @@
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
+ [SugarColumn(IsIgnore = true)]
+ public string ACT_ID { get; set; }
#endregion
#region 澶栭敭灞炴��
--
Gitblit v1.9.3