From ddd9612ed7cefe12c8ea33ced0711a0b9a3feb99 Mon Sep 17 00:00:00 2001
From: liudl <673013083@qq.com>
Date: 星期日, 16 二月 2025 18:18:42 +0800
Subject: [PATCH] 修改接口

---
 Admin.NET/WCS.Application/PLC/PLCService.cs |  397 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 371 insertions(+), 26 deletions(-)

diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index c0953f1..1366feb 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -16,6 +16,7 @@
 using System.Data;
 using System.Reflection.Emit;
 using WCS.Application.Entity;
+using WCS.Application.Service.WcsDevice.Dto;
 using WCS.Application.Util;
 using static SKIT.FlurlHttpClient.Wechat.Api.Models.CgibinExpressIntracityUpdateStoreRequest.Types;
 using static SKIT.FlurlHttpClient.Wechat.Api.Models.NontaxInsertBillRequest.Types.CardExtra.Types.BillCard.Types;
@@ -1748,8 +1749,52 @@
 
 
                     #endregion
+                    
                 }
                 break;
+            #region 灏忚溅鍙斁淇″彿
+            case "150":
+                { // 鑾峰彇宸ヤ綅浠诲姟鍙蜂俊鎭�
+                    var strMsg = "";
+                    var http = new HttpService();
+                    // 鑾峰彇鎵樼洏浠诲姟鍙�
+                    var modPosTask = modDevice.listStation.FirstOrDefault(m => m.Text == "浠诲姟鍙�");
+                    var (res1, val) = plcConn.GetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos);
+                    if (res1.IsSucceed)
+                    {
+                        string tasknoVal = val.ToString();
+                        var modTask = _db.Queryable<WcsTask>().First(m => m.Status == TaskStatusEnum.Doing && m.TaskNo == tasknoVal && m.IsDelete == false);
+                        if (modTask == null)
+                        {
+                            //璇诲彇鎴愬姛鍚庡啓鍏�151
+                            var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "151");//鏀跺埌鍙斁淇″彿鍚庡啓鍏�151
+                            if (ret.IsSucceed)
+                            {
+                                //鍥炰紶WMS鍙斁淇″彿
+                                strMsg = http.RequesContinueAgv(val.ToString(), modDevice.StationNum);
+                                if (!strMsg.Contains("-1"))
+                                {
+                                    // 鎻掑叆浠诲姟鏄庣粏 
+                                    var modInsertTaskMonitor = new WcsTaskMonitor()
+                                    {
+                                        PlcId = modDevice.Id,
+                                        PlcName = modDevice.Text,
+                                        InteractiveMsg = $"鍐欏叆鎸囦护151锛歿modDevice.StationNum}宸ヤ綅鍙帴鍙桝GV鏀捐揣鍏ュ簱",
+                                        Status = TaskStatusEnum.Complete,
+                                        StartLocat = modDevice.StationNum
+                                    };
+                                    // 鎻掑叆浜や簰鏃ュ織
+                                    _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+                                }
+                            }
+                            break;
+                        }
+                    }
+                     //
+
+                }
+                break;
+            #endregion
 
             default: break;
         }
@@ -1815,10 +1860,13 @@
                             // 閫氶亾鍙�
                             var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "閫氶亾鍙�");
 
-                            // 婕旂ず妯″紡鐩存帴鍐欏叆1鍒嗛亾
-                            var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "1");
+                            // 婕旂ず妯″紡鐩存帴鍐欏叆鍒嗛亾鍙�
+                            Random random = new Random();
+                            int ranNumber = random.Next(2) == 0 ? 1 : 5;
+                            var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, ranNumber.ToString());
                             if (ret.IsSucceed)
                             {
+                                Log.Information(string.Format("鍒嗛亾鎴愬姛锛岄亾鍙锋槸锛�" + ranNumber));
                                 // 鍐欏叆娴佺▼鎺у埗瀛� 2
                                 var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
                                 if (!retVal.IsSucceed)
@@ -1871,11 +1919,12 @@
                                         }
                                     }
                                 }
