From 33572be8da5fd6534b56e1e22d70e8cf56f5fe41 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期日, 27 四月 2025 17:00:11 +0800
Subject: [PATCH] 开发料桶转运功能

---
 Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs |  466 +++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 284 insertions(+), 182 deletions(-)

diff --git a/Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs b/Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs
index ed0d101..8856889 100644
--- a/Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs
+++ b/Wms/WMS.BLL/BllTransServer/HopperTransportServer.cs
@@ -6,10 +6,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Policy;
 using System.Text;
 using System.Threading.Tasks;
 using Utility.Tools;
+using WMS.BLL.LogServer;
 using WMS.DAL;
+using WMS.Entity.BllAsnEntity;
+using WMS.Entity.BllSoEntity;
 using WMS.Entity.Context;
 using WMS.Entity.DataEntity;
 using WMS.Entity.LogEntity;
@@ -354,7 +358,7 @@
                     string agvMsg = string.Empty;
                     //缁欎笅杞︿笅鍙戜换鍔�
                     logTaskEntry.SendDate = DateTime.Now;//鍙戦�佹椂闂�
-                    var agvResult = CreateTaskForAgv(task, url, out agvMsg);
+                    var agvResult = RcsHelper.CreateTaskForAgv(task, url, out agvMsg);
                     if (agvResult)//鎴愬姛
                     {
                         //璇锋眰鎴愬姛淇敼浠诲姟琛ㄧ浉搴斿瓧娈电姸鎬�
@@ -401,7 +405,7 @@
         /// <param name="lotNo">鎵规</param>
         /// <param name="userId">鎿嶄綔浜�</param>
         /// <exception cref="Exception"></exception>
-        public void jiaoCheHopper(string areaNo, string StartLocate, string plnNo, string plnStatus, decimal weight,  string skuNo, string lotNo, int userId)
+        public void jiaoCheHopper(string areaNo, string StartLocate, string plnNo, string plnStatus, decimal weight,  string skuNo, string lotNo, string url,int userId)
         {
             try
             {
@@ -409,7 +413,7 @@
 
                 if (string.IsNullOrWhiteSpace(areaNo) || string.IsNullOrWhiteSpace(StartLocate) || string.IsNullOrWhiteSpace(plnStatus))
                 {
-                    throw new Exception("鍖哄煙/鐩爣浣�/妗剁被鍨嬩笉鑳戒负绌�");
+                    throw new Exception("鍖哄煙/璧峰浣�/妗剁被鍨嬩笉鑳戒负绌�");
                 }
 
                 //if (plnStatus == "0" && string.IsNullOrWhiteSpace(standard))
@@ -421,29 +425,24 @@
                 {
                     throw new Exception("婊℃《璇烽�夋嫨鐗╂枡涓庢壒娆�");
                 }
-                //鍒ゆ柇鐩爣鍙枡鍌ㄤ綅鐘舵��
-                var endLocateInfo = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.LocatNo == StartLocate && m.AreaNo == areaNo);
-                if (endLocateInfo == null)
-                {
-                    throw new Exception("娌℃湁鏌ヨ鍒扮洰鏍囧偍浣嶄俊鎭�");
-                }
-                if (endLocateInfo.Flag != "0")
-                {
-                    throw new Exception("鐩爣鍌ㄤ綅鏍囪瘑涓嶆槸姝e父鍙敤鐨�");
-                }
-                if (endLocateInfo.Status != "0")
-                {
-                    throw new Exception("鐩爣鍌ㄤ綅鐘舵�佷笉鏄┖鍌ㄤ綅");
-                }
-
                 #endregion
+                //寮�鍚簨鍔�
+                Db.BeginTran();
 
-                var pln = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == plnNo);
-                var locate = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.AreaNo == areaNo && m.LocatNo == StartLocate);
-                var skuName = "";
-                var packagNo = "";
-                if (plnStatus == "2")
+                //妗朵俊鎭�
+                var pln = Db.Queryable<SysPallets>().First(w => w.IsDel == "0" && w.PalletNo == plnNo);
+                if (pln == null)
                 {
+                    throw new Exception("鏈煡璇㈠埌妗朵俊鎭�");
+                }
+
+                //璧峰鍌ㄤ綅淇℃伅
+                var startLoction = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.AreaNo == areaNo && m.LocatNo == StartLocate);
+                var skuName = "";//鐗╂枡鍚嶇О
+                var packagNo = "";
+                if (plnStatus == "2")//婊℃《
+                {
+                    //鐗╂枡淇℃伅
                     var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == skuNo);
                     if (sku == null)
                     {
@@ -455,7 +454,17 @@
                 {
 
                 }
+                //鐩爣妤煎眰
+                var layer = startLoction.Layer;
+                var houseStr = layer == 3 ? "3妤间腑闂寸珯" : layer == 4 ? "4妤间腑闂寸珯" : "";
+                //閫氳繃浠撳簱鍚嶇О鏌ヨ浠撳簱淇℃伅
+                var house = Db.Queryable<SysWareHouse>().First(m => m.IsDel == "0" && m.WareHouseName == houseStr);
+                if (house == null)
+                {
+                    throw new Exception("娌℃湁鏌ヨ鍒颁粨搴撲俊鎭�");
+                }
 
+                //妗跺簱瀛樻槑缁�
                 var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.PalletNo == plnNo);
                 if (stockDetail == null)
                 {
@@ -471,7 +480,7 @@
                         FrozenQty = 0,
                         InspectQty = 0,
 
-                        WareHouseNo = locate.WareHouseNo,
+                        WareHouseNo = startLoction.WareHouseNo,
                         AreaNo = areaNo,
                         LocatNo = StartLocate,
                         PalletNo = plnNo,
@@ -497,20 +506,26 @@
                     Db.Updateable(stockDetail).ExecuteCommand();
 
                 }
