From 7a4c218909936721fe281737491d10efc7378e09 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 19 七月 2024 17:53:30 +0800
Subject: [PATCH] 优化工单信息页面
---
代码管理/PCS/WCS_Server/WIDESEA_WCS/Services/WCS/Partial/VV_DispatchService.cs | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Services/WCS/Partial/VV_DispatchService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Services/WCS/Partial/VV_DispatchService.cs"
index 9322093..7a78eac 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Services/WCS/Partial/VV_DispatchService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Services/WCS/Partial/VV_DispatchService.cs"
@@ -63,19 +63,21 @@
{
if (!scheduler.IsRun())
{
+ WIDESEA.Helper.GetToken();
+
var cooRes = CoonPLC();
var startRes = SrartScheduler();
if (startRes.Status)
{
if (cooRes.Status)
{
- WriteDBLog.Success($"寮�鍚湇鍔�", new { 鏁版嵁 = "鏈嶅姟鍚姩鎴愬姛锛�" }, "PCS", UserContext.Current.UserTrueName);
+ WriteDBLog.Success($"寮�鍚湇鍔�", new { 鏁版嵁 = "鏈嶅姟鍚姩鎴愬姛锛�" }, "PCS", UserContext.Current.UserName);
return webResponse.OK("鏈嶅姟鍚姩鎴愬姛锛�");
}
else
{
//杩斿洖PLC寮傚父
- WriteDBLog.Error($"寮�鍚湇鍔�", new { 鏁版嵁 = cooRes }, "PCS", UserContext.Current.UserTrueName);
+ WriteDBLog.Error($"寮�鍚湇鍔�", new { 鏁版嵁 = cooRes }, "PCS", UserContext.Current.UserName);
return cooRes;
}
}
@@ -83,7 +85,7 @@
{
//璋冨害鍚姩澶辫触锛屽叧闂叏閮�
//WriteLog.Write_Log("鏈嶅姟", "鏈嶅姟", "鍚姩鏈嶅姟\n[璋冨害寮傚父]" + startRes.Message);
- WriteDBLog.Error($"寮�鍚湇鍔�", new { 鏁版嵁 = startRes.Message }, "PCS", UserContext.Current.UserTrueName);
+ WriteDBLog.Error($"寮�鍚湇鍔�", new { 鏁版嵁 = startRes.Message }, "PCS", UserContext.Current.UserName);
return startRes;
}
}
@@ -149,7 +151,7 @@
PLCClient client = null;
if (plc.plcinfo_type == "Simene")
{
- client = new SiemensPLCClient()
+ client = new SiemensPLCClient(plc.plcinfo_model)
{
PLCName = plc.plcinfo_name,
Ip = plc.plcinfo_ip,
@@ -236,6 +238,7 @@
{
order.dbAddress = item.plcdetail_db + "." + item.plcdetail_value;
}
+ order.opratortype = item.plcdetail_opratortype;
order.dataLen = item.plcdetail_len;
order.Methods = item.plcdetail_number;//
itmes.Add(order);
--
Gitblit v1.9.3