-                                // 鏍规嵁绠卞唴鍝佺鍙疯幏鍙栫爜韬茬粦瀹氬伐浣嶅強瀵瑰簲鐨勫垎閬撳彿
-                                var checkTaskInfo = _db.Queryable<WcsCheckTask>().First(w => w.SkuNo == boxInfo.SkuNo && w.SkuName == boxInfo.SkuName && w.LotNo == boxInfo.LotNo && w.Status == "1");
-                                if (checkTaskInfo == null)
+
+
+                                // 楠岃瘉鏄惁闆剁
+                                if (boxInfo.BitBoxMark == "1")
                                 {
-                                    // 缁戝畾淇℃伅涓簄ull鍐欏叆鍓旈櫎閫氶亾鍙�
+                                    // 鏄浂绠辩洿鎺ュ墧闄わ紝杩涜浜哄伐缁勬墭
                                     var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
                                     if (ret.IsSucceed)
                                     {
@@ -1883,8 +1932,225 @@
                                         var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
                                         if (retVal.IsSucceed)
                                         {
-                                            Log.Error("绠辩爜鏈粦瀹氬垎鎷d换鍔★紝杩涜鍓旈櫎銆�");
+                                            Log.Error("闆剁锛岃繘琛屽墧闄ゃ��");
                                             break;
+                                        }
+                                    }
+                                    break;
+                                }
+
+
+                                // 鏍规嵁绠卞唴鍝佺鍙疯幏鍙栫爜韬茬粦瀹氬伐浣嶅強瀵瑰簲鐨勫垎閬撳彿
+                                var checkTaskInfo = _db.Queryable<WcsCheckTask>().First(w => w.SkuNo == boxInfo.SkuNo && w.SkuName == boxInfo.SkuName && w.LotNo == boxInfo.LotNo && w.Status == "1");
+                                if (checkTaskInfo == null)
+                                {
+                                    // 鍒ゆ柇鏄惁鍏宠仈鍗曟嵁 wcsordertask
+                                    var orderModel = _db.Queryable<WcsOderTask>()
+                                        .First(m => m.SkuNo == boxInfo.SkuNo && m.Status== TaskStatusEnum.Wait && m.LotNo == boxInfo.LotNo && m.IsDelete == false);
+                                    if (orderModel != null)
+                                    {
+                                        // 鏍规嵁boxinfo琛ㄤ骇绾垮瓧娈佃嚜鍔ㄧ粦瀹氬垎閬�(1绾夸骇鍝佸彧鑳界粦瀹氬埌8閬�)
+                                        if (boxInfo.LineNo != "1")
+                                        {// 缁戝畾鍒伴櫎8閬撳鍏朵粬閬�
+
+                                            // 鑾峰彇鏈粦瀹氶亾
+                                            var lineNoModels = _db.Queryable<WcsCheckTask>()
+                                                .Where(m => m.Status == "0" && m.LineNo != "8" && m.RoboatType == PLCTypeEnum.RobotPalletizer).ToList();
+                                            if (lineNoModels.Count > 0)
+                                            {
+                                                // 鑾峰彇褰撳墠鐗╂枡鍝佺鍙�
+                                                var skuInfo = await _db.Queryable<WcsMateialPzInfo>().Where(w => w.SkuNo == boxInfo.SkuNo).FirstAsync();
+                                                if (skuInfo == null)
+                                                {
+                                                    // 姝や骇鍝佽嫢娌¤瀹氬搧瑙勶紝杩涜鍓旈櫎澶勭悊銆傞槻姝㈠牭濉炰欢绠辩嚎
+                                                    var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
+                                                    if (ret.IsSucceed)
+                                                    {
+                                                        // 鍐欏叆娴佺▼鎺у埗瀛� 2
+                                                        var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+                                                        if (retVal.IsSucceed)
+                                                        {
+                                                            Log.Error("娌℃湁绌洪棽鍒嗛亾锛岃繘琛屽墧闄ゃ��");
+                                                            break;
+                                                        }
+                                                    }
+                                                    break;
+                                                }
+
+                                                foreach (var lineNoModel in lineNoModels) 
+                                                {
+                                                    // 璇诲彇璁惧楠岃瘉鏄惁缁戝畾鍒嗛亾
+                                                    var (respg, pzNo) = plcConn.GetPlcDBValue(lineNoModel.PosType, lineNoModel.DbNumber, lineNoModel.PlcPos);
+                                                    if (respg.IsSucceed)
+                                                    {
+                                                        if (pzNo != 0)
+                                                        {
+                                                            // plc姝ゅ垎閬撴湭瑙g粦
+                                                            break;
+                                                        }
+                                                        else 
+                                                        {
+                                                            // 鑷姩缁戝畾鍒嗛亾
+                                                            lineNoModel.OrderNo = orderModel.OrderNo;
+                                                            lineNoModel.LotNo = boxInfo.LotNo;
+                                                            lineNoModel.SkuNo = boxInfo.SkuNo;
+                                                            lineNoModel.SkuName = boxInfo.SkuName;
+                                                            lineNoModel.Qty = orderModel.Qty;
+                                                            lineNoModel.Status = "1";//宸茬粦瀹�
+                                                            lineNoModel.PZNo = skuInfo.PZNo;
+
+                                                            // 缁橮LC鍐欏叆鍝佽
+                                                            var ret = plcConn.SetPlcDBValue(lineNoModel.PosType, lineNoModel.DbNumber, lineNoModel.PlcPos, skuInfo.PZNo);
+                                                            if (ret.IsSucceed)
+                                                            {
+                                                                //鍐欏叆娴佺▼瀛楁垚鍔熷悗鏇存柊鍒嗘嫞浠诲姟
+                                                                _db.Updateable(lineNoModel).ExecuteCommand();
+                                                                //鏇存柊WcsOderTask琛�
+                                                                orderModel.Status = TaskStatusEnum.Doing;
+                                                                _db.Updateable(orderModel).ExecuteCommand();
+                                                                // Liudl 閫氱煡鍓嶇鏇存柊鍒嗘嫞浠诲姟
+                                                                //涓嬪彂鍒嗘嫞浠诲姟
+                                                                HubUtil.PublicCheckTask(lineNoModel.Adapt<WcsDeviceTaskOrderDto>());
+                                                                break;
+                                                            }
+                                                            else
+                                                            {
+                                                                throw Oops.Bah("涓嶱CL浜や簰澶辫触锛岀粦瀹氬け璐ワ紒");
+                                                            }
+                                                        }
+                                                    }
+                                                    else 
+                                                    {
+                                                        // 璇诲彇plc澶辫触
+                                                        break;
+                                                    }
+                                                }
+
+                                            }
+                                            else 
+                                            {
+                                                // 鑻ユ病鏈夌┖闂查亾锛岃繘琛屽墧闄ゅ鐞嗐�傞槻姝㈠牭濉炰欢绠辩嚎
+                                                var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
+                                                if (ret.IsSucceed)
+                                                {
+                                                    // 鍐欏叆娴佺▼鎺у埗瀛� 2
+                                                    var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+                                                    if (retVal.IsSucceed)
+                                                    {
+                                                        Log.Error("娌℃湁绌洪棽鍒嗛亾锛岃繘琛屽墧闄ゃ��");
+                                                        break;
+                                                    }
+                                                }
+                                                break;
+                                            }
+                                        }
+                                        else 
+                                        {// 缁戝畾鍒�8閬�
+                                         // 鑾峰彇鏈粦瀹氶亾
+                                            var lineNo8Model = _db.Queryable<WcsCheckTask>()
+                                                .First(m => m.Status == "0" && m.LineNo == "8" && m.RoboatType == PLCTypeEnum.RobotPalletizer);
+                                            if (lineNo8Model != null)
+                                            {
+                                                // 鑾峰彇褰撳墠鐗╂枡鍝佺鍙�
+                                                var skuInfo = await _db.Queryable<WcsMateialPzInfo>().Where(w => w.SkuNo == boxInfo.SkuNo).FirstAsync();
+                                                if (skuInfo == null)
+                                                {
+                                                    // 姝や骇鍝佽嫢娌¤瀹氬搧瑙勶紝杩涜鍓旈櫎澶勭悊銆傞槻姝㈠牭濉炰欢绠辩嚎
+                                                    var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
+                                                    if (ret.IsSucceed)
+                                                    {
+                                                        // 鍐欏叆娴佺▼鎺у埗瀛� 2
+                                                        var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+                                                        if (retVal.IsSucceed)
+                                                        {
+                                                            Log.Error("娌℃湁绌洪棽鍒嗛亾锛岃繘琛屽墧闄ゃ��");
+                                                            break;
+                                                        }
+                                                    }
+                                                    break;
+                                                }
+
+
+                                                // 璇诲彇璁惧楠岃瘉鏄惁缁戝畾鍒嗛亾
+                                                var (respg, pzNo) = plcConn.GetPlcDBValue(lineNo8Model.PosType, lineNo8Model.DbNumber, lineNo8Model.PlcPos);
+                                                if (respg.IsSucceed)
+                                                {
+                                                    if (pzNo != 0)
+                                                    {
+                                                        // plc姝ゅ垎閬撴湭瑙g粦
+                                                        break;
+                                                    }
+                                                    else
+                                                    {
+                                                        // 鑷姩缁戝畾鍒嗛亾
+                                                        lineNo8Model.OrderNo = orderModel.OrderNo;
+                                                        lineNo8Model.LotNo = boxInfo.LotNo;
+                                                        lineNo8Model.SkuNo = boxInfo.SkuNo;
+                                                        lineNo8Model.SkuName = boxInfo.SkuName;
+                                                        lineNo8Model.Qty = orderModel.Qty;
+                                                        lineNo8Model.Status = "1";//宸茬粦瀹�
+                                                        lineNo8Model.PZNo = skuInfo.PZNo;
+
+                                                        // 缁橮LC鍐欏叆鍝佽
+                                                        var ret = plcConn.SetPlcDBValue(lineNo8Model.PosType, lineNo8Model.DbNumber, lineNo8Model.PlcPos, skuInfo.PZNo);
+                                                        if (ret.IsSucceed)
+                                                        {
+                                                            //鍐欏叆娴佺▼瀛楁垚鍔熷悗鏇存柊鍒嗘嫞浠诲姟
+                                                            _db.Updateable(lineNo8Model).ExecuteCommand();
+                                                            //鏇存柊WcsOderTask琛�
+                                                            orderModel.Status = TaskStatusEnum.Doing;
+                                                            _db.Updateable(orderModel).ExecuteCommand();
+
+                                                            // Liudl 閫氱煡鍓嶇鏇存柊鍒嗘嫞浠诲姟
+                                                            //涓嬪彂鍒嗘嫞浠诲姟
+                                                            HubUtil.PublicCheckTask(lineNo8Model.Adapt<WcsDeviceTaskOrderDto>());
+                                                            break;
+                                                        }
+                                                        else
+                                                        {
+                                                            throw Oops.Bah("涓嶱CL浜や簰澶辫触锛岀粦瀹氬け璐ワ紒");
+                                                        }
+                                                    }
+                                                }
+                                                else
+                                                {
+                                                    // 璇诲彇plc澶辫触
+                                                    break;
+                                                }
+                                                
+
+                                            }
+                                            else
+                                            {
+                                                // 娌℃湁绌洪棽閬擄紝杩涜鍓旈櫎澶勭悊銆傞槻姝㈠牭濉炰欢绠辩嚎
+                                                var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
+                                                if (ret.IsSucceed)
+                                                {
+                                                    // 鍐欏叆娴佺▼鎺у埗瀛� 2
+                                                    var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+                                                    if (retVal.IsSucceed)
+                                                    {
+                                                        Log.Error("娌℃湁绌洪棽鍒嗛亾锛岃繘琛屽墧闄ゃ��");
+                                                        break;
+                                                    }
+                                                }
+                                                break;
+                                            }
+                                        }
+                                    }
+                                    else 
+                                    {
+                                        // 涓嶅叧鑱斿崟鎹洿鎺ヨ繘琛屽墧闄ゅ鐞�
+                                        var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "0");
+                                        if (ret.IsSucceed)
+                                        {
+                                            // 鍐欏叆娴佺▼鎺у埗瀛� 2
+                                            var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
+                                            if (retVal.IsSucceed)
+                                            {
+                                                Log.Error("绠辩爜鏈粦瀹氬垎鎷d换鍔★紝杩涜鍓旈櫎銆�");
+                                                break;
+                                            }
                                         }
                                     }
                                 }
