From a1190b73462ad2cd7d3ff4a5d942d1435ac62031 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 10 十月 2024 09:49:13 +0800
Subject: [PATCH] 优化工序逻辑
---
Tiger.Business.MES/Transaction/PackingNode.cs | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index 8304759..e5e5baf 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -262,12 +262,14 @@
action.LocaleMsg = new("MES.Transaction.PackingNode.NodeSubmit.OperateNodeError", PostCode, CurBatch.WO.ORDER_NO);
return action;
}
+ var curNodeSetting = CurBatch.GetNodeSetting(curNode);
+
//褰撳伐姝ュ垪琛ㄤ负绌猴紝鍒欐墽琛屽綋鍓嶅伐搴忕殑蹇呰閫昏緫褰撲綔绗竴涓伐搴忚妭鐐癸紝瀹屾垚鍚庢寜闇�姹傚垱寤哄悗缁殑宸ユ鍒楄〃
if (Steps.IsNullOrEmpty())
{
BeginAt = DateTime.Now;
//鍒ゆ柇宸ュ崟瀹炴椂鐘舵�佸垽鏂槸鍚﹀彲浠ョ敓浜�
- var woStatus = CurBatch.CheckCanProduce(curNode);
+ var woStatus = CurBatch.CheckCanProduce(curNode, curNodeSetting);
if (!woStatus.IsSuccessed)
{
woStatus.Data.ShortMsg = new("宸ュ崟寮傚父", ShortMessage.Types.Error);
@@ -378,7 +380,7 @@
wipSN.PRD_CODE = curShiftPeriod.Period.PRD_CODE;
}
//濡傛灉鏄姇鍏ョ珯
- if (curNode.IS_INPUT == "Y")
+ if (curNodeSetting.IS_INPUT == "Y")
{
var woSN = woSNs.First(q => q.SN == wipSN.SN);
woSN.STATUS = BIZ_MES_WO_SN.STATUSs.Inputed.GetValue();
@@ -386,7 +388,7 @@
wipSN.INLINE_DATE = DateTime.Now;
}
//濡傛灉鏄骇鍑虹珯
- if (curNode.IS_OUTPUT == "Y")
+ if (curNodeSetting.IS_OUTPUT == "Y")
{
var woSN = woSNs.First(q => q.SN == wipSN.SN);
woSN.STATUS = BIZ_MES_WO_SN.STATUSs.Finished.GetValue();
@@ -458,7 +460,7 @@
var _wipSns = wipSNs.Clone();
var _wipHiss = CurWipSNHiss.Clone();
var _defect = CurDefects.Clone();
- var _curNode = curNode.Clone();
+ var _curNodeSetting = curNodeSetting.Clone();
var _Batch = CurBatch.Batch.Clone();
//鍒濆鍖栧伐姝ュ垪琛�
@@ -483,13 +485,13 @@
db.Storageable(_defect, UserCode).ExecuteCommand();
}
//濡傛灉鏄姇鍏ョ珯
- if (_curNode.IS_INPUT == "Y")
+ if (_curNodeSetting.IS_INPUT == "Y")
{
db.Updateable<BIZ_MES_WO>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + _woSns.Count).Where(q => q.ORDER_NO == _Batch.ORDER_NO).ExecuteCommand();
db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + _woSns.Count).Where(q => q.BATCH_NO == _Batch.BATCH_NO).ExecuteCommand();
}
//濡傛灉鏄骇鍑虹珯
- if (_curNode.IS_OUTPUT == "Y")
+ if (_curNodeSetting.IS_OUTPUT == "Y")
{
db.Updateable<BIZ_MES_WO>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + _woSns.Count).Where(q => q.ORDER_NO == _Batch.ORDER_NO).ExecuteCommand();
db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + _woSns.Count).Where(q => q.BATCH_NO == _Batch.BATCH_NO).ExecuteCommand();
@@ -600,7 +602,7 @@
//淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭�
CurOperInfo(locale).InputQty += CurWipSNs.Count;
action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(locale));
- action.Data.ShortMsg = new("杩囩珯鎴愬姛", ShortMessage.Types.Success);
+ action.Data.ShortMsg = new(CurWipSNs.Any(q => q.DFT_FLAG == "Y") ? "涓嶈壇杩囩珯" : "鑹搧杩囩珯", ShortMessage.Types.Success);
//action.LocaleMsg = new($"宸ュ崟[{CurWipSN.WORK_ORDER}]鐨勬潯鐮乕{CurWipSN.SN}]鍦ㄥ矖浣峓{CurWipSN.POST_CODE}]宸ュ簭[{CurWipSN.NODE_NAME}]杩囩珯鎴愬姛锛岀姸鎬乕{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]");
action.LocaleMsg = new("MES.Transaction.CollectNode.ScanSn.PassSuccess", CurWipSNs.First().WORK_ORDER, CurSN, CurWipSNs.First().POST_CODE, CurWipSNs.First().NODE_NAME,CurWipSNs.First().STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
--
Gitblit v1.9.3