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

update：更新B位静置库

Browse Source
This commit is contained in:
XingCheng3
2026-06-05 13:52:52 +08:00
parent d1403d22b8
commit 4aab62831a
21 changed files with 336 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Common/09MesDataFunction/MesDataFunction/14MisDataFunctionDB/MisDataFun.BaseFlow.cs
View File

@@ -211,5 +211,26 @@ namespace MisDataFunDll
MisDataFun.LogRecording_OP(OpName, "WARNING", "MOM", msg);
return false;
}
/// <summary>
/// 写入 保存完成和工作完成 并且对此进行一定判断校验
/// </summary>
/// <param name="isOver"></param>
public static void WriteMesReadOver(string OpName,bool isOver)
{
if (isOver)
{
MIS_BASE.Read_WorkStart(OpName,out bool isWorkStart);
if(!isWorkStart)
{
MisDataFun.LogRecording_OP(OpName, "WARNING", "WriteMesReadOver", "产品未在位 不予写入工作完成");
return;
}
}
//通知PLC，MES工作完成
MIS_BASE.Write_MesWorkFinish(OpName, isOver);
//通知PLC，MES保存完成
MIS_BASE.Write_MesReadOver(OpName, isOver);
}
}
}

17
Common/09MesDataFunction/MesDataFunction/14MisDataFunctionDB/MisDataFun.DB.cs
View File

@@ -542,12 +542,19 @@ namespace MisDataFunDll
{
// 机型代码 对应客户标签字段映射
string targetField;
switch (EngineTypeID)
if (OpName.StartsWith("OP450"))
{
case 1: case 5: targetField = "TEXT9"; break;
case 2: case 3: case 6: case 7: targetField = "TEXT14"; break;
case 4: targetField = "TEXT16"; break;
default: targetField = ""; break;
targetField = "TEXT1";
}
else
{
switch (EngineTypeID)
{
case 1: case 5: targetField = "TEXT9"; break;
case 2: case 3: case 6: case 7: targetField = "TEXT14"; break;
case 4: targetField = "TEXT16"; break;
default: targetField = ""; break;
}
}
if (!string.IsNullOrEmpty(targetField))

8
Common/09MesDataFunction/MesDataFunction/webService/CallWebService.cs
View File

@@ -1405,6 +1405,7 @@ namespace MisDataSaveDate
}
getAllLabelContents.sfcList = sfc;
if (opName == "OP490-3") getAllLabelContents.Y = "2";
if (opName.StartsWith("OP450")) getAllLabelContents.Y = "3";
MisDataFun.LogRecording_OP(opName, "INFO", "MOM", "调用打印配置接口");
ND_Api.getAllLabelContents(apiName, opName, getAllLabelContents,out string responseContent, out code, out message);
if (code == "0")
@@ -1535,6 +1536,9 @@ namespace MisDataSaveDate
case "dcGroupRevision":
dataCollectForResourceInspect.dcGroupRevision = paramValue?.ToString() ?? "";
break;
case "executeMode":
dataCollectForResourceInspect.executeMode = paramValue?.ToString() ?? "";
break;
case "operation":
dataCollectForResourceInspect.operation = operation;
break;
@@ -1556,9 +1560,11 @@ namespace MisDataSaveDate
int EngineTypeID = Convert.ToInt32(dt_quality.Rows[0]["产品代码"]);
if (opName == "OP320")
{
if (EngineTypeID == 2 || EngineTypeID == 6 || EngineTypeID == 7) dataCollectForResourceInspect.dcSequence = "B1";
if (EngineTypeID == 2 ) dataCollectForResourceInspect.dcSequence = "B1";
if (EngineTypeID == 3) dataCollectForResourceInspect.dcSequence = "B2";
if (EngineTypeID == 4) dataCollectForResourceInspect.dcSequence = "B3";
if (EngineTypeID == 5) dataCollectForResourceInspect.dcSequence = "B4";
if (EngineTypeID == 6) dataCollectForResourceInspect.dcSequence = "B5";
}
List<ParametricData> parametricDataArray = new List<ParametricData>();