From 6eb8d6015059b3e0059ba479c108c1cab2e5f133 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期四, 31 十月 2024 09:40:50 +0800
Subject: [PATCH] 修改问题

---
 Admin.NET/WCS.Application/PLC/PLCService.cs |   41 +++++++++++++++++++++--------------------
 1 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 84810ce..c34b5ad 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -283,22 +283,23 @@
                                         modcTaskMonitor.InteractiveMsg = string.Format("宸ヤ綅锛歿0},鍐欏叆鍙栬揣瀹屾垚:640", startStationVal);
                                         // 鎻掑叆浜や簰鏃ュ織
                                         _db.Insertable(modcTaskMonitor).ExecuteCommand();
-                                    }
 
-                                    var retc = plcConveyorConn.SetPlcDBValue(ConveyorMod.PosType, ConveyorMod.DbNumber, ConveyorMod.WcsPos, "640");
+                                        var retc = plcConveyorConn.SetPlcDBValue(ConveyorMod.PosType, ConveyorMod.DbNumber, ConveyorMod.WcsPos, "640");
 
-                                    if (!retc.IsSucceed)
-                                    {
-                                        modcTaskMonitor.InteractiveMsg = string.Format("宸ヤ綅锛歿0},鍐欏叆鍙栬揣瀹屾垚640澶辫触", startStationVal);
-                                        // 鎻掑叆浜や簰鏃ュ織
-                                        _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+                                        if (!retc.IsSucceed)
+                                        {
+                                            modcTaskMonitor.InteractiveMsg = string.Format("宸ヤ綅锛歿0},鍐欏叆鍙栬揣瀹屾垚640澶辫触", startStationVal);
+                                            // 鎻掑叆浜や簰鏃ュ織
+                                            _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+                                            //涓嬪彂浠诲姟鏃ュ織
+                                            HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                                            break;
+                                        }
+
                                         //涓嬪彂浠诲姟鏃ュ織
                                         HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
-                                        break;
                                     }
 
-                                    //涓嬪彂浠诲姟鏃ュ織
-                                    HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                                 }
 
                                 // 璇诲彇wcs鎺у埗瀛�
@@ -1993,7 +1994,7 @@
                             string TaskNo = "", EndLocate = "";
                             string strMsg = http.BindRequestRoadWay(checkTaskMedel.OrderNo,palletNo, checkTaskMedel.BoxCount.ToDecimal(),"0", checkTaskMedel.SkuNo, checkTaskMedel.LotNo, "","", boxInfoList, 
                                 modDevice.StationNum, "1", "2", ref EndLocate, ref TaskNo);
-                            if (!strMsg.Contains("-1"))
+                            if (strMsg.Contains("-1"))
                             {
                                 Log.Error(string.Format("鐢宠宸烽亾澶辫触锛岀爜鍨涘伐浣峽0};鍘熷洜{1}", modDevice.StationNum, strMsg));
                                 break;
@@ -2137,15 +2138,15 @@
                 var ret = plcConn.SetPlcDBValue(item.PosTypeLot, item.DbNumber, item.PosLot, "1");
                 if (ret.IsSucceed)
                 {
-                    //鍐欏叆娴佺▼瀛楁垚鍔熷悗鏇存柊鍒嗘嫞浠诲姟
-                    item.OrderNo = "";
-                    item.TaskNo = "";
-                    item.LotNo = "";
-                    item.SkuNo = "";
-                    item.SkuName = "";
-                    item.BoxType = "";
-                    item.Qty = 0;
-                    item.PZNo = "";
+                    //鍐欏叆娴佺▼瀛楁垚鍔熷悗鏇存柊鍒嗘嫞浠诲姟    liudl 鏈�鍚庝竴鎵樼洏鐢宠瀹屽叆搴撴墠鍙竻绌�
+                    //item.OrderNo = "";
+                    //item.TaskNo = "";
+                    //item.LotNo = "";
+                    //item.SkuNo = "";
+                    //item.SkuName = "";
+                    //item.BoxType = "";
+                    //item.Qty = 0;
+                    //item.PZNo = "";
                     item.Status = status;      // 缁戝畾鍒嗛亾 0锛氳В缁�  1锛氱粦瀹� 
 
                     //鏇存柊鍒嗘嫞浠诲姟

--
Gitblit v1.8.0