From 2c94cc6e9ecd7087463c54350ae6dbc292fe9bdd Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期五, 17 一月 2025 15:33:03 +0800
Subject: [PATCH] 出库 机器人拆垛 出库分道

---
 Admin.NET/WCS.Application/PLC/PLCService.cs |  102 +++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 90 insertions(+), 12 deletions(-)

diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 2c61b1f..11c55a9 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -1514,7 +1514,7 @@
                             // 鍙嶉WMS
                             var requestMode = new TaskRequestWMS()
                             {
-                                TaskNo = modTask.TaskNo,
+                                TaskNo = modTask.TaskNo + modTask.EndLocate ,
                                 PalletNo = modTask.PalletNo,
                                 TaskType = ((int)TaskTypeEnum.Out).ToString(),
                                 TaskStatus = ((int)TaskStatusEnum.Complete).ToString()
@@ -1623,7 +1623,7 @@
                                 // 鍙嶉WMS
                                 var requestMode = new TaskRequestWMS()
                                 {
-                                    TaskNo = modTask.TaskNo,
+                                    TaskNo = modTask.TaskNo + modTask.EndLocate ,
                                     PalletNo = modTask.PalletNo,
                                     TaskType = ((int)TaskTypeEnum.Out).ToString(),
                                     TaskStatus = ((int)TaskStatusEnum.Complete).ToString()
@@ -2117,14 +2117,16 @@
                                         var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
                                         if (retVal.IsSucceed)
                                         {
-                                            if (modDevice.DbNumber == "DB102")//1L鎷嗚泛鍒嗘嫞鍚庨渶瑕佸洖浼犵鐮�
-                                            {
-                                                var http = new HttpService();
-                                                IsBaleModel2 ret1 = http.RequestBoxno(boxNoVal);
-                                                if (ret1.Success == -1)
+                                            {  // liudl 姝ゆ绋嬪簭涓嶄細鎵ц 纭鍚庣洿鎺ュ垹闄�
+                                                if (modDevice.DbNumber == "DB102")//1L鎷嗚泛鍒嗘嫞鍚庨渶瑕佸洖浼犵鐮�
                                                 {
-                                                    Log.Error("绠辩爜鍒嗘嫞鍥炰紶澶辫触锛岄渶瑕佹墜鍔ㄦ嫞璐с�傚け璐ョ鐮侊細"+boxNoVal);
-                                                    break;
+                                                    var http = new HttpService();
+                                                    IsBaleModel2 ret1 = http.RequestBoxno(boxNoVal);
+                                                    if (ret1.Success == -1)
+                                                    {
+                                                        Log.Error("绠辩爜鍒嗘嫞鍥炰紶澶辫触锛岄渶瑕佹墜鍔ㄦ嫞璐с�傚け璐ョ鐮侊細"+boxNoVal);
+                                                        break;
+                                                    }
                                                 }
                                             }
                                             break;
@@ -2479,7 +2481,7 @@
     }
 
     /// <summary>
-    /// 鎷嗗灈鏈哄櫒浜轰笟鍔″鐞�
+    /// 鍑哄簱浠剁杈撻�佸拰鎷嗗灈鏈哄櫒浜轰笟鍔″鐞�
     /// </summary>
     /// <param name="modDevice"></param>
     private static void StackingRobot(WcsDeviceDto modDevice)
@@ -2536,12 +2538,12 @@
                                 // 鏄惁鍐欏叆鎴愬姛
                                 if (listResult.All(s => s.IsSucceed))
                                 {
-                                    var ret1 = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "20");
+                                    var ret1 = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "30");
 
                                 }
                                 else
                                 {
-                                    Log.Error(string.Format($"鐮佸灈淇℃伅鏈啓鍏ワ紒鎵樼洏鍙凤細"+palletVal+"锛岀爜鍨涗綅锛�"+modDevice.StationNum));
+                                    Log.Error(string.Format($"鐮佸灈淇℃伅鏈啓鍏ワ紒鎵樼洏鍙凤細" + palletVal + "锛岀爜鍨涗綅锛�" + modDevice.StationNum));
                                     break;
                                 }
                             }
@@ -2553,6 +2555,82 @@
                     break;
             }
         }
+        else 
+        {
+            switch (modDevice.Value.ToString())
+            {
+                case "1":
+                    // 1妤间欢绠盤LC璇锋眰WCS璇荤爜
+                    {
+                        // 璇诲彇plc绠辩爜
+                        var modBoxNo = modDevice.listStation.FirstOrDefault(m => m.Text == "涓绘壂鏉$爜");
+                        var (res, boxNo) = plcConn.GetPlcDBValue(modBoxNo.PosType, modDevice.DbNumber, modBoxNo.PlcPos);
+                        if (string.IsNullOrWhiteSpace(boxNo.ToString()))
+                        {
+
+                            // 绠变俊鎭负null鍐欏叆鍓旈櫎閫氶亾鍙�:0
+                            var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "0");
+                            if (ret.IsSucceed)
+                            {
+                                // 鍐欏叆娴佺▼鎺у埗瀛� 2
+                                var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+                                if (retVal.IsSucceed)
+                                {
+                                    Log.Error("绠辩爜涓簄ull鎴栧凡缁戝畾鎵樼洏锛岃繘琛屽墧闄ゃ��");
+                                    break;
+                                }
+                            }
+                        }
+                        else
+                        {
+                            // 绠辩爜
+                            string boxNoVal = boxNo.ToString();     
+                            // 閫氶亾鍙�
+                            var modLineNo = modDevice.listStation.FirstOrDefault(m => m.Text == "閫氶亾鍙�");                                 
+
+                            // 璋冪敤wms鎺ュ彛楠岃瘉绠辩爜鏄惁鍙嫞璐у苟杩斿洖瑁呰溅鍙�
+                            var http = new HttpService();
+                            RequestloadingAddre requesModel = http.ResultBoxInfoExportWcs(boxNoVal);
+                            if (requesModel.Success != "0")
+                            {
+                                // 绠变俊鎭负null鍐欏叆鍓旈櫎閫氶亾鍙�:0
+                                var ret = plcConn.SetPlcDBValue(modLineNo.PosType, modDevice.DbNumber, modLineNo.PlcPos, "0");
+                                if (ret.IsSucceed)
+                                {
+                                    // 鍐欏叆娴佺▼鎺у埗瀛� 2
+                                    var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+                                    if (retVal.IsSucceed)
+                                    {
+                                        Log.Error("鍑哄簱鍒嗘嫞鏍规嵁绠辩爜鑾峰彇瑁呰溅鍙eけ璐ワ紝杩涜鍓旈櫎銆�" + requesModel.Message);
+                                        break;
+                                    }
+                                }
+                            }
+                            else 
+                            {
+                                // 鍐欏叆鍑哄簱鍒嗛亾鍙�
+                                var ret = plcConn.SetPlcDBValue(modLineNo.PosType, modDevice.DbNumber, modLineNo.PlcPos, requesModel.loadingAddre);
+                                if (ret.IsSucceed)
+                                {
+                                    // 鍐欏叆娴佺▼鎺у埗瀛� 2
+                                    var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+                                    if (retVal.IsSucceed)
+                                    {
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    };break;
+                case "10": 
+                    // 1妤间欢绠盤LC璇荤爜澶辫触锛學CS涓嶅仛澶勭悊鐩存帴鍓旈櫎鎵嬫寔鎷h揣銆�
+                    { 
+                        
+                    };break;
+                default:
+                    break;
+            }
+        }
                 
     }
 

--
Gitblit v1.8.0