@@ -1898,14 +2164,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;
@@ -2016,6 +2284,7 @@
                             }
 
                             var rowCount = _db.Updateable(boxInfo).ExecuteCommand();
+                            Log.Information(string.Format("鎻掔爜鎴愬姛锛岀鐮佹槸锛�"+ boxNo, modDevice.StationNum));
                             if (rowCount > 0)
                             {
                                 // 鎻掔爜鎴愬姛
@@ -2160,12 +2429,12 @@
                                     }
                                     break;
                                 }
+                                // 缁勬墭鎴愬姛鍚庡皢淇℃伅瀛樺埌log琛�
                                 string sqlStr = $"insert into WCSBoxInfoLog select * from WCSBoxInfo where IsDelete=0 and PalletNo='{palletNo}'";
                                 int insertCount = _db.Ado.ExecuteCommand(sqlStr);
                                 if (insertCount > 0)
                                 {
-                                    // 缁勬墭鎴愬姛鍚庡皢淇℃伅瀛樺埌log琛�
-                                    string sqlStr2 = $"delete from WCSBoxInfoLog where  IsDelete=0 and PalletNo='{palletNo}'";
+                                    string sqlStr2 = $"delete from WCSBoxInfo where  IsDelete=0 and PalletNo='{palletNo}'";
                                     _db.Ado.ExecuteCommand(sqlStr2);
                                 }
                                 