-                //鑾峰彇鍌ㄤ綅鍦板潃
+                //鍒嗛厤鍌ㄤ綅
+                var endLocatInfo = GetLocatModel(house.WareHouseNo, plnStatus, skuNo, pln.Standard);//鐩爣鍌ㄤ綅
+                //娌℃湁鍙敤绌哄偍浣�
+                if (endLocatInfo == null)
+                {
+                    throw new Exception("娌℃湁鎵惧埌鍚堥�傜殑鐩爣鍌ㄤ綅");
+                }
 
                 var taskNo = new Common().GetMaxNo("TK");
                 //娣诲姞浠诲姟
-                var task = new LogTask
+                var logTaskEntry = new LogTask
                 {
                     TaskNo = taskNo,
                     Sender = "WMS",
                     Receiver = "WCS",
                     IsSuccess = 0, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
 
-                    StartLocat = "",//璧峰浣嶇疆
-                    EndLocat = StartLocate,//鐩爣浣嶇疆
-                    PalletNo = "",//鎵樼洏鐮�
+                    StartLocat = StartLocate,//璧峰浣嶇疆
+                    EndLocat = endLocatInfo.LocatNo,//鐩爣浣嶇疆
+                    PalletNo = plnNo,//鎵樼洏鐮�
                     IsSend = 1,//鏄惁鍙啀娆′笅鍙�
                     IsCancel = 1,//鏄惁鍙彇娑�
                     IsFinish = 1,//鏄惁鍙畬鎴�
@@ -520,17 +535,187 @@
 
                     CreateTime = DateTime.Now
                 };
-                Db.Insertable(task).ExecuteCommand();
+                Db.Insertable(logTaskEntry).ExecuteCommand();
+
+                //缁勭粐涓嬪彂灏忚溅浠诲姟淇℃伅
+                var task = new TaskDetial
+                {
+                    Taskno = taskNo,//浠诲姟鍙�
+                    Startport = StartLocate,//璧峰浣嶇疆
+                    Endport = endLocatInfo.LocatNo,//鐩爣浣嶇疆
+                    Pallno = plnNo,//妗跺彿
+                    Crtype = "1",//鍙《
+                };
                 //璋冪敤AGV鎺ュ彛涓嬪彂浠诲姟
