From f12084241b438c025550d4f9337935abf9a52c81 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期六, 10 八月 2024 19:17:25 +0800
Subject: [PATCH] 在制品的生产信息的关联使用在制品的ID来关联，优化生产信息保存逻辑
---
Tiger.Business.MES/WorkAction/Assembly.cs | 54 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 32 insertions(+), 22 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/Assembly.cs b/Tiger.Business.MES/WorkAction/Assembly.cs
index b83aef9..ab68c80 100644
--- a/Tiger.Business.MES/WorkAction/Assembly.cs
+++ b/Tiger.Business.MES/WorkAction/Assembly.cs
@@ -180,6 +180,7 @@
{
AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
AUTH_PROD = CurPosition.CurLine.LINE_CODE,
+ WIP_ID = wipSn.ID,
SN = input.SN,
PROD_SN = wipSn.SN,
ITEM_CODE = item.ItemInfo.ITEM_CODE,
@@ -203,30 +204,34 @@
}
else
{
- var record = new MES_WIP_ASSY()
+ foreach (var wipSn in CurPosition.CurWipSNs)
{
- AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
- AUTH_PROD = CurPosition.CurLine.LINE_CODE,
- SN = input.SN,
- PROD_SN = CurPosition.CurSN,
- ITEM_CODE = item.ItemInfo.ITEM_CODE,
- QTY = 1,
- UNIT = item.ItemInfo.UNIT,
- WORK_ORDER = CurPosition.CurWipSNs.First().WORK_ORDER,
- BATCH_NO = CurPosition.CurWipSNs.First().BATCH_NO,
- ROT_CODE = CurPosition.CurWipSNs.First().ROT_CODE,
- NODE_ID = CurPosition.CurWipSNs.First().NODE_ID,
- NODE_NAME = CurPosition.CurWipSNs.First().NODE_NAME,
- FTY_CODE = CurPosition.CurWipSNs.First().FTY_CODE,
- WS_CODE = CurPosition.CurWipSNs.First().WS_CODE,
- LINE_CODE = CurPosition.CurWipSNs.First().LINE_CODE,
- POST_CODE = CurPosition.CurWipSNs.First().POST_CODE,
- OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE,
- SEGMENT = CurPosition.CurWipSNs.First().SEGMENT,
- };
- item.Records.Add(record);
+ var record = new MES_WIP_ASSY()
+ {
+ AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
+ AUTH_PROD = CurPosition.CurLine.LINE_CODE,
+ WIP_ID = wipSn.ID,
+ SN = input.SN,
+ PROD_SN = wipSn.SN,
+ ITEM_CODE = item.ItemInfo.ITEM_CODE,
+ QTY = 1,
+ UNIT = item.ItemInfo.UNIT,
+ WORK_ORDER = wipSn.WORK_ORDER,
+ BATCH_NO = wipSn.BATCH_NO,
+ ROT_CODE = wipSn.ROT_CODE,
+ NODE_ID = wipSn.NODE_ID,
+ NODE_NAME = wipSn.NODE_NAME,
+ FTY_CODE = wipSn.FTY_CODE,
+ WS_CODE = wipSn.WS_CODE,
+ LINE_CODE = wipSn.LINE_CODE,
+ POST_CODE = wipSn.POST_CODE,
+ OPER_CODE = wipSn.OPER_CODE,
+ SEGMENT = wipSn.SEGMENT,
+ };
+ item.Records.Add(record);
+ }
- if (item.Records.Sum(q => q.QTY) >= item.LoadQty * CurPosition.CurWipSNs.Count)
+ if (item.Records.Sum(q => q.QTY) / item.Records.Count >= item.LoadQty * CurPosition.CurWipSNs.Count)
{
item.IsFinished = true;
}
@@ -277,6 +282,7 @@
{
AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
AUTH_PROD = CurPosition.CurLine.LINE_CODE,
+ WIP_ID = wipSn.ID,
HIS_ID = CurPosition.CurWipSNHiss.First(q => q.SN == wipSn.SN).ID,
SN = wipSn.SN,
STATUS = wipSn.STATUS,
@@ -294,7 +300,11 @@
POST_CODE = wipSn.POST_CODE,
OPER_CODE = wipSn.OPER_CODE,
SEGMENT = wipSn.SEGMENT,
+ FLOW_SN = wipSn.FLOW_SN,
TRAY_SN = wipSn.TRAY_SN,
+ INNER_SN = wipSn.INNER_SN,
+ CARTON_SN = wipSn.CARTON_SN,
+ PALLET_SN = wipSn.PALLET_SN,
OPERATION_TIME = DateTime.Now,
SFTS_CODE = wipSn.SFTS_CODE,
SFT_CODE = wipSn.SFT_CODE,
--
Gitblit v1.9.3