From a0b82ad5eb966a359b393fbbe0d5f63d079f7dcb Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期四, 12 六月 2025 11:02:01 +0800
Subject: [PATCH] 修改问题

---
 Wms/WMS.BLL/HttpServer.cs | 2018 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 2,016 insertions(+), 2 deletions(-)

diff --git a/Wms/WMS.BLL/HttpServer.cs b/Wms/WMS.BLL/HttpServer.cs
index 210df4f..97b2d33 100644
--- a/Wms/WMS.BLL/HttpServer.cs
+++ b/Wms/WMS.BLL/HttpServer.cs
@@ -1,8 +1,18 @@
-锘縰sing SqlSugar;
+锘縰sing Model.InterFaceModel;
+using Model.ModelVm;
+using Newtonsoft.Json;
+using SqlSugar;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
+using Utility.Tools;
+using WMS.BLL.Logic;
 using WMS.BLL.LogServer;
+using WMS.DAL;
+using WMS.Entity.BllAsnEntity;
+using WMS.Entity.BllQualityEntity;
+using WMS.Entity.BllSoEntity;
 using WMS.Entity.Context;
 using WMS.Entity.DataEntity;
 using WMS.Entity.LogEntity;
@@ -16,6 +26,1294 @@
         private static readonly SqlSugarScope Db = DataContext.Db;
         public HttpServer() { }
 