+                string agvMsg = string.Empty;
+                //缁欎笅杞︿笅鍙戜换鍔�
+                logTaskEntry.SendDate = DateTime.Now;//鍙戦�佹椂闂�
+                var agvResult = RcsHelper.CreateTaskForAgv(task, url, out agvMsg);
+                if (agvResult)//鎴愬姛
+                {
+                    //璇锋眰鎴愬姛淇敼浠诲姟琛ㄧ浉搴斿瓧娈电姸鎬�
+                    logTaskEntry.IsSuccess = 1;
+                    logTaskEntry.IsSend = 0;
+                    //logTaskEntry.IsCancel = 0;
+                    logTaskEntry.BackDate = DateTime.Now;
+                    logTaskEntry.Status = "1";//姝e湪鎵ц
+                    Db.Insertable(logTaskEntry).ExecuteCommand();
 
+                    startLoction.Status = "3";//鍑哄簱涓�
+                    Db.Updateable(startLoction).ExecuteCommand();
 
+                    endLocatInfo.Status = "2";//鍏ュ簱涓�
+                    Db.Updateable(endLocatInfo).ExecuteCommand();
+                }
+                else//澶辫触
+                {
+                    logTaskEntry.IsSuccess = 0;
+                    logTaskEntry.Information = agvMsg;
+                    Db.Insertable(logTaskEntry).ExecuteCommand();
+                }
 
+                //鎻愪氦浜嬪姟
+                Db.CommitTran();
             }
             catch (Exception e)
             {
+                //鍥炴粴浜嬪姟
+                Db.RollbackTran();
                 throw new Exception(e.Message);
             }
         }
