From f656805650f0024d30ede19d8c32070f319ed507 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期日, 21 七月 2024 21:56:41 +0800
Subject: [PATCH] MES逻辑增加组织的判断和保存
---
Tiger.Business.MES/Transaction/TestNode.cs | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/TestNode.cs b/Tiger.Business.MES/Transaction/TestNode.cs
index 3e2ad80..9bbc31d 100644
--- a/Tiger.Business.MES/Transaction/TestNode.cs
+++ b/Tiger.Business.MES/Transaction/TestNode.cs
@@ -165,6 +165,8 @@
//褰撳伐姝ュ垪琛ㄤ负绌猴紝鍒欐墽琛屽綋鍓嶅伐搴忕殑蹇呰閫昏緫褰撲綔绗竴涓伐搴忚妭鐐癸紝瀹屾垚鍚庢寜闇�姹傚垱寤哄悗缁殑宸ユ鍒楄〃
if (Steps.IsNullOrEmpty())
{
+ var curNode = CurBatch.GetNode(PostCode);
+
//缁戝畾鏉＄爜鍒板伐鍗�
if (!CurBatch.WoSNs.Any(q => q.SN == input.SN))
{
@@ -173,11 +175,12 @@
WORK_ORDER = CurBatch.Batch.ORDER_NO,
SN = input.SN,
STATUS = BIZ_MES_WO_SN.STATUSs.NotInput.GetValue(),
- BATCH_NO = CurBatch.Batch.BATCH_NO,
});
}
var woSN = CurBatch.WoSNs.FirstOrDefault(q => q.SN == input.SN);
- var curNode = CurBatch.GetNode(PostCode);
+ woSN.AUTH_ORG = CurBatch.WO.AUTH_ORG;
+ woSN.AUTH_PROD = CurLine.LINE_CODE;
+ woSN.BATCH_NO = CurBatch.Batch.BATCH_NO;
//鏉＄爜杩囩珯
var wipSN = Biz.Db.Queryable<MES_WIP_DATA>().First(q => q.SN == input.SN && q.BATCH_NO == CurBatch.Batch.BATCH_NO) ?? new MES_WIP_DATA()
@@ -194,6 +197,7 @@
DFT_FLAG = "N",
DFT_COUNT = 0,
};
+ wipSN.AUTH_ORG = CurBatch.WO.AUTH_ORG;
wipSN.AUTH_PROD = CurLine.LINE_CODE;
wipSN.STATUS = wipSN.STATUS > 0 ? MES_WIP_DATA.STATUSs.OK.GetValue() : wipSN.STATUS;
wipSN.ROT_CODE = CurBatch.WO.ROUTE_CODE;
@@ -206,9 +210,13 @@
wipSN.OPER_CODE = curNode.OPER_CODE;
wipSN.SEGMENT = curNode.SEGMENT;
wipSN.OPERATION_TIME = DateTime.Now;
- wipSN.SFTS_CODE = CurLine.SFTS_CODE;
- //wipSN.SFT_CODE = CurBatch.WO.ROUTE_CODE;
- //wipSN.PRD_CODE = CurBatch.WO.ROUTE_CODE;
+ var curShiftPeriod = GetShiftPeriodForNow();
+ if (!curShiftPeriod.IsNullOrEmpty())
+ {
+ wipSN.SFTS_CODE = curShiftPeriod.ShiftSys.SFTS_CODE;
+ wipSN.SFT_CODE = curShiftPeriod.Shift.SFT_CODE;
+ wipSN.PRD_CODE = curShiftPeriod.Period.PRD_CODE;
+ }
CurBatch.StartWorking(UserCode);
//濡傛灉鏄姇鍏ョ珯
--
Gitblit v1.9.3