From 157abc191c34e57c1b958ae74fc3de6518ca8a30 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 28 二月 2025 11:06:36 +0800
Subject: [PATCH] 修改客户需求

---
 Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 1251 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 1,192 insertions(+), 59 deletions(-)

diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index 4bb15cd..73bf387 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -1,16 +1,28 @@
 锘縰sing System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Policy;
 using System.Text;
+using System.Threading.Tasks;
+using Model.InterFaceModel;
 using Model.ModelDto.BllCheckDto;
+using Model.ModelDto.LogDto;
 using Model.ModelDto.PdaDto;
+using Model.ModelDto.SysDto;
+using Model.ModelVm;
+using Newtonsoft.Json;
 using SqlSugar;
+using Utility.Tools;
 using WMS.BLL.LogServer;
+using WMS.BLL.SysServer;
+using WMS.DAL;
 using WMS.Entity.BllAsnEntity;
 using WMS.Entity.BllCheckEntity;
 using WMS.Entity.BllSoEntity;
 using WMS.Entity.Context;
 using WMS.Entity.DataEntity;
+using WMS.Entity.LogEntity;
 using WMS.Entity.SysEntity;
 using WMS.IBLL.IPdaServer;
 
@@ -137,7 +149,7 @@
                     {
                         PalletNo = palletNo,
                         SkuNo = sku,
-                        Qty = (int?)stockDetail.Qty,
+                        Qty = stockDetail.Qty,
                         CheckResult = 4,
                     };
 
@@ -169,7 +181,7 @@
             }
         }
 
-        public void CrSetCheck(string crNo, string crDetail, string palletNo, string boxNo, string boxNo3, string result, int? qty, string isContinue, int userId)
+        public void CrSetCheck(string crNo, string crDetail, string palletNo, string boxNo, string boxNo3, string result, decimal? qty, string isContinue, int userId)
         {
             try
             {
@@ -293,6 +305,17 @@
                         checkDetail.RealQty = qty;
                     }
                     checkDetail.CheckResult = 1;
+                    var checkInfo = Db.Queryable<BllStockCheckLog>().First(m =>
+                    m.IsDel == "0" && m.CRNo == crNo && m.PalletNo == palletNo && m.SkuNo == sku && m.LotNo == lotNo);
+                    checkInfo.RealQty = qty;
+                    checkInfo.CheckResult = 1;
+
+                    checkInfo.CheckUserId = userId;
+                    checkInfo.CheckDate = time;
+
+                    checkInfo.UpdateUser = userId;
+                    checkInfo.UpdateTime = time;
+                    Db.Updateable(checkInfo).ExecuteCommand();
                     Db.Updateable(checkDetail).ExecuteCommand();
                     Db.Updateable(list).ExecuteCommand();
                 }