+
+        /// <summary>
+        /// 灏忚溅鍙嶉浠诲姟瀹屾垚
+        /// </summary>
+        /// <param name="taskNo"></param>
+        /// <param name="status"></param>
+        /// <param name="comeFrom"></param>
+        /// <param name="userId"></param>
+        /// <exception cref="Exception"></exception>
+        public void RCSFinishTask(string taskNo, string status, string comeFrom, int userId = 0)
+        {
+            try
+            {
+                #region 鏉′欢鍒ゆ柇
+                var resultModel = new ErpModel() { Success = -1, Message = "" };
+                if (string.IsNullOrEmpty(taskNo))
+                {
+                    throw new Exception("浠诲姟鍙蜂笉鍙负绌�");
+                }
+                //浠诲姟淇℃伅
+                var taskInfo = Db.Queryable<LogTask>().First(w => w.TaskNo == taskNo);
+                if (taskInfo == null)
+                {
+                    throw new Exception($"浠诲姟鍙蜂负:{taskNo}鐨勪换鍔′笉瀛樺湪!");
+                }
+                if (taskInfo.Status != "1" && comeFrom != "WMS")
+                {
+                    throw new Exception($"浠诲姟鍙蜂负:{taskNo}鐨勪换鍔$姸鎬佸紓甯�");
+                }
+                #endregion
+                //寮�鍚簨鍔�
+                Db.BeginTran();
+                var comTime = DateTime.Now;
+
+                if (status == "0")
+                {
+                    taskInfo.Status = "3";//寮傚父缁撴潫
+                    //淇敼浠诲姟鐘舵��
+                    Db.Updateable(taskInfo).ExecuteCommand();
+
+                    resultModel.Success = 0;
+                    resultModel.Message = "鎴愬姛";
+
+                    //鎻愪氦浜嬪姟
+                    Db.CommitTran();
+
+                    return;
+                }
+                //搴撳瓨鏄庣粏
+                var stockDetail = Db.Queryable<DataStockDetail>().First(w => w.PalletNo == taskInfo.PalletNo);
+                if (stockDetail == null)
+                {
+                    throw new Exception($"妗跺簱瀛樹俊鎭笉瀛樺湪");
+                }
+                //璧峰鍌ㄤ綅淇℃伅
+                var startLocatInfo = Db.Queryable<SysStorageLocat>().First(w => w.LocatNo == taskInfo.StartLocat && w.IsDel == "0");
+                if (startLocatInfo == null)
+                {
+                    throw new Exception($"璧峰鍌ㄤ綅淇℃伅涓嶅瓨鍦�");
+                }
+                startLocatInfo.Status = "0";//绌哄偍浣�
+                //淇敼璧峰鍌ㄤ綅鐘舵��
+                Db.Updateable(startLocatInfo).ExecuteCommand();
+
+                //鐩爣鍌ㄤ綅淇℃伅
+                var endLocatInfo = Db.Queryable<SysStorageLocat>().First(w => w.LocatNo == taskInfo.EndLocat && w.IsDel == "0");
+                if (endLocatInfo == null)
+                {
+                    throw new Exception($"鐩爣鍌ㄤ綅淇℃伅涓嶅瓨鍦�");
+                }
+                endLocatInfo.Status = "1";//鏈夌墿鍝�
+                //淇敼鐩爣鍌ㄤ綅鐘舵��
+                Db.Updateable(endLocatInfo).ExecuteCommand();
+
+                //鐩爣鍌ㄤ綅鎵�灞炲尯鍩�
+                var endAreaInfo = Db.Queryable<SysStorageArea>().First(w => w.IsDel == "0" && w.WareHouseNo == endLocatInfo.WareHouseNo && w.AreaNo == endLocatInfo.AreaNo);
+                if (endAreaInfo == null)
+                {
+                    throw new Exception($"鐩爣鍌ㄤ綅鎵�灞炲尯鍩熶俊鎭笉瀛樺湪");
+                }
+
+                stockDetail.WareHouseNo = endLocatInfo.WareHouseNo;//鎵�灞炰粨搴�
+                stockDetail.RoadwayNo = endLocatInfo.RoadwayNo;//鎵�灞炲贩閬�
+                stockDetail.AreaNo = endLocatInfo.AreaNo;//鎵�灞炲尯鍩�
+                stockDetail.LocatNo = endLocatInfo.LocatNo;//鍌ㄤ綅鍦板潃
+                stockDetail.UpdateTime = DateTime.Now;//鏇存柊鏃堕棿
+                if (endAreaInfo.Type == "0")//鍑�妗跺尯
+                {
+                    stockDetail.PalletStatus = "0";
+                    stockDetail.Status = "0";//寰呭垎閰�
+                }
+                else if (endAreaInfo.Type == "1")//婊℃《鍖�
+                {
+                    stockDetail.PalletStatus = "1";
+                    stockDetail.Status = "0";//寰呭垎閰�
+                }
+                else if (endAreaInfo.Type == "2")//鑴忔《鍖�
+                {
+                    stockDetail.PalletStatus = "3";
+                    stockDetail.LotNo = "";//鎵规
+                    stockDetail.SkuNo = "";
+                    stockDetail.SkuName = "";
+                    stockDetail.Status = "0";//寰呭垎閰�
+                    stockDetail.InspectStatus = "0";//寰呮楠�
+                }
+                //淇敼搴撳瓨鏄庣粏
+                Db.Updateable(stockDetail).ExecuteCommand();
+                
+                taskInfo.Status = "2";//鎵ц瀹屾垚
+                taskInfo.IsSend = 0;
+                taskInfo.IsCancel = 0;
+                taskInfo.IsFinish = 0;
+                taskInfo.FinishDate = DateTime.Now;//瀹屾垚鏃堕棿
+                //淇敼浠诲姟鐘舵��
+                Db.Updateable(taskInfo).ExecuteCommand();
+
+                if (comeFrom == "WMS")
+                {
+                    //娣诲姞鎿嶄綔鏃ュ織璁板綍
+                    var k = new OperationCrServer().AddLogOperationCr("搴撳唴浣滀笟", "搴撳唴鏃ュ織", taskInfo.TaskNo, "瀹屾垚", $"鐐瑰嚮瀹屾垚鎸夐挳銆佷换鍔″彿涓猴細{taskInfo.TaskNo}鐨勪换鍔�", userId);
+                }
+                //鎻愪氦浜嬪姟
+                Db.CommitTran();
+            }
+            catch (Exception ex)
+            {
+                //鍥炴粴浜嬪姟
+                Db.RollbackTran();
+                throw new Exception(ex.Message);
+            }
+        }
+
 
         private bool YikuTask(string palletNo, string taskNo, string url)
         {
@@ -624,7 +809,7 @@
                         string agvMsg = string.Empty;
                         //缁欎笅杞︿笅鍙戜换鍔�
                         logTaskEntry.SendDate = DateTime.Now;//鍙戦�佹椂闂�
-                        var agvResult = CreateTaskForAgv(task, url, out agvMsg, "70");
+                        var agvResult = RcsHelper.CreateTaskForAgv(task, url, out agvMsg, "70");
                         if (agvResult)//鎴愬姛
                         {
                             //璇锋眰鎴愬姛淇敼浠诲姟琛ㄧ浉搴斿瓧娈电姸鎬�
@@ -719,7 +904,7 @@
                     string agvMsg = string.Empty;
                     //缁欎笅杞︿笅鍙戜换鍔�
                     logTaskInfoZ.SendDate = DateTime.Now;//鍙戦�佹椂闂�
-                    var agvResult = CreateTaskForAgv(task, url, out agvMsg, "70");
+                    var agvResult = RcsHelper.CreateTaskForAgv(task, url, out agvMsg, "70");
                     if (agvResult)//鎴愬姛
                     {
                         //璇锋眰鎴愬姛淇敼浠诲姟琛ㄧ浉搴斿瓧娈电姸鎬�
@@ -794,59 +979,7 @@
                             continue;
                         }
                         //鍒嗛厤鍌ㄤ綅
-                        var endLocatInfo = new SysStorageLocat();//鐩爣鍌ㄤ綅
-                        string areaNo = string.Empty;
-                        switch (detailInfo.PalletStatus)
-                        {
-                            case "0"://鍑�妗�
-                                //鏌ュ埌鍒板噣妗跺尯鍩熺紪鍙�
-                                areaNo = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.WareHouseNo == itemHouseNo && w.Type == "0").Select(s => s.AreaNo).First();
-                                //鍒嗛厤鍌ㄤ綅
-                                endLocatInfo = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0"
-                                                    && w.WareHouseNo == detailInfo.WareHouseNo && w.AreaNo == areaNo)
-                                                    .OrderBy(o => o.Row).OrderByDescending(o => o.Column).First();
-                                break;
-                            case "2"://婊℃《
-                                //鏌ュ埌鍒版弧妗跺尯鍩熺紪鍙�
-                                areaNo = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.WareHouseNo == itemHouseNo && w.Type == "1").Select(s => s.AreaNo).First();
-                                //鍒嗛厤鍌ㄤ綅
-                                //鍏堟煡鍒板悓鐗╂枡鐨勭粍
-                                string sql = $@"select Row from SysStorageLocat where WareHouseNo='{itemHouseNo}' and AreaNo='{areaNo}' and LocatNo in(
-	                                            select LocatNo from DataStockDetail where SkuNo='{detailInfo.SkuNo}' and SkuName='{detailInfo.SkuName}' and Standard='{detailInfo.Standard}' and WareHouseNo='{itemHouseNo}' and AreaNo='{areaNo}' 
-                                            ) group by Row";
-
-                                List<int> RowList = Db.Ado.SqlQuery<int>(sql).ToList();
-                                foreach (var rowItem in RowList)
-                                {
-                                    endLocatInfo = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0"
-                                                   && w.WareHouseNo == detailInfo.WareHouseNo && w.AreaNo == areaNo && w.Row == rowItem)
-                                                   .OrderByDescending(o => o.Column).First();
-
-                                    if (endLocatInfo != null)
-                                    {
-                                        break;
-                                    }
-                                }
-                                //娌℃湁鎵惧埌鐩稿悓鐗╂枡鍚岀粍鐨勭┖鍌ㄤ綅
-                                if (endLocatInfo == null)
-                                {
-                                    endLocatInfo = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0"
-                                                   && w.WareHouseNo == detailInfo.WareHouseNo && w.AreaNo == areaNo)
-                                                   .OrderBy(o => o.Row).OrderByDescending(o => o.Column).First();
-                                }
-
-                                break;
-                            case "3"://鑴忔《
-                               //鏌ュ埌鍒拌剰妗跺尯鍩熺紪鍙�
-                                areaNo = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.WareHouseNo == itemHouseNo && w.Type == "2").Select(s => s.AreaNo).First();
-                                //鍒嗛厤鍌ㄤ綅
-                                endLocatInfo = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0"
-                                                    && w.WareHouseNo == detailInfo.WareHouseNo && w.AreaNo == areaNo)
-                                                    .OrderBy(o => o.Row).OrderByDescending(o => o.Column).First();
-
-
-                                break;
-                        }
+                        var endLocatInfo = GetLocatModel(itemHouseNo,detailInfo.PalletStatus,detailInfo.SkuNo,detailInfo.Standard);//鐩爣鍌ㄤ綅
                         //娌℃湁鍙敤绌哄偍浣�
                         if (endLocatInfo == null)
                         {
@@ -888,7 +1021,7 @@
                         string agvMsg = string.Empty;
                         //缁欎笅杞︿笅鍙戜换鍔�
                         logTaskEntry.SendDate = DateTime.Now;//鍙戦�佹椂闂�
-                        var agvResult = CreateTaskForAgv(task, url, out agvMsg);
+                        var agvResult = RcsHelper.CreateTaskForAgv(task, url, out agvMsg);
                         if (agvResult)//鎴愬姛
                         {
                             //璇锋眰鎴愬姛淇敼浠诲姟琛ㄧ浉搴斿瓧娈电姸鎬�
@@ -928,110 +1061,79 @@
                 throw new Exception(e.Message);
             }
         }