@@ -2260,13 +2529,13 @@
     }
 
     /// <summary>
-    /// 鎷嗗灈鏈哄櫒浜轰笟鍔″鐞�
+    /// 鍑哄簱浠剁杈撻�佸拰鎷嗗灈鏈哄櫒浜轰笟鍔″鐞�
     /// </summary>
     /// <param name="modDevice"></param>
     private static void StackingRobot(WcsDeviceDto modDevice)
     {
         var plcConn = modDevice.PLCUtil;
-        if (modDevice.DbNumber == "DB131" && modDevice.DbNumber == "DB132" && modDevice.DbNumber == "DB133" && modDevice.DbNumber == "DB134")
+        if (modDevice.DbNumber == "DB131" || modDevice.DbNumber == "DB132" || modDevice.DbNumber == "DB133" || modDevice.DbNumber == "DB134")
         {
             switch (modDevice.Value.ToString())
             {
@@ -2286,7 +2555,7 @@
                         // 鏍规嵁浠诲姟鍙疯幏鍙栦换鍔′俊鎭�
                         if (res1.IsSucceed)
                         {
-                            var modTask = _db.Queryable<WcsTask>().First(m => m.Status == TaskStatusEnum.Doing && m.TaskNo == tasknoVal && m.EndLocate == "009" && m.IsDelete == false);
+                            var modTask = _db.Queryable<WcsTask>().First(m => m.TaskNo == tasknoVal && m.EndLocate == "009" && m.IsDelete == false);
                             if (modTask == null)
                             {
                                 Log.Error(string.Format($"鍑哄簱浠诲姟鏈笅鍙戯紝璇蜂汉宸ュ鐞嗭紝鏃犳硶鎷嗗灈锛�"));
@@ -2296,33 +2565,33 @@
                             //閫氳繃浠诲姟鍙峰拰鎵樼洏鍙峰悜WMS鐢宠姝ゆ墭鐩樼殑鎷嗗灈淇℃伅
                             var http = new HttpService();
                             RequestBoxInfoCheckAll tasklist = http.RequestBoxCheckinfo(palletVal, tasknoVal);
-                            if (!tasklist.Success.Contains("-1"))
+                            if (tasklist.Success != -1)
                             {
                                 //鑾峰彇鎷嗗灈鐗╂枡鍝佺(闇�瑕佸鍔犵墿鏂欏垽鏂紝鍚屼竴涓墿鏂欏彿鍙兘浼氬嚭鐜颁笉鍚岀殑鐮佸灈瑙勫垯)
-                                var pz = _db.Queryable<WcsMateialPzInfo>().First(m => m.SkuNo == tasklist.list[0].SkuNo);
+                                var pz = _db.Queryable<WcsMateialPzInfo>().First(m => m.SkuNo == tasklist.data.SkuNo);
                                 //涓嬪彂鎷嗘墭瑙勬牸锛屾媶绠辨暟鍜屾墭鐩樹笂鎬荤鏁帮紙涓嶇粦瀹氭満鍣ㄤ汉锛屾媶鍨涗换鍔′俊鎭彧涓嬪彂涓�娆★級
                                 // 缁橮LC鍐欏叆浠诲姟鏁版嵁
                                 var listResult = new List<Result>();
                                 // 鑾峰彇鎵樼洏瑙勫垯
                                 var Standard = modDevice.listStation.FirstOrDefault(m => m.Text == "瑙勬牸");
-                                listResult.Add(plcConn.SetPlcDBValue(Standard.PosType, modDevice.DbNumber, Standard.PlcPos, tasklist.list[0].Standard));
+                                listResult.Add(plcConn.SetPlcDBValue(Standard.PosType, modDevice.DbNumber, Standard.PlcPos, pz.PZNo));
                                 //鎶撶鏁�
                                 var qty = modDevice.listStation.FirstOrDefault(m => m.Text == "鎷嗙鏁伴噺");
-                                listResult.Add(plcConn.SetPlcDBValue(qty.PosType, modDevice.DbNumber, qty.PlcPos, tasklist.list[0].Qty.ToString()));
+                                listResult.Add(plcConn.SetPlcDBValue(qty.PosType, modDevice.DbNumber, qty.PlcPos, tasklist.data.Qty.ToString()));
                                 //鎬荤鏁�
                                 var qtycount = modDevice.listStation.FirstOrDefault(m => m.Text == "鎬荤鏁�");
-                                listResult.Add(plcConn.SetPlcDBValue(qtycount.PosType, modDevice.DbNumber, qtycount.PlcPos, tasklist.list[0].QtyCount.ToString()));
+                                listResult.Add(plcConn.SetPlcDBValue(qtycount.PosType, modDevice.DbNumber, qtycount.PlcPos, tasklist.data.QtyCount.ToString()));
 
 
                                 // 鏄惁鍐欏叆鎴愬姛
                                 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;
                                 }
                             }
@@ -2334,6 +2603,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