@@ -760,32 +783,40 @@
         {
             try
             {
-                var models = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo);
-                if (models == null)
-                {
-                    throw new Exception("鎵樼洏搴撳瓨淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
-                }
-                if (string.IsNullOrEmpty(models.LocatNo))
-                {
-                    throw new Exception("鎵樼洏鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
-                }
-                if (models.WareHouseNo != "W02")
-                {
-                    throw new Exception("璇ユ墭鐩樻湭鍦ㄥ钩搴撳唴,璇锋鏌�!");
-                }
-                var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == models.LocatNo);
-                if (storageLocat == null)
-                {
-                    throw new Exception("鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
-                }
                 var storageArea = new List<SysStorageArea>();
-                if (storageLocat.AreaNo.Contains("B0"))
+                if (string.IsNullOrEmpty(palletNo))
                 {
-                    storageArea = Db.Queryable<SysStorageArea>().Where(w => w.AreaNo.Contains("B0")).ToList();
+                    storageArea = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.WareHouseNo == "W02").OrderBy(o => o.AreaNo).ToList();
                 }
                 else
                 {
-                    storageArea = Db.Queryable<SysStorageArea>().Where(w => w.AreaNo.Contains("B1")).ToList();
+                    var models = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo);
+                    if (models == null)
+                    {
+                        throw new Exception("鎵樼洏搴撳瓨淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+                    }
+                    if (string.IsNullOrEmpty(models.LocatNo))
+                    {
+                        throw new Exception("鎵樼洏鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+                    }
+                    //if (models.WareHouseNo != "W02")
+                    //{
+                    //    throw new Exception("璇ユ墭鐩樻湭鍦ㄥ钩搴撳唴,璇锋鏌�!");
+                    //}
+                    var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == models.LocatNo);
+                    if (storageLocat == null)
+                    {
+                        throw new Exception("鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+                    }
+
+                    if (storageLocat.AreaNo.Contains("B0"))
+                    {
+                        storageArea = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.AreaNo.Contains("B0") && w.WareHouseNo == "W02").OrderBy(o => o.AreaNo).ToList();
+                    }
+                    else
+                    {
+                        storageArea = Db.Queryable<SysStorageArea>().Where(w => w.IsDel == "0" && w.Status == "0" && w.AreaNo.Contains("B1") && w.WareHouseNo == "W02").OrderBy(o => o.AreaNo).ToList();
+                    }
                 }
                 return storageArea;
             }
@@ -802,7 +833,7 @@
         {
             try
             {
-                var allotList = Db.Queryable<BllExportNotice>().Where(m => m.IsDel == "0" && m.Status == "2").Select(m => m.SONo).Distinct().ToList();
+                var allotList = Db.Queryable<BllExportNotice>().Where(m => m.IsDel == "0" && (m.Status == "3" || m.Status == "4")).Select(m => m.SONo).Distinct().ToList();
                 return allotList;
             }
             catch (Exception ex)
@@ -854,12 +885,12 @@
         }
 
         /// <summary>
-        /// agv杞繍鍛煎彨灏忚溅-寮�鍙戞湭瀹屾垚寰呯‘璁�
+        /// agv杞繍鍛煎彨灏忚溅
         /// </summary>
         /// <param name="palletNo"></param>
         /// <param name="areaNo"></param>
         /// <param name="ruku"></param>
-        public void AgvTransport(string palletNo, string areaNo, string ruku, int userId)
+        public void AgvTransport(string palletNo, string areaNo, string ruku, int userId, string url, string wcsurl)
         {
             if (string.IsNullOrEmpty(palletNo))
             {
@@ -869,12 +900,46 @@
             {
                 throw new Exception("璇烽�夋嫨鐩爣鍖哄煙鎴栧叆搴撳彛锛�");
             }
+            if (!string.IsNullOrEmpty(areaNo) && !string.IsNullOrEmpty(ruku))
+            {
+                throw new Exception("鐩爣鍖哄煙鍜屽叆搴撳彛涓嶈兘鍚屾椂閫夋嫨锛�");
+            }
             try
             {
+                string EndLocat = string.Empty,OrderTy = "";//鐩爣浣嶇疆
+                var tasktype = "D00";  //灏忚溅浠诲姟绫诲瀷锛岄粯璁や负鐐瑰埌鐐逛换鍔�                              
+
+                var log = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && (w.Status == "0" || w.Status == "1"));
+                if (log != null)
+                {
+                    throw new Exception("璇ユ墭鐩樺凡鏈夊皬杞︾瓑寰呮墽琛屾垨姝e湪鎵ц鐨勪换鍔�!");
+                }
                 var stockDetail = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo);
                 if (stockDetail == null)
                 {
-                    throw new Exception("鎵樼洏搴撳瓨淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+                    throw new Exception("鎵樼洏涓婄墿鏂欏簱瀛樻槑缁嗕俊鎭笉瀛樺湪,璇锋鏌�!");
+                }
+                if (!string.IsNullOrEmpty(areaNo))
+                {
+                    var storageArea = Db.Queryable<SysStorageArea>().First(w => w.IsDel == "0" && w.AreaNo == areaNo);
+                    if (storageArea == null)
+                    {
+                        throw new Exception("鎵�閫夊尯鍩熶俊鎭笉瀛樺湪,璇锋鏌�!");
+                    }
+                    EndLocat = GetLocat(areaNo, stockDetail.SkuNo, stockDetail.LotNo, palletNo);
+                    OrderTy = "3";//绉诲簱
+                }
+                else
+                {
+                    EndLocat = ruku;
+                    OrderTy = "0";//鍏ュ簱
+
+
+                }
+                var stock = Db.Queryable<DataStock>().First(w => w.IsDel == "0" && w.SkuNo == stockDetail.SkuNo && w.LotNo == stockDetail.LotNo);
+                if (stock == null)
+                {
+                    throw new Exception("鎵樼洏涓婄墿鏂欏簱瀛樹俊鎭笉瀛樺湪,璇锋鏌�!");
                 }
                 if (string.IsNullOrEmpty(stockDetail.LocatNo))
                 {
@@ -884,28 +949,187 @@
                 {
                     throw new Exception("璇ユ墭鐩樻湭鍦ㄥ钩搴撳唴,璇锋鏌�!");
                 }
+                //璧峰鍌ㄤ綅淇℃伅
                 var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == stockDetail.LocatNo);
                 if (storageLocat == null)
                 {
                     throw new Exception("鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
                 }
+                //鐩爣鍌ㄤ綅淇℃伅
+                var storageLocatEnd = new SysStorageLocat();
+                if (!string.IsNullOrEmpty(areaNo))
+                {
+                    storageLocatEnd = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == EndLocat && w.Flag == "0" && w.Status == "0");
+                    if (storageLocatEnd == null)
+                    {
+                        throw new Exception("鐩爣鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+                    }
+                }
+
                 //寮�鍚簨鍔�
                 Db.BeginTran();
+
+                //璇锋眰WCS鍏ュ簱鍙f斁璐х‘璁�
+                if (!string.IsNullOrEmpty(ruku))
+                {
+                    try
+                    {
+                        var port = new
+                        {
+                            Port = EndLocat
+                        };
+                        var json = JsonConvert.SerializeObject(port);
+                        var res = HttpHelper.DoPost(wcsurl, json, "璇锋眰WCS鍏ュ簱鍙f槸鍚﹀彲鏀捐揣", "WCS");
+
+                        //////瑙f瀽杩斿洖鏁版嵁 
+                        var ret = JsonConvert.DeserializeObject<WcsModel>(res);
+                        if (ret.StatusCode == -1)
+                        {
+                            throw new Exception(EndLocat + "鍙峰叆搴撳彛宸叉湁鍏朵粬浠诲姟鍗犵敤,璇烽�夋嫨鍏朵粬鍏ュ簱鍙�");
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new Exception(ex.Message);
+                    }
+                }
+                
+                
+
+                //娣诲姞鍑哄簱浠诲姟
+                var taskNo = new Common().GetMaxNo("TK");
+                var exTask = new LogTask
+                {
+                    TaskNo = taskNo,
+                    Sender = "WMS",
+                    Receiver = "AGV",
+                    IsSuccess = 0, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+
+                    StartLocat = stockDetail.LocatNo,//璧峰浣嶇疆
+                    EndLocat = EndLocat,//鐩爣浣嶇疆
+                    PalletNo = palletNo,//鎵樼洏鐮�
+                    Msg = string.Format("杞繍浠诲姟锛歿0}=>>{1}", stockDetail.LocatNo, EndLocat),
+                    IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+                    IsCancel = 1,//鏄惁鍙彇娑�
+                    IsFinish = 1,//鏄惁鍙畬鎴�
+                    Type = OrderTy,//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟  2 绉诲簱浠诲姟
+                    Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝e湪鎵ц2鎵ц瀹屾垚
+                    OrderType = OrderTy,//0 鍏ュ簱鍗� 1 鍑哄簱鍗�  2 鐩樼偣鍗�  3 绉诲簱鍗�
+
+                    CreateTime = DateTime.Now
+                };
+                Db.Insertable(exTask).ExecuteCommand();
+
                 //淇敼搴撳瓨鏄庣粏淇℃伅
-                stockDetail.WareHouseNo = "";
-                stockDetail.RoadwayNo = "";
-                stockDetail.AreaNo = "";
-                stockDetail.LocatNo = "";
-
+                stockDetail.Status = "4";//绉诲簱閿佸畾
+                //stockDetail.LockQty = stockDetail.Qty;//閿佸畾搴撳瓨鏁伴噺
                 Db.Updateable(stockDetail).ExecuteCommand();
-                //淇敼鍌ㄤ綅鍦板潃鐘舵��
-                storageLocat.Status = "0";//绌哄偍浣�
+                //淇敼搴撳瓨淇℃伅
+                //stock.LockQty += (decimal)stockDetail.Qty;
+                //Db.Updateable(stock).ExecuteCommand();
 
+                //淇敼璧峰鍌ㄤ綅鍦板潃鐘舵��
+                storageLocat.Status = "5";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑 
                 Db.Updateable(storageLocat).ExecuteCommand();
+
+                //淇敼鐩爣鍌ㄤ綅鍦板潃鐘舵��
+                if (storageLocatEnd != null)
+                {
+                    storageLocatEnd.Status = "4";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑 
+                    Db.Updateable(storageLocatEnd).ExecuteCommand();
+                }
+                //娣诲姞鎿嶄綔鏃ュ織璁板綍
+                var k = new OperationCrServer().AddLogOperationCr("PDA妯″潡", "AGV杞繍", palletNo, OrderTy == "0" ?"鍏ュ簱":"绉诲簱", $"PDA鍛煎彨灏忚溅瀵规墭鐩樺彿锛歿palletNo}鍙戣捣杞繍", userId);
 
                 #region 鍛煎彨灏忚溅浠g爜
 
+                var endlono = EndLocat;
+                if (OrderTy == "0")
+                {
+                    tasktype = "RK0"; //鍏ュ簱浠诲姟
+                }
+
+                //缂撳瓨搴撲綅杞崲     3妤兼帴椹充綅Y003_001锛孻003_002锛孻003_003  
+                if (storageLocatEnd.AreaNo == "B12")
+                {
+                    switch (EndLocat.ToString().Substring(4, 1))
+                    {
+                        case "1":
+                            endlono = "Y003_0" + EndLocat.ToString().Substring(5, 2);
+                            tasktype = "D00";     //鐐瑰埌鐐逛换鍔�
+                            break;
+                        default:
+                            break;
+                    }
+                }
+
+                //鐐瑰埌鐐规寚浠ら泦鍚�
+                object[] position = new object[2];
+                position[0] = new
+                {
+                    positionCode = stockDetail.LocatNo,
+                    type = "00"
+                };
+                position[1] = new
+                {
+                    positionCode = endlono,
+                    type = "00"
+                };
+
+                List<AgvSchedulingTask> agvTaskList = new List<AgvSchedulingTask>();
+               
+
+                AgvSchedulingTask agvTask = new AgvSchedulingTask();
+                Random r = new Random();
+                long ran = DateTime.Now.Ticks;
+                agvTask.ReqCode = ran.ToString();
+                agvTask.TaskCode = taskNo;
+                agvTask.TaskTyp = tasktype;
+                agvTask.PositionCodePath = position;
+                agvTask.CtnrTyp = "1";
+                if (tasktype == "D02")
+                {
+                    agvTask.CtnrNum = "10";     //鍙犳墭浠诲姟闇�瑕佷笅鍙戠┖鎵樼洏鏁伴噺
+                }
+
+                agvTaskList.Add(agvTask);
+
+                
+                // 姝e紡杩愯绋嬪簭鏀惧紑
+                string str = "";
+                var list2 = agvTaskList.Select(m => m.TaskCode).ToList();
+                var jsonData = JsonConvert.SerializeObject(agvTaskList);
+                jsonData = jsonData.Substring(1, jsonData.Length - 1);
+                jsonData = jsonData.Substring(0, jsonData.Length - 1);
+                string response = "";
+
+                try
+                {
+                    var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+                    response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV杞繍鍛戒护", "AGV");
+                    var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
+
+                    //////瑙f瀽杩斿洖鏁版嵁 
+                    var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
+                    if (agvModel.Code == "0")
+                    {
+                        //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
+                        new TaskServer().EditTaskIssueOk(list2, time1, time2);
+                        str += "涓嬪彂鎴愬姛";
+                    }
+                    if (agvModel.Code == "1")
+                    {
+                        new TaskServer().EditTaskIssueNo(list2, time1, time2, agvModel.Message);
+                        throw new Exception(agvModel.Message);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    throw new Exception(ex.Message);
+                }
+               
                 #endregion
+
                 //鎻愪氦浜嬪姟
                 Db.CommitTran();
             }
@@ -916,21 +1140,17 @@
             }
         }
         /// <summary>
-        /// agv杞繍鍛煎彨灏忚溅鍙栬揣-寮�鍙戞湭瀹屾垚寰呯‘璁�
+        /// agv杞繍鍛煎彨灏忚溅鍙栬揣
         /// </summary>
         /// <param name="soNo"></param>
         /// <param name="palletNo"></param>
         /// <param name="areaNo"></param>
         /// <param name="userId"></param>
-        public void AgvTransport2(string soNo,string palletNo, string areaNo, int userId)
+        public List<string> AgvTransport2(string soNo, string palletNo, string areaNo,string ruku, int userId, string url)
         {
             if (string.IsNullOrEmpty(soNo))
             {
                 throw new Exception("璇烽�夋嫨鍑哄簱鍗曟嵁锛�");
-            }
-            if (string.IsNullOrEmpty(palletNo))
-            {
-                throw new Exception("璇锋壂鎻忔墭鐩樻潯鐮侊紒");
             }
             if (string.IsNullOrEmpty(areaNo))
             {
@@ -938,51 +1158,437 @@
             }
             try
             {
+                //寮�鍚簨鍔�
+                Db.BeginTran();
+                List<AgvSchedulingTask> agvTaskList = new List<AgvSchedulingTask>();
+                var strList = new List<string>();//閿欒淇℃伅闆嗗悎  //0 锛氶儴鍒嗘墭鐩樺凡鏈夊皬杞︾瓑寰呮墽琛屾垨姝e湪鎵ц鐨勪换鍔�
+                //鍑哄簱鍗曚俊鎭�
                 var notice = Db.Queryable<BllExportNotice>().First(w => w.IsDel == "0" && w.SONo == soNo);
                 if (notice == null)
                 {
                     throw new Exception("鍑哄簱鍗曟嵁淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
                 }
-                var allot = Db.Queryable<BllExportAllot>().First(w => w.IsDel == "0" && w.SONo == soNo && w.PalletNo == palletNo);
-                if (allot == null)
+                //鐩爣鍖哄煙淇℃伅
+                var storageArea = Db.Queryable<SysStorageArea>().First(w => w.IsDel == "0" && w.AreaNo == areaNo);
+                if (storageArea == null)
                 {
-                    throw new Exception("璇ユ墭鐩樺嚭搴撳垎閰嶄俊鎭笉瀛樺湪,璇锋鏌�!");
+                    throw new Exception("鎵�閫夊尯鍩熶俊鎭笉瀛樺湪,璇锋鏌�!");
                 }
-                var stockDetail = Db.Queryable<DataStockDetail>().First(w => w.IsDel == "0" && w.PalletNo == palletNo);
-                if (stockDetail == null)
+                List<DataStockDetail> stockDetailList = new List<DataStockDetail>();//闇�瑕佺殑鎵樼洏鏄庣粏
+                if (!string.IsNullOrEmpty(palletNo))//鍗曟墭鐩樺彨璐�
                 {
-                    throw new Exception("鎵樼洏搴撳瓨淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+                    stockDetailList = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.PalletNo == palletNo).ToList();
                 }
-                if (string.IsNullOrEmpty(stockDetail.LocatNo))
+                else//鏁翠釜鍑哄簱鍗曞彨璐�
                 {
-                    throw new Exception("鎵樼洏鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+                //    string sqlStr = $"select * from DataStockDetail where PalletNo in (select PalletNo from BllExportAllot where IsDel='0' and SONo='{soNo}')";
+                //    stockDetailList = Db.Ado.SqlQuery<DataStockDetail>(sqlStr).ToList();
+                    stockDetailList = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.SONo == soNo).ToList();
                 }
-                if (stockDetail.WareHouseNo != "W02")
+                if (stockDetailList.Count <= 0)
                 {
-                    throw new Exception("璇ユ墭鐩樻湭鍦ㄥ钩搴撳唴,璇锋鏌�!");
+                    throw new Exception("鎵樼洏鏄庣粏涓嶅瓨鍦�,璇锋鏌�!");
                 }
-                var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == stockDetail.LocatNo);
+
+                var log = Db.Queryable<LogTask>().Where(w => w.IsDel == "0" && (w.Status == "0" || w.Status == "1"));//浠诲姟琛�
+                var storageLocat = Db.Queryable<SysStorageLocat>().Where(w => w.IsDel == "0");//鍌ㄤ綅琛�
+                var stock = Db.Queryable<DataStock>().Where(w => w.IsDel == "0");//搴撳瓨鎬昏〃
+                string EndLocat = string.Empty;//鐩爣浣嶇疆
+                string hasLocatNoList = string.Empty;//宸插垎閰嶇殑鍌ㄤ綅
+
+                foreach (var item in stockDetailList)
+                {
+                    
+                    if (string.IsNullOrEmpty(item.LocatNo))
+                    {
+                        throw new Exception($"鎵樼洏鍙凤細{item.PalletNo}鐨勫偍浣嶄俊鎭笉瀛樺湪,璇锋鏌�!");
+                    }
+                    if (item.WareHouseNo != "W02")
+                    {
+                        throw new Exception($"鎵樼洏鍙凤細{item.PalletNo}鏈湪骞冲簱鍐�,璇锋鏌�!");
+                    }
+                    //浠诲姟淇℃伅
+                    var logInfo = log.First(w => w.PalletNo == item.PalletNo);
+                    if (logInfo != null)
+                    {
+                        if (!strList.Contains("1"))
+                        {
+                            strList.Add("1");
+                        }
+                        continue;
+                        //throw new Exception($"鎵樼洏鍙凤細{item.PalletNo}宸叉湁灏忚溅绛夊緟鎵ц鎴栨鍦ㄦ墽琛岀殑浠诲姟!");
+                    }
+                    //璧峰鍌ㄤ綅淇℃伅
+                    var storageLocatBegin = storageLocat.First(w => w.LocatNo == item.LocatNo);
+                    if (storageLocat == null)
+                    {
+                        throw new Exception($"鎵樼洏鍙凤細{item.PalletNo}鎵�鍦ㄧ殑鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+                    }
+                    //鑾峰彇鐩爣鍌ㄤ綅
+                    EndLocat = GetLocat(areaNo, item.SkuNo, item.LotNo, palletNo);
+                    if (string.IsNullOrEmpty(EndLocat))
+                    {
+                        throw new Exception("鍒嗛厤鐩爣鍌ㄤ綅澶辫触,璇锋鏌�!");
+                    }
+                    if (string.IsNullOrEmpty(hasLocatNoList))
+                    {
+                        hasLocatNoList = EndLocat;
+                    }
+                    else
+                    {
+                        hasLocatNoList = hasLocatNoList + "," + EndLocat;
+                    }
+                    //鐩爣鍌ㄤ綅淇℃伅
+                    var storageLocatEnd = storageLocat.First(w => w.LocatNo == EndLocat && w.Flag == "0" && w.Status == "0");
+                    if (storageLocatEnd == null)
+                    {
+                        throw new Exception("鐩爣鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+                    }
+
+                    //娣诲姞鍑哄簱浠诲姟
+                    var taskNo = new Common().GetMaxNo("TK");
+                    var exTask = new LogTask
+                    {
+                        TaskNo = taskNo,
+                        Sender = "WMS",
+                        Receiver = "AGV",
+                        IsSuccess = 0, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+                        Msg = string.Format("杞繍浠诲姟锛歿0}=>>{1}", item.LocatNo, EndLocat),
+                        StartLocat = item.LocatNo,//璧峰浣嶇疆
+                        EndLocat = EndLocat,//鐩爣浣嶇疆
+                        PalletNo = item.PalletNo,//鎵樼洏鐮�
+                        IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+                        IsCancel = 1,//鏄惁鍙彇娑�
+                        IsFinish = 1,//鏄惁鍙畬鎴�
+                        Type = "2",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟  2 绉诲簱浠诲姟
+                        Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝e湪鎵ц2鎵ц瀹屾垚
+                        OrderType = "3",//0 鍏ュ簱鍗� 1 鍑哄簱鍗�  2 鐩樼偣鍗�  3 绉诲簱鍗�
+
+                        CreateTime = DateTime.Now
+                    };
+                    Db.Insertable(exTask).ExecuteCommand();
+
+                    var endlono = EndLocat;
+                    var tasktype = "D00";
+
+                    //鏍规嵁鐩殑鍦板潃搴撳尯鑾峰彇灏忚溅浠诲姟绫诲瀷
+                    switch (storageLocatEnd.AreaNo)
+                    {
+                        case "B13":
+                            tasktype = "D02";  // 鍙犳墭浠诲姟锛堢洰鐨勫湴鍧�涓虹┖鎵樼洏鏀堕泦鍖猴級
+                            break;
+                        case "B15":
+                            tasktype = "D01";  // 鎷嗘墭浠诲姟锛堢洰鐨勫湴鍧�涓烘嫞璐у尯锛�
+                            break;
+                    }
+
+                    //缂撳瓨搴撲綅杞崲     3妤煎師杈呮枡Y003_001鍒癥003_011 
+                    if (storageLocatEnd.AreaNo == "B12")
+                    {
+                        switch (EndLocat.ToString().Substring(4, 1))
+                        {
+                            case "1":
+                                endlono = "Y003_0" + EndLocat.ToString().Substring(5, 2);
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                    
+                    //鐐瑰埌鐐规寚浠ら泦鍚�
+                    object[] position = new object[2];
+                    position[0] = new
+                    {
+                        positionCode = item.LocatNo,
+                        type = "00"
+                    };
+                    position[1] = new
+                    {
+                        positionCode = endlono,
+                        type = "00"
+                    };
+
+                    AgvSchedulingTask agvTask = new AgvSchedulingTask();
+                    Random r = new Random();
+                    long ran = DateTime.Now.Ticks;
+                    agvTask.ReqCode = ran.ToString();
+                    agvTask.TaskCode = taskNo;
+                    agvTask.TaskTyp = tasktype;
+                    agvTask.PositionCodePath = position;
+
+                    agvTaskList.Add(agvTask);
+
+                    //淇敼搴撳瓨鏄庣粏淇℃伅
+                    item.Status = "4";//绉诲簱閿佸畾
+                    //item.LockQty = item.Qty;//閿佸畾搴撳瓨鏁伴噺
+                    Db.Updateable(item).ExecuteCommand();
+
+                    //淇敼璧峰鍌ㄤ綅鍦板潃鐘舵��
+                    storageLocatBegin.Status = "5";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑 
+                    Db.Updateable(storageLocatBegin).ExecuteCommand();
+                    //淇敼鐩爣鍌ㄤ綅鍦板潃鐘舵��
+                    storageLocatEnd.Status = "4";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑 
+                    Db.Updateable(storageLocatEnd).ExecuteCommand();
+                    
+                    if (!strList.Contains("0"))
+                    {
+                        strList.Add("0");
+                    }
+
+                    //var stockInfo = stock.First(w => w.SkuNo == item.SkuNo && w.LotNo == item.LotNo);
+                    ////淇敼搴撳瓨淇℃伅
+                    //stockInfo.LockQty += (decimal)item.Qty;//閿佸畾鏁伴噺
+                    //Db.Updateable(stockInfo).ExecuteCommand();
+                }
+                if (string.IsNullOrEmpty(palletNo))
+                {
+                    //娣诲姞鎿嶄綔鏃ュ織璁板綍
+                    var k = new OperationCrServer().AddLogOperationCr("PDA妯″潡", "AGV杞繍", palletNo, "绉诲簱", $"PDA鍛煎彨灏忚溅瀵瑰嚭搴撳崟锛歿soNo}涓嬫墍鏈夋墭鐩樺彂璧疯浆杩�", userId);
+                }
+                else
+                {
+                    //娣诲姞鎿嶄綔鏃ュ織璁板綍
+                    var k = new OperationCrServer().AddLogOperationCr("PDA妯″潡", "AGV杞繍", palletNo, "绉诲簱", $"PDA鍛煎彨灏忚溅瀵规墭鐩樺彿锛歿palletNo}鍙戣捣杞繍", userId);
+                }
+
+                #region 鍛煎彨灏忚溅浠g爜
+
+                
+
+                
+                    // 姝e紡杩愯绋嬪簭鏀惧紑
+                    string str = "";
+                    var list2 = agvTaskList.Select(m => m.TaskCode).ToList();
+                    var jsonData = JsonConvert.SerializeObject(agvTaskList);
+                    jsonData = jsonData.Substring(1, jsonData.Length - 1);
+                    jsonData = jsonData.Substring(0, jsonData.Length - 1);
+                    string response = "";
+
+                    try
+                    {
+                        var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+                        response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV杞繍鍙栬揣鍛戒护", "AGV");
+                        var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
+
+                        //////瑙f瀽杩斿洖鏁版嵁 
+                        var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
+                        if (agvModel.Code == "0")
+                        {
+                            //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
+                            new TaskServer().EditTaskIssueOk(list2, time1, time2);
+                            str += "涓嬪彂鎴愬姛";
+                            //IsTrue = true;
+                        }
+                        if (agvModel.Code == "1")
+                        {
+                            new TaskServer().EditTaskIssueNo(list2, time1, time2, agvModel.Message);
+                            throw new Exception(agvModel.Message);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new Exception(ex.Message);
+                    }
+                
+
+                #endregion
+
+                //鎻愪氦浜嬪姟
+                Db.CommitTran();
+                return strList;
+            }
+            catch (Exception ex)
+            {
+                Db.RollbackTran();
+                throw new Exception(ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 绌烘墭鐩樺叆搴撳懠鍙皬杞�
+        /// </summary>
+        /// <param name="palletNo"></param>
+        /// <param name="areaNo"></param>
+        /// <param name="ruku"></param>
+        public void AgvTransport3(string palletNo, string LocatNo, string ruku, int userId, string url, string wcsurl)
+        {
+            if (string.IsNullOrEmpty(palletNo))
+            {
+                throw new Exception("璇锋壂鎻忔墭鐩樻潯鐮侊紒");
+            }
+            if (string.IsNullOrEmpty(ruku))
+            {
+                throw new Exception("璇烽�夋嫨鍏ュ簱鍙o紒");
+            }
+            try
+            {
+                if (ruku == "001")
+                {
+                    var xlocate = Db.Queryable<SysStorageLocat>().First(w => w.Status == "0" && (w.LocatNo == "B13010101" || w.LocatNo == "B13020101" || w.LocatNo == "B13030101"));
+                    if (xlocate == null)
+                    {
+                        throw new Exception("绌烘墭鐩樻敹闆嗗櫒宸叉弧");
+                    }
+                    ruku = Db.Queryable<SysStorageLocat>().First(w => w.Status == "0" && (w.LocatNo == "B13010101" || w.LocatNo == "B13020101" || w.LocatNo == "B13030101")).LocatNo;
+                }
+                if (ruku == "002")
+                {
+                    var dlocate = Db.Queryable<SysStorageLocat>().First(w => w.Status == "0" && (w.LocatNo == "B13040101" || w.LocatNo == "B13050101" || w.LocatNo == "B13060101"));
+                    if (dlocate == null)
+                    {
+                        throw new Exception("绌烘墭鐩樻敹闆嗗櫒宸叉弧");
+                    }
+                    ruku = Db.Queryable<SysStorageLocat>().First(w => w.Status == "0" && (w.LocatNo == "B13040101" || w.LocatNo == "B13050101" || w.LocatNo == "B13060101")).LocatNo;
+                }
+                if (ruku == null)
+                {
+                    throw new Exception("褰撳墠鎵樼洏鏀堕泦鍣ㄥ伐浣嶆棤绌轰綑锛岃灏嗙┖鎵樼洏鍨涘叆绔嬩綋搴�");
+                }
+                string EndLocat = ruku;//鐩爣浣嶇疆
+                string OrderTy = ruku.Length ==3 ? "0":"2";
+                var tasktype = "RK0"; //鍏ュ簱浠诲姟
+                int palnoqty = 1;
+                var log = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && (w.Status == "0" || w.Status == "1"));
+                if (log != null)
+                {
+                    throw new Exception("璇ユ墭鐩樺凡鏈夊皬杞︾瓑寰呮墽琛屾垨姝e湪鎵ц鐨勪换鍔�!");
+                }
+                //璧峰鍌ㄤ綅淇℃伅
+                var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == LocatNo);
                 if (storageLocat == null)
                 {
                     throw new Exception("鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
                 }
+
                 //寮�鍚簨鍔�
                 Db.BeginTran();
-                //淇敼搴撳瓨鏄庣粏淇℃伅
-                stockDetail.WareHouseNo = "";
-                stockDetail.RoadwayNo = "";
-                stockDetail.AreaNo = "";
-                stockDetail.LocatNo = "";
+                if (EndLocat.Length == 3)
+                {
+                    //璇锋眰WCS鍏ュ簱鍙f斁璐х‘璁�
+                    try
+                    {
+                        var port = new
+                        {
+                            Port = EndLocat
+                        };
+                        var json = JsonConvert.SerializeObject(port);
+                        var res = HttpHelper.DoPost(wcsurl, json, "璇锋眰WCS鍏ュ簱鍙f槸鍚﹀彲鏀捐揣", "WCS");
 
-                Db.Updateable(stockDetail).ExecuteCommand();
-                //淇敼鍌ㄤ綅鍦板潃鐘舵��
-                storageLocat.Status = "0";//绌哄偍浣�
+                        //////瑙f瀽杩斿洖鏁版嵁 
+                        var ret = JsonConvert.DeserializeObject<WcsModel>(res);
+                        if (ret.StatusCode == -1)
+                        {
+                            throw new Exception(EndLocat + "鍙峰叆搴撳彛宸叉湁鍏朵粬浠诲姟鍗犵敤,璇烽�夋嫨鍏朵粬鍏ュ簱鍙�");
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new Exception(ex.Message);
+                    }
+                }
+                else
+                {
+                    tasktype = "D02";
+                    palnoqty = (int)Db.Queryable<BllPalletBind>().First(w => w.PalletNo == palletNo && w.Status == "1" && w.IsDel == "0").Qty;
 
+                }
+
+                //娣诲姞鍏ュ簱浠诲姟
+                var taskNo = new Common().GetMaxNo("TK");
+                var exTask = new LogTask
+                {
+                    TaskNo = taskNo,
+                    Sender = "WMS",
+                    Receiver = "AGV",
+                    IsSuccess = 0, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+
+                    StartLocat = LocatNo,//璧峰浣嶇疆
+                    EndLocat = EndLocat,//鐩爣浣嶇疆
+                    PalletNo = palletNo,//鎵樼洏鐮�
+                    Msg = string.Format("杞繍浠诲姟锛歿0}=>>{1}", LocatNo, EndLocat),
+                    IsSend = 0,//鏄惁鍙啀娆′笅鍙�
+                    IsCancel = 0,//鏄惁鍙彇娑�
+                    IsFinish = 0,//鏄惁鍙畬鎴�
+                    Type = OrderTy,//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟  2 绉诲簱浠诲姟
+                    Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝e湪鎵ц2鎵ц瀹屾垚
+                    OrderType = OrderTy,//0 鍏ュ簱鍗� 1 鍑哄簱鍗�  2 鐩樼偣鍗�  3 绉诲簱鍗�
+
+                    CreateTime = DateTime.Now
+                };
+                Db.Insertable(exTask).ExecuteCommand();
+
+                //淇敼璧峰鍌ㄤ綅鍦板潃鐘舵��
+                storageLocat.Status = "5";//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑 
                 Db.Updateable(storageLocat).ExecuteCommand();
+
+                //娣诲姞鎿嶄綔鏃ュ織璁板綍
+                var k = new OperationCrServer().AddLogOperationCr("PDA妯″潡", "绌烘墭鍏ュ簱", palletNo, OrderTy == "0" ? "鍏ュ簱" : "绉诲簱", $"PDA鍛煎彨灏忚溅瀵规墭鐩樺彿锛歿palletNo}鍙戣捣杞繍", userId);
 
                 #region 鍛煎彨灏忚溅浠g爜
 
+                //鐐瑰埌鐐规寚浠ら泦鍚�
+                object[] position = new object[2];
+                position[0] = new
+                {
+                    positionCode = LocatNo,
+                    type = "00"
+                };
+                position[1] = new
+                {
+                    positionCode = EndLocat,
+                    type = "00"
+                };
+
+                List<AgvSchedulingTask> agvTaskList = new List<AgvSchedulingTask>();
+
+
+                AgvSchedulingTask agvTask = new AgvSchedulingTask();
+                Random r = new Random();
+                long ran = DateTime.Now.Ticks;
+                agvTask.ReqCode = ran.ToString();
+                agvTask.TaskCode = taskNo;
+                agvTask.TaskTyp = tasktype;
+                agvTask.PositionCodePath = position;
+                agvTask.CtnrTyp = palnoqty.ToString();
+
+                agvTaskList.Add(agvTask);
+
+
+                // 姝e紡杩愯绋嬪簭鏀惧紑
+                string str = "";
+                var list2 = agvTaskList.Select(m => m.TaskCode).ToList();
+                var jsonData = JsonConvert.SerializeObject(agvTaskList);
+                jsonData = jsonData.Substring(1, jsonData.Length - 1);
+                jsonData = jsonData.Substring(0, jsonData.Length - 1);
+                string response = "";
+
+                try
+                {
+                    var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+                    response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV杞繍鍛戒护", "AGV");
+                    var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
+
+                    //////瑙f瀽杩斿洖鏁版嵁 
+                    var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
+                    if (agvModel.Code == "0")
+                    {
+                        //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
+                        new TaskServer().EditTaskIssueOk(list2, time1, time2);
+                        str += "涓嬪彂鎴愬姛";
+                    }
+                    if (agvModel.Code == "1")
+                    {
+                        new TaskServer().EditTaskIssueNo(list2, time1, time2, agvModel.Message);
+                        throw new Exception(agvModel.Message);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    throw new Exception(ex.Message);
+                }
+
                 #endregion
+
                 //鎻愪氦浜嬪姟
                 Db.CommitTran();
             }
@@ -992,6 +1598,533 @@
                 throw new Exception(ex.Message);
             }
         }
+
+        #region
+
+        /// <summary>
+        /// agv璋冨害浠诲姟涓嬪彂
+        /// </summary>
+        /// <param name="type">鎼繍绫诲瀷</param>
+        /// <param name="taskno">浠诲姟鍙�</param>
+        /// <param name="positionStart">璧峰鍦板潃</param>
+        /// <param name="positionEnd">鐩殑鍦板潃</param>               2
+        /// <param name="url">鎺ュ彛URL</param>
+        public OutCommanAgvDto AGVTask(string type, string taskno, string positionStart, string positionEnd ,string url)
+        {
+
+            var endlono = positionEnd;
+            var tasktype = type;
+            var storageLocatEnd = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == endlono && w.Flag == "0" && w.Status == "0");
+            if (storageLocatEnd == null)
+            {                                                      
+                throw new Exception("鐢熸垚鐨凙GV浠诲姟鐩殑鍦板潃涓嶆纭�");
+            }
+            //鏍规嵁鐩殑鍦板潃搴撳尯鑾峰彇灏忚溅浠诲姟绫诲瀷
+            switch (storageLocatEnd.AreaNo)
+            {
+                case "B13":
+                    tasktype = "D02";  // 鍙犳墭浠诲姟锛堢洰鐨勫湴鍧�涓虹┖鎵樼洏鏀堕泦鍖猴級
+                    break;
+                case "B15":
+                    tasktype = "D01";  // 鎷嗘墭浠诲姟锛堢洰鐨勫湴鍧�涓烘嫞璐у尯锛�
+                    break;
+            }
+
+            // MES鐢宠澶囨枡锛屽鏂欏尯搴撲綅闇�瑕佽浆鎹�     杞﹂棿澶囨枡缂撳瓨浣嶅悕绉帮細Y003_001-->Y003_011  
+            if (storageLocatEnd.AreaNo == "B12")
+            {
+                switch (endlono.ToString().Substring(4, 1))
+                {
+                    case "1":
+                        endlono = "Y003_0" + endlono.Substring(5, 2);
+                        break;
+                    default:
+                        break;
+                }
+            }
+            List<AgvSchedulingTask> agvTaskList = new List<AgvSchedulingTask>();
+
+            object[] position = new object[2];
+            position[0] = new
+            {
+                positionCode = positionStart,
+                type = "00"
+            };
+            position[1] = new
+            {
+                positionCode = endlono,
+                type = "00"
+            };
+
+            AgvSchedulingTask agvTask = new AgvSchedulingTask();
+            Random r = new Random();
+            long ran = DateTime.Now.Ticks;
+            agvTask.ReqCode = ran.ToString();
+            //agvTask.ReqCode = taskno;         //agv璇锋眰缂栧彿锛岄渶瑕侀殢鏈虹敓鎴�  锛堟渶澶�32浣嶏級
+            agvTask.TaskCode = taskno;         //浠诲姟鍙�
+            agvTask.TaskTyp = tasktype;           //鎼繍绫诲瀷
+            agvTask.PositionCodePath = position;      //璧峰鍜岀洰鐨勪綅闆嗗悎
+            agvTask.CtnrTyp = "1";            //瀹瑰櫒绫诲瀷锛屽�间负1
+            if (tasktype == "D02")
+            {
+                agvTask.CtnrNum = "10";     //鍙犳墭浠诲姟闇�瑕佷笅鍙戠┖鎵樼洏鏁伴噺
+            }
+            
+            agvTaskList.Add(agvTask);
+
+            string str = "";
+            var list2 = agvTaskList.Select(m => m.TaskCode).ToList();
+            var jsonData = JsonConvert.SerializeObject(agvTaskList);
+            jsonData = jsonData.Substring(1, jsonData.Length-1);
+            jsonData = jsonData.Substring(0, jsonData.Length - 1);
+
+            try
+            {
+                var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+                var response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV杞繍鍛戒护", "AGV");
+                //response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV杞繍鍛戒护", "AGV");
+                var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
+
+                //////瑙f瀽杩斿洖鏁版嵁 
+                var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
+                if (agvModel.Code == "0")
+                {
+                    //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
+                    new TaskServer().EditTaskIssueOk(list2, time1, time2);
+                    str += "涓嬪彂鎴愬姛";
+                }
+                if (agvModel.Code == "1")
+                {
+                    new TaskServer().EditTaskIssueNo(list2, time1, time2, agvModel.Message);
+                    throw new Exception(agvModel.Message);
+                }
+                return agvModel;
+            }
+            catch (Exception ex)
+            {
+                throw new Exception(ex.Message);
+            }
+            
+        }
+
+        /// <summary>
+        /// agv浠诲姟鍙栨秷
+        /// </summary>
+        /// <param name="taskno">鍙栨秷浠诲姟缂栧彿</param>
+        /// <param name="url">鎺ュ彛URL</param>
+        public void cancelTask(string taskno,string url)
+        {
+            try
+            {
+                AgvCancelTask agvTaskList = new AgvCancelTask();
+                Random r = new Random();
+                long ran = DateTime.Now.Ticks;
+                agvTaskList.ReqCode = ran.ToString();
+                //agvTaskList.ReqCode = "006"; //闅忔満鐢熸垚
+                agvTaskList.TaskCode = taskno.ToString();
+                //agvTaskList.ReqTime = DateTime.Now.ToString();
+
+               var jsonData = JsonConvert.SerializeObject(agvTaskList);
+                var response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV杞繍鍛戒护", "AGV");
+                var agvModel = JsonConvert.DeserializeObject<cancelTaskModel>(response);
+
+                if (agvModel.Code != "0")
+                {
+                    throw new Exception("涓嬪彂AGV鍙栨秷浠诲姟澶辫触");
+                }
+
+            }
+            catch (Exception ex)
+            {
+
+                throw ex;
+            }
+
+        }
+
+        #endregion
+
+        /// <summary>
+        /// 鏍规嵁鍖哄煙鍒嗛厤鍌ㄤ綅
+        /// </summary>
+        /// <param name="areaNo"></param>
+        /// <param name="skuNo"></param>
+        /// <param name="lotNo"></param>
+        /// <returns></returns>
+        private string GetLocat(string areaNo, string skuNo, string lotNo, string palletNo, string hasLocatNoList = "")
+        {
+            try
+            {
+                string endLocat = string.Empty;//鐩爣鍌ㄤ綅
+                                               //褰撶劧鍖哄煙鎵�鏈夊偍浣嶄俊鎭�
+                var storageLocatList = Db.Queryable<SysStorageLocat>().Where(w => w.WareHouseNo == "W02" && w.AreaNo == areaNo).ToList();
+                //鍚屽尯鍩熷悓鎵规鐗╂枡鐨勫偍浣嶄俊鎭�
+                List<string> locatList = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.SkuNo == skuNo && w.LotNo == lotNo && w.WareHouseNo == "W02" && w.AreaNo == areaNo && w.PalletNo != palletNo)
+                    .OrderByDescending(o => o.LocatNo).Select(s => s.LocatNo).Distinct().ToList();
+                foreach (var item in locatList)
+                {
+                    var locatInfo = storageLocatList.Where(w => w.LocatNo == item).First();
+
+                    var locatInfo2 = storageLocatList.Where(w => w.IsDel == "0" && w.Status == "0" && w.Flag == "0" && w.LocatNo != locatInfo.LocatNo && w.Row == locatInfo.Row && !hasLocatNoList.Contains(w.LocatNo))
+                        .OrderByDescending(o => o.Column).First();
+                    if (locatInfo2 != null)
+                    {
+                        endLocat = locatInfo2.LocatNo;
+                    }
+                }
+                if (string.IsNullOrEmpty(endLocat))
+                {
+                    var locatInfo3 = storageLocatList.Where(w => w.IsDel == "0" && w.Flag == "0" && w.Status == "0" && !hasLocatNoList.Contains(w.LocatNo))
+                                .OrderByDescending(m => m.Layer).OrderByDescending(m => m.Column).OrderByDescending(m => m.Row).First();
+
+                    if (locatInfo3 != null)
+                    {
+                        endLocat = locatInfo3.LocatNo;
+                    }
+                }
+                
+                return endLocat;
+            }
+            catch (Exception ex)
+            {
+                throw new Exception(ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 涓嬪彂AGV浠诲姟缁х画鎵ц
+        /// </summary>
+        /// <param name="taskno"></param>
+        /// <param name="url"></param>
+        /// <returns></returns>
+        public void AgvContinue(string taskno,string url) 
+        {
+
+            Random r = new Random();
+            long ran = DateTime.Now.Ticks;
+            var ReqCode = ran.ToString();
+            var data = new 
+            { 
+                reqCode = ReqCode, 
+                taskCode = taskno  
+            };
+            var jsonData = JsonConvert.SerializeObject(data);
+            try
+            {
+                var response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV缁х画鎵ц鍛戒护", "AGV");
+
+                //////瑙f瀽杩斿洖鏁版嵁 
+                var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
+                if (agvModel.Code == "1")
+                {
+                    throw new Exception(agvModel.Message);
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new Exception(ex.Message);
+            }
+        }
+        #endregion
+
+        #region 浜哄伐杞繍
+
+        //浜哄伐杞繍
+        public void ArtificialTransport(string palletNo, string locatNo, string endLocatNo, string mesTokenUrl, string mesUrl,int userId)
+        {
+            if (string.IsNullOrEmpty(palletNo))
+            {
+                throw new Exception("璇锋壂鎻忔墭鐩樻潯鐮侊紒");
+            }
+            if (string.IsNullOrEmpty(locatNo))
+            {
+                throw new Exception("璇烽�夋嫨璧峰鍦板潃锛�");
+            }
+            if (string.IsNullOrEmpty(endLocatNo))
+            {
+                throw new Exception("璇疯緭鍏ョ洰鏍囧湴鍧�锛�");
+            }
+
+            try
+            {
+                #region 鍒ゆ柇淇℃伅
+                //寮�鍚簨鍔�
+                Db.BeginTran();
+
+                var stockDetail = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.PalletNo == palletNo).ToList();
+                if (stockDetail.Count == 0)
+                {
+                    throw new Exception("鎵樼洏涓婄墿鏂欏簱瀛樻槑缁嗕俊鎭笉瀛樺湪,璇锋鏌�!");
+                }
+               
+                if (string.IsNullOrEmpty(stockDetail.First().LocatNo))
+                {
+                    throw new Exception("鎵樼洏鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+                }
+                if (stockDetail.First().WareHouseNo != "W02")
+                {
+                    throw new Exception("璇ユ墭鐩樻湭鍦ㄥ钩搴撳唴,璇锋鏌�!");
+                }
+
+                
+
+                //璧峰鍌ㄤ綅淇℃伅
+                var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == locatNo);
+                if (storageLocat == null)
+                {
+                    throw new Exception("璧峰鍦板潃鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+                }
+                //鐩爣鍌ㄤ綅淇℃伅
+                var EndLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == endLocatNo);
+                if (EndLocat == null)
+                {
+                    throw new Exception("鐩爣鍦板潃鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
+                }
+
+                #endregion
+
+               
+
+                //闇�鍏堝垽鏂洰鏍囧湴鍧�鍓嶆柟鏄惁鏈夌┖鍌ㄤ綅
+
+                storageLocat.Status = "0"; //鏇存敼璧峰鍌ㄤ綅
+                Db.Updateable(storageLocat).ExecuteCommand();
+                EndLocat.Status = "1"; //鏇存敼鐩爣鍌ㄤ綅
+                Db.Updateable(storageLocat).ExecuteCommand();
+
+                var data = new List<RequertBeiliaoInfoModel>();
+
+                //鏇存敼搴撳瓨鏄庣粏
+                foreach (var item in stockDetail)
+                {
+                    item.LocatNo = EndLocat.LocatNo;//鍌ㄤ綅鏇存敼
+                    item.WareHouseNo = EndLocat.WareHouseNo;//鎵�灞炰粨搴撴洿鏀�
+                    item.RoadwayNo = EndLocat.RoadwayNo;//鎵�灞炲贩閬撴洿鏀�
+                    item.AreaNo = EndLocat.AreaNo;//鎵�灞炲尯鍩熸洿鏀� 
+
+                    Db.Updateable(item).ExecuteCommand();
+
+                    if (EndLocat != null && EndLocat.AreaNo == "B12") //鏄惁鏄�3妤肩紦瀛樺尯 鏄細鍒犻櫎搴撳瓨
+                    {
+                        if (string.IsNullOrWhiteSpace(item.SONo))
+                        {
+                            throw new Exception("褰撳墠鎵樼洏涓嶆槸鎷兼墭鍑哄簱鎵樼洏");
+                        }
+                        var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.StockDetailId == item.Id).ToList();
+                        if (boxInfo.Count == 0)
+                        {
+                            throw new Exception("鎵樼洏涓婄墿鏂欑鐮佷俊鎭笉瀛樺湪,璇锋鏌�!");
+                        }
+                        //var boxno = boxInfo.GroupBy(w => w.BoxNo).ToList();
+                        var boxno = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.StockDetailId == item.Id).GroupBy(m => new
+                        {
+                            m.BoxNo,
+                            m.ProductionTime,
+                            m.ExpirationTime,
+                        }).Select(it => new DataBoxInfo()
+                        {
+                            BoxNo = it.BoxNo,
+                            ProductionTime = it.ProductionTime,
+                            ExpirationTime = it.ExpirationTime,
+                        }).ToList();
+
+                        //璁板綍鎵樼洏涓婁俊鎭粰MES
+                        foreach (var item2 in boxno) {
+                            //var a = item.ProductionTime.ToString();
+                            data.Add(new RequertBeiliaoInfoModel()
+                            {
+                                no = item2.BoxNo,
+                                materiel_no = item.SkuNo,
+                                materiel_name = item.SkuName,
+                                qty = item.Qty,
+                                batch = item.LotNo,
+                                producttime = item2.ProductionTime.ToString().Substring(0,10),
+                                expiry = item2.ExpirationTime.ToString().Substring(0, 10)
+
+                            });
+                        }
+                        //搴撳瓨绠辩爜鏄庣粏鍒犻櫎
+                        Db.Deleteable(boxInfo).ExecuteCommand();
+                        //鍒犻櫎搴撳瓨鎵樼洏淇℃伅
+                        Db.Deleteable(item).ExecuteCommand();
+                        //鏇存敼搴撳瓨鎬昏〃
+                        var stock = Db.Queryable<DataStock>().First(w => w.IsDel == "0" && w.SkuNo == item.SkuNo && w.LotNo == item.LotNo);
+                        stock.LockQty -= (decimal)item.Qty;
+                        stock.Qty -= (decimal)item.Qty;
+                        Db.Updateable(stock).ExecuteCommand();
+                        //鏇存敼鎵樼洏鐘舵��
+                        var pallet = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
+                        if (pallet != null)
+                        {
+                            pallet.Status = "0";
+                            Db.Updateable(pallet).ExecuteCommand();
+                        }
+                    }
+                }
+
+
+                if (EndLocat != null && EndLocat.AreaNo == "B12")
+                {
+                    //鑾峰彇浠ょ墝
+                    //var token = new Token().GetMesToken(mesTokenUrl);
+                    var token = "";
+                    Dictionary<string, string> mesDic = new Dictionary<string, string>()
+                    {
+                        {"Authorization",token }
+                    };
+                    var endlono = EndLocat.LocatNo;
+                    //缂撳瓨搴撲綅杞崲
+                    switch (EndLocat.LocatNo.ToString().Substring(4, 1))
+                    {
+                        case "1":
+                            endlono = "Y003_0" + EndLocat.LocatNo.ToString().Substring(5, 2);
+                            break;
+                        default:
+                            break;
+                    }             
+                    var mescode = Db.Queryable<BllExportNotice>().Where(w => w.SONo == stockDetail.First().SONo).First();
+                    var mesData = new RequertBeiliaoModel()
+                    {
+                        morder_no = mescode.OrderCode,
+                        pallet = stockDetail.First().PalletNo,
+                        layer_no = endlono,
+                        items = data
+                    };
+                    var jsonData = JsonConvert.SerializeObject(mesData);
+                    //璋冪敤鎺ュ彛
+                    var response = HttpHelper.DoPost(mesUrl, jsonData, "澶囨枡瀹屾垚杩愯嚦缂撳瓨鍖哄弽棣堣嚦MES", "MES", mesDic);
+
+                    var obj = JsonConvert.DeserializeObject<MesModel>(response);//瑙f瀽杩斿洖鏁版嵁
+                    if (obj.status != "success")
+                    {
+                        throw new Exception("澶囨枡鍚屾MES澶辫触锛�" + obj.message);
+                    }
+
+                }
+
+
+
+                //娣诲姞鎿嶄綔鏃ュ織璁板綍
+                var k = new OperationCrServer().AddLogOperationCr("PDA妯″潡", "浜哄伐杞繍", palletNo, "绉诲簱", $"PDA鍛煎彨灏忚溅瀵规墭鐩樺彿锛歿palletNo}鍙戣捣杞繍", userId);
+                
+                //鎻愪氦浜嬪姟
+                Db.CommitTran();
+            }
+            catch (Exception ex)
+            {
+                Db.RollbackTran();
+                throw new Exception(ex.Message);
+            }
+
+
+             
+
+        }
+        #endregion
+
+        #region 绠辩爜鏌ヨ
+        /// <summary>
+        /// 绠辩爜鏌ヨ 
+        /// </summary>
+        /// <param name="boxNo">绠辩爜</param>
+        /// <returns></returns>
+        public DataBoxDto GetBoxQueryList(string boxNo)
+        {
+            // 瀹炰緥鍖栬繑鍥炵被
+            DataBoxDto boxModel = new DataBoxDto();
+            List<DataBoxInfoDto> list = new List<DataBoxInfoDto>();
+
+            // 鏍规嵁绠辩爜鑾峰彇绠变俊鎭�
+            var boxData = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);
+            
+            if (boxData.Count() == 0) 
+            {
+                // 鏍规嵁鐩掔爜鑾峰彇绠变俊鎭�
+                boxData = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo2 == boxNo);
+                if (boxData.Count() == 0) 
+                {
+                    boxModel = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo3 == boxNo).Select(it => new DataBoxDto() { Qty = it.Qty }, true).First();
+                    return boxModel;
+                }
+
+                list = boxData.Select(it => new DataBoxInfoDto()
+                {
+                    BoxNo2 = it.BoxNo3,
+                    Qty2 = it.Qty
+                }).ToList();
+
+                boxData = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo2 == boxNo);
+                boxModel = boxData.GroupBy(m => new
+                {
+                    m.BoxNo,
+                    m.SkuName,
+                    m.SkuNo,
+                    m.LotNo,
+                    m.SupplierLot,
+                    m.InspectStatus
+                }).Select(it => new DataBoxDto()
+                {
+                    BoxNo = it.BoxNo,
+                    SkuName = it.SkuName,
+                    SkuNo = it.SkuNo,
+                    LotNo = it.LotNo,
+                    SupplierLot = it.SupplierLot,
+                    InspectStatus = it.InspectStatus == "0" ? "寰呮" : it.InspectStatus == "1" ? "鍚堟牸":"涓嶅悎鏍�",
+                    Qty = SqlFunc.AggregateSum(it.Qty)
+                }).First();
+
+                boxModel.InfoList = list;
+                return boxModel;
+            }
+            else  //绠辩爜鍐呮暟鎹�
+            {
+                // 澶勭悊澶氱骇鐮�
+                var num = boxData.Count(m => !string.IsNullOrWhiteSpace(m.BoxNo2));
+                if (num > 0)
+                {
+                    list = boxData.GroupBy(m => new
+                    {
+                        m.BoxNo2
+                    }).Select(it => new DataBoxInfoDto()
+                    {
+                        BoxNo2 = it.BoxNo2,
+                        Qty2 = SqlFunc.AggregateSum(it.Qty)
+                    }).ToList();
+                }
+                else
+                {
+                    list = boxData.Select(it => new DataBoxInfoDto()
+                    {
+                        BoxNo2 = SqlFunc.IsNull(it.BoxNo3,""),
+                        Qty2 = it.Qty
+                    }).ToList();
+                }
+
+                // 绠辩爜淇℃伅璧嬪��
+                boxData = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);
+                boxModel = boxData.GroupBy(m => new
+                {
+                    m.BoxNo,
+                    m.SkuName,
+                    m.SkuNo,
+                    m.LotNo,
+                    m.SupplierLot,
+                    m.InspectStatus
+                }).Select(it => new DataBoxDto()
+                {
+                    BoxNo = it.BoxNo,
+                    SkuName = it.SkuName,
+                    SkuNo = it.SkuNo,
+                    LotNo = it.LotNo,
+                    SupplierLot = it.SupplierLot,
+                    InspectStatus = it.InspectStatus == "0" ? "寰呮" : it.InspectStatus == "1" ? "鍚堟牸" : "涓嶅悎鏍�",
+                    Qty = SqlFunc.AggregateSum(it.Qty)
+                }).First();
+                boxModel.InfoList = list;
+
+                return boxModel;
+            }
+        }
         #endregion
 
     }

--
Gitblit v1.8.0