+
         /// <summary>
-        /// 缁欏皬杞︿笅鍙戜换鍔�
+        /// 鍒嗛厤鍌ㄤ綅
         /// </summary>
-        /// <param name="req"></param>
+        /// <param name="houseNo">浠撳簱缂栧彿</param>
+        /// <param name="palletStatus">妗剁姸鎬�</param>
+        /// <param name="skuNo">鐗╂枡缂栫爜</param>
+        /// <param name="standard">妗惰鏍�</param>
         /// <returns></returns>
-        public bool CreateTaskForAgv(TaskDetial taskDetial, string url, out string agvMsg, string priority = null)
+        /// <exception cref="Exception"></exception>
+        private SysStorageLocat GetLocatModel(string houseNo, string palletStatus,string skuNo="",string standard="")
         {
-            bool result = false;
-
-            #region 鍛煎彨灏忚溅浠g爜
-            List<PositionCodePath> pahtList = new List<PositionCodePath>();
-            //璧峰浣嶇疆
-            PositionCodePath path1 = new PositionCodePath();
-            path1.positionCode = taskDetial.Startport;
-            if (taskDetial.Crtype == "1")//鍙《锛堟《鍑哄簱锛�
+            try
             {
-                path1.type = "05";
-            }
-            else if (taskDetial.Crtype == "0")//鐢宠鍌ㄤ綅锛堟《鍏ュ簱锛�
-            {
-                path1.type = "00";
-            }
-            else//鍚岃溅闂村钩灞傛惉杩�
-            {
-                path1.type = "05";
-            }
-            pahtList.Add(path1);
-
-            //鐩爣浣嶇疆
-            PositionCodePath path2 = new PositionCodePath();
-            path2.positionCode = taskDetial.Endport;
-            if (taskDetial.Crtype == "1")//鍙《锛堟《鍑哄簱锛�
-            {
-                path2.type = "00";
-            }
-            else if (taskDetial.Crtype == "1")//鐢宠鍌ㄤ綅锛堟《鍏ュ簱锛�
-            {
-                path2.type = "05";
-            }
-            else //鍚岃溅闂村钩灞傛惉杩�
-            {
-                path2.type = "05";
-            }
-            pahtList.Add(path2);
-
-            //涓嬭溅浠诲姟鍗�
-            AgvSchedulingTask agvTask = new AgvSchedulingTask();
-            agvTask.reqCode = taskDetial.Taskno;//璇锋眰缂栧彿
-            agvTask.taskCode = taskDetial.Taskno;//浠诲姟鍙�
-            agvTask.ctnrCode = taskDetial.Pallno;//妗跺彿            
-            agvTask.reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");//璇锋眰鏃堕棿                
-            agvTask.wbCode = "";
-            agvTask.positionCodePath = pahtList;//灏忚溅璺緞
-            agvTask.podCode = "";
-            agvTask.userCallCode = "";//taskDetial.Endport;//鐩爣浣嶇疆
-            agvTask.priority = priority;//浼樺厛绾�
-            //鍒ゆ柇瀹瑰櫒绫诲瀷
-            agvTask.ctnrTyp = "1";// 1锛氭《 2锛氭《锛堝皬锛� 3锛氭墭鐩�
-
-            //鍒ゆ柇浠诲姟绫诲瀷
-            if (taskDetial.Crtype == "1")//鍙《锛堟《鍑哄簱锛�
-            {
-                agvTask.taskTyp = "Z3";//浠诲姟绫诲瀷 绾胯竟鍒版墭鐩樻敹闆嗗櫒 Z1锛� 鎵樼洏鍨涚敵璇峰叆搴� Z2
-            }
-            else if (taskDetial.Crtype == "0")//鐢宠鍌ㄤ綅锛堟《鍏ュ簱锛�
-            {
-                agvTask.taskTyp = "Z4";//浠诲姟绫诲瀷 绾胯竟鍒版墭鐩樻敹闆嗗櫒 Z1锛� 鎵樼洏鍨涚敵璇峰叆搴� Z2
-            }
-            else//鍚岃溅闂村钩灞傛惉杩�
-            {
-                agvTask.taskTyp = "Z5";
-            }
-
-            // 姝e紡杩愯绋嬪簭鏀惧紑
-            var jsonData = JsonConvert.SerializeObject(agvTask);
-            string response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV杞繍鍛戒护", "AGV");
-            //瑙f瀽杩斿洖鏁版嵁 
-            var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
-            if (agvModel.Code == "0")
-            {
-                result = true;//缁欎笅杞︿笅鍙戜换鍔℃垚鍔�
-
-                agvMsg = "";
-            }
-            else
-            {
-                string logMsg = "";
-                if (taskDetial.Crtype == "1")//鍙《锛堟《鍑哄簱锛�
+                var endLocatInfo = new SysStorageLocat();//鐩爣鍌ㄤ綅
+                string areaNo = string.Empty;
+                switch (palletStatus)
                 {
-                    logMsg = "鐢宠鍙《";
-                }
-                else if (taskDetial.Crtype == "0")//鐢宠鍌ㄤ綅锛堟《鍏ュ簱锛�
-                {
-                    logMsg = "鐢宠鍌ㄤ綅";
-                }
-                var logStr = $@".\log\AGV\AGV{logMsg}" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
-                LogFile.SaveLogToFile($"AGV{logMsg}寮傚父锛�( {agvModel.Message} ),", logStr);
+                    case "0"://鍑�妗�
+                             //鏌ュ埌鍒板噣妗跺尯鍩熺紪鍙�
+                        areaNo = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.Type == "0").Select(s => s.AreaNo).First();
+                        //鍒嗛厤鍌ㄤ綅
+                        endLocatInfo = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0"
+                                            && w.WareHouseNo == houseNo && w.AreaNo == areaNo)
+                                            .OrderBy(o => o.Row).OrderByDescending(o => o.Column).First();
+                        break;
+                    case "2"://婊℃《
+                             //鏌ュ埌鍒版弧妗跺尯鍩熺紪鍙�
+                        areaNo = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.Type == "1").Select(s => s.AreaNo).First();
+                        //鍒嗛厤鍌ㄤ綅
+                        //鍏堟煡鍒板悓鐗╂枡鐨勭粍
+                        string sql = $@"select Row from SysStorageLocat where WareHouseNo='{houseNo}' and AreaNo='{areaNo}' and LocatNo in(
+	                                            select LocatNo from DataStockDetail where SkuNo='{skuNo}' and Standard='{standard}' and WareHouseNo='{houseNo}' and AreaNo='{areaNo}' 
+                                            ) group by Row";
 
