From 7e469b73ac4f022cb78689c6d2b0c4ddee26d18c Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 02 12月 2024 15:37:34 +0800
Subject: [PATCH] 优化

---
 SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs b/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
index 90dac1a..ebd3081 100644
--- a/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
+++ b/SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs
@@ -262,7 +262,15 @@
             }
         }
 
-        public bool OutboundFinishConfirm(string stationCode, bool value, out string msg)
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="stationCode"></param>
+        /// <param name="value"></param>
+        /// <param name="msg"></param>
+        /// <param name="isClearData">鏄惁闇�瑕佹竻鐞嗘暟鎹�</param>
+        /// <returns></returns>
+        public bool OutboundFinishConfirm(string stationCode, bool value, out string msg, bool isClearData)
         {
             try
             {
@@ -278,7 +286,7 @@
                     return false;
                 }
 
-                if (value)
+                if (value && isClearData)
                 {
                     b2 = this.plcService.WriteValuePoint(stationObj.W_ReqOut, false, view_stationObj.W_ReqOut);
                     if (!b2.result)
@@ -438,7 +446,7 @@
         /// <param name=""></param>
         /// <param name=""></param>
         /// <returns></returns>
-        public bool WritePalletizingTaskInfo(string stationCode, int taskID, short length, short width, short height, short rotate, short toplace, short placeX, short placeY, short placeZ,short lastnum, out string msg)
+        public bool WritePalletizingTaskInfo(string stationCode, int taskID, short length, short width, short height, short rotate, short toplace, short placeX, short placeY, short placeZ, short lastnum, out string msg)
         {
             try
             {
@@ -454,7 +462,7 @@
                       stationObj.W_Inbound_TaskID);
                     return false;
                 }
-           
+
                 b2 = this.plcService.WriteValuePoint(stationObj.W_Length, length, view_stationObj.W_Length);
                 if (!b2.result)
                 {
@@ -611,7 +619,7 @@
                      stationObj.W_Height);
                     return false;
                 }
-   
+
                 b2 = this.plcService.WriteValuePoint(stationObj.W_DataFinish, true, view_stationObj.W_DataFinish);
                 if (!b2.result)
                 {
@@ -652,7 +660,7 @@
                 MessageModel b2 = this.plcService.WriteValuePoint(stationObj.W_PalletizingTaskFinish, value, view_stationObj.W_PalletizingTaskFinish);
                 if (!b2.result)
                 {
-                    msg = string.Format("鍚慡tation"+stationCode+" 鍐欏叆浠诲姟瀹屾垚纭 鍦板潃{0} 鍐�  " + value + "澶辫触,杩斿洖缁撴灉:" + b2.resMsg,
+                    msg = string.Format("鍚慡tation" + stationCode + " 鍐欏叆浠诲姟瀹屾垚纭 鍦板潃{0} 鍐�  " + value + "澶辫触,杩斿洖缁撴灉:" + b2.resMsg,
                         stationObj.W_OutboundFinishConfirm);
                     return false;
                 }

--
Gitblit v1.9.3