From 6c4fdad188710d1ea09a67db4396b2bf4c6f06ac Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 05 12月 2024 09:05:34 +0800
Subject: [PATCH] 22
---
SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs b/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
index ebd3081..87695ad 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
@@ -9,7 +9,7 @@
using iWareCommon.Utils;
using iWareCommon.Common.Globle;
using iWareCommon;
-using iWareSda.Devices._3_Station.StationModel;
+
using Newtonsoft.Json;
using iWareSda.Model;
@@ -180,8 +180,9 @@
}
+
/// <summary>
- /// 鍐欏叆榻愬缁撴灉
+ /// 鍐欏叆榻愬缁撴灉銆佽В鏋愮粨鏋�
/// </summary>
/// <param name="deviceId"></param>
/// <param name="value">true:琛ㄧず 榻愬銆俧alse锛氫笉榻愬</param>
@@ -196,21 +197,25 @@
var view_stationObj = this.View.W_StationForWriteCommList.Where(x => x.StationCode == stationCode).FirstOrDefault();
- int i_result = 0;
- if (value)
+ MessageModel b2 = null;
+ if (stationCode == StationLocationEnum.BZ01.ToString() || stationCode == StationLocationEnum.BZ30.ToString())
{
- i_result = 998;
- }
- else
- {
- i_result = 999;
- }
- MessageModel b2 = this.plcService.WriteValuePoint(stationObj.W_KittingInfo, i_result, view_stationObj.W_KittingInfo);
- if (!b2.result)
- {
- msg = string.Format("鍚慡tation鍦板潃{0} 鍐� " + value + "澶辫触,杩斿洖缁撴灉:" + b2.resMsg,
- stationObj.W_DataFinish);
- return false;
+ int i_result = 0;
+ if (value)
+ {
+ i_result = 998;
+ }
+ else
+ {
+ i_result = 999;
+ }
+ b2 = this.plcService.WriteValuePoint(stationObj.W_KittingInfo, i_result, view_stationObj.W_KittingInfo);
+ if (!b2.result)
+ {
+ msg = string.Format("鍚慡tation鍦板潃{0} 鍐� " + value + "澶辫触,杩斿洖缁撴灉:" + b2.resMsg,
+ stationObj.W_DataFinish);
+ return false;
+ }
}
b2 = this.plcService.WriteValuePoint(stationObj.W_DataFinish, true, view_stationObj.W_DataFinish);
--
Gitblit v1.9.3