From 8a516270bda96fd7e3afae81421b16937676940c Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 10 12月 2024 11:20:55 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine

---
 SDA/iWareSda/Devices/4-Station/StationService/IStationService.cs |   78 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/SDA/iWareSda/Devices/4-Station/StationService/IStationService.cs b/SDA/iWareSda/Devices/4-Station/StationService/IStationService.cs
index 67113d8..0201af1 100644
--- a/SDA/iWareSda/Devices/4-Station/StationService/IStationService.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationService/IStationService.cs
@@ -1,4 +1,5 @@
 锘縰sing iWareModel;
+using iWareSda.Model;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -44,6 +45,14 @@
         [OperationContract]
         StationView GetStationInfo(int deviceId);
 
+        /// <summary>
+        /// 鑾峰彇褰撳墠姝ｅ湪鎶ヨ鐨勬姤璀﹀垪琛�
+        /// </summary>
+        /// <param name="deviceId"></param>
+        /// <returns></returns>
+        [OperationContract]
+        List<DeviceWarningInfo> GetWaringInfoList(int deviceId, List<WmsConfigDeviceWarning> configDeviceWarningList);
+
         [OperationContract]
         SdaResEntity IsTaskFinish(int deviceId, int taskId);
 
@@ -84,6 +93,16 @@
         SdaResEntity IsHaveHeatBeat(int deviceId);
 
         /// <summary>
+        /// 鍐橮LC bool
+        /// </summary>
+        /// <param name="deviceId"></param>
+        /// <param name="dbAddress"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        [OperationContract]
+        SdaResEntity WriteBoolPlcData(int deviceId, string dbAddress, bool value);
+
+        /// <summary>
         /// 鍐欏叆榻愬淇℃伅
         /// </summary>
         /// <param name="deviceId"></param>
@@ -108,7 +127,7 @@
         /// <param name="value"></param>
         /// <returns></returns>
         [OperationContract]
-        SdaResEntity OutboundFinishConfirm(int deviceId, bool value, string stationCode);
+        SdaResEntity OutboundFinishConfirm(int deviceId, bool value, string stationCode, bool isClearData);
 
 
         /// <summary>
@@ -139,7 +158,31 @@
         /// <param name="outbound_TaskID"></param>
         /// <returns></returns>
         [OperationContract]
-        SdaResEntity WriteOutStoreTaskInfo(int deviceId, string stationCode, string sourcePlaceNo, int outbound_TaskID);
+        SdaResEntity WriteOutStoreTaskInfo(bool isResetData, int deviceId, string stationCode, string sourcePlaceNo, int outbound_TaskID);
+
+        /// <summary>
+        /// 鍐欏叆鐮佹澘浠诲姟淇℃伅
+        /// </summary>
+        /// <param name="deviceId"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        [OperationContract]
+        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);
+
+        /// <summary>
+        /// 鐮佸灈瀹屾垚宸茬‘璁�
+        /// </summary>
+        /// <param name="deviceId"></param>
+        /// <param name="value"></param>
+        /// <returns></returns
+        [OperationContract]
+        SdaResEntity SetPalletizingTaskFinishAck(int deviceId, bool value, string stationCode);
+
+        [OperationContract]
+        SdaResEntity WriteSurroundTaskInfo(int deviceId, string stationCode, short taskID, short length, short width, short cartonhigh, short cartonwidth, short placex, short placey);
+
+        [OperationContract]
+        SdaResEntity SetSurroundTaskFinishAck(int deviceId, bool value, string stationCode);
 
         /// <summary>
         /// Station鐨勪换鍔″畬鎴怉CK璧嬪��
@@ -149,6 +192,15 @@
         /// <returns></returns>
         [OperationContract]
         SdaResEntity WriteStation_FinishACK(int deviceId, bool value, int plcTaskId);
+        /// <summary>
+        /// 澶嶄綅瑙ｆ瀽瀹屾垚
+        /// </summary>
+        /// <param name="deviceId"></param>
+        /// <param name="value"></param>
+        /// <param name="stationCode"></param>
+        /// <returns></returns>
+        [OperationContract]
+        SdaResEntity WriteStation_ACK(int deviceId, bool value, string stationCode);
 
         /// <summary>
         /// 鍥涗釜鍏ュ簱鍙ｆ壂鎻忛獙璇丄CK璧嬪��
@@ -174,5 +226,27 @@
            string value_Out_SerialNumber,
            int plcTaskId);
 
+
+
+        /// <summary>
+        /// 鍐欏叆 琛ユ澘宸ヤ綅鍏佽杩涙澘
+        /// </summary>
+        /// <param name="deviceId"></param>
+        /// <param name="value"></param>
+        /// <param name="stationCode"></param>
+        /// <returns></returns>
+        [OperationContract]
+        SdaResEntity WriteStation_AllowIn(int deviceId, bool value, string stationCode);
+
+
+        /// <summary>
+        /// 鍐欏叆 浜哄伐鏀捐
+        /// </summary>
+        /// <param name="deviceId"></param>
+        /// <param name="value"></param>
+        /// <param name="stationCode"></param>
+        /// <returns></returns>
+        [OperationContract]
+        SdaResEntity WriteStation_PersonAllow(int deviceId, bool value, string stationCode);
     }
 }

--
Gitblit v1.9.3