From 607fa9a9dec5ff4fe780231d635bbd62e1740f37 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 02 12月 2024 18:37:27 +0800
Subject: [PATCH] 1
---
SDA/iWareSda/Devices/4-Station/StationService/StationService.cs | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/SDA/iWareSda/Devices/4-Station/StationService/StationService.cs b/SDA/iWareSda/Devices/4-Station/StationService/StationService.cs
index 9700a68..3267b36 100644
--- a/SDA/iWareSda/Devices/4-Station/StationService/StationService.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationService/StationService.cs
@@ -407,7 +407,7 @@
/// <summary>
- /// 鍐欏叆榻愬缁撴灉
+ /// 鍐欏叆榻愬缁撴灉銆佽В鏋愮粨鏋�
/// </summary>
/// <param name="deviceId"></param>
/// <param name="value"></param>
@@ -476,7 +476,7 @@
/// <param name="deviceId"></param>
/// <param name="value"></param>
/// <returns></returns>
- public SdaResEntity OutboundFinishConfirm(int deviceId, bool value, string stationCode)
+ public SdaResEntity OutboundFinishConfirm(int deviceId, bool value, string stationCode, bool isClearData)
{
SdaResEntity _SdaResEntity = new SdaResEntity();
try
@@ -489,7 +489,7 @@
var Station = StationResult.resData as StationEntity;
string msg = "";
- var result = Station.OutboundFinishConfirm(stationCode, value, out msg);
+ var result = Station.OutboundFinishConfirm(stationCode, value, out msg,isClearData);
_SdaResEntity.result = result;
_SdaResEntity.resMsg = msg;
return _SdaResEntity;
@@ -572,7 +572,7 @@
/// <param name="deviceId"></param>
/// <param name="value"></param>
/// <returns></returns>
- public SdaResEntity WritePalletizingTaskInfo(int deviceId, string stationCode,int taskID, bool isLast, bool isFirst, short length, short width, short height,short rotate,short toplace,short placeX,short placeY, short placeZ)
+ public SdaResEntity WritePalletizingTaskInfo(int deviceId, string stationCode,int taskID, short length, short width, short height,short rotate,short toplace,short placeX,short placeY, short placeZ,short lastnum)
{
SdaResEntity _SdaResEntity = new SdaResEntity();
try
@@ -585,7 +585,7 @@
var Station = StationResult.resData as StationEntity;
string msg = "";
- var result = Station.WritePalletizingTaskInfo(stationCode, taskID,isLast,isFirst, length, width, height,rotate,toplace,placeX,placeY,placeZ, out msg);
+ var result = Station.WritePalletizingTaskInfo(stationCode, taskID, length, width, height,rotate,toplace,placeX,placeY,placeZ,lastnum ,out msg);
_SdaResEntity.result = result;
_SdaResEntity.resMsg = msg;
return _SdaResEntity;
@@ -635,7 +635,7 @@
/// <param name="deviceId"></param>
/// <param name="value"></param>
/// <returns></returns>
- public SdaResEntity WriteSurroundTaskInfo(int deviceId, string stationCode, int taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey)
+ public SdaResEntity WriteSurroundTaskInfo(int deviceId, string stationCode, short taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey)
{
SdaResEntity _SdaResEntity = new SdaResEntity();
try
@@ -691,6 +691,31 @@
return _SdaResEntity;
}
}
+ public SdaResEntity WriteStation_ACK(int deviceId, bool value, string stationCode)
+ {
+ SdaResEntity _SdaResEntity = new SdaResEntity();
+ try
+ {
+ var StationResult = Station_CacheEntity.GetDeviceObj(deviceId);
+ if (!StationResult.result)
+ {
+ return StationResult;
+ }
+ var Station = StationResult.resData as StationEntity;
+
+ string msg = "";
+ var result = Station.WriteStation_ACK(stationCode, value, out msg);
+ _SdaResEntity.result = result;
+ _SdaResEntity.resMsg = msg;
+ return _SdaResEntity;
+ }
+ catch (Exception ex)
+ {
+ _SdaResEntity.result = false;
+ _SdaResEntity.resMsg = ex.Message;
+ return _SdaResEntity;
+ }
+ }
/// <summary>
/// 鍐欏叆鍑哄簱浠诲姟淇℃伅
/// </summary>
--
Gitblit v1.9.3