+
+        public OutCommandDto RequestPalletIn(string palletNo, string houseNo, int palletNum, string Strlocate)
+        {
+            //return null;
+            try
+            {
+                #region 鍒ゆ柇
+                if (string.IsNullOrEmpty(palletNo))
+                {
+                    throw new Exception("鎵樼洏鍙蜂笉鑳戒负绌�");
+                }
+                if (string.IsNullOrEmpty(houseNo))
+                {
+                    throw new Exception("浠撳簱鍙蜂笉鑳戒负绌�");
+                }
+                if (palletNum <= 0)
+                {
+                    throw new Exception("鎵樼洏鏁伴噺涓嶈兘灏忕瓑0");
+                }
+                if (string.IsNullOrEmpty(Strlocate))
+                {
+                    throw new Exception("璧峰浣嶇疆涓嶈兘涓虹┖");
+                }
+                //鑾峰彇鍌ㄤ綅淇℃伅
+                var locateInfo = Db.Queryable<SysStorageLocat>().First(m => m.IsDel == "0" && m.WareHouseNo == "W04" && m.LocatNo == Strlocate);
+                if (locateInfo == null)
+                {
+                    throw new Exception("鏈煡璇㈠埌绌哄偍浣�");
+                }
+                if (locateInfo.Flag != "0")
+                {
+                    throw new Exception("褰撳墠浣嶇疆鏍囪瘑鐘舵�佹槸闈炴甯哥殑");
+                }
+
+                #endregion
+
+                #region MyRegion
+
+                var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo).ToList();
+                if (stockDetail.Count > 0)
+                {
+                    throw new Exception("褰撳墠鎵樼洏鍦ㄥ簱鍐呭凡鏈夊簱瀛樹俊鎭紝璇锋牳瀹�");
+                }
+
+                //鑾峰彇鎵樼洏淇℃伅
+                var pallet = Db.Queryable<SysPallets>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
+                if (pallet == null)
+                {
+                    throw new Exception("鏈煡璇㈠埌鎵樼洏淇℃伅");
+                }
+                if (pallet.Status != "0")
+                {
+                    throw new Exception("鎵樼洏鐘舵�佷笉鑳芥湭浣跨敤鐘舵��");
+                }
+                //鑾峰彇鎵樼洏淇℃伅
+                var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == "100099");
+                if (sku == null)
+                {
+                    throw new Exception("鐗╂枡淇℃伅涓湭鏌ヨ鍒扮┖鎵樼洏鐨勭墿鏂欎俊鎭紝涓嶅彲鍏ュ簱");
+                }
+                var pNum = 0;
+                var bNum = 0;
+
+                new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
+
+                var datetime = Db.GetDate();
+                Db.BeginTran();
+
+                // 鎻掑叆鎵樼洏缁戝畾琛�
+                var modelpb = new BllPalletBind
+                {
+                    ASNNo = "",
+                    ASNDetailNo = 0,
+                    TaskNo = "", //浠诲姟鍙�
+                    PalletNo = palletNo,
+                    Qty = palletNum,
+                    FullQty = pNum,
+                    Status = "2", //涓婃灦瀹屾垚
+                    Type = "1", //0 鐗╂枡鎵� 1 绌烘墭
+                    LotNo = "",
+                    LotText = "",
+                    SupplierLot = "",
+                    InspectMark = "0", //0 鍚� 1 鏄�
+                    BitPalletMark = pNum == palletNum ? "0" : "1",
+                    IsBale = "0",
+                    IsBelt = "0",
+                    CreateUser = 0,
+                    CreateTime = Db.GetDate()
+                };
+                var id = Db.Insertable(modelpb).ExecuteReturnIdentity();
+
+                #region 鐢宠鍌ㄤ綅
+
+                SysStorageLocat locate = null;
+
+
+                //鍒ゆ柇鐗╂枡鏄惁鍚湁绫诲埆淇℃伅
+                if (string.IsNullOrWhiteSpace(sku.CategoryNo))
+                {
+                    throw new Exception($"鐗╂枡锛歿sku.SkuNo}鏈煡璇㈠埌绫诲埆淇℃伅");
+                }
+
+                var skuCategory = Db.Queryable<SysMaterialCategory>().First(m => m.IsDel == "0" && m.CategoryNo == sku.CategoryNo);
+                if (skuCategory == null)
+                {
+                    throw new Exception($"鏈湪绫诲埆淇℃伅涓煡璇㈠埌鐗╂枡锛歿sku.SkuNo}鍖呭惈鐨勭被鍒�");
+                }
+
+                var areaStr = skuCategory.AreaNo.Split(",");
+                var areaList = new List<string>();
+                foreach (var item in areaStr)
+                {
+                    areaList.Add(item);
+                }
+                var allotLocate = new AllotLocation();
+                for (int i = 1; i <= 2; i++)
+                {
+                    var iStr = i.ToString();
+                    locate = allotLocate.GetSuiTableLocate(houseNo, areaList, "", iStr);
+                    if (locate != null)
+                    {
+                        break;
+                    }
+                }
+
+
+
+                #endregion
+
+                #region 搴撳瓨鏄庣粏
+                var sd1 = new DataStockDetail()
+                {
+                    LotNo = modelpb.LotNo,
+                    LotText = modelpb.LotText,
+                    SupplierLot = modelpb.SupplierLot,
+                    SkuNo = sku.SkuNo,
+                    SkuName = sku.SkuName,
+                    Standard = sku.Standard,
+                    Qty = modelpb.Qty,
+                    LockQty = 0,
+                    FrozenQty = 0,
+                    InspectQty = 0,
+                    ASNNo = modelpb.ASNNo,
+                    ASNDetailNo = modelpb.ASNDetailNo,
+                    //WareHouseNo = locate.WareHouseNo,
+                    //RoadwayNo = locate.RoadwayNo,
+                    //AreaNo = locate.AreaNo,
+                    //LocatNo = locate.LocatNo,
+                    PalletNo = modelpb.PalletNo,
+                    PalletNo2 = modelpb.PalletNo2,
+                    PalletNo3 = modelpb.PalletNo3,
+                    PalletTags = "0",
+                    CompleteTime = datetime,
+                    ProductionTime = modelpb.ProductionTime,
+                    ExpirationTime = modelpb.ExpirationTime,
+                    Status = "0",
+                    InspectMark = modelpb.InspectMark,
+                    InspectStatus = sku.IsInspect,
+                    BitPalletMark = modelpb.BitPalletMark,
+                    PackagNo = sku.PackagNo,
+                    IsBale = modelpb.IsBale,
+                    IsBelt = modelpb.IsBelt,
+
+
+                    IsDel = "0",
+                    CreateUser = 0,
+                    CreateTime = datetime
+                };
+                var sdId1 = Db.Insertable(sd1).ExecuteReturnIdentity();
+                #endregion
+
+                #region 搴撳瓨 
+                var dataStock1 = Db.Queryable<DataStock>().First(m => m.IsDel == "0" && m.SkuNo == sku.SkuNo);
+                if (dataStock1 != null)
+                {
+                    dataStock1.Qty += modelpb.Qty;
+                    if (modelpb.InspectMark == "1")
+                    {
+                        dataStock1.IsSampling = "0";
+                    }
+                    Db.Updateable(dataStock1).ExecuteCommand();
+                }
+                else
+                {
+                    var stock = new DataStock()
+                    {
+                        SkuNo = sku.SkuNo,
+                        SkuName = sku.SkuName,
+                        Standard = sku.Standard,
+                        LotNo = "",
+                        LotText = "",
+                        Qty = modelpb.Qty,
+                        LockQty = 0,
+                        FrozenQty = 0,
+                        IsSampling = "0",
+                        IsDel = "0",
+                        CreateUser = 0,
+                        CreateTime = datetime
+                    };
+                    Db.Insertable(stock).ExecuteCommand();
+                }
+                #endregion
+
+                // 鏇存敼鎵樼洏浣跨敤鐘舵��
+                string sqlStr = string.Empty;
+                sqlStr = $"update SysPallets set Status = '1' where PalletNo = '{palletNo}';";
+                Db.Ado.ExecuteCommand(sqlStr);
+
+                #region 娣诲姞浠诲姟
+
+                //娣诲姞宸烽亾浣跨敤璁板綍
+                var log = new SysRoadwayUseLog
+                {
+                    RoadwayNo = locate.RoadwayNo,
+                    WareHouseNo = houseNo,
+                    Row = 0,
+                    Column = 0,
+                    Layer = 0,
+                };
+                Db.Insertable(log).ExecuteCommand();
+                var taskNo = new Common().GetMaxNo("TK");
+                var inTask = new LogTask    //鍏ュ簱浠诲姟
+                {
+                    TaskNo = taskNo,
+                    Sender = "WMS",
+                    Receiver = "WCS",
+                    IsSuccess = 1, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+                    SendDate = DateTime.Now,  //鍙戦�佹椂闂�
+                    BackDate = DateTime.Now,  //杩斿洖鏃堕棿
+                    StartRoadway = "",            // 璧峰宸烽亾
+                    StartLocat = Strlocate,//璧峰浣嶇疆
+                    EndLocat = locate.LocatNo,//鐩爣浣嶇疆
+                    EndRoadway = locate.RoadwayNo,  // 鐩爣宸烽亾
+                    PalletNo = palletNo,//鎵樼洏鐮�
+                    IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+                    IsCancel = 1,//鏄惁鍙彇娑�
+                    IsFinish = 1,//鏄惁鍙畬鎴�
+                    Type = "0",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟  2 绉诲簱浠诲姟
+                    Status = "1",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝e湪鎵ц2鎵ц瀹屾垚
+                    OrderType = "0",//0 鍏ュ簱鍗� 1 鍑哄簱鍗�  2 鐩樼偣鍗�  3 绉诲簱鍗�
+                    Msg = $"{locateInfo.LocatNo}鍒�=>>" + locate.LocatNo + "鐨勫叆搴撲换鍔�", //鍏抽敭淇℃伅
+
+                };
+                Db.Insertable(inTask).ExecuteCommand();
+                var asnNo = "";
+
+                //娣诲姞鎵樼洏涓婃灦璁板綍
+                var upShelf = new BllPalletUpShelf()
+                {
+                    TaskNo = inTask.TaskNo,
+                    TraceNo = asnNo,
+                    PalletNo = palletNo,
+                    SkuNo = sku.SkuNo,
+                    SkuName = sku.SkuName,
+                    LotNo = "",
+                    Status = "1",
+
+                    WareHouseNo = houseNo,
+                    RoadwayNo = locate.RoadwayNo,
+                    AreaNo = locate.AreaNo,
+                    LocatNo = locate.LocatNo,
+
+                    CreateUser = 0,
+                };
+                Db.Insertable(upShelf).ExecuteCommand();
+
+
+
+                locate.Status = "2";
+                Db.Updateable(locate).ExecuteCommand();
+
+                var comDto = new OutCommandDto()
+                {
+                    TaskNo = taskNo, // 浠诲姟鍙�
+                    TaskType = "0",// 浠诲姟绫诲瀷
+                    PalletNo = palletNo,//鎵樼洏鍙�
+
+                    StartRoadway = inTask.StartRoadway,
+                    StartLocate = inTask.StartLocat, // 璧峰浣嶇疆
+                    EndLocate = inTask.EndLocat, // 鐩爣浣嶇疆 
+                    EndRoadway = inTask.EndRoadway,   // 鐩爣宸烽亾
+                    Qty = int.Parse(modelpb.Qty.ToString()),
+
+                    Order = 999,
+                    Type = PLCTypeEnum.AGV
+                };
+
+                #endregion
+
+                
+                Db.CommitTran();
+
+                #endregion
+
+                return comDto;
+            }
+            catch (Exception e)
+            {
+                throw new Exception(e.Message);
+            }
+        }
+
+
+        /// <summary>
+        /// 鐢宠鍌ㄤ綅  锛堢珛浣撳簱锛�
+        /// </summary>
+        /// <param name="palletNo"></param>
+        /// <param name="houseNo"></param>
+        /// <param name="ceng"></param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        public OutCommandDto RequestLocation(string palletNo, string houseNo,string ceng)
+        {
+            try
+            {
+                //楠岃瘉鎵樼洏鏉$爜鏄惁涓虹┖
+                if (string.IsNullOrEmpty(palletNo))
+                {
+                    throw new Exception("璇疯緭鍏ヨ鐢宠鐨勬墭鐩樻潯鐮�");
+                }
+                //楠岃瘉鎵�灞炰粨搴撴槸鍚︿负绌�
+                if (string.IsNullOrEmpty(houseNo))
+                {
+                    throw new Exception("璇烽�夋嫨鎵�灞炰粨搴�");
+                }
+                //楠岃瘉鏄惁涓哄钩搴撳叆搴�
+                var houseType = Db.Queryable<SysWareHouse>().First(a => a.WareHouseNo == houseNo);//鑾峰彇浠撳簱绫诲瀷
+                //楠岃瘉鏄惁涓虹珛浣撳簱鍏ュ簱
+                if (houseType.Type != "1")
+                {
+                    throw new Exception("浠撳簱绫诲瀷閿欒锛岃閫夋嫨绔嬩綋搴撲粨搴�");
+                }
+
+                OutCommandDto comDto;//杩斿洖wcs鐨勫叆搴撳懡浠�
+
+                var stock = Db.Queryable<SysPallets>().First(a => a.PalletNo == palletNo);//鎵樼洏淇℃伅
+
+                //鍒ゆ柇鎵樼洏鏉$爜鏄惁鏈夋晥
+                if (stock == null)
+                    throw new Exception("鎵樼洏鏉$爜涓嶅彈WMS绠$悊锛屼笉鍙叆搴擄紒");
+
+                #region 
+                
+                
+                var skuList = Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0").ToList();
+                //鐗╂枡绫诲埆淇℃伅
+                var skuCategoryList = Db.Queryable<SysMaterialCategory>().Where(m => m.IsDel == "0").ToList();
+
+                var skuNo = ""; //鍏ュ簱鐗╂枡 
+                var starLocate = ""; // 璧峰鍌ㄤ綅
+                var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
+                //楠岃瘉鐗╂枡鏄惁鏈夋垚鍝�
+                foreach (var item in stockDetail)
+                {
+                    var skuItem = skuList.First(m => m.SkuNo == item.SkuNo);
+                    if (skuItem.Type == "2")
+                    {
+                        throw new Exception("鎴愬搧鐗╂枡璇峰叆鎴愬搧搴�");
+                    }
+                }
+                var upShelfOldList = Db.Queryable<BllPalletUpShelf>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1")).ToList();
+                if (upShelfOldList.Count != 0) //鏌ヨ鍒板叆搴撲俊鎭�
+                {
+                    var upShelfOld = upShelfOldList.First();
+                    var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == upShelfOld.TaskNo);
+                    if (beingTask == null)
+                    {
+                        throw new Exception("璇ユ墭鐩樻鍦ㄥ叆搴擄紝浣嗘湭鏌ヨ鍒颁换鍔′俊鎭�");
+                    }
+                    if (!string.IsNullOrWhiteSpace(beingTask.EndLocat))
+                    {
+                        comDto = new OutCommandDto()
+                        {
+                            TaskNo = beingTask.TaskNo, // 浠诲姟鍙�
+                            TaskType = "0",// 浠诲姟绫诲瀷 
+                            PalletNo = palletNo,//鎵樼洏鍙�
+
+                            StartRoadway = beingTask.StartRoadway, // 璧峰宸烽亾
+                            StartLocate = beingTask.StartLocat, // 璧峰浣嶇疆
+                            EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
+                            EndRoadway = beingTask.EndRoadway,                           //  鐩爣宸烽亾
+                            
+                            Order = 999,
+                            Type = PLCTypeEnum.AGV
+                        };
+                        if (beingTask.IsSuccess == 0)
+                        {
+                            beingTask.IsSuccess = 1;
+                        }
+                        beingTask.Status = "1";
+                        Db.Updateable(beingTask).ExecuteCommand();
+
+                        foreach (var item in upShelfOldList)
+                        {
+                            if (item.Status == "0")
+                            {
+                                upShelfOld.Status = "1";
+                                Db.Updateable(upShelfOld).ExecuteCommand();
+                            }
+                        }
+                        
+                        return comDto;
+                    }
+                    else
+                    {
+                        throw new Exception("鏌ヨ鍒颁换鍔′絾鐩殑鍌ㄤ綅涓虹┖");
+                    }
+                }
+                else //鐢宠鍏ュ簱
+                {
+                    if (stockDetail.Count == 0)
+                    {
+                        throw new Exception($"{palletNo}鎵樼洏鏉$爜涓嶅叿鏈夌鐮佷俊鎭紝涓嶅彲鍏ュ簱锛�");
+                    }
+                    if (stockDetail.Count(m => !string.IsNullOrWhiteSpace(m.LocatNo)) == 0)
+                    {
+                        throw new Exception("褰撳墠鎵樼洏娌℃湁鍦ㄥ钩搴撳偍浣嶄笂锛岃鏍稿疄");
+                    }
+                    starLocate = stockDetail.First().LocatNo;
+
+                    var pingAreaStr = Db.Queryable<SysStorageArea>().Where(m => m.IsDel == "0" && m.WareHouseNo == "W04" && m.AreaNo != "B06" && m.AreaNo != "B07").Select(m => m.AreaNo).ToList();
+                    var pingLocateInfo = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == starLocate && pingAreaStr.Contains(m.AreaNo) && m.IsDel == "0");
+                    if (pingLocateInfo == null)
+                    {
+                        throw new Exception("褰撳墠鎵樼洏鎵�鍦ㄧ殑鍌ㄤ綅娌℃湁鍦ㄧ郴缁熶腑鎵惧埌淇℃伅");
+                    }
+                    if (pingLocateInfo.Status != "1")
+                    {
+                        throw new Exception("褰撳墠鎵樼洏鎵�鍦ㄧ殑鍌ㄤ綅鐘舵�侀敊璇紝涓嶆槸绌哄偍浣�");
+                    }
+                    skuNo = stockDetail.First().SkuNo;
+
+                    var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0"
+                    && (m.Status == "0" || m.Status == "1") && m.PalletNo == palletNo && m.Type == "0");
+                    if (beingTask != null)
+                    {
+                        if (!string.IsNullOrWhiteSpace(beingTask.EndLocat))
+                        {
+                            comDto = new OutCommandDto()
+                            {
+                                PalletNo = palletNo,//鎵樼洏鍙�
+                                StartRoadway = beingTask.StartRoadway, // 璧峰宸烽亾
+                                StartLocate = beingTask.StartLocat, // 璧峰浣嶇疆
+                                EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
+                                EndRoadway = beingTask.EndRoadway,                           //  鐩爣宸烽亾
+                                TaskNo = beingTask.TaskNo, // 浠诲姟鍙�
+                                TaskType = "0",// 浠诲姟绫诲瀷 (鍑哄簱)
+                                OutMode = "",  //鐩爣鍦板潃
+                                Order = 1,
+                                Type = PLCTypeEnum.AGV
+                            };
+                            if (beingTask.IsSuccess == 0)
+                            {
+                                beingTask.IsSuccess = 1;
+                               
+                            }
+                            beingTask.Status = "1";
+                            Db.Updateable(beingTask).ExecuteCommand();
+                            return comDto;
+                        }
+                        else
+                        {
+                            throw new Exception("鏌ヨ鍒颁换鍔′絾鐩殑鍌ㄤ綅涓虹┖");
+                        }
+                    }
+
+                    //鑾峰彇瀵瑰簲鍥炲簱瑙勫垯
+                    var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetName == "鎵樼洏鍥炲簱楠岃瘉" && a.IsEnable == "NO");
+                    #region 鎵樼洏鍥炲簱瑙勫垯
+
+                    if (function != null)
+                    {
+                        //鎷h揣瀹屾垚鍚庡厑璁告墭鐩樺洖搴�
+                        if (function.SetValue == "CompletePick")
+                        {
+                            var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.LotNo == stockDetail[0].LotNo && a.PalletNo == palletNo && a.SkuNo == stockDetail[0].SkuNo);
+
+                            //楠岃瘉鎷h揣鏄庣粏鏄惁瀛樺湪
+                            if (allot != null)
+                            {
+                                //楠岃瘉褰撳墠鎵樼洏鎷h揣淇℃伅鏄惁宸插畬鎴�
+                                if (allot.Status != "5")
+                                {
+                                    throw new Exception("褰撳墠鎵樼洏鎷h揣淇℃伅鏈畬鎴愶紝璇峰畬鎴愬悗鍥炲簱锛�");
+                                }
+                            }
+                        }
+                    }
+                    #endregion
+                }
+
+                var allotLocate = new AllotLocation();
+
+                #region 鐢宠鍌ㄤ綅
+
+                SysStorageLocat locate;
+                                var sku = skuList.FirstOrDefault(m => m.SkuNo == skuNo);
+                if (sku == null)
+                {
+                    throw new Exception("鐗╂枡淇℃伅涓湭鏌ヨ鍒板叆搴撳崟鏄庣粏鍖呭惈鐨勭墿鏂欎俊鎭紝涓嶅彲鍏ュ簱");
+                }
+                //鍒ゆ柇鐗╂枡鏄惁鍚湁绫诲埆淇℃伅
+                if (string.IsNullOrWhiteSpace(sku.CategoryNo))
+                {
+                    throw new Exception($"鐗╂枡锛歿sku.SkuNo}鏈煡璇㈠埌绫诲埆淇℃伅");
+                }
+
+                var skuCategory = skuCategoryList.FirstOrDefault(m => m.CategoryNo == sku.CategoryNo);
+                if (skuCategory == null)
+                {
+                    throw new Exception($"鏈湪绫诲埆淇℃伅涓煡璇㈠埌鐗╂枡锛歿sku.SkuNo}鍖呭惈鐨勭被鍒�");
+                }
+
+                var areaStr = skuCategory.AreaNo.Split(",");
+                var areaList = new List<string>();
+                foreach (var item in areaStr)
+                {
+                    areaList.Add(item);
+                }
+
+                locate = allotLocate.GetSuiTableLocate(houseNo, areaList, "",ceng);
+                
+
+                #endregion
+
+                Db.BeginTran();
+                try
+                {
+
+                    
+                    //娣诲姞宸烽亾浣跨敤璁板綍
+                    var log = new SysRoadwayUseLog
+                    {
+                        RoadwayNo = locate.RoadwayNo,
+                        WareHouseNo = houseNo,
+                        Row = 0,
+                        Column = 0,
+                        Layer = 0,
+                    };
+                    Db.Insertable(log).ExecuteCommand();
+                    var taskNo = new Common().GetMaxNo("TK");
+                    var inTask = new LogTask    //鍏ュ簱浠诲姟
+                    {
+                        TaskNo = taskNo,
+                        Sender = "WMS",
+                        Receiver = "WCS",
+                        IsSuccess = 1, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+                        SendDate = DateTime.Now,  //鍙戦�佹椂闂�
+                        BackDate = DateTime.Now,  //杩斿洖鏃堕棿
+                        StartRoadway = "",            // 璧峰宸烽亾
+                        StartLocat = starLocate,//璧峰浣嶇疆
+                        EndLocat = locate.LocatNo,//鐩爣浣嶇疆
+                        EndRoadway = locate.RoadwayNo,  // 鐩爣宸烽亾
+                        PalletNo = palletNo,//鎵樼洏鐮�
+                        IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+                        IsCancel = 1,//鏄惁鍙彇娑�
+                        IsFinish = 1,//鏄惁鍙畬鎴�
+                        Type = "0",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟  2 绉诲簱浠诲姟
+                        Status = "1",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝e湪鎵ц2鎵ц瀹屾垚
+                        OrderType = "0",//0 鍏ュ簱鍗� 1 鍑哄簱鍗�  2 鐩樼偣鍗�  3 绉诲簱鍗�
+                        Msg = "鍏ュ簱鍙e埌=>>" + locate.LocatNo + "鐨勫叆搴撲换鍔�", //鍏抽敭淇℃伅
+
+                    };
+                    Db.Insertable(inTask).ExecuteCommand();
+                    var asnNo = "";
+                    // 娣诲姞鎵樼洏缁戝畾琛ㄦ墭鐩樺叆搴撲换鍔″彿 liudl
+                    foreach (DataStockDetail stockModel in stockDetail)
+                    {
+                        var bindModel = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.Status == "2"
+                        && m.PalletNo == stockModel.PalletNo && m.ASNNo == stockModel.ASNNo && m.ASNDetailNo == stockModel.ASNDetailNo).OrderByDescending(m=>m.CreateTime).First();
+                        if (bindModel != null && string.IsNullOrWhiteSpace(bindModel.TaskNo))
+                        {
+                            bindModel.TaskNo = taskNo;
+                            bindModel.WareHouseNo = locate.WareHouseNo;
+                            bindModel.RoadwayNo = locate.RoadwayNo;
+                            bindModel.LocatNo = locate.LocatNo;
+                            Db.Updateable(bindModel).ExecuteCommand();
+                            asnNo = stockModel.ASNNo;
+                        }
+                    }
+                    foreach (DataStockDetail stockModel in stockDetail)
+                    {
+                        //娣诲姞鎵樼洏涓婃灦璁板綍
+                        var upShelf = new BllPalletUpShelf()
+                        {
+                            TaskNo = inTask.TaskNo,
+                            TraceNo = asnNo,
+                            PalletNo = palletNo,
+                            SkuNo = stockModel.SkuNo,
+                            SkuName = stockModel.SkuName,
+                            LotNo = stockModel.LotNo,
+                            Status = "1",
+
+                            WareHouseNo = houseNo,
+                            RoadwayNo = locate.RoadwayNo,
+                            AreaNo = locate.AreaNo,
+                            LocatNo = locate.LocatNo,
+
+                            CreateUser = 0,
+                        };
+                        Db.Insertable(upShelf).ExecuteCommand();
+                    }
+                     
+                    
+                    locate.Status = "2";
+                    Db.Updateable(locate).ExecuteCommand();
+                     
+                    Db.CommitTran();
+                    comDto = new OutCommandDto()
+                    {
+                        TaskNo = taskNo, // 浠诲姟鍙�
+                        TaskType = "0",// 浠诲姟绫诲瀷
+                        PalletNo = palletNo,//鎵樼洏鍙�
+
+                        StartRoadway = inTask.StartRoadway,
+                        StartLocate = inTask.StartLocat, // 璧峰浣嶇疆
+                        EndLocate = inTask.EndLocat, // 鐩爣浣嶇疆 
+                        EndRoadway = inTask.EndRoadway,   // 鐩爣宸烽亾
+                        
+                        Order = 999,
+                        Type = PLCTypeEnum.AGV
+                    };
+
+                }
+                catch (Exception ex)
+                {
+                    Db.RollbackTran();
+                    throw new Exception(ex.Message);
+                }
+                #endregion
+
+
+                return comDto;
+            }
+            catch (Exception e)
+            {
+                throw new Exception(e.Message);
+            }
+        }
+
+        /// <summary>
+        /// 鐢宠宸烽亾(瀵嗛泦搴�)
+        /// </summary>
+        /// <param name="palletNo"></param>
+        /// <param name="houseNo"></param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        public OutCommandDto RequestMiJiRoadWay(string palletNo, string houseNo)
+        {
+            try
+            {
+                #region 楠岃瘉鎵樼洏鍚堟硶鎬�
+                //楠岃瘉鎵樼洏鏉$爜鏄惁涓虹┖
+                if (string.IsNullOrEmpty(palletNo))
+                {
+                    throw new Exception("璇疯緭鍏ヨ鐢宠鐨勬墭鐩樻潯鐮�");
+                }
+                //楠岃瘉鎵�灞炰粨搴撴槸鍚︿负绌�
+                if (string.IsNullOrEmpty(houseNo))
+                {
+                    throw new Exception("璇烽�夋嫨鎵�灞炰粨搴�");
+                }
+                //鑾峰彇浠撳簱绫诲瀷
+                var houseType = Db.Queryable<SysWareHouse>().First(a => a.WareHouseNo == houseNo);
+                //楠岃瘉鏄惁涓哄瘑闆嗗簱
+                if (houseType.Type != "3")
+                {
+                    throw new Exception("浠撳簱涓嶆槸瀵嗛泦搴�");
+                }
+
+                var stock = Db.Queryable<SysPallets>().First(a => a.PalletNo == palletNo);//鎵樼洏淇℃伅
+                //鍒ゆ柇鎵樼洏鏉$爜鏄惁鏈夋晥
+                if (stock == null)
+                {
+                    throw new Exception("鎵樼洏鏉$爜涓嶅彈WMS绠$悊锛屼笉鍙叆搴擄紒");
+                }
+                #endregion
+
+                OutCommandDto comDto;//杩斿洖wcs鐨勫叆搴撳懡浠�
+                
+                #region 浠g爜鍧�
+
+                //鏌ヨ鎵樼洏缁戝畾淇℃伅(鐘舵�佷负绛夊緟鍏ュ簱/姝e湪鎵ц鐨�)
+                
+                var skuNo = ""; //鍏ュ簱鐗╂枡
+                var lotNo = ""; //鍏ュ簱鎵规
+                
+                //鐗╂枡淇℃伅
+                var skuList = Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0").ToList();
+                //鐗╂枡绫诲埆淇℃伅
+                var skuCategoryList = Db.Queryable<SysMaterialCategory>().Where(m => m.IsDel == "0").ToList();
+                //鎵樼洏搴撳瓨淇℃伅
+                var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
+                //楠岃瘉鐗╂枡鏄惁鏈夋垚鍝�
+                //foreach (var item in stockDetail)
+                //{
+                //    var skuItem = skuList.First(m => m.SkuNo == item.SkuNo);
+                //    if (skuItem.SkuNo == "100099")
+                //    {
+                //        continue;
+                //    }
+                //    if (skuItem.Type != "2")
+                //    {
+                //        throw new Exception("鎵樼洏涓婃湁涓嶆槸鎴愬搧鐨勭墿鏂�");
+                //    }
+                //}
+                var upShelfOld = Db.Queryable<BllPalletUpShelf>().First(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1"));
+
+                if (upShelfOld != null) //姝e父鍏ュ簱
+                {
+                    var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == upShelfOld.TaskNo);
+                    if (beingTask == null)
+                    {
+                        throw new Exception("璇ユ墭鐩樻鍦ㄥ叆搴擄紝浣嗘湭鏌ヨ鍒颁换鍔′俊鎭�");
+                    }
+                    if (!string.IsNullOrWhiteSpace(beingTask.EndRoadway))
+                    {
+                        comDto = new OutCommandDto()
+                        {
+                            TaskNo = beingTask.TaskNo, // 浠诲姟鍙�
+                            TaskType = "0",// 浠诲姟绫诲瀷
+                            PalletNo = palletNo,//鎵樼洏鍙�
+
+                            StartRoadway = beingTask.StartRoadway, // 璧峰宸烽亾
+                            StartLocate = beingTask.StartLocat, // 璧峰浣嶇疆
+                            EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
+                            EndRoadway = beingTask.EndRoadway, //  鐩爣宸烽亾
+
+                            Order = 999,
+                            Type = PLCTypeEnum.ConveyorLine
+                        };
+                        if (beingTask.IsSuccess == 0)
+                        {
+                            beingTask.IsSuccess = 1;
+                        }
+                        beingTask.Status = "1";
+                        Db.Updateable(beingTask).ExecuteCommand();
+                        if (upShelfOld.Status == "0")
+                        {
+                            upShelfOld.Status = "1";
+                            Db.Updateable(upShelfOld).ExecuteCommand();
+                        }
+                        return comDto;
+                    }
+                    else
+                    {
+                        throw new Exception("鏌ヨ鍒颁换鍔′絾鐩殑宸烽亾涓虹┖");
+                    }
+                }
+                else //鐢宠鍏ュ簱
+                {
+                    if (stockDetail.Count == 0)
+                    {
+                        throw new Exception($"{palletNo}鎵樼洏涓嶅瓨鍦ㄥ簱瀛樹俊鎭紝涓嶅彲鍏ュ簱锛�");
+                    }
+                    if (stockDetail.Count(m => !string.IsNullOrWhiteSpace(m.LocatNo)) > 0)
+                    {
+                        throw new Exception("褰撳墠鎵樼洏宸插湪搴撳唴锛岃鏍稿疄");
+                    }
+                    skuNo = stockDetail.First().SkuNo;
+                    lotNo = stockDetail.First().LotNo;
+
+                    #region 鍒ゆ柇璇ユ墭鐩橈紝鏄惁绗﹀悎鍥炲簱鍔熻兘璁惧畾鐨勫洖搴撹鍒�
+                    //鑾峰彇瀵瑰簲鍥炲簱瑙勫垯
+                    var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0"&& a.FunSetNo == "Fun041" && a.IsEnable == "NO");
+                    if (function != null)
+                    {
+                        //鎷h揣瀹屾垚鍚庡厑璁告墭鐩樺洖搴�
+                        var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0"&& a.LotNo == stockDetail[0].LotNo && a.PalletNo == palletNo && a.SkuNo == stockDetail[0].SkuNo);
+
+                        //楠岃瘉鎷h揣鏄庣粏鏄惁瀛樺湪
+                        if (allot != null)
+                        {
+                            //楠岃瘉褰撳墠鎵樼洏鎷h揣淇℃伅鏄惁宸插畬鎴�
+                            if (allot.Status != "5")
+                            {
+                                throw new Exception("褰撳墠鎵樼洏鎷h揣淇℃伅鏈畬鎴愶紝璇峰畬鎴愬悗鍥炲簱锛�");
+                            }
+                        }
+                    }
+                    #endregion
+                }
+
+                var allotLocate = new AllotLocation();
+                
+                #region 鏍规嵁sku纭鍖哄煙鍒掑垎
+
+                //鐗╂枡淇℃伅
+                var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == skuNo);
+                if (sku == null)
+                {
+                    throw new Exception("鐗╂枡缂栫爜涓嶅瓨鍦紝涓嶅彲鍏ュ簱");
+                }
+                //鍒ゆ柇鐗╂枡鏄惁鍚湁绫诲埆淇℃伅
+                if (string.IsNullOrWhiteSpace(sku.CategoryNo))
+                {
+                    throw new Exception($"鐗╂枡锛歿sku.SkuNo}鏈缃被鍒�,涓嶅彲鍏ュ簱");
+                }
+                //鐗╂枡绫诲埆淇℃伅
+                var skuCategory = Db.Queryable<SysMaterialCategory>().First(m => m.IsDel == "0" && m.CategoryNo == sku.CategoryNo);
+                if (skuCategory == null)
+                {
+                    throw new Exception($"{sku.SkuNo}鐗╂枡绫诲埆涓嶅瓨鍦紝涓嶅彲鍏ュ簱");
+                }
+                //鏁寸悊鍖哄煙淇℃伅
+                var areaStr = skuCategory.AreaNo.Split(",");
+                var areaList = new List<string>();
+                foreach (var item in areaStr)
+                {
+                    areaList.Add(item);
+                }
+                var roadStr = Db.Queryable<SysStorageRoadway>().Where(m => m.IsDel == "0" && m.Status == "0").Select(m=>m.RoadwayNo).ToList();
+                //宸烽亾缁勪俊鎭�
+                var roadList = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.WareHouseNo == houseNo && areaList.Contains(m.AreaNo) && !string.IsNullOrWhiteSpace(m.RoadwayNo) && roadStr.Contains(m.RoadwayNo))
+                    .GroupBy(m => m.RoadwayNo).OrderBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).ToList();
+
+                #endregion
+
+                //鑾峰彇鐢宠鐨勫瘑闆嗗簱宸烽亾
+                var roadNo = allotLocate.GetMiJiSuiTableRoad(houseNo, roadList, areaList, skuNo, lotNo);
+
+                if (string.IsNullOrWhiteSpace(roadNo))
+                {
+                    throw new Exception("鏈煡璇㈠埌瀛樺湪绌哄偍浣嶅贩閬�");
+                }
+
+                Db.BeginTran();
+                try
+                {
+                    //娣诲姞宸烽亾浣跨敤璁板綍
+                    var log = new SysRoadwayUseLog
+                    {
+                        RoadwayNo = roadNo,
+                        WareHouseNo = houseNo,
+                        Row = 0,
+                        Column = 0,
+                        Layer = 0,
+                    };
+                    Db.Insertable(log).ExecuteCommand();
+
+                    // 娣诲姞鍏ュ簱鏃ュ織璁板綍
+                    var taskNo = new Common().GetMaxNo("TK");
+                    var inTask = new LogTask    //鍏ュ簱浠诲姟
+                    {
+                        TaskNo = taskNo,
+                        Sender = "WMS",
+                        Receiver = "WCS",
+                        IsSuccess = 0, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+                        SendDate = DateTime.Now,  //鍙戦�佹椂闂�
+                        BackDate = DateTime.Now,  //杩斿洖鏃堕棿
+                        StartRoadway = "",            // 璧峰宸烽亾
+                        StartLocat = "",//璧峰浣嶇疆
+                        EndLocat = "",//鐩爣浣嶇疆
+                        EndRoadway = roadNo,  // 鐩爣宸烽亾
+                        PalletNo = palletNo,//鎵樼洏鐮�
+                        IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+                        IsCancel = 1,//鏄惁鍙彇娑�
+                        IsFinish = 1,//鏄惁鍙畬鎴�
+                        Type = "0",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟  2 绉诲簱浠诲姟
+                        Status = "1",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝e湪鎵ц2鎵ц瀹屾垚
+                        OrderType = "0",//0 鍏ュ簱鍗� 1 鍑哄簱鍗�  2 鐩樼偣鍗�  3 绉诲簱鍗�
+                        Msg = "鍏ュ簱鍙e埌=>>" + roadNo + "宸烽亾鐨勫叆搴撲换鍔�", //鍏抽敭淇℃伅
+
+                    };
+                    Db.Insertable(inTask).ExecuteCommand();
+
+                    var asnNo = "";
+                    // 娣诲姞鎵樼洏缁戝畾琛ㄦ墭鐩樺叆搴撲换鍔″彿  liudl
+                    
+                    foreach (DataStockDetail stockModel in stockDetail)
+                    {
+                        var bindModel = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.Status == "2"
+                        && m.PalletNo == stockModel.PalletNo && m.ASNNo == stockModel.ASNNo && m.ASNDetailNo == stockModel.ASNDetailNo).OrderByDescending(m=>m.CreateTime).First();
+                        if (bindModel != null && string.IsNullOrWhiteSpace(bindModel.TaskNo))
+                        {
+                            bindModel.TaskNo = taskNo;
+                            bindModel.WareHouseNo = houseNo;
+                            bindModel.RoadwayNo = roadNo;
+                            Db.Updateable(bindModel).ExecuteCommand();
+                            asnNo = stockModel.ASNNo;
+                        }
+
+                    }
+                    
+                    foreach (DataStockDetail stockModel in stockDetail)
+                    {
+                        //娣诲姞鎵樼洏涓婃灦璁板綍
+                        var upShelf = new BllPalletUpShelf()
+                        {
+                            TaskNo = inTask.TaskNo,
+                            TraceNo = asnNo,
+                            PalletNo = palletNo,
+                            SkuNo = stockModel.SkuNo,
+                            SkuName = stockModel.SkuName,
+                            LotNo = stockModel.LotNo,
+                            Status = "1",
+
+                            WareHouseNo = houseNo,
+                            RoadwayNo = roadNo,
+                            AreaNo = "",
+                            LocatNo = "",
+
+                            CreateUser = 0,
+                        };
+                        Db.Insertable(upShelf).ExecuteCommand();
+                    }
+
+                    Db.CommitTran();
+
+                    comDto = new OutCommandDto()
+                    {
+                        TaskNo = taskNo, // 浠诲姟鍙�
+                        TaskType = "0",// 浠诲姟绫诲瀷:鍏ュ簱浠诲姟
+                        PalletNo = palletNo,//鎵樼洏鍙�
+
+                        StartRoadway = inTask.StartRoadway,// 璧峰宸烽亾
+                        StartLocate = inTask.StartLocat, // 璧峰浣嶇疆
+                        EndLocate = inTask.EndLocat, // 鐩爣浣嶇疆 
+                        EndRoadway = inTask.EndRoadway,   // 鐩爣宸烽亾
+                       
+                        Order = 999,
+                        Type = PLCTypeEnum.ConveyorLine
+                    };
+                }
+                catch (Exception ex)
+                {
+                    Db.RollbackTran();
+                    throw new Exception(ex.Message);
+                }
+                #endregion
+
+                return comDto;
+            }
+            catch (Exception e)
+            {
+                throw new Exception(e.Message);
+            }
+        }
+
+        /// <summary>
+        /// 1 鐢宠鍌ㄤ綅 锛堢敵璇峰贩閬撳悗 鍐嶇敵璇峰偍浣嶅偍浣� 锛�
+        /// </summary>
+        /// <param name="palletNo"></param>
+        /// <param name="houseNo"></param>
+        /// <param name="roadwayNo"></param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        public OutCommandDto RequestMiJiLocation(string palletNo, string houseNo, string roadwayNo)
+        {
+            try
+            {
+                #region 楠岃瘉
+
+                //楠岃瘉鎵樼洏鏉$爜鏄惁涓虹┖
+                if (string.IsNullOrEmpty(palletNo))
+                {
+                    throw new Exception("璇疯緭鍏ヨ鐢宠鐨勬墭鐩樻潯鐮�");
+                }
+                //楠岃瘉鎵�灞炰粨搴撴槸鍚︿负绌�
+                if (string.IsNullOrEmpty(houseNo))
+                {
+                    throw new Exception("璇烽�夋嫨鎵�灞炰粨搴�");
+                }
+                //楠岃瘉鎵�灞炰粨搴撴槸鍚︿负绌�
+                if (string.IsNullOrEmpty(roadwayNo))
+                {
+                    throw new Exception("宸烽亾涓嶈兘涓虹┖");
+                }
+                //鑾峰彇浠撳簱绫诲瀷
+                var houseType = Db.Queryable<SysWareHouse>().First(a => a.WareHouseNo == houseNo);
+                //楠岃瘉鏄惁涓哄瘑闆嗗簱
+                if (houseType.Type != "3")
+                {
+                    throw new Exception("浠撳簱涓嶆槸瀵嗛泦搴�");
+                }
+                var stock = Db.Queryable<SysPallets>().First(a => a.PalletNo == palletNo);//鎵樼洏淇℃伅
+
+                //鍒ゆ柇鎵樼洏鏉$爜鏄惁鏈夋晥
+                if (stock == null)
+                {
+                    throw new Exception("鎵樼洏鏉$爜涓嶅彈WMS绠$悊锛屼笉鍙叆搴擄紒");
+                }
+
+                #endregion
+
+                OutCommandDto comDto;//杩斿洖wcs鐨勫叆搴撳懡浠�
+
+                #region 
+
+                //鏌ヨ鎵樼洏缁戝畾淇℃伅(鐘舵�佷负绛夊緟鍏ュ簱鐨�)
+               
+
+                var skuList = Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0").ToList();
+                //鐗╂枡绫诲埆淇℃伅
+                var skuCategoryList = Db.Queryable<SysMaterialCategory>().Where(m => m.IsDel == "0").ToList();
+                
+                var skuNo = "";//鍏ュ簱鐗╂枡
+                var isAddTask = true; //鏄惁娣诲姞鏂颁换鍔�
+                var oldTaskNo = "";  //鏃т换鍔″彿
+                var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
+                //楠岃瘉鐗╂枡鏄惁鏈夋垚鍝�
+                //foreach (var item in stockDetail)
+                //{
+                //    var skuItem = skuList.First(m => m.SkuNo == item.SkuNo);
+                //    if (skuItem.SkuNo == "100099")
+                //    {
+                //        continue;
+                //    }
+                //    if (skuItem.Type != "2")
+                //    {
+                //        throw new Exception("鎵樼洏涓婃湁涓嶆槸鎴愬搧鐨勭墿鏂�");
+                //    }
+                //}
+                
+                var upShelfOld = Db.Queryable<BllPalletUpShelf>().First(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1"));
+
+                if (upShelfOld != null) //鏈変笂鏋跺叆搴撲俊鎭�
+                {
+                    
+                    var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == upShelfOld.TaskNo);
+                    if (beingTask == null)
+                    {
+                        throw new Exception("璇ユ墭鐩樻鍦ㄥ叆搴擄紝浣嗘湭鏌ヨ鍒颁换鍔′俊鎭�");
+                    }
+                    if (!string.IsNullOrWhiteSpace(beingTask.EndLocat))
+                    {
+                        comDto = new OutCommandDto()
+                        {
+                            TaskNo = beingTask.TaskNo, // 浠诲姟鍙�
+                            TaskType = "0",// 浠诲姟绫诲瀷 
+                            PalletNo = palletNo,//鎵樼洏鍙�
+
+                            StartRoadway = beingTask.StartRoadway, // 璧峰宸烽亾
+                            StartLocate = beingTask.StartRoadway, // 璧峰浣嶇疆
+                            EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
+                            EndRoadway = beingTask.EndRoadway, // 鐩爣宸烽亾
+                                 
+                            Order = 999,
+                            Type = PLCTypeEnum.ShuttleCar,
+                        };
+                        if (beingTask.IsSuccess == 0)
+                        {
+                            beingTask.IsSuccess = 1;
+                            Db.Updateable(beingTask).ExecuteCommand();
+                        }
+                        if (upShelfOld.Status == "0")
+                        {
+                            upShelfOld.Status = "1";
+                            Db.Updateable(upShelfOld).ExecuteCommand();
+                        }
+                        return comDto;
+                    }
+                    else
+                    {
+                        isAddTask = false;
+                        oldTaskNo = beingTask.TaskNo;
+                        skuNo = upShelfOld.SkuNo;//鍏ュ簱鐗╂枡
+                    }
+                    
+                }
+                else //鐢宠鍏ュ簱
+                {
+                    if (stockDetail.Count == 0)
+                    {
+                        throw new Exception($"{palletNo}鎵樼洏鏉$爜娌℃湁搴撳瓨淇℃伅锛屼笉鍙叆搴擄紒");
+                    }
+                    if (stockDetail.Count(m => !string.IsNullOrWhiteSpace(m.LocatNo)) > 0)
+                    {
+                        throw new Exception("褰撳墠鎵樼洏宸插湪搴撳唴锛岃鏍稿疄");
+                    }
+                    skuNo = stockDetail.First().SkuNo;//鍏ュ簱鐗╂枡
+
+                    //鑾峰彇瀵瑰簲鍥炲簱瑙勫垯
+                    var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetName == "鎵樼洏鍥炲簱楠岃瘉" && a.IsEnable == "NO");
+                    #region 鎵樼洏鍥炲簱瑙勫垯
+
+                    if (function != null)
+                    {
+                        //鎷h揣瀹屾垚鍚庡厑璁告墭鐩樺洖搴�
+                        if (function.SetValue == "CompletePick")
+                        {
+                            var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.LotNo == stockDetail[0].LotNo && a.PalletNo == palletNo && a.SkuNo == stockDetail[0].SkuNo);
+
+                            //楠岃瘉鎷h揣鏄庣粏鏄惁瀛樺湪
+                            if (allot != null)
+                            {
+                                //楠岃瘉褰撳墠鎵樼洏鎷h揣淇℃伅鏄惁宸插畬鎴�
+                                if (allot.Status != "5")
+                                {
+                                    throw new Exception("褰撳墠鎵樼洏鎷h揣淇℃伅鏈畬鎴愶紝璇峰畬鎴愬悗鍥炲簱锛�");
+                                }
+                            }
+                        }
+                    }
+                    #endregion
+                }
+
+                var allotLocate = new AllotLocation();
+
+                #region 鐢宠鍌ㄤ綅
+
+                SysStorageLocat locate;
+               
+                var sku = skuList.FirstOrDefault(m => m.SkuNo == skuNo);
+                if (sku == null)
+                {
+                    throw new Exception("鐗╂枡淇℃伅涓湭鏌ヨ鍒板叆搴撳崟鏄庣粏鍖呭惈鐨勭墿鏂欎俊鎭紝涓嶅彲鍏ュ簱");
+                }
+                //鍒ゆ柇鐗╂枡鏄惁鍚湁绫诲埆淇℃伅
+                if (string.IsNullOrWhiteSpace(sku.CategoryNo))
+                {
+                    throw new Exception($"鐗╂枡锛歿sku.SkuNo}鏈煡璇㈠埌绫诲埆淇℃伅");
+                }
+
+                var skuCategory = skuCategoryList.FirstOrDefault(m => m.CategoryNo == sku.CategoryNo);
+                if (skuCategory == null)
+                {
+                    throw new Exception($"鏈湪绫诲埆淇℃伅涓煡璇㈠埌鐗╂枡锛歿sku.SkuNo}鍖呭惈鐨勭被鍒�");
+                }
+
+                var areaStr = skuCategory.AreaNo.Split(",");
+                var areaList = new List<string>();
+                foreach (var item in areaStr)
+                {
+                    areaList.Add(item);
+                }
+
+                locate = allotLocate.GetMiJiSuiTableLocate(roadwayNo, areaList);
+                if (locate == null)
+                {
+                    throw new Exception($"娌℃湁绌哄偍浣�");
+                }
+
+                #endregion
+
+                Db.BeginTran();
+                try
+                {
+
+                    if (isAddTask)
+                    {
+                        var taskNo = new Common().GetMaxNo("TK");
+                        var inTask = new LogTask    //鍏ュ簱浠诲姟
+                        {
+                            TaskNo = taskNo,
+                            Sender = "WMS",
+                            Receiver = "WCS",
+                            IsSuccess = 1, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+                            SendDate = DateTime.Now,  //鍙戦�佹椂闂�
+                            BackDate = DateTime.Now,  //杩斿洖鏃堕棿
+                            StartRoadway = "",            // 璧峰宸烽亾
+                            StartLocat = "",//璧峰浣嶇疆
+                            EndLocat = locate.LocatNo,//鐩爣浣嶇疆
+                            EndRoadway = locate.RoadwayNo,  // 鐩爣宸烽亾
+                            PalletNo = palletNo,//鎵樼洏鐮�
+                            IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+                            IsCancel = 1,//鏄惁鍙彇娑�
+                            IsFinish = 1,//鏄惁鍙畬鎴�
+                            Type = "0",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟  2 绉诲簱浠诲姟
+                            Status = "1",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝e湪鎵ц2鎵ц瀹屾垚
+                            OrderType = "0",//0 鍏ュ簱鍗� 1 鍑哄簱鍗�  2 鐩樼偣鍗�  3 绉诲簱鍗�
+                            Msg = "鍏ュ簱鍙e埌=>>" + locate.LocatNo + "鐨勫叆搴撲换鍔�", //鍏抽敭淇℃伅
+
+                        };
+                        Db.Insertable(inTask).ExecuteCommand();
+                        var asnNo = "";
+                        // 娣诲姞鎵樼洏缁戝畾琛ㄦ墭鐩樺叆搴撲换鍔″彿 liudl
+                        foreach (DataStockDetail stockModel in stockDetail)
+                        {
+                            var bindModel = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.Status == "2"
+                            && m.PalletNo == stockModel.PalletNo && m.ASNNo == stockModel.ASNNo && m.ASNDetailNo == stockModel.ASNDetailNo);
+                            if (bindModel != null && string.IsNullOrWhiteSpace(bindModel.TaskNo))
+                            {
+                                bindModel.TaskNo = taskNo;
+                                bindModel.WareHouseNo = locate.WareHouseNo;
+                                bindModel.RoadwayNo = locate.RoadwayNo;
+                                bindModel.LocatNo = locate.LocatNo;
+                                Db.Updateable(bindModel).ExecuteCommand();
+                                asnNo = stockModel.ASNNo;
+                            }
+                        }
+                        foreach (DataStockDetail stockModel in stockDetail)
+                        {
+                            //娣诲姞鎵樼洏涓婃灦璁板綍
+                            var upShelf = new BllPalletUpShelf()
+                            {
+                                TaskNo = inTask.TaskNo,
+                                TraceNo = asnNo,
+                                PalletNo = palletNo,
+                                SkuNo = stockModel.SkuNo,
+                                SkuName = stockModel.SkuName,
+                                LotNo = stockModel.LotNo,
+                                Status = "1",
+
+                                WareHouseNo = houseNo,
+                                RoadwayNo = locate.RoadwayNo,
+                                AreaNo = locate.AreaNo,
+                                LocatNo = locate.LocatNo,
+
+                                CreateUser = 0,
+                            };
+                            Db.Insertable(upShelf).ExecuteCommand();
+                        }
+
+                        oldTaskNo = taskNo;
+                    }
+                    else
+                    {
+                        var oldTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == oldTaskNo);
+                        oldTask.EndLocat = locate.LocatNo;
+                        oldTask.EndRoadway = locate.RoadwayNo;
+                        if (oldTask.IsSuccess == 0)
+                        {
+                            oldTask.IsSuccess = 1;
+                            oldTask.Status = "1";
+                        }
+                        Db.Updateable(oldTask).ExecuteCommand();
+
+
+                        var bindModelList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.Status == "2"
+                           && m.PalletNo == oldTask.PalletNo && m.TaskNo == oldTaskNo).ToList();
+                        foreach (var bindModel in bindModelList)
+                        {
+                            if (string.IsNullOrWhiteSpace(bindModel.LocatNo))
+                            {
+                                bindModel.TaskNo = oldTask.TaskNo;
+                                bindModel.WareHouseNo = locate.WareHouseNo;
+                                bindModel.RoadwayNo = locate.RoadwayNo;
+                                bindModel.LocatNo = locate.LocatNo;
+                                Db.Updateable(bindModel).ExecuteCommand();
+
+                            }
+                        }
+                        //鏇存敼涓婃灦淇℃伅
+                        var upShelfList = Db.Queryable<BllPalletUpShelf>().Where(m => m.IsDel == "0" && m.TaskNo == oldTask.TaskNo && m.PalletNo == palletNo).ToList();
+                        foreach (var upShelf in upShelfList)
+                        {
+                            upShelf.WareHouseNo = locate.WareHouseNo;
+                            upShelf.RoadwayNo = locate.RoadwayNo;
+                            upShelf.LocatNo = locate.LocatNo;
+                            upShelf.Status = "1";
+                            Db.Updateable(upShelf).ExecuteCommand();
+
+                        }
+
+                    }
+
+                    locate.Status = "2";
+                    Db.Updateable(locate).ExecuteCommand();
+                   
+                    Db.CommitTran();
+                    comDto = new OutCommandDto()
+                    {
+                        TaskNo = oldTaskNo, // 浠诲姟鍙�
+                        TaskType = "0",// 浠诲姟绫诲瀷
+                        PalletNo = palletNo,//鎵樼洏鍙�
+
+                        StartRoadway = "",
+                        StartLocate = "", // 璧峰浣嶇疆
+                        EndLocate = locate.LocatNo, // 鐩爣浣嶇疆 
+                        EndRoadway = locate.RoadwayNo,   // 鐩爣宸烽亾
+
+                        Order = 999,  //鐩爣鍦板潃
+                        Type = PLCTypeEnum.ShuttleCar
+                    };
+
+                }
+                catch (Exception ex)
+                {
+                    Db.RollbackTran();
+                    throw new Exception(ex.Message);
+                }
+                #endregion
+
+
+                return comDto;
+            }
+            catch (Exception e)
+            {
+                throw new Exception(e.Message);
+            }
+        }
+
+        /// <summary>
+        /// agv璧板嚭鍌ㄤ綅淇敼鍌ㄤ綅淇℃伅锛屼粎闄愬钩搴撳偍浣�
+        /// </summary>
+        /// <param name="taskNo"></param>
+        /// <param name="userId"></param>
         public void UpLocateByAgvOut(string taskNo, int userId)
         {
             try
@@ -41,12 +1339,21 @@
                 {
                     throw new Exception($"鏈煡璇㈠埌浠诲姟涓殑鍌ㄤ綅淇℃伅");
                 }
-                var pingAreaStr = Db.Queryable<SysStorageArea>().Where(m => m.IsDel == "0" && m.WareHouseNo == "W04" && m.AreaNo != "B06" && m.AreaNo != "B07").Select(m => m.AreaNo).ToList();
+                var pingAreaStr = Db.Queryable<SysStorageArea>().Where(m => m.IsDel == "0" && m.WareHouseNo == "W04").Select(m => m.AreaNo).ToList();
                 var pingLocateInfo = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == locate.LocatNo && pingAreaStr.Contains(m.AreaNo) && m.IsDel == "0");
                 if (pingLocateInfo == null)
                 {
                     throw new Exception("褰撳墠浠诲姟璧峰鍌ㄤ綅涓嶅湪骞冲簱鍌ㄤ綅");
                 }
+                var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == task.PalletNo).ToList();
+                foreach (var item in stockDetail)
+                {
+                    item.WareHouseNo = "";
+                    item.RoadwayNo = "";
+                    item.AreaNo = "";
+                    item.LocatNo = "";
+                }
+                Db.Updateable(stockDetail).ExecuteCommand();
                 locate.Status = "0";
                 Db.Updateable(locate).ExecuteCommand();
             }
@@ -55,5 +1362,712 @@
                 throw new Exception(e.Message);
             }
         }
+
+        /// <summary>
+        /// 鍏ュ簱浠诲姟瀹屾垚JC34
+        /// </summary>
+        /// <param name="taskNo"></param>
+        /// <param name="userId"></param>
+        /// <exception cref="Exception"></exception>
+        public void ArrivalSuccess2(string taskNo, int userId)
+        {
+            try
+            {
+                //姝e父鍏ュ簱 
+                var task = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == taskNo);
+                if (task == null)
+                {
+                    throw new Exception("鏈煡璇㈠埌浠诲姟淇℃伅");
+                }
+                if (task.Status == "2")
+                {
+                    throw new Exception("褰撳墠浠诲姟宸插畬鎴�");
+                }
+
+                var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == task.PalletNo).ToList();
+                var upShelf = Db.Queryable<BllPalletUpShelf>().First(m => m.TaskNo == taskNo);
+                if (upShelf == null)
+                {
+                    throw new Exception("娌℃湁鎵惧埌鎵樼洏涓婃灦淇℃伅");
+                }
+                //褰撳墠浠诲姟涓殑鍌ㄤ綅淇℃伅
+                var locate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == task.EndLocat);
+                if (locate == null)
+                {
+                    throw new Exception($"鏈煡璇㈠埌浠诲姟涓殑鍌ㄤ綅淇℃伅");
+                }
+                Db.BeginTran();
+
+                task.Status = "2";//浠诲姟鐘舵��
+                task.IsSend = 0;
+                task.IsCancel = 0;
+                task.IsFinish = 0;
+                task.FinishDate = DateTime.Now;//瀹屾垚鏃堕棿
+                Db.Updateable(task).ExecuteCommand();
+                if (userId != 0)
+                {
+                    //娣诲姞鎿嶄綔鏃ュ織璁板綍
+                    var k = new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鏃ュ織", taskNo, "瀹屾垚", $"鐐瑰嚮瀹屾垚鎸夐挳銆佸畬鎴愪换鍔″彿涓猴細{taskNo}鐨勪换鍔�", userId);
+                }
+
+                //鍒ゆ柇鏄惁鏄洖娴佸叆搴撳畬鎴�
+                if (!stockDetail.Any())
+                {
+                    throw new Exception("娌℃湁鏌ヨ鍒板簱瀛樹俊鎭�");
+                }
+
+                foreach (var item in stockDetail)
+                {
+                    item.WareHouseNo = locate.WareHouseNo;
+                    item.RoadwayNo = locate.RoadwayNo;
+                    item.AreaNo = locate.AreaNo;
+                    item.LocatNo = locate.LocatNo;
+                    item.UpdateTime = DateTime.Now;
+                    if (userId != 0)
+                    {
+                        item.UpdateUser = userId;
+                    }
+                }
+                upShelf.Status = "2";
+                Db.Updateable(upShelf).ExecuteCommand();
+
+                locate.Status = "1";
+                Db.Updateable(locate).ExecuteCommand();
+                Db.Updateable(stockDetail).ExecuteCommand();
+                Db.CommitTran();
+
+            }
+            catch (Exception e)
+            {
+                Db.RollbackTran();
+                throw new Exception(e.Message);
+            }
+        }
+
+        /// <summary>
+        /// 绉诲簱鍗曠殑 绉诲簱浠诲姟瀹屾垚JC34 鍏煎AGV灏忚溅绉诲簱
+        /// </summary>
+        /// <param name="taskNo"></param>
+        /// <param name="userId"></param>
+        /// <exception cref="Exception"></exception>
+        public void MoveSuccess(string taskNo, int userId)
+        {
+            try
+            {
+                Db.BeginTran();
+                //姝e父鍏ュ簱 
+                var task = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == taskNo);
+                if (task == null)
+                {
+                    throw new Exception("鏈煡璇㈠埌浠诲姟淇℃伅");
+                }
+                if (task.Status == "2")
+                {
+                    throw new Exception("褰撳墠浠诲姟宸插畬鎴�");
+                }
+
+                var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == task.PalletNo).ToList();
+                //鍒ゆ柇鏄惁鏄洖娴佸叆搴撳畬鎴�
+                if (!stockDetail.Any())
+                {
+                    throw new Exception("娌℃湁鏌ヨ鍒板簱瀛樹俊鎭�");
+                }
+                //褰撳墠浠诲姟涓殑鍌ㄤ綅淇℃伅
+                var locate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == task.StartLocat);
+                if (locate == null)
+                {
+                    throw new Exception($"鏈煡璇㈠埌浠诲姟涓殑璧峰鍌ㄤ綅淇℃伅");
+                }
+                //褰撳墠浠诲姟涓殑鍌ㄤ綅淇℃伅
+                var locate2 = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == task.EndLocat);
+                if (locate2 == null)
+                {
+                    throw new Exception($"鏈煡璇㈠埌浠诲姟涓殑鐩爣鍌ㄤ綅淇℃伅");
+                }
+                
+                task.Status = "2";//浠诲姟鐘舵��
+                task.IsSend = 0;
+                task.IsCancel = 0;
+                task.IsFinish = 0;
+                task.FinishDate = DateTime.Now;//瀹屾垚鏃堕棿
+                Db.Updateable(task).ExecuteCommand();
+                if (userId != 0)
+                {
+                    //娣诲姞鎿嶄綔鏃ュ織璁板綍
+                    var k = new OperationASNServer().AddLogOperationAsn("搴撳唴浣滀笟", "搴撳唴鏃ュ織", taskNo, "瀹屾垚", $"鐐瑰嚮瀹屾垚鎸夐挳銆佸畬鎴愪换鍔″彿涓猴細{taskNo}鐨勪换鍔�", userId);
+                }
+
+                foreach (var item in stockDetail)
+                {
+                    if (locate2.LocatNo == "B040101")
+                    {
+                        item.WareHouseNo = "";
+                        item.RoadwayNo = "";
+                        item.AreaNo = "";
+                        item.LocatNo = "";
+                    }
+                    else
+                    {
+                        item.WareHouseNo = locate2.WareHouseNo;
+                        item.RoadwayNo = locate2.RoadwayNo;
+                        item.AreaNo = locate2.AreaNo;
+                        item.LocatNo = locate2.LocatNo;
+                    }
+                    item.UpdateTime = DateTime.Now;
+                    if (userId != 0)
+                    {
+                        item.UpdateUser = userId;
+                    }
+                }
+
+                if (locate.WareHouseNo != "W04")
+                {
+                    locate.Status = "0";
+                    Db.Updateable(locate).ExecuteCommand();
+                }
+                
+                if (locate2.LocatNo == "B040101")
+                {
+                    locate2.Status = "0";
+                    Db.Updateable(locate2).ExecuteCommand();
+                }
+                else
+                {
+                    locate2.Status = "1";
+                    Db.Updateable(locate2).ExecuteCommand();
+                }
+                
+                Db.Updateable(stockDetail).ExecuteCommand();
+                Db.CommitTran();
+
+            }
+            catch (Exception e)
+            {
+                Db.RollbackTran();
+                throw new Exception(e.Message);
+            }
+        }
+
+        /// <summary>
+        /// 鍑哄簱鍗曠殑绉诲簱浠诲姟锛孞C34 璐ф灦鎵樼洏涓嬫灦
+        /// </summary>
+        /// <param name="taskNo">浠诲姟鍙�</param>
+        /// <param name="userId">鎿嶄綔浜�</param>
+        /// <exception cref="Exception"></exception>
+        public void ExMoveSuccess(string taskNo, int userId)
+        {
+            try
+            {
+                //褰撳墠浠诲姟淇℃伅
+                var task = Db.Queryable<LogTask>().First(m => m.TaskNo == taskNo && m.IsDel == "0");
+                if (task == null)
+                {
+                    throw new Exception($"鏈煡璇㈠埌浠诲姟鍙蜂负锛氣�榹taskNo}鈥欑殑浠诲姟淇℃伅");
+                }
+                if (task.Status == "2")
+                {
+                    throw new Exception("褰撳墠浠诲姟宸插畬鎴�");
+                }
+                Db.BeginTran();
+                //搴撳瓨涓綋鍓嶆墭鐩樼殑淇℃伅
+                var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == task.PalletNo).ToList();
+                //褰撳墠浠诲姟涓殑鐩爣鍌ㄤ綅淇℃伅
+                //褰撳墠浠诲姟涓殑鍘熷偍浣�
+                var locate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == task.StartLocat);
+                if (locate == null)
+                {
+                    throw new Exception($"WMS绯荤粺涓病鏈夎{task.StartLocat}鍌ㄤ綅瀵瑰簲鐨勪俊鎭�");
+                }
+                var locate2 = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == task.EndLocat);
+                if (locate2 == null)
+                {
+                    throw new Exception($"WMS绯荤粺涓病鏈夎{task.EndLocat}鍌ㄤ綅瀵瑰簲鐨勪俊鎭�");
+                }
+                //骞冲簱涓偍浣嶉泦鍚�
+                var pingKuLocate = Db.Queryable<SysStorageLocat>().Where(m => m.WareHouseNo == "W04" && m.IsDel == "0").ToList();
+                var pingKuList = pingKuLocate.Select(m => m.LocatNo).ToList();
+                try
+                {
+
+                    //task.Status = "5";//浠诲姟鐘舵��
+                    ////鍒ゆ柇璧峰鐩爣浣嶇疆閮芥槸骞冲簱  
+                    //if (pingKuList.Contains(task.StartLocat) && pingKuList.Contains(task.EndLocat))
+                    //{
+                    task.Status = "2";
+                    //}
+
+                    task.IsSend = 0;
+                    task.IsCancel = 0;
+                    task.IsFinish = 0;
+                    task.FinishDate = DateTime.Now;//瀹屾垚鏃堕棿
+                    Db.Updateable(task).ExecuteCommand();
+
+                    #region 淇敼鍌ㄤ綅鐘舵��
+
+                    if (!pingKuList.Contains(task.StartLocat))
+                    {
+                        //鍘熷偍浣嶆敼涓虹┖鍌ㄤ綅 0
+                        locate.Status = "0";
+                        Db.Updateable(locate).ExecuteCommand();
+                    }
+
+
+                    //鐩爣鍌ㄤ綅鏀逛负鏈夎揣鐗� 1
+                    locate2.Status = "1";
+                    Db.Updateable(locate2).ExecuteCommand();
+                    
+                    foreach (var item in stockDetail)
+                    {
+                        item.WareHouseNo = locate2.WareHouseNo;
+                        item.AreaNo = locate2.AreaNo;
+                        item.RoadwayNo = locate2.RoadwayNo;
+                        item.LocatNo = locate2.LocatNo;
+                    }
+                    Db.Updateable(stockDetail).ExecuteCommand();
+                    
+
+
+                    #endregion
+
+                    Db.CommitTran();
+                }
+                catch (Exception ex)
+                {
+                    Db.RollbackTran();
+                    throw new Exception(ex.Message);
+                }
+            }
+            catch (Exception ex)
+            {
+                throw new Exception("瀹屾垚鍙嶉澶辫触锛�" + ex.Message);
+            }
+        }
+
+
+
+        /// <summary>
+        /// PDA涓嬪彂鍑哄簱
+        /// </summary>
+        /// <param name="soNo"></param>
+        /// <param name="detailId"></param>
+        /// <param name="outMode"></param>
+        /// <param name="palletNo"></param>
+        /// <param name="userId"></param>
+        /// <param name="url"></param>
+        /// <param name="str"></param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        public List<OutCommandDto> IssueOutHouseLk(string soNo, string detailId,string outMode, string palletNo, int userId, string url, out string str)
+        {
+            try
+            {
+                var outDto1 = new List<OutCommandDto>(); //鍑哄簱鏁版嵁鐨勯泦鍚堬紙娣卞害涓�1鐨勫偍浣嶏級
+                //璁板綍閿欒淇℃伅鐨勯泦鍚� //1:褰撳墠瑕佸嚭搴撶殑鍌ㄤ綅姝e湪绉诲嚭銆�2 鍑哄簱鐨勬墭鐩樺偍浣嶄俊鎭敊璇�(鍦ㄥ偍浣嶈〃涓湭鏌ヨ鍒�)銆�3鍌ㄤ綅鎹熷潖涓嶈兘鍑哄簱銆�4 瑕佸嚭搴撶殑鎵樼洏姝e湪鍏ュ簱
+                 
+
+                var com = new Common();
+                var notice = Db.Queryable<BllExportNotice>().First(m => m.SONo == soNo && m.IsDel == "0");
+                if (notice == null)
+                {
+                    throw new Exception($"鏈壘鍒皗soNo}鍑哄簱鍗曚俊鎭�");
+                }
+                if (notice.WareHouseNo != "W02")
+                {
+                    throw new Exception("浠撳簱鍙烽敊璇�");
+                }
+                var intDetailId = int.Parse(detailId);
+                if (intDetailId <=0) 
+                {
+                    throw new Exception("閫夋嫨鐨勫嚭搴撳崟鏄庣粏鍙傛暟閿欒");
+                }
+                //鎵�鏈夎鍑哄簱鐨勫嚭搴撳垎閰嶄俊鎭�(鏈笅鍙戠殑淇℃伅鍜屽緟鎷h揣鐨勪俊鎭�)
+                var item = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.SONo == soNo && a.SODetailNo == intDetailId && a.PalletNo == palletNo && a.Status == "0" );
+                if (item == null) //鍒ゆ柇鏄惁鏈夐渶瑕佷笅鍙戠殑鍑哄簱娴佹按
+                {
+                    throw new Exception("褰撳墠鍑哄簱鍗曟嵁鏃犻渶瑕佷笅鍙戠殑鎵樼洏");
+                }
+
+                #region 闆嗗悎 
+
+                //瑕佸嚭搴撶殑鏄庣粏闆嗗悎
+                var outStockDetail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == item.PalletNo).ToList();
+                //鐗╂枡缂栫爜琛�
+                var skuList = Db.Queryable<SysMaterials>().Where(w => w.IsDel == "0");
+                //鍖呰琛�
+                var packagList = Db.Queryable<SysPackag>().Where(w => w.IsDel == "0");
+                Db.BeginTran();
+                try
+                {
+                    List<LogTask> logTaskList = new List<LogTask>();//姝ゆ鍑哄簱浠诲姟闆嗗悎锛屼负搴斿鍚屾墭鐩樹笉鍚岀墿鏂欏嚭搴�
+                    var i = 0;
+                    str = string.Empty;
+                    var outLocatelist1 = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.AreaNo == "B02" && m.Flag == "0").ToList();
+                    var outLocatelist2 = Db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.AreaNo == "B05" && m.Flag == "0").ToList();
+                    //寰幆鍒嗛厤鐨勪俊鎭敓鎴愬嚭搴撲换鍔�
+                     
+                    var outModeLocate = outMode;
+                        
+                    var taskNoStr = "";
+
+                    // 鍌ㄤ綅鍙�
+                    var locateNo = outStockDetail.First(m => m.PalletNo == item.PalletNo).LocatNo;
+
+                    #region 鍒ゆ柇
+
+                    //鍒ゆ柇鎵樼洏鏄惁鍦ㄥ簱鍐�
+                    if (string.IsNullOrWhiteSpace(locateNo)) //搴撳
+                    {
+                        //鍒ゆ柇鎵樼洏鏄惁鍦ㄥ叆搴撲腑
+                        var imBl = com.GetImTask(item.PalletNo);
+                        if (imBl != null)
+                        {
+                            throw new Exception("瑕佸嚭搴撶殑鎵樼洏姝e湪鍏ュ簱");
+                        }
+                        //鍒ゆ柇鏄惁鏄凡缁忓嚭杩囧簱鍙堝洖搴� 
+                        if (item.Status == "0")
+                        {
+                            //濡傛灉涓嶅湪浠撳簱鍐咃紝褰撳墠鍒嗛厤淇℃伅鐩存帴鏇存柊鍑哄簱瀹屾垚 
+                            item.Status = "2";//鐘舵��
+                            item.OutMode = outModeLocate;//鍑哄簱鍙� 
+                            Db.Updateable(item).ExecuteCommand();
+                            var noticeDetail = Db.Queryable<BllExportNoticeDetail>().First(m => m.IsDel == "0" && m.Id == item.SODetailNo);
+                            if (noticeDetail != null) //鏇存柊鍑哄簱鍗曟嵁鐨勪笅鍙戞暟閲�
+                            {
+                                noticeDetail.FactQty += item.Qty;
+                                Db.Updateable(noticeDetail).ExecuteCommand();
+                            }
+
+                            //var notice2 = Db.Queryable<BllExportNotice>().First(m => m.IsDel == "0" && m.SONo == item.SONo);
+                            if (notice.Status == "0" || notice.Status == "1" || notice.Status == "2")
+                            {
+                                var detailList = Db.Queryable<BllExportNoticeDetail>().Where(m => m.IsDel == "0" && m.SONo == item.SONo).ToList();
+                                if (detailList.Count(m => m.Qty >= m.AllotQty) > 0)
+                                {
+                                    notice.Status = "3"; //鍙樻洿鐘舵�佷负姝e湪鎵ц
+                                    Db.Updateable(notice).ExecuteCommand();
+                                }
+                            }
+                            Db.CommitTran();
+                            str = "鎵樼洏宸插湪搴撳";
+                            return outDto1;
+                        }
+                    }
+
+                    var locate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == locateNo && m.IsDel == "0");//褰撳墠鍑哄簱鐨勫偍浣嶄俊鎭�
+                    if (locate == null)
+                    {
+                        throw new Exception("鍑哄簱鐨勬墭鐩樺偍浣嶄俊鎭敊璇�(鍦ㄥ偍浣嶈〃涓湭鏌ヨ鍒�)");
+                    }
+                    //鍒ゆ柇鍌ㄤ綅鏍囧織鏄惁涓烘崯鍧�
+                    if (locate.Flag == "2")
+                    {
+                        throw new Exception("鍌ㄤ綅鎹熷潖涓嶈兘鍑哄簱");
+                    }
+                    if (locate.WareHouseNo != "W02")
+                    {
+                        throw new Exception("鎵樼洏涓嶅湪璐ф灦搴撲笂");
+                    }
+                    var locateEnd = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == outModeLocate && m.IsDel == "0");//褰撳墠鍑哄簱鐨勭洰鏍囧偍浣嶄俊鎭�
+                    if (locateEnd == null)
+                    {
+                        throw new Exception("鍑哄簱鐨勬墭鐩樺偍浣嶄俊鎭敊璇�(鍦ㄥ偍浣嶈〃涓湭鏌ヨ鍒�)");
+                    }
+                    else if (locateEnd.Status != "0")
+                    {
+                        throw new Exception("鐩爣鍌ㄤ綅鐘舵�佷笉鏄┖鍌ㄤ綅");
+                    }
+                    #endregion
+
+                    if (locate.Status == "1") //鏈夌墿鍝�
+                    {
+                        #region 娣诲姞鍑哄簱浠诲姟
+
+                        var taskNo = new Common().GetMaxNo("TK");
+                        var exTask = new LogTask    //鍑哄簱浠诲姟
+                        {
+                            TaskNo = taskNo,
+                            Sender = "WMS",
+                            Receiver = "WCS",
+                            IsSuccess = 0, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+
+                            StartLocat = locate.LocatNo,//璧峰浣嶇疆
+                            EndLocat = outModeLocate,//鐩爣浣嶇疆
+                            PalletNo = item.PalletNo,//鎵樼洏鐮�
+                            IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+                            IsCancel = 1,//鏄惁鍙彇娑�
+                            IsFinish = 1,//鏄惁鍙畬鎴�
+                            Type = "1",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟  2 绉诲簱浠诲姟
+                            Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝e湪鎵ц2鎵ц瀹屾垚
+                            OrderType = "1",//0 鍏ュ簱鍗� 1 鍑哄簱鍗�  2 鐩樼偣鍗�  3 绉诲簱鍗�
+                            Msg = "浠�" + locate.LocatNo + "鍒�" + outModeLocate + "鐨勫嚭搴撲换鍔�", //鍏抽敭淇℃伅
+                        };
+                        Db.Insertable(exTask).ExecuteCommand();
+                        logTaskList.Add(exTask);
+
+                        outDto1.Add(new OutCommandDto()
+                        {
+                            TaskNo = exTask.TaskNo, // 浠诲姟鍙�
+                            TaskType = "1",// 浠诲姟绫诲瀷 (鍑哄簱)0鍏� 1鍑� 2绉� 
+
+                            PalletNo = item.PalletNo,//鎵樼洏鍙�
+                            StartLocate = locate.LocatNo, // 璧峰浣嶇疆
+                            StartRoadway = locate.RoadwayNo,//鍏跺疄宸烽亾
+                            EndLocate = outModeLocate, // 鐩爣浣嶇疆 
+
+                            Order = 999,
+                            Type = PLCTypeEnum.AGV
+
+                        });
+                        taskNoStr = exTask.TaskNo;
+
+                        #endregion
+
+                        #region 鏀瑰彉鏁版嵁
+                        if (item.Status == "0")//鍒ゆ柇鎵樼洏鏄惁涓嬪彂杩�
+                        {
+                            var noticeDetail = Db.Queryable<BllExportNoticeDetail>().First(m => m.IsDel == "0" && m.Id == item.SODetailNo);
+                            if (noticeDetail != null) //鏇存柊鍑哄簱鍗曟嵁鐨勪笅鍙戞暟閲�
+                            {
+                                noticeDetail.FactQty += item.Qty;
+                                Db.Updateable(noticeDetail).ExecuteCommand();
+                            }
+
+                            //var notice2 = Db.Queryable<BllExportNotice>().First(m => m.IsDel == "0" && m.SONo == item.SONo);
+                            if (notice.Status == "0" || notice.Status == "1" || notice.Status == "2")
+                            {
+                                var detailList = Db.Queryable<BllExportNoticeDetail>().Where(m => m.IsDel == "0" && m.SONo == item.SONo).ToList();
+                                if (detailList.Count(m => m.Qty >= m.AllotQty) > 0)
+                                {
+                                    notice.Status = "3"; //鍙樻洿鐘舵�佷负姝e湪鎵ц
+                                    Db.Updateable(notice).ExecuteCommand();
+                                }
+                            }
+                        }
+                        locate.Status = "3"; //瑕佸嚭搴撶殑鍌ㄤ綅鏀瑰彉鐘舵�� 姝e湪鍑哄簱
+                        Db.Updateable(locate).ExecuteCommand();
+                        var locate2 = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == outModeLocate && m.IsDel == "0");//褰撳墠鍑哄簱鐨勭洰鏍囧偍浣嶄俊鎭�
+                        locate2.Status = "4";
+                        Db.Updateable(locate2).ExecuteCommand();
+
+                        item.TaskNo = taskNoStr; // 鍑哄簱鍒嗛厤淇℃伅涓洿鏂颁换鍔″彿
+                        item.Status = "1"; // 鍑哄簱鍒嗛厤淇℃伅鐘舵�佹敼涓烘鍦ㄦ墽琛� 
+                        //item.UnstackingMode = unstackingMode2;//鎷嗗灈鏂瑰紡
+                        item.OutMode = outModeLocate;//鍑哄簱鍙�
+                        //item.LoadingAddre = unstackingMode2 == "0" ? loadingAddre : "";//瑁呰溅鍙�
+                        Db.Updateable(item).ExecuteCommand();
+
+                        #endregion
+                        
+                    }
+                    else if (locate.Status == "3") //鍑哄簱涓�
+                    {
+                        #region 鏀瑰彉鏁版嵁
+                        //鍒ゆ柇鏄惁鏄凡缁忓嚭杩囧簱鍙堝洖搴擄紙鐘舵�佷负寰呮嫞璐х殑 1锛�
+                        if (item.Status == "0")
+                        {
+                            var noticeDetail = Db.Queryable<BllExportNoticeDetail>().First(m => m.IsDel == "0" && m.Id == item.SODetailNo);
+                            if (noticeDetail != null) //鏇存柊鍑哄簱鍗曟嵁鐨勪笅鍙戞暟閲�
+                            {
+                                noticeDetail.FactQty += item.Qty;
+                                Db.Updateable(noticeDetail).ExecuteCommand();
+                            }
+
+                            //var notice2 = Db.Queryable<BllExportNotice>().First(m => m.IsDel == "0" && m.SONo == item.SONo);
+                            if (notice.Status == "0" || notice.Status == "1" || notice.Status == "2")
+                            {
+                                var detailList = Db.Queryable<BllExportNoticeDetail>().Where(m => m.IsDel == "0" && m.SONo == item.SONo).ToList();
+                                if (detailList.Count(m => m.Qty >= m.AllotQty) > 0)
+                                {
+                                    notice.Status = "3"; //鍙樻洿鐘舵�佷负姝e湪鎵ц
+                                    Db.Updateable(notice).ExecuteCommand();
+                                }
+                            }
+                        }
+                        var taskNo = Db.Queryable<LogTask>().First(m => m.OrderType == "1" && m.TaskNo != item.TaskNo && m.Status == "1" && m.PalletNo == item.PalletNo);
+                        if (taskNo == null)
+                        {
+                            taskNo = logTaskList.FirstOrDefault(m => m.PalletNo == item.PalletNo);//褰撳墠鏈夊悓鎵樼洏涓嶅悓鐗╂枡鍑哄簱
+                        }
+                        if (taskNo == null)
+                        {
+                            throw new Exception($"鎵樼洏鍙凤細{item.PalletNo},鍑哄簱寮傚父");
+                        }
+                        item.TaskNo = taskNo.TaskNo;
+                        item.Status = "1"; // 鍑哄簱鍒嗛厤淇℃伅鐘舵�佹敼涓烘鍦ㄦ墽琛� 
+                        item.OutMode = item.OutMode;//鍑哄簱鍙�
+                        //item.UnstackingMode = unstackingMode2;//鎷嗗灈妯″紡
+                        Db.Updateable(item).ExecuteCommand();
+                        
+                        #endregion
+                    }
+                    else if (locate.Status == "5") //绉诲嚭涓�
+                    {
+                        throw new Exception("褰撳墠瑕佸嚭搴撶殑鍌ㄤ綅姝e湪绉诲嚭");
+                    }
+                    
+
+                    //娣诲姞鎿嶄綔鏃ュ織璁板綍
+                    var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "涓嬪彂鍑哄簱", soNo, "鍑哄簱", $"鐐瑰嚮鍑哄簱鎸夐挳鍑哄簱鍗曞彿涓猴細{soNo}鐨勫嚭搴撳崟", userId);
+                    Db.CommitTran();
+                    
+                    if (outDto1.Count > 0)
+                    {
+                        // 姝e紡杩愯绋嬪簭鏀惧紑
+                        var list2 = outDto1.Select(m => m.TaskNo).ToList();
+                        var jsonData = JsonConvert.SerializeObject(outDto1);
+                        string response = "";
+
+                        try
+                        {
+                            var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+                            response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "WCS");
+                            var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
+
+                            //瑙f瀽杩斿洖鏁版嵁 
+                            var wcsModel = JsonConvert.DeserializeObject<WcsModel2>(response);
+                            if (wcsModel.code == 200)
+                            {
+                                //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
+                                new TaskServer().EditTaskIssueOk(list2, time1, time2);
+                                str = "涓嬪彂鎴愬姛";
+                            }
+                            else
+                            {
+                                new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.message);
+                                throw new Exception(wcsModel.message);
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            throw new Exception(ex.Message);
+                        }
+
+                    }
+
+                    return outDto1;
+                }
+                catch (Exception e)
+                {
+                    Db.RollbackTran();
+                    throw new Exception(e.Message);
+                }
+
+
+                #endregion
+            }
+            catch (Exception e)
+            {
+                throw new Exception(e.Message);
+            }
+        }
+
+
+        #region MyRegion
+
+
+        /// <summary>
+        /// 鍚慙imes鍙戦�佽楠屼俊鎭�
+        /// </summary>
+        /// <param name="model">model.Id:璇烽獙鍗曚富閿紱model.Code:鍑哄簱鍙� </param>
+        /// <param name="userId">鎿嶄綔鐢ㄦ埛</param>
+        /// <param name="url">Wcs鍦板潃</param>
+        /// <returns></returns>
+        public bool SendInspectionRequest(IdVm model, int userId, string url, string userName)
+        {
+            try
+            {
+                // 鍒ゆ柇璇烽獙鍗曠姸鎬�
+                var data = Db.Queryable<BllQualityInspectionRequest>()
+                    .Where(m => m.QcNo == model.Code && m.IsDel == "0" && m.Status == "0").ToList().FirstOrDefault();
+                if (data == null)
+                {
+                    throw new Exception("鎿嶄綔澶辫触!璇烽獙鍗曠姸鎬佸彉鏇�.");
+                }
+
+                // 璁板綍浠诲姟鏃ュ織
+                //var taskNo = new Common().GetMaxNo("TK");
+                //var exTask = new LogTask()
+                //{
+                //     TaskNo = taskNo,
+                //     Sender = "WMS",
+                //     Receiver = "Limes",
+                //     IsSuccess = 0,                  //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+                //     StartLocat = "",               //璧峰浣嶇疆
+                //     PalletNo = "",                 //鎵樼洏鐮�
+                //     IsSend = 1,                    //鏄惁鍙啀娆′笅鍙�
+                //     IsCancel = 1,                  //鏄惁鍙彇娑�
+                //     IsFinish = 1,                  //鏄惁鍙畬鎴�    
+                //     Status = "0",                  //浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝e湪鎵ц2鎵ц瀹屾垚
+                //     OrderType = "5",               //0 鍏ュ簱鍗� 1 鍑哄簱鍗�  2 鐩樼偣鍗�  3 绉诲簱鍗� 4 鍙栨牱鍑哄簱鍗� 5 鍏朵粬
+                //     EndLocat = "",          //鐩爣浣嶇疆
+                //     Type = "3",                     //浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟  2 绉诲簱浠诲姟
+                //     Msg = "璇烽獙浠诲姟"
+                //};
+
+                //// 鎻掑叆浠诲姟鏃ュ織
+                //Db.Insertable(exTask).ExecuteCommand();
+
+
+                // 璋冪敤Limes鎺ュ彛鍙戣捣璇烽獙
+                var sendModel = new SendLimesModel()
+                {
+                    QcNo = data.QcNo,
+                    SkuNo = data.SkuNo,
+                    Qty = data.Qty.ToString(),
+                    LotNo = data.LotNo,
+                    SupplierLot = data.SupplierLot,
+                    RequestUser = userName,                       // 璇烽獙浜�
+                };
+                var jsonData = JsonConvert.SerializeObject(sendModel);
+                string response = "";
+
+                try
+                {
+                    var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+                    //response = HttpHelper.DoPost(url, jsonData, "涓婁紶Limes绯荤粺鍙戣捣璇烽獙", "Limes");
+                    var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
+
+                    ////瑙f瀽杩斿洖鏁版嵁 
+                    //var limesModel = JsonConvert.DeserializeObject<LimesModel>(response);
+                    //if (limesModel.Success == 0)
+                    //{
+                    
+
+                    // 鏇存柊璇烽獙鍗曚俊鎭�
+                    data.Status = "1";
+                    data.SamplingQty = 10;//decimal.Parse(limesModel.SamplingQty);
+                    data.RequestUser = userId;
+                    data.RequestTime = DateTime.Now;
+                    data.UpdateTime = DateTime.Now;
+                    data.UpdateUser = userId;
+
+                    Db.Updateable(data).ExecuteCommand();
+                    //}
+                    //if (limesModel.Success == -1)
+                    //{
+                    
+                    //    throw new Exception(limesModel.Message);
+                    //}
+                }
+                catch (Exception ex)
+                {
+                    throw new Exception(ex.Message);
+                }
+
+                //娣诲姞鎿嶄綔鏃ュ織璁板綍
+                var k = new OperationCrServer()
+                    .AddLogOperationCr("璐ㄩ噺绠$悊", "璐ㄦ璇烽獙", model.Code, "璇烽獙", $"鍚戣川閲忛儴鍒嗗彂璧疯楠�!", userId);
+
+                return true;
+            }
+            catch (Exception e)
+            {
+                throw new Exception(e.Message);
+            }
+        }
+
+        #endregion
+
+
     }
 }

--
Gitblit v1.8.0