wenjy
/
Aucma.BoxShellStore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - MessageBox样式修改，位于所有窗口前面

Browse Source
collection-v1.0
wenjy 2 years ago
parent c73e01a0a5
commit 85e6541343
15 changed files with 336 additions and 24 deletions
Show Stats Download Patch File Download Diff File

2
Aucma.Scada.UI/App.xaml.cs
Unescape Escape View File

@ -34,7 +34,7 @@ namespace Aucma.Scada.UI
mutex = new System.Threading.Mutex(true, System.Diagnostics.Process.GetCurrentProcess().ProcessName, out ret);
if (!ret)
{
MessageBox.Show("应用程序已开启，禁止重复运行");
MessageBox.Show("应用程序已开启，禁止重复运行", "提示", MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
Environment.Exit(0);
}
else

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb
View File

Binary file not shown.

232
Aucma.Scada.UI/bin/Debug/Log/2023-11-16/LogInfo.txt
View File

File diff suppressed because one or more lines are too long

16
Aucma.Scada.UI/bin/Debug/Log/2023-11-16/PlcLog.txt
Unescape Escape View File

@ -62,4 +62,20 @@
日志时间：2023-11-16 09:36:16,302 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-16 17:18:14,640 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-16 17:18:16,704 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！
<-------------->
日志时间：2023-11-16 17:18:16,704 [1]
日志级别：INFO
日志内容：三菱Q系列PLC连接开始
<-------------->
日志时间：2023-11-16 17:18:18,738 [1]
日志级别：INFO
日志内容：三菱Q系列PLC建立连接失败！！！

64
Aucma.Scada.UI/bin/Debug/Log/2023-11-16/SqlLog.txt
Unescape Escape View File

@ -530,4 +530,68 @@
日志时间：2023-11-16 09:36:50,527 [1]
日志级别：INFO
日志内容：SELECT "OBJ_ID","SPACE_CODE","MATERIAL_CODE","MATERIAL_NAME","MATERIAL_TYPE","MATERIAL_AMOUNT","STORE_CODE","IS_FLAG","CREATED_TIME" FROM "BASE_SPACEDETAIL" WHERE (( 1 = 1 ) AND((( "STORE_CODE" = :storeCode1 ) AND ( "MATERIAL_TYPE" = :materialType2 )) AND ( "IS_FLAG" <> :isFlag3 )))；参数：[{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":16,"Direction":0,"IsNullable":false,"ParameterName":":storeCode1","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":"XKJCK-001","TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0},{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":16,"Direction":0,"IsNullable":false,"ParameterName":":materialType2","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":"3600000781","TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0},{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":":isFlag3","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":1,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
<-------------->
日志时间：2023-11-16 17:18:29,818 [1]
日志级别：INFO
日志内容：SELECT "OBJID","TASK_CODE","TASK_TYPE","TASK_STATUS","TASK_MODEL","PLAN_CODE","MATERIAL_CODE","MATERIAL_TYPE","SPACE_CODE","SPACE_NAME","PLAN_AMOUNT","COMPLETE_AMOUNT","BEGIN_TIME","END_TIME","IS_FLAG","STORE_CODE","CREATED_TIME" FROM "REAL_TASKINFO" WHERE (( 1 = 1 ) AND((( "TASK_TYPE" = :taskType1 ) AND ( "TASK_STATUS" <> :taskStatus2 )) AND ("STORE_CODE" IN ('XKJCK-001','NDJCK-001')) ))；参数：[{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":":taskType1","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":1,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0},{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":":taskStatus2","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
<-------------->
日志时间：2023-11-16 17:18:30,373 [1]
日志级别：INFO
日志内容：SELECT * FROM "GET_STORE_MATERIALSTOCK" WHERE STORE_CODE in (:shellStore,:linerStore) ；参数：[{"_Size":0,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":16,"Direction":0,"IsNullable":false,"ParameterName":":shellStore","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":"XKJCK-001","TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0},{"_Size":0,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":16,"Direction":0,"IsNullable":false,"ParameterName":":linerStore","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":"NDJCK-001","TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
<-------------->
日志时间：2023-11-16 17:18:30,467 [1]
日志级别：INFO
日志内容：SELECT "OBJID","TASK_CODE","TASK_TYPE","TASK_STATUS","TASK_MODEL","PLAN_CODE","MATERIAL_CODE","MATERIAL_TYPE","SPACE_CODE","SPACE_NAME","PLAN_AMOUNT","COMPLETE_AMOUNT","BEGIN_TIME","END_TIME","IS_FLAG","STORE_CODE","CREATED_TIME" FROM "REAL_TASKINFO" WHERE (( 1 = 1 ) AND((( "TASK_TYPE" = :taskType1 ) AND ( "TASK_STATUS" <> :taskStatus2 )) AND ("STORE_CODE" IN ('XKJCK-001','NDJCK-001')) ))；参数：[{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":":taskType1","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":2,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0},{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":":taskStatus2","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":3,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
<-------------->
日志时间：2023-11-16 17:18:30,748 [1]
日志级别：INFO
日志内容：SELECT "OBJID","TASK_CODE","TASK_TYPE","TASK_STATUS","TASK_MODEL","PLAN_CODE","MATERIAL_CODE","MATERIAL_TYPE","SPACE_CODE","SPACE_NAME","PLAN_AMOUNT","COMPLETE_AMOUNT","BEGIN_TIME","END_TIME","IS_FLAG","STORE_CODE","CREATED_TIME" FROM "REAL_TASKINFO" WHERE (( 1 = 1 ) AND(( "TASK_TYPE" = :taskType1 ) AND ("STORE_CODE" IN ('XKJCK-001','NDJCK-001')) ))；参数：[{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":":taskType1","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":1,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
<-------------->
日志时间：2023-11-16 17:18:31,502 [1]
日志级别：INFO
日志内容：SELECT "S"."OBJ_ID" AS "OBJID" , "S"."SPACE_CODE" AS "SPACECODE" , "S"."SPACE_NAME" AS "SPACENAME" , "S"."SPACE_CAPACITY" AS "SPACECAPACITY" , "S"."SPACE_STOCK" AS "SPACESTOCK" , "S"."SPACE_STATUS" AS "SPACESTATUS" , "S"."SPACE_TYPE" AS "SPACETYPE" , "S"."IS_FLAG" AS "ISFLAG" , "B"."MATERIAL_NAME" AS "MATERIALTYPE" , "S"."ONROUTE_AMOUNT" AS "ONROUTEAMOUNT" , "S"."INSTORE_FLAG" AS "INSTOREFLAG" , "S"."OUTROUTE_AMOUNT" AS "OUTROUTEAMOUNT" , "S"."OUTSTORE_FLAG" AS "OUTSTOREFLAG" , "S"."UNUSUAL_FLAG" AS "UNUSUALFLAG" FROM "BASE_SPACEINFO" "S" Left JOIN "BASE_BOMINFO" "B" ON ( "S"."MATERIAL_TYPE" = "B"."MATERIAL_CODE" ) WHERE ( "S"."STORE_CODE" = :storeCode0 )；参数：[{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":16,"Direction":0,"IsNullable":false,"ParameterName":":storeCode0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":"XKJCK-001","TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
<-------------->
日志时间：2023-11-16 17:18:32,090 [1]
日志级别：INFO
日志内容：SELECT * FROM "GET_STATION_MATERIALSTATS" WHERE PRODUCTLINE_CODE = :stationCode ；参数：[{"_Size":0,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":16,"Direction":0,"IsNullable":false,"ParameterName":":stationCode","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":"ZZ-01","TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
<-------------->
日志时间：2023-11-16 17:18:32,137 [1]
日志级别：INFO
日志内容：SELECT * FROM "GET_STATION_HOURAMOUNT" WHERE PRODUCTLINE_CODE = :stationCode ；参数：[{"_Size":0,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":16,"Direction":0,"IsNullable":false,"ParameterName":":stationCode","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":"ZZ-01","TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
<-------------->
日志时间：2023-11-16 17:18:32,224 [1]
日志级别：INFO
日志内容：SELECT "S"."OBJ_ID" AS "OBJID" , "S"."SPACE_CODE" AS "SPACECODE" , "S"."SPACE_NAME" AS "SPACENAME" , "S"."SPACE_CAPACITY" AS "SPACECAPACITY" , "S"."SPACE_STOCK" AS "SPACESTOCK" , "S"."SPACE_STATUS" AS "SPACESTATUS" , "S"."SPACE_TYPE" AS "SPACETYPE" , "S"."IS_FLAG" AS "ISFLAG" , "B"."MATERIAL_NAME" AS "MATERIALTYPE" , "S"."ONROUTE_AMOUNT" AS "ONROUTEAMOUNT" , "S"."INSTORE_FLAG" AS "INSTOREFLAG" , "S"."OUTROUTE_AMOUNT" AS "OUTROUTEAMOUNT" , "S"."OUTSTORE_FLAG" AS "OUTSTOREFLAG" , "S"."UNUSUAL_FLAG" AS "UNUSUALFLAG" FROM "BASE_SPACEINFO" "S" Left JOIN "BASE_BOMINFO" "B" ON ( "S"."MATERIAL_TYPE" = "B"."MATERIAL_CODE" ) WHERE ( "S"."STORE_CODE" = :storeCode0 )；参数：[{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":16,"Direction":0,"IsNullable":false,"ParameterName":":storeCode0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":"NDJCK-001","TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
<-------------->
日志时间：2023-11-16 17:18:49,175 [1]
日志级别：INFO
日志内容：SELECT "OBJ_ID","PLAN_CODE","ORDER_CODE","SALEORDER_CODE","SALEORDER_LINENUMBER","MATERIAL_CODE","MATERIAL_NAME","PRODUCTLINE_CODE","PLAN_AMOUNT","COMPLETE_AMOUNT","BEGIN_TIME","END_TIME","IS_FLAG" FROM "PRODUCT_PLANINFO" WHERE (( 1 = 1 ) AND( "PRODUCTLINE_CODE" = :productLineCode1 ))；参数：[{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":16,"Direction":0,"IsNullable":false,"ParameterName":":productLineCode1","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":"ZZ-01","TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
<-------------->
日志时间：2023-11-16 17:18:52,175 [1]
日志级别：INFO
日志内容：SELECT "OBJ_ID","BOM_CODE","MATERIAL_CODE","MATERIAL_NAME","MATERIAL_TYPE","STANDARD_AMOUNT","PARENT_ID","PLANT_CODE","PRODUCT_LINE_CODE","IS_FLAG" FROM "BASE_BOMINFO" WHERE ( "PARENT_ID" = :parentId0 )；参数：[{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":16,"Direction":0,"IsNullable":false,"ParameterName":":parentId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":"9002006859","TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
<-------------->
日志时间：2023-11-16 17:18:52,206 [1]
日志级别：INFO
日志内容：SELECT "OBJ_ID","BOM_CODE","MATERIAL_CODE","MATERIAL_NAME","MATERIAL_TYPE","STANDARD_AMOUNT","PARENT_ID","PLANT_CODE","PRODUCT_LINE_CODE","IS_FLAG" FROM "BASE_BOMINFO" WHERE ( "PARENT_ID" = :parentId0 )；参数：[{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":16,"Direction":0,"IsNullable":false,"ParameterName":":parentId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":"3406001225","TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
<-------------->
日志时间：2023-11-16 17:18:52,234 [1]
日志级别：INFO
日志内容：SELECT "OBJ_ID","BOM_CODE","MATERIAL_CODE","MATERIAL_NAME","MATERIAL_TYPE","STANDARD_AMOUNT","PARENT_ID","PLANT_CODE","PRODUCT_LINE_CODE","IS_FLAG" FROM "BASE_BOMINFO" WHERE ( "PARENT_ID" = :parentId0 )；参数：[{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":16,"Direction":0,"IsNullable":false,"ParameterName":":parentId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":"3600000781","TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
<-------------->
日志时间：2023-11-16 17:18:52,262 [1]
日志级别：INFO
日志内容：SELECT "OBJ_ID","BOM_CODE","MATERIAL_CODE","MATERIAL_NAME","MATERIAL_TYPE","STANDARD_AMOUNT","PARENT_ID","PLANT_CODE","PRODUCT_LINE_CODE","IS_FLAG" FROM "BASE_BOMINFO" WHERE ( "PARENT_ID" = :parentId0 )；参数：[{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":16,"Direction":0,"IsNullable":false,"ParameterName":":parentId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":"3600000788","TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
<-------------->
日志时间：2023-11-16 17:18:52,296 [1]
日志级别：INFO
日志内容：SELECT "OBJ_ID","BOM_CODE","MATERIAL_CODE","MATERIAL_NAME","MATERIAL_TYPE","STANDARD_AMOUNT","PARENT_ID","PLANT_CODE","PRODUCT_LINE_CODE","IS_FLAG" FROM "BASE_BOMINFO" WHERE ( "PARENT_ID" = :parentId0 )；参数：[{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":16,"Direction":0,"IsNullable":false,"ParameterName":":parentId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":"8000004624","TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
<-------------->
日志时间：2023-11-16 17:18:52,324 [1]
日志级别：INFO
日志内容：SELECT "OBJ_ID","BOM_CODE","MATERIAL_CODE","MATERIAL_NAME","MATERIAL_TYPE","STANDARD_AMOUNT","PARENT_ID","PLANT_CODE","PRODUCT_LINE_CODE","IS_FLAG" FROM "BASE_BOMINFO" WHERE ( "PARENT_ID" = :parentId0 )；参数：[{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":16,"Direction":0,"IsNullable":false,"ParameterName":":parentId0","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":"8208002965","TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]
<-------------->
日志时间：2023-11-16 17:18:52,352 [1]
日志级别：INFO
日志内容：SELECT "OBJ_ID","SPACE_CODE","MATERIAL_CODE","MATERIAL_NAME","MATERIAL_TYPE","MATERIAL_AMOUNT","STORE_CODE","IS_FLAG","CREATED_TIME" FROM "BASE_SPACEDETAIL" WHERE (( 1 = 1 ) AND((( "STORE_CODE" = :storeCode1 ) AND ( "MATERIAL_TYPE" = :materialType2 )) AND ( "IS_FLAG" <> :isFlag3 )))；参数：[{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":16,"Direction":0,"IsNullable":false,"ParameterName":":storeCode1","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":"XKJCK-001","TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0},{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":16,"Direction":0,"IsNullable":false,"ParameterName":":materialType2","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":"3600000781","TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0},{"_Size":4000,"IsRefCursor":false,"IsClob":false,"IsNvarchar2":false,"DbType":11,"Direction":0,"IsNullable":false,"ParameterName":":isFlag3","Size":4000,"SourceColumn":null,"SourceColumnNullMapping":false,"UdtTypeName":null,"Value":1,"TempDate":null,"SourceVersion":0,"TypeName":null,"IsJson":false,"IsArray":false,"CustomDbType":null,"Precision":0,"Scale":0}]

10
Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs
Unescape Escape View File

@ -253,11 +253,11 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
PlanCode = string.Empty;
ProductModel = string.Empty;
BeginTime = string.Empty;
MessageBox.Show("执行计划删除成功");
MessageBox.Show("执行计划删除成功", "提示", MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
}
else
{
MessageBox.Show("执行计划删除失败");
MessageBox.Show("执行计划删除失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
}
}
@ -270,7 +270,7 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
string info = obj as string;
if (info == planCode)
{
MessageBox.Show("该计划正在执行中，请勿重复下传");
MessageBox.Show("该计划正在执行中，请勿重复下传", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
}
else
{
@ -278,11 +278,11 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
if (result != null)
{
RefreshPlanExecute(result);
MessageBox.Show("执行计划已下达");
MessageBox.Show("执行计划已下达", "提示", MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
}
else
{
MessageBox.Show("执行计划下达失败");
MessageBox.Show("执行计划下达失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
}
}

2
Aucma.Scada.UI/viewModel/AssemblyPlan/PlanInfoEditViewModel.cs
Unescape Escape View File

@ -268,7 +268,7 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
bool result = assemblyPlanBusiness.PlanTransmitByProductPlan(_ProductPlanCode, _TransmitAmount);
if (result)
{
MessageBox.Show("执行计划维护成功");
MessageBox.Show("执行计划维护成功", "提示", MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
}
}

8
Aucma.Scada.UI/viewModel/AssemblyPlan/QuantityIssuedViewModel.cs
Unescape Escape View File

@ -67,13 +67,13 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
bool shellResult = assemblyPlanBusiness.JudgmentStock(productPlanInfo, Convert.ToInt32(_TransmitAmount), appConfig.shellMaterialType,appConfig.shellStoreCode);
if (!shellResult)
{
MessageBox.Show("计划下达失败，箱壳物料库存不足");
MessageBox.Show("计划下达失败，箱壳物料库存不足", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
return;
}
bool linerResult = assemblyPlanBusiness.JudgmentStock(productPlanInfo, Convert.ToInt32(_TransmitAmount), appConfig.linerMaterialType, appConfig.linerStoreCode);
if (!linerResult)
{
MessageBox.Show("计划下达失败，内胆物料库存不足");
MessageBox.Show("计划下达失败，内胆物料库存不足", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
return;
}
@ -97,14 +97,14 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
}
else
{
MessageBox.Show("生产计划获取失败，加载为空");
MessageBox.Show("生产计划获取失败，加载为空", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
return;
}
bool result = assemblyPlanBusiness.PlanTransmitByProductPlan(_PlanInfo.planCode, Convert.ToInt32(_TransmitAmount));
if (result)
{
MessageBox.Show("执行计划维护成功");
MessageBox.Show("执行计划维护成功", "提示", MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
}
}

10
Aucma.Scada.UI/viewModel/InventoryInfo/LinerInventoryViewModel.cs
Unescape Escape View File

@ -143,7 +143,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
}
else
{
MessageBox.Show("货道入库状态修改失败");
MessageBox.Show("货道入库状态修改失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
}
}
@ -162,7 +162,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
}
else
{
MessageBox.Show("货道出库状态修改失败");
MessageBox.Show("货道出库状态修改失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
}
}
@ -181,7 +181,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
}
else
{
MessageBox.Show("货道异常标识修改失败");
MessageBox.Show("货道异常标识修改失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
}
}
@ -200,7 +200,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
}
else
{
MessageBox.Show("货道状态修改失败");
MessageBox.Show("货道状态修改失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
}
}
@ -248,7 +248,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
}
else
{
MessageBox.Show("出库任务创建失败");
MessageBox.Show("出库任务创建失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
}
}
}

10
Aucma.Scada.UI/viewModel/InventoryInfo/ShellInventoryViewModel.cs
Unescape Escape View File

@ -146,7 +146,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
}
else
{
MessageBox.Show("货道入库状态修改失败");
MessageBox.Show("货道入库状态修改失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
}
}
@ -165,7 +165,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
}
else
{
MessageBox.Show("货道出库状态修改失败");
MessageBox.Show("货道出库状态修改失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
}
}
@ -184,7 +184,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
}
else
{
MessageBox.Show("货道异常标识修改失败");
MessageBox.Show("货道异常标识修改失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
}
}
@ -203,7 +203,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
}
else
{
MessageBox.Show("货道状态修改失败");
MessageBox.Show("货道状态修改失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
}
}
@ -256,7 +256,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo
}
else
{
MessageBox.Show("出库任务创建失败");
MessageBox.Show("出库任务创建失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
}
}
}

2
Aucma.Scada.UI/viewModel/MainViewModel.cs
Unescape Escape View File

@ -151,7 +151,7 @@ namespace Aucma.Scada.UI.viewModel
{
logHelper.Error("打开系统键盘逻辑异常", ex);
MessageBox.Show($"系统键盘打开异常:{ex.Message}");
MessageBox.Show($"系统键盘打开异常:{ex.Message}", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
}
}

4
Aucma.Scada.UI/viewModel/OutStoreInfo/OutStoreInfoViewModel.cs
Unescape Escape View File

@ -302,12 +302,12 @@ namespace Aucma.Scada.UI.viewModel.OutStoreInfo
if (outStoreBusiness.DeleteTaskInfoByTaskCode(taskCode))
{
MessageBox.Show("任务删除成功");
MessageBox.Show("任务删除成功", "提示", MessageBoxButton.OK, MessageBoxImage.Information, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
Query();
}
else
{
MessageBox.Show("任务删除失败");
MessageBox.Show("任务删除失败", "提示", MessageBoxButton.OK, MessageBoxImage.Error, MessageBoxResult.OK, MessageBoxOptions.DefaultDesktopOnly);
}
}

BIN
HighWayIot/bin/Debug/HighWayIot.Repository.dll
View File

Binary file not shown.

BIN
HighWayIot/bin/Debug/HighWayIot.Repository.pdb
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save