From 8bc453e47b30f0acf4333bec955ec86dadf428d5 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 16 十月 2024 14:32:11 +0800
Subject: [PATCH] 优化了一些已知问题
---
Tiger.Business.MES/WorkAction/ThreeInOne.cs | 9 +++++++++
Tiger.Api/Language.db | 0
Tiger.Business.MES/Common/WorkBatch.cs | 4 ++--
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Tiger.Api/Language.db b/Tiger.Api/Language.db
index 97b853c..288d0f7 100644
--- a/Tiger.Api/Language.db
+++ b/Tiger.Api/Language.db
Binary files differ
diff --git a/Tiger.Business.MES/Common/WorkBatch.cs b/Tiger.Business.MES/Common/WorkBatch.cs
index 7554540..a96d8bb 100644
--- a/Tiger.Business.MES/Common/WorkBatch.cs
+++ b/Tiger.Business.MES/Common/WorkBatch.cs
@@ -161,7 +161,7 @@
}
//宸ュ崟鎵规鎶曞叆鏁伴噺鍑忓幓鎶ュ簾鏁伴噺濡傛灉澶т簬绛変簬璁″垝鏁伴噺锛屽垯涓嶅厑璁哥敓浜�
//if (curNode.IS_INPUT == "Y" && Batch.INPUT_QTY - Batch.SCRAP_QTY >= Batch.PLAN_QTY)
- if (curNodeSetting.IS_INPUT == "Y" && WoSNs.Count(q => q.STATUS > BIZ_MES_WO_SN.STATUSs.NotInput.GetValue() && q.BATCH_NO == Batch.BATCH_NO) - Batch.SCRAP_QTY >= Batch.PLAN_QTY)
+ if (curNode.IS_FIRST_NODE == "Y" && WoSNs.Count(q => q.STATUS > BIZ_MES_WO_SN.STATUSs.NotInput.GetValue() && q.BATCH_NO == Batch.BATCH_NO) - Batch.SCRAP_QTY >= Batch.PLAN_QTY)
{
action.IsSuccessed = false;
action.Data.SetValue(this, null);
@@ -169,7 +169,7 @@
action.LocaleMsg = new("MES.WorkBatch.BatchInputEnough", Batch.BATCH_NO, WoSNs.Count(q => q.BATCH_NO == Batch.BATCH_NO), Batch.SCRAP_QTY, Batch.PLAN_QTY);
}
//宸ュ崟鎶曞叆鏁伴噺鍑忓幓鎶ュ簾鏁伴噺濡傛灉澶т簬绛変簬璁″垝鏁伴噺锛屽垯涓嶅厑璁哥敓浜�
- if (curNodeSetting.IS_INPUT == "Y" && WoSNs.Count(q => q.STATUS > BIZ_MES_WO_SN.STATUSs.NotInput.GetValue() && q.WORK_ORDER == WO.ORDER_NO) - WO.SCRAP_QTY >= WO.PLAN_QTY)
+ if (curNode.IS_FIRST_NODE == "Y" && WoSNs.Count(q => q.STATUS > BIZ_MES_WO_SN.STATUSs.NotInput.GetValue() && q.WORK_ORDER == WO.ORDER_NO) - WO.SCRAP_QTY >= WO.PLAN_QTY)
{
action.IsSuccessed = false;
action.Data.SetValue(this, null);
diff --git a/Tiger.Business.MES/WorkAction/ThreeInOne.cs b/Tiger.Business.MES/WorkAction/ThreeInOne.cs
index 50afc1d..1a77309 100644
--- a/Tiger.Business.MES/WorkAction/ThreeInOne.cs
+++ b/Tiger.Business.MES/WorkAction/ThreeInOne.cs
@@ -267,6 +267,15 @@
CustCSN = Biz.Db.Queryable<MES_CUST_SN>().Where(q => q.CUST_SN == input.Data).First();
var isOK = true;
+ //瀹㈡埛鏉＄爜鎵埌鍘傚唴鏉＄爜
+ if (isOK && FlowCSN.FLOW_SN == input.Data)
+ {
+ CurStep.SetStatusMessage(StepStatus.Error, Biz.L("璇锋壂鎻忔纭殑瀹㈡埛鏍囩"));
+ action.Data.ShortMsg = new("璇锋壂鎻忔纭殑瀹㈡埛鏍囩", ShortMessage.Types.Failed);
+ action.IsSuccessed = isOK = false;
+ //action.LocaleMsg = new($"鍘傚唴鏉＄爜[{0}]缁戝畾瀹㈡埛鏉＄爜[{1}]澶辫触锛屽巶鍐呮潯鐮佷笌瀹㈡埛鏉＄爜涓嶈兘涓�鏍凤紝璇锋壂鎻忔纭殑瀹㈡埛鏍囩");
+ action.LocaleMsg = new("MES.WorkAction.ThreeInOne.TheSameSN", FlowCSN.FLOW_SN, input.Data);
+ }
//瀹㈡埛鏉＄爜宸茬粦瀹氬叾浠栧巶鍐呮潯鐮�
if (isOK && !CustCSN.IsNullOrEmpty() && !CustCSN.FLOW_SN.IsNullOrEmpty() && CustCSN.FLOW_SN != FlowCSN.FLOW_SN)
{
--
Gitblit v1.9.3