From 1ab448972aed699a5665876316972cc07b879e95 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 18 十月 2024 15:35:13 +0800
Subject: [PATCH] 包装行为支持生成包装条码
---
Tiger.Business.MES/WorkAction/PackingAction.cs | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index ae3603a..b16ca05 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -75,7 +75,7 @@
RULE_CODE = PkgRule.RULE_CODE,
RULE_NAME = PkgRule.RULE_NAME,
PROD_CODE = CurPosition.WorkBatch.WO.ITEM_CODE,
- ITEM_CODE = Biz.Db.Queryable<MES_CUST_SN>().Where(q => q.FLOW_SN == CurPosition.CurWipSNs.First().FLOW_SN).First()?.ITEM_CODE,
+ CustSN = Biz.Db.Queryable<MES_CUST_SN>().Where(q => q.FLOW_SN == CurPosition.CurWipSNs.First().FLOW_SN).First(),
Item = new WipPkgItem()
{
PKG_CODE = max.PKG_CODE,
@@ -84,6 +84,7 @@
PKG_LEVEL = max.PKG_LEVEL,
PKG_QTY = max.PKG_QTY,
LABEL_CODE = LabelDic.Count > max.PKG_LEVEL ? LabelDic[max.PKG_LEVEL]?.LABEL_CODE : null,
+ SN = CurPosition.GenerateSN(max.SN_RULE, this),
}
};
WipPkgItem child = null;
@@ -99,6 +100,7 @@
PKG_LEVEL = dtl.PKG_LEVEL,
PKG_QTY = dtl.PKG_QTY,
LABEL_CODE = LabelDic.Count > dtl.PKG_LEVEL ? LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE : null,
+ SN = CurPosition.GenerateSN(dtl.SN_RULE, this),
};
if (!child.IsNullOrEmpty())
{
@@ -533,14 +535,15 @@
PKG_LEVEL = dtl.PKG_LEVEL,
PKG_QTY = dtl.PKG_QTY,
LABEL_CODE = LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE,
+ SN = CurPosition.GenerateSN(dtl.SN_RULE, this).IsNullOrEmpty(pInput.PkgSN),
IsFinished = true,
};
- CurPkgItem.Package = Biz.Db.Queryable<MES_WIP_PKG>().Where(q => q.SN == pInput.PkgSN && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).First() ?? new()
+ CurPkgItem.Package = Biz.Db.Queryable<MES_WIP_PKG>().Where(q => q.SN == CurPkgItem.SN && q.AUTH_ORG == CurPosition.WorkBatch.WO.AUTH_ORG).First() ?? new()
{
AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
AUTH_PROD = CurPosition.CurLine.LINE_CODE,
- SN = pInput.PkgSN,
+ SN = CurPkgItem.SN,
};
CurPkgItem.Package.WIP_ID = CurPosition.CurWipSNs.Count == 1 ? CurPosition.CurWipSNs.First().ID : null;
CurPkgItem.Package.PKG_TYPE = dtl.PkgType.PKG_NAME;
@@ -559,6 +562,7 @@
CurPkgItem.Package.OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE;
CurPkgItem.Package.SEGMENT = CurPosition.CurWipSNs.First().SEGMENT;
CurPkgItem.Package.ACT_ID = NodeAct.ID;
+ CurPkgItem.Package.FLOW_SN = CurPosition.CurWipSNs.First().FLOW_SN;
FinishLevel++;
//瀹屾垚鍖呰鐨勫眰绾у皬浜庢渶澶栧眰鍖呰灞傜骇
if (FinishLevel < PkgRule.Details.Max(q => q.PKG_LEVEL))
@@ -584,7 +588,7 @@
{
AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
AUTH_PROD = CurPosition.CurLine.LINE_CODE,
- SN = pInput.PkgSN,
+ SN = CurPkgItem.SN.IsNullOrEmpty(pInput.PkgSN),
PKG_TYPE = dtl.PkgType.PKG_NAME,
ITEM_CODE = CurPkgItem.Items.First().Package.ITEM_CODE,
QTY = CurPkgItem.Items.Sum(q => q.Package.QTY),
@@ -604,7 +608,7 @@
{
AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
AUTH_PROD = CurPosition.CurLine.LINE_CODE,
- SN = pInput.PkgSN,
+ SN = CurPkgItem.SN.IsNullOrEmpty(pInput.PkgSN),
PKG_TYPE = dtl.PkgType.PKG_NAME,
ITEM_CODE = CurPosition.CurWipSNs.First().ITEM_CODE,
QTY = CurPkgItem.Items.Sum(q => q.Package.QTY),
@@ -621,6 +625,7 @@
OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE,
SEGMENT = CurPosition.CurWipSNs.First().SEGMENT,
ACT_ID = NodeAct.ID,
+ FLOW_SN = CurPosition.CurWipSNs.First().FLOW_SN,
};
FinishLevel++;
//瀹屾垚鍖呰鐨勫眰绾у皬浜庢渶澶栧眰鍖呰灞傜骇
@@ -654,6 +659,7 @@
PKG_LEVEL = nextDtl.PKG_LEVEL,
PKG_QTY = nextDtl.PKG_QTY,
LABEL_CODE = LabelDic[nextDtl.PKG_LEVEL]?.LABEL_CODE,
+ SN = CurPosition.GenerateSN(nextDtl.SN_RULE, this),
};
curItem.Items.Add(next);
}
--
Gitblit v1.9.3