From a55e502c37bdc2831fc904c08961e9bca7778ae7 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 21 十一月 2024 12:05:29 +0800
Subject: [PATCH] 工序的一些优化
---
Tiger.Business.MES/WorkAction/PackingAction.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index f04c510..34d5977 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -84,7 +84,7 @@
IS_MIN_PKG = max.PkgType.IS_MIN_PKG,
PKG_LEVEL = max.PKG_LEVEL,
PKG_QTY = max.PKG_QTY,
- LABEL_CODE = LabelDic.Count > max.PKG_LEVEL ? LabelDic[max.PKG_LEVEL]?.LABEL_CODE : null,
+ LABEL_CODE = LabelDic.Count >= max.PKG_LEVEL ? LabelDic[max.PKG_LEVEL]?.LABEL_CODE : null,
SN = CurPosition.GenerateSN(max.SN_RULE, this),
}
};
@@ -100,7 +100,7 @@
IS_MIN_PKG = dtl.PkgType.IS_MIN_PKG,
PKG_LEVEL = dtl.PKG_LEVEL,
PKG_QTY = dtl.PKG_QTY,
- LABEL_CODE = LabelDic.Count > dtl.PKG_LEVEL ? LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE : null,
+ LABEL_CODE = LabelDic.Count >= dtl.PKG_LEVEL ? LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE : null,
SN = CurPosition.GenerateSN(dtl.SN_RULE, this),
};
if (!child.IsNullOrEmpty())
@@ -631,6 +631,8 @@
POST_CODE = CurPkgItem.Items.First().Package.POST_CODE,
OPER_CODE = CurPkgItem.Items.First().Package.OPER_CODE,
SEGMENT = CurPkgItem.Items.First().Package.SEGMENT,
+ ACT_ID = CurPkgItem.Items.First().Package.ACT_ID,
+ ACT_NAME = CurPkgItem.Items.First().Package.ACT_NAME,
} : new()
{
AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
@@ -947,9 +949,9 @@
{
db.Storageable(_pkgList, CurPosition.UserCode).ExecuteCommand();
//var wipIDs = _pkgList.Where(q => !q.WIP_ID.IsNullOrEmpty()).Select(q => q.WIP_ID).ToList();
- var nodeID = _pkgList.First(q => !q.WIP_ID.IsNullOrEmpty()).NODE_ID;
- var actID = _pkgList.First(q => !q.WIP_ID.IsNullOrEmpty()).ACT_ID;
- var wo = _pkgList.First(q => !q.WIP_ID.IsNullOrEmpty()).WORK_ORDER;
+ var nodeID = _pkgList.First(q => !q.NODE_ID.IsNullOrEmpty()).NODE_ID;
+ var actID = _pkgList.First(q => !q.ACT_ID.IsNullOrEmpty()).ACT_ID;
+ var wo = _pkgList.First(q => !q.WORK_ORDER.IsNullOrEmpty()).WORK_ORDER;
//鍖呰淇℃伅淇濆瓨鍒板湪鍒跺搧淇℃伅琛�
db.Updateable<MES_WIP_DATA>(CurPosition.UserCode)
.SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
--
Gitblit v1.9.3