meswork/2-BeiqiFutian-MesProject
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加返修上线与弹窗提示

Browse Source
This commit is contained in:
XingCheng3
2026-06-01 15:33:29 +08:00
parent c5e248e993
commit 5fc3f2edc5
4 changed files with 98 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
MisDataFunction/MesServer.Function/Function1052/OpcServer/EngineGetOver.cs
View File

@@ -97,14 +97,16 @@ namespace MesServerFunctions
//SendMessage.ShowMoby(OpName);
// ET030 无屏幕 不判断是否重复工作过
//判断该订单数据是否已经工作过，有的话则在WEB跳出弹窗选择 并同时禁止工作
DataTable dt2 = BaseDataSystemMES.EngineIsTwoWork(OpName, OrderForm, EngineID);
if (dt2.Rows[0]["result"].ToString() == "1" && isBackWork == 0) //已完成
// 判断是否需要二次确认工作（返修线返修优先，其次已工作过）
DataTable dt2 = BaseDataSystemMES.EngineIsNeedTwoWorkConfirm(OpName, OrderForm, EngineID);
if (dt2.Rows[0]["result"].ToString() == "1") //已完成s
{
//不允许工作
MIS_BASE.Write_FixAllow(OpName, false);
//通知WEB校验重新工作还是跳过 点重新工作给允许工作，点跳过给工作完成
string message = "MES|Engine_Is_TwoWork|" + OpName + "|1";
// 通知WEB校验重新工作还是跳过 点重新工作给允许工作，点跳过给工作完成
string msg = dt2.Rows[0]["msg"].ToString().Replace("|", " ").Replace("&", " ");
string color = dt2.Rows[0]["color"].ToString();
string message = "MES|Engine_Is_TwoWork_Msg|" + OpName + "|" + msg + "&" + color;
SendMessage.AsyncSendMessage(message);
}
else