From b1f0187e6bdcc02aceb4989e2d6587c7f3a62440 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 14 四月 2025 16:58:06 +0800
Subject: [PATCH] 叠托机申请空托跺绑定

---
 Admin.NET/WCS.Application/PLC/PLCService.cs   |   99 ++++++++++++++++++++------------
 Admin.NET/WCS.Application/Util/HttpService.cs |   24 ++++++++
 2 files changed, 86 insertions(+), 37 deletions(-)

diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 1f94f94..db502b1 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -1200,55 +1200,59 @@
 
         #region#瀹炴椂鏄剧ず閲嶉噺鍒癓ED灞忓箷
         var modPosPalletWeightIng = modDevice.listStation.FirstOrDefault(m => m.Text == "瀹為檯閲嶉噺");
-        var (resPalletWeightIng, palletWeightValIng) = plcConn.GetPlcDBValue(modPosPalletWeightIng.PosType, modDevice.DbNumber, modPosPalletWeightIng.PlcPos);
-        switch (modDevice.StationNum)
+        if (modPosPalletWeightIng != null)
         {
-            case "094":
-                {
-                    if (Convert.ToDecimal(palletWeightValIng) != weight94)
+            var (resPalletWeightIng, palletWeightValIng) = plcConn.GetPlcDBValue(modPosPalletWeightIng.PosType, modDevice.DbNumber, modPosPalletWeightIng.PlcPos);
+            switch (modDevice.StationNum)
+            {
+                case "094":
                     {
-                        LedDisplay(modDevice.LedIP, $"褰撳墠閲嶉噺(KG)锛歿Convert.ToDecimal(palletWeightValIng)}");
-                        weight94 = Convert.ToDecimal(palletWeightValIng);
+                        if (Convert.ToDecimal(palletWeightValIng) != weight94)
+                        {
+                            LedDisplay(modDevice.LedIP, $"褰撳墠閲嶉噺(KG)锛歿Convert.ToDecimal(palletWeightValIng)}");
+                            weight94 = Convert.ToDecimal(palletWeightValIng);
+                        }
                     }
-                }
-                break;
-            case "160":
-                {
-                    if (Convert.ToDecimal(palletWeightValIng) != weight160)
+                    break;
+                case "160":
                     {
-                        LedDisplay(modDevice.LedIP, $"褰撳墠閲嶉噺(KG)锛歿Convert.ToDecimal(palletWeightValIng)}");
-                        weight160 = Convert.ToDecimal(palletWeightValIng);
+                        if (Convert.ToDecimal(palletWeightValIng) != weight160)
+                        {
+                            LedDisplay(modDevice.LedIP, $"褰撳墠閲嶉噺(KG)锛歿Convert.ToDecimal(palletWeightValIng)}");
+                            weight160 = Convert.ToDecimal(palletWeightValIng);
+                        }
                     }
-                }
-                break;
-            case "155":
-                {
-                    if (Convert.ToDecimal(palletWeightValIng) != weight155)
+                    break;
+                case "155":
                     {
-                        LedDisplay(modDevice.LedIP, $"褰撳墠閲嶉噺(KG)锛歿Convert.ToDecimal(palletWeightValIng)}");
-                        weight155 = Convert.ToDecimal(palletWeightValIng);
+                        if (Convert.ToDecimal(palletWeightValIng) != weight155)
+                        {
+                            LedDisplay(modDevice.LedIP, $"褰撳墠閲嶉噺(KG)锛歿Convert.ToDecimal(palletWeightValIng)}");
+                            weight155 = Convert.ToDecimal(palletWeightValIng);
+                        }
                     }
-                }
-                break;
-            case "152":
-                {
-                    if (Convert.ToDecimal(palletWeightValIng) != weight152)
+                    break;
+                case "152":
                     {
-                        LedDisplay(modDevice.LedIP, $"褰撳墠閲嶉噺(KG)锛歿Convert.ToDecimal(palletWeightValIng)}");
-                        weight152 = Convert.ToDecimal(palletWeightValIng);
+                        if (Convert.ToDecimal(palletWeightValIng) != weight152)
+                        {
+                            LedDisplay(modDevice.LedIP, $"褰撳墠閲嶉噺(KG)锛歿Convert.ToDecimal(palletWeightValIng)}");
+                            weight152 = Convert.ToDecimal(palletWeightValIng);
+                        }
                     }
-                }
-                break;
-            case "153":
-                {
-                    if (Convert.ToDecimal(palletWeightValIng) != weight153)
+                    break;
+                case "153":
                     {
-                        LedDisplay(modDevice.LedIP, $"褰撳墠閲嶉噺(KG)锛歿Convert.ToDecimal(palletWeightValIng)}");
-                        weight153 = Convert.ToDecimal(palletWeightValIng);
+                        if (Convert.ToDecimal(palletWeightValIng) != weight153)
+                        {
+                            LedDisplay(modDevice.LedIP, $"褰撳墠閲嶉噺(KG)锛歿Convert.ToDecimal(palletWeightValIng)}");
+                            weight153 = Convert.ToDecimal(palletWeightValIng);
+                        }
                     }
-                }
-                break;
+                    break;
+            }
         }
+
         #endregion
 
 
@@ -1442,6 +1446,27 @@
 
                     var http = new HttpService();
                     string TaskNo = "", EndLocate = "";
+
+                    //鏍规嵁宸ヤ綅鍒ゆ柇鏄惁涓哄彔鎵樻満宸ヤ綅鐢宠绌烘墭鐩樿泛鍏ュ簱锛屾槸锛氬悜WMS鐢宠绌烘墭鐩樿泛缁勬墭
+                    string groupMsg = "";
+                    if (modDevice.StationNum == "72")
+                    {
+                        groupMsg = http.BindNullPalletWcs(10, palletVal);
+
+                        if (groupMsg.Contains("-1"))
+                        {
+                            // 鍐欏叆杈撻�佺嚎閫�鍥炴寚浠�
+                            var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modPosEndLocat.PlcPos, modDevice.StationNum);
+                            if (ret.IsSucceed)
+                            {
+                                plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "350");
+                            }
+
+                            break;
+                        }                       
+                    }
+
+                    //鍚慦MS鐢宠宸烽亾
                     strMsg = http.RequestRoadWay(palletVal, modDevice.StationNum, taskModel, louCeng, ref EndLocate, ref TaskNo, (int)palletHeightVal);
 
                     if (!strMsg.Contains("-1"))
diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs
index 49a0d97..d2e284f 100644
--- a/Admin.NET/WCS.Application/Util/HttpService.cs
+++ b/Admin.NET/WCS.Application/Util/HttpService.cs
@@ -439,4 +439,28 @@
         }
         return returnStr;
     }
+
+    /// <summary>
+    /// 鍙犳墭鏈虹敵璇风┖鎵樿泛缁戝畾
+    /// </summary>
+    /// <param name="palletNo"></param>
+    /// <returns></returns>
+    public string BindNullPalletWcs(int qty,string palletNo)
+    {
+        string returnStr = "";
+        var model = new
+        {
+            PalletNo = palletNo,
+            Qty = qty,
+        };
+        string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+        var result = (url + "/api/DownAPi/BindNullPalletWcs").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseSkuInfo>().Result;
+        Log.Information("璋冪敤WMS鎺ュ彛鍙犳墭鏈虹粦瀹氱┖鎵樿泛" + result.ToJson());
+
+        if (result.Success != 0)
+        {
+            returnStr = "-1:" + result.Message;
+        }
+        return returnStr;
+    }
 }

--
Gitblit v1.8.0