-                agvMsg = agvModel.Message;
+                        List<int> RowList = Db.Ado.SqlQuery<int>(sql).ToList();
+                        foreach (var rowItem in RowList)
+                        {
+                            endLocatInfo = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0"
+                                           && w.WareHouseNo == houseNo && w.AreaNo == areaNo && w.Row == rowItem)
+                                           .OrderByDescending(o => o.Column).First();
+
+                            if (endLocatInfo != null)
+                            {
+                                break;
+                            }
+                        }
+                        //娌℃湁鎵惧埌鐩稿悓鐗╂枡鍚岀粍鐨勭┖鍌ㄤ綅
+                        if (endLocatInfo == null)
+                        {
+                            endLocatInfo = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0"
+                                           && w.WareHouseNo == houseNo && w.AreaNo == areaNo)
+                                           .OrderBy(o => o.Row).OrderByDescending(o => o.Column).First();
+                        }
+
+                        break;
+                    case "3"://鑴忔《
+                             //鏌ュ埌鍒拌剰妗跺尯鍩熺紪鍙�
+                        areaNo = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.Type == "2").Select(s => s.AreaNo).First();
+                        //鍒嗛厤鍌ㄤ綅
+                        endLocatInfo = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0"
+                                            && w.WareHouseNo == houseNo && w.AreaNo == areaNo)
+                                            .OrderBy(o => o.Row).OrderByDescending(o => o.Column).First();
+
+
+                        break;
+                }
+                return endLocatInfo;
             }
-            return result;
-            #endregion
+            catch (Exception ex)
+            {
+                throw new Exception(ex.Message);
+            }
         }
-
-
     }
 }

--
Gitblit v1.8.0