From 27f65639a1fe594dae5e31c7f90749e9e4b89b95 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 23 11月 2024 13:26:14 +0800
Subject: [PATCH] 2
---
SDA/iWareSda/Devices/4-Station/StationService/StationService.cs | 75 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 insertions(+), 4 deletions(-)
diff --git a/SDA/iWareSda/Devices/4-Station/StationService/StationService.cs b/SDA/iWareSda/Devices/4-Station/StationService/StationService.cs
index b7eb1da..90b9047 100644
--- a/SDA/iWareSda/Devices/4-Station/StationService/StationService.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationService/StationService.cs
@@ -444,7 +444,7 @@
/// <param name="deviceId"></param>
/// <param name="value"></param>
/// <returns></returns>
- public SdaResEntity InboundFinishConfirm(int deviceId, string stationCode)
+ public SdaResEntity InboundFinishConfirm(int deviceId, bool value, string stationCode)
{
SdaResEntity _SdaResEntity = new SdaResEntity();
try
@@ -457,7 +457,39 @@
var Station = StationResult.resData as StationEntity;
string msg = "";
- var result = Station.InboundFinishConfirm(stationCode, out msg);
+ var result = Station.InboundFinishConfirm(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>
+ /// <param name="deviceId"></param>
+ /// <param name="value"></param>
+ /// <returns></returns>
+ public SdaResEntity OutboundFinishConfirm(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.OutboundFinishConfirm(stationCode, value, out msg);
_SdaResEntity.result = result;
_SdaResEntity.resMsg = msg;
return _SdaResEntity;
@@ -476,7 +508,7 @@
/// <param name="deviceId"></param>
/// <param name="value"></param>
/// <returns></returns>
- public SdaResEntity WriteInStoreTaskInfo(int deviceId, string stationCode, string toPlaceNo, short length, short width, short height)
+ public SdaResEntity WriteInStoreTaskInfo(int deviceId, string stationCode, string toPlaceNo, short length, short width, short height, int inbound_TaskID)
{
SdaResEntity _SdaResEntity = new SdaResEntity();
try
@@ -489,7 +521,42 @@
var Station = StationResult.resData as StationEntity;
string msg = "";
- var result = Station.WriteInStoreTaskInfo(stationCode, toPlaceNo, length, width, height, out msg);
+ var result = Station.WriteInStoreTaskInfo(stationCode, toPlaceNo, length, width, height, out msg, inbound_TaskID);
+ _SdaResEntity.result = result;
+ _SdaResEntity.resMsg = msg;
+ return _SdaResEntity;
+ }
+ catch (Exception ex)
+ {
+ _SdaResEntity.result = false;
+ _SdaResEntity.resMsg = ex.Message;
+ return _SdaResEntity;
+ }
+ }
+
+
+ /// <summary>
+ /// 鍐欏叆鍑哄簱浠诲姟淇℃伅
+ /// </summary>
+ /// <param name="deviceId"></param>
+ /// <param name="stationCode"></param>
+ /// <param name="sourcePlaceNo"></param>
+ /// <param name="outbound_TaskID"></param>
+ /// <returns></returns>
+ public SdaResEntity WriteOutStoreTaskInfo(int deviceId, string stationCode, string sourcePlaceNo, int outbound_TaskID)
+ {
+ 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.WriteOutStoreTaskInfo(stationCode, sourcePlaceNo, out msg, outbound_TaskID);
_SdaResEntity.result = result;
_SdaResEntity.resMsg = msg;
return _SdaResEntity;
--
Gitblit